Remove Don't trigger lootable refresh for non-player interaction

patches/server/0004-Leaves-Server-Config-And-Command.patch

@@ -128,10 +128,10 @@ index e1c99d941c7bb954bf3ac83d5002dbf58fd833b0..4760b943da08771a42fcb22eba4d586d
                          .withRequiredArg()
 diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..10d09c21a1c3c7048d309294fdf4206a603d5164
+index 0000000000000000000000000000000000000000..c5c89964d60f291a4625545bb39f314850945ae6
 --- /dev/null
 +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
-@@ -0,0 +1,990 @@
+@@ -0,0 +1,985 @@
 +package top.leavesmc.leaves;
 +
 +import com.destroystokyo.paper.util.SneakyThrow;
@@ -797,11 +797,6 @@ index 0000000000000000000000000000000000000000..10d09c21a1c3c7048d309294fdf4206a
 +        useFastItemMergeRaytracing = getBoolean("settings.performance.use-fast-item-merge-raytracing", useFastItemMergeRaytracing);
 +    }
 +
-+    public static boolean dontTriggerLootableRefreshNonPlayer = true;
-+    private static void dontTriggerLootableRefreshNonPlayer() {
-+        dontTriggerLootableRefreshNonPlayer = getBoolean("settings.performance.dont-trigger-lootable-refresh-for-non-player", dontTriggerLootableRefreshNonPlayer);
-+    }
-+
 +    public static boolean dontRespondPingBeforeStart = true;
 +    private static void dontRespondPingBeforeStart() {
 +        dontRespondPingBeforeStart = getBoolean("settings.misc.dont-respond-ping-before-start-fully", dontRespondPingBeforeStart);

patches/server/0088-Don-t-trigger-lootable-refresh-for-non-player-intera.patch

@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: violetc <58360096+s-yh-china@users.noreply.github.com>
-Date: Mon, 17 Jul 2023 22:51:31 +0800
-Subject: [PATCH] Don't trigger lootable refresh for non-player interaction
-
-This patch is Powered by Gale(https://github.com/GaleMC/Gale)
-
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
-index 081691f9710ff1115e4308f79ed49fbc38941193..b9f4e2df35a12f6aebd7ef9fca94dd456a34682b 100644
---- a/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
-@@ -70,6 +70,7 @@ public abstract class RandomizableContainerBlockEntity extends BaseContainerBloc
-     }
- 
-     public void unpackLootTable(@Nullable Player player) {
-+        if (top.leavesmc.leaves.LeavesConfig.dontTriggerLootableRefreshNonPlayer && player == null) return; // Leaves - don't trigger lootable refresh for non-player interaction
-         if (this.lootableData.shouldReplenish(player) && this.level.getServer() != null) { // Paper
-             LootTable lootTable = this.level.getServer().getLootData().getLootTable(this.lootTable);
-             if (player instanceof ServerPlayer) {

patches/server/0098-Reduce-array-allocations.patch

@@ -223,7 +223,7 @@ index cf20f0983fc25b26cf92b9d3a28746b1909fc56b..c8d62a76bfa1a54b6ecb23f0d53ba2db
      }
      // Paper start
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 99aa4e9363d5b00c397e3cddc21c341f35812ba4..67105a6bbe39a38805dcf5ee026ec1269069c53a 100644
+index 8bd39a2809031950eab9f4b69db1c65b9e723ea3..21619aa9b039d59a14522ea872c6fe49023ad055 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -351,7 +351,7 @@ public class ServerEntity {
@@ -236,7 +236,7 @@ index 99aa4e9363d5b00c397e3cddc21c341f35812ba4..67105a6bbe39a38805dcf5ee026ec126
  
              for (int j = 0; j < i; ++j) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index c47df8d18be8ac7d32a16e6662dbbd850efc8e8a..709229d6226464d2a0bc773a3916c811f42a69aa 100644
+index 55ef6d5ffebe04e678dc89ec2740f031af361cb8..4c86d1836c8b4ac9c535cf5bccd71decf996278b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -177,6 +177,7 @@ import org.bukkit.event.world.GenericGameEvent;

patches/server/0099-Optimize-sun-burn-tick.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize sun burn tick
 This patch is Powered by Gale(https://github.com/GaleMC/Gale)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 990c1304dd8eb4d7330acb343e00c28b5a3c99a1..70b62bffa6defd2207f69f38fecaa99760bc2bbd 100644
+index 0ba05de67c4ae1926f4adf8a4283414cf5c2bd1f..570ee65b43a08f6f1846192b71660f0ed4c5b447 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1997,8 +1997,22 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

patches/server/0101-Use-optimized-collection.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Use optimized collection
 This patch is Powered by Gale(https://github.com/GaleMC/Gale)
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 445582a852826f177f220e3bcd96db3030134f64..092c7a1430c1e380cdaec308624afce0733a4556 100644
+index 09b79deb76e9766c3cf960a8d1295d762c589e11..136cd6152ea1107bb471b0abfe7f5682357ada44 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -295,7 +295,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -84,7 +84,7 @@ index 6fa00d9239546aa82b9e92e25a33103868084c38..5d50d9d2700a8943105301ef0ac467e4
          // Paper start
          int arraySize = rules.keySet().stream().mapToInt(key -> key.gameRuleIndex).max().orElse(-1) + 1;
 diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
-index 96b9d47aa3720491424c35c9e73fc996bfc8cd20..b87ce8e774e1030de8986067a308505c735a494d 100644
+index 98eb6061da8ac8617b54d489ff41b4808dafe839..55dc80e03b071ded8f8a066a161afbcd8235d05d 100644
 --- a/src/main/java/net/minecraft/world/level/block/Block.java
 +++ b/src/main/java/net/minecraft/world/level/block/Block.java
 @@ -61,6 +61,7 @@ import net.minecraft.world.phys.shapes.BooleanOp;

patches/server/0109-Skip-negligible-planar-movement-multiplication.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Skip negligible planar movement multiplication
 This patch is Powered by Gale(https://github.com/GaleMC/Gale)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index aeb86eb3362893e54e0bf28ab36cdf4d2eea6c31..515b90384ce5a168496635226f4df92ea3a7a915 100644
+index ab063e4a3fcdb402dfedac90b8b5ec4336021be3..a8eb0643a1c6f3db4453c8f86b106572bb06ddfd 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1237,9 +1237,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

patches/server/0111-Avoid-anvil-too-expensive.patch

@@ -18,7 +18,7 @@ index e0c3a4ba27e21c3692e601acd0af60873bcbb84c..b9fcf49ed88c62265d9aa8926c1228b9
              }
  
 diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
-index 579d06b8fd026f4a9b8c865bb8192ec7fc805fc2..7a922b532677afa21c7e9dbaddd6d1fec3008ee5 100644
+index 3447c3059ef55c483cf2d0282b1a4970a0a4d26b..24ba449a4b9f1ba9e92590acc55651a4bca672ad 100644
 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 @@ -610,6 +610,7 @@ public final class LeavesConfig {

patches/server/0114-Leaves-update-command.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Leaves update command
 
 
 diff --git a/src/main/java/top/leavesmc/leaves/command/LeavesCommand.java b/src/main/java/top/leavesmc/leaves/command/LeavesCommand.java
-index bdd4f2305e8336929bbf9bfaa4d369b3ac6702c0..78d3df6a15057d42466c266226f308a070f560ac 100644
+index e89bf96486c87cdff6c1a425afd10d744376c77f..8027a27b253db02570c2f28ebb200001b76a1fc3 100644
 --- a/src/main/java/top/leavesmc/leaves/command/LeavesCommand.java
 +++ b/src/main/java/top/leavesmc/leaves/command/LeavesCommand.java
 @@ -12,6 +12,7 @@ import org.bukkit.permissions.PermissionDefault;

patches/server/0116-Add-Leaves-Auto-Update.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add Leaves Auto Update
 
 
 diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
-index 7a922b532677afa21c7e9dbaddd6d1fec3008ee5..fd5254d73733ca7660ffa6ff232591fb7a416f97 100644
+index 24ba449a4b9f1ba9e92590acc55651a4bca672ad..e9484e242c8edfe08eb201ccbb863204e5e973fe 100644
 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 @@ -14,6 +14,7 @@ import top.leavesmc.leaves.bot.agent.Actions;
@@ -16,7 +16,7 @@ index 7a922b532677afa21c7e9dbaddd6d1fec3008ee5..fd5254d73733ca7660ffa6ff232591fb
  import top.leavesmc.leaves.util.MathUtils;
  import top.leavesmc.leaves.protocol.CarpetServerProtocol.CarpetRule;
  import top.leavesmc.leaves.protocol.CarpetServerProtocol.CarpetRules;
-@@ -830,6 +831,7 @@ public final class LeavesConfig {
+@@ -825,6 +826,7 @@ public final class LeavesConfig {
      private static void autoUpdate() {
          autoUpdate = getBoolean("settings.misc.auto-update.enable", autoUpdate);
          autoUpdateTime = getList("settings.misc.auto-update.time", autoUpdateTime);