diff --git a/gradle.properties b/gradle.properties
index 124d1e55..76bcdfe0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group = cn.dreeam.leaf
 mcVersion = 1.21.1
 version = 1.21.1-R0.1-SNAPSHOT
 
-galeCommit = 0f8447745c03d811434c81f6db87736351bceb13
+galeCommit = 3a10fbfb0d13a2ef47da837b4c524272779f5c0d
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/server/0003-Leaf-Config.patch b/patches/server/0003-Leaf-Config.patch
index a9c6e60d..b418ec01 100644
--- a/patches/server/0003-Leaf-Config.patch
+++ b/patches/server/0003-Leaf-Config.patch
@@ -11,7 +11,7 @@ Add per world config
 Add config reload
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 58663d658394704eda5193d60ed8d412c4845fae..86c54bdbe9db0c2b11c78a0323a33344614131ba 100644
+index e6d3fb2e7f7c4b5e5298acef7569a046c9062b67..9783e7800d060d0daab25b37b86cbbd811e02f65 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -14,6 +14,13 @@ val alsoShade: Configuration by configurations.creating
@@ -41,10 +41,10 @@ index 278adb48400ca9d4fd37bff040b37d4a8dd47282..759b22fc6f949829cef757232357368e
              DedicatedServerSettings dedicatedserversettings = new DedicatedServerSettings(optionset); // CraftBukkit - CLI argument support
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f4dd63ae1a9715f3cd10949ca49a269897443e56..1e18635c78ee73fab352465e56f2dc827ae8337a 100644
+index f39c51ae8ea689cb089cd9d4195276c2cfdaf1b7..5fed168aeeab505cd75cb89af09ac3ba8bb5aedb 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1222,6 +1222,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1221,6 +1221,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              org.spigotmc.WatchdogThread.tick();
              // Paper end - Improved Watchdog Support
              org.spigotmc.WatchdogThread.hasStarted = true; // Paper
diff --git a/patches/server/0007-Pufferfish-Optimize-mob-spawning.patch b/patches/server/0007-Pufferfish-Optimize-mob-spawning.patch
index 949307a9..1339de7e 100644
--- a/patches/server/0007-Pufferfish-Optimize-mob-spawning.patch
+++ b/patches/server/0007-Pufferfish-Optimize-mob-spawning.patch
@@ -20,10 +20,10 @@ and, in my opinion, worth the low risk of minor mob-spawning-related
 inconsistencies.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1e18635c78ee73fab352465e56f2dc827ae8337a..99f8d182023bc25ad3bcf546c6f11c8abe6a1a5f 100644
+index 5fed168aeeab505cd75cb89af09ac3ba8bb5aedb..3b23d29e49678a9cd850f3dc91bbdc0c0ceb03e3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -310,6 +310,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -309,6 +309,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public volatile boolean abnormalExit = false; // Paper
      public static final long SERVER_INIT = System.nanoTime(); // Paper - Lag compensation
  
diff --git a/patches/server/0011-Purpur-Server-Changes.patch b/patches/server/0011-Purpur-Server-Changes.patch
index 804ca4fc..47c1b580 100644
--- a/patches/server/0011-Purpur-Server-Changes.patch
+++ b/patches/server/0011-Purpur-Server-Changes.patch
@@ -571,7 +571,7 @@ index 759b22fc6f949829cef757232357368ef80d0d34..94e6f298b12f86f923bb58b88caec6f3
              Bootstrap.bootStrap();
              Bootstrap.validate();
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 99f8d182023bc25ad3bcf546c6f11c8abe6a1a5f..9d082b3c06281b0cafe455959d6ef20b8891110e 100644
+index 3b23d29e49678a9cd850f3dc91bbdc0c0ceb03e3..3e13ef5a4d3771a0c8eab0721951051a84aba9fa 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -289,6 +289,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -582,16 +582,16 @@ index 99f8d182023bc25ad3bcf546c6f11c8abe6a1a5f..9d082b3c06281b0cafe455959d6ef20b
      public java.util.Queue<Runnable> processQueue = new java.util.concurrent.ConcurrentLinkedQueue<Runnable>();
      public int autosavePeriod;
      // Paper - don't store the vanilla dispatcher
-@@ -305,6 +306,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -304,6 +305,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+     public final io.papermc.paper.configuration.PaperConfigurations paperConfigurations; // Paper - add paper configuration files
      public final GaleConfigurations galeConfigurations; // Gale - Gale configuration
-     public static long currentTickLong = 0L; // Paper - track current tick as a long
      public boolean isIteratingOverLevels = false; // Paper - Throw exception on world create while being ticked
 +    public boolean lagging = false; // Purpur
 +    protected boolean upnp = false; // Purpur
  
      public volatile Thread shutdownThread; // Paper
      public volatile boolean abnormalExit = false; // Paper
-@@ -1025,6 +1028,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1024,6 +1027,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          Commands.COMMAND_SENDING_POOL.shutdownNow(); // Paper - Perf: Async command map building; Shutdown and don't bother finishing
          MinecraftTimings.stopServer(); // Paper
          this.server.spark.disable(); // Paper - spark
@@ -606,7 +606,7 @@ index 99f8d182023bc25ad3bcf546c6f11c8abe6a1a5f..9d082b3c06281b0cafe455959d6ef20b
          // CraftBukkit start
          if (this.server != null) {
              this.server.disablePlugins();
-@@ -1120,6 +1131,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1119,6 +1130,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.safeShutdown(waitForShutdown, false);
      }
      public void safeShutdown(boolean waitForShutdown, boolean isRestarting) {
@@ -615,7 +615,7 @@ index 99f8d182023bc25ad3bcf546c6f11c8abe6a1a5f..9d082b3c06281b0cafe455959d6ef20b
          this.isRestarting = isRestarting;
          this.hasLoggedStop = true; // Paper - Debugging
          if (isDebugging()) io.papermc.paper.util.TraceUtil.dumpTraceForThread("Server stopped"); // Paper - Debugging
-@@ -1242,6 +1255,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1241,6 +1254,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              }
              // Paper end - Add onboarding message for initial server start
  
@@ -632,7 +632,7 @@ index 99f8d182023bc25ad3bcf546c6f11c8abe6a1a5f..9d082b3c06281b0cafe455959d6ef20b
              while (this.running) {
                  long i;
  
-@@ -1278,6 +1301,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1276,6 +1299,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                      this.recentTps[0] = tps1.getAverage();
                      this.recentTps[1] = tps5.getAverage();
                      this.recentTps[2] = tps15.getAverage();
@@ -640,7 +640,7 @@ index 99f8d182023bc25ad3bcf546c6f11c8abe6a1a5f..9d082b3c06281b0cafe455959d6ef20b
                      tickSection = currentTime;
                  }
                  // Paper end - further improve server tick loop
-@@ -1302,6 +1326,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1300,6 +1324,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  // Paper end - rewrite chunk system
                  this.mayHaveDelayedTasks = true;
                  this.delayedTasksMaxNextTickTimeNanos = Math.max(Util.getNanos() + i, this.nextTickTimeNanos);
@@ -653,7 +653,7 @@ index 99f8d182023bc25ad3bcf546c6f11c8abe6a1a5f..9d082b3c06281b0cafe455959d6ef20b
                  this.startMeasuringTaskExecutionTime();
                  this.waitUntilNextTick();
                  this.finishMeasuringTaskExecutionTime();
-@@ -1745,7 +1775,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1743,7 +1773,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              long worldTime = level.getGameTime();
              final ClientboundSetTimePacket worldPacket = new ClientboundSetTimePacket(worldTime, dayTime, doDaylight);
              for (Player entityhuman : level.players()) {
@@ -662,7 +662,7 @@ index 99f8d182023bc25ad3bcf546c6f11c8abe6a1a5f..9d082b3c06281b0cafe455959d6ef20b
                      continue;
                  }
                  ServerPlayer entityplayer = (ServerPlayer) entityhuman;
-@@ -1766,6 +1796,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1764,6 +1794,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              worldserver.hasEntityMoveEvent = io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - Add EntityMoveEvent
              net.minecraft.world.level.block.entity.HopperBlockEntity.skipHopperEvents = worldserver.paperConfig().hopper.disableMoveEvent || org.bukkit.event.inventory.InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0; // Paper - Perf: Optimize Hoppers
              worldserver.updateLagCompensationTick(); // Paper - lag compensation
@@ -8203,7 +8203,7 @@ index e86fdf5d6853b7bddfe19d6e5d41d3dec0c25f23..f45567aa7695da68f92809a6c208eb51
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index b8dacff80c114a00b698b6fc29e4d6da2eaedb5e..9ef292d75160089b278ee38d41f65aeb221ea600 100644
+index adbe1c6aad0abe367280b75c4d6691ac5e26bc30..a23cf6bc107220c92fa40c56e8360e1744ec9ab9 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -66,6 +66,12 @@ public class ItemEntity extends Entity implements TraceableEntity {
@@ -8219,7 +8219,7 @@ index b8dacff80c114a00b698b6fc29e4d6da2eaedb5e..9ef292d75160089b278ee38d41f65aeb
  
      public ItemEntity(EntityType<? extends ItemEntity> type, Level world) {
          super(type, world);
-@@ -400,7 +406,16 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -399,7 +405,16 @@ public class ItemEntity extends Entity implements TraceableEntity {
  
      @Override
      public boolean hurt(DamageSource source, float amount) {
@@ -8237,7 +8237,7 @@ index b8dacff80c114a00b698b6fc29e4d6da2eaedb5e..9ef292d75160089b278ee38d41f65aeb
              return false;
          } else if (!this.getItem().isEmpty() && this.getItem().is(Items.NETHER_STAR) && source.is(DamageTypeTags.IS_EXPLOSION)) {
              return false;
-@@ -608,6 +623,12 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -607,6 +622,12 @@ public class ItemEntity extends Entity implements TraceableEntity {
      public void setItem(ItemStack stack) {
          this.getEntityData().set(ItemEntity.DATA_ITEM, stack);
          this.despawnRate = this.level().paperConfig().entities.spawning.altItemDespawnRate.enabled ? this.level().paperConfig().entities.spawning.altItemDespawnRate.items.getOrDefault(stack.getItem(), this.level().spigotConfig.itemDespawnRate) : this.level().spigotConfig.itemDespawnRate; // Paper - Alternative item-despawn-rate
@@ -11414,13 +11414,13 @@ index 0d447c8a141a7d7fcaf9218571bf0513dd28269e..fdc57a81cbd7a02a3ade0da8ff84d7df
          this.updateActivity();
      }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index 2280004638fd19ed018cb3e77d53a018b34ec516..4578fc25456361b76c9821f066fd8a628cd4bd67 100644
+index 2b43337ac63d051718a2074fcc46e128a1d65129..77cc311e2b9aea6cb4d014fa93aac2d362bc8cd3 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -97,22 +97,70 @@ public class Zombie extends Monster {
      private int inWaterTime;
      public int conversionTime;
-     private int lastTick = MinecraftServer.currentTick; // CraftBukkit - add field
+     // private int lastTick = MinecraftServer.currentTick; // CraftBukkit - add field // Paper - remove anti tick skipping measures / wall time
 -    private boolean shouldBurnInDay = true; // Paper - Add more Zombie API
 +    //private boolean shouldBurnInDay = true; // Paper - Add more Zombie API // Purpur - implemented in LivingEntity - API for any mob to burn daylight
  
@@ -11510,7 +11510,7 @@ index 2280004638fd19ed018cb3e77d53a018b34ec516..4578fc25456361b76c9821f066fd8a62
          this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, IronGolem.class, true));
          this.targetSelector.addGoal(5, new NearestAttackableTargetGoal<>(this, Turtle.class, 10, true, false, Turtle.BABY_ON_LAND_SELECTOR));
      }
-@@ -244,32 +304,7 @@ public class Zombie extends Monster {
+@@ -241,32 +301,7 @@ public class Zombie extends Monster {
  
      @Override
      public void aiStep() {
@@ -11544,7 +11544,7 @@ index 2280004638fd19ed018cb3e77d53a018b34ec516..4578fc25456361b76c9821f066fd8a62
          super.aiStep();
      }
  
-@@ -307,6 +342,7 @@ public class Zombie extends Monster {
+@@ -304,6 +339,7 @@ public class Zombie extends Monster {
  
      }
  
@@ -11552,7 +11552,7 @@ index 2280004638fd19ed018cb3e77d53a018b34ec516..4578fc25456361b76c9821f066fd8a62
      public boolean isSunSensitive() {
          return this.shouldBurnInDay; // Paper - Add more Zombie API
      }
-@@ -435,7 +471,7 @@ public class Zombie extends Monster {
+@@ -432,7 +468,7 @@ public class Zombie extends Monster {
          nbt.putBoolean("CanBreakDoors", this.canBreakDoors());
          nbt.putInt("InWaterTime", this.isInWater() ? this.inWaterTime : -1);
          nbt.putInt("DrownedConversionTime", this.isUnderWaterConverting() ? this.conversionTime : -1);
@@ -11561,7 +11561,7 @@ index 2280004638fd19ed018cb3e77d53a018b34ec516..4578fc25456361b76c9821f066fd8a62
      }
  
      @Override
-@@ -448,7 +484,7 @@ public class Zombie extends Monster {
+@@ -445,7 +481,7 @@ public class Zombie extends Monster {
              this.startUnderWaterConversion(nbt.getInt("DrownedConversionTime"));
          }
          // Paper start - Add more Zombie API
@@ -11570,7 +11570,7 @@ index 2280004638fd19ed018cb3e77d53a018b34ec516..4578fc25456361b76c9821f066fd8a62
              this.shouldBurnInDay = nbt.getBoolean("Paper.ShouldBurnInDay");
          }
          // Paper end - Add more Zombie API
-@@ -520,19 +556,20 @@ public class Zombie extends Monster {
+@@ -517,19 +553,20 @@ public class Zombie extends Monster {
          }
  
          if (object instanceof Zombie.ZombieGroupData entityzombie_groupdatazombie) {
@@ -11597,7 +11597,7 @@ index 2280004638fd19ed018cb3e77d53a018b34ec516..4578fc25456361b76c9821f066fd8a62
                          Chicken entitychicken1 = (Chicken) EntityType.CHICKEN.create(this.level());
  
                          if (entitychicken1 != null) {
-@@ -542,6 +579,7 @@ public class Zombie extends Monster {
+@@ -539,6 +576,7 @@ public class Zombie extends Monster {
                              this.startRiding(entitychicken1);
                              world.addFreshEntity(entitychicken1, CreatureSpawnEvent.SpawnReason.MOUNT); // CraftBukkit
                          }
@@ -11605,7 +11605,7 @@ index 2280004638fd19ed018cb3e77d53a018b34ec516..4578fc25456361b76c9821f066fd8a62
                      }
                  }
              }
-@@ -588,7 +626,7 @@ public class Zombie extends Monster {
+@@ -585,7 +623,7 @@ public class Zombie extends Monster {
      }
  
      protected void randomizeReinforcementsChance() {
@@ -16589,7 +16589,7 @@ index 86d95edc7dd1e42b4b38eba1177cd508e72e4fc4..6c07fc507df6070854f5950a8616d294
      private static final float SAFE_TRAVEL_MAX_ENTITY_XY = 4.0F;
      private static final double SAFE_TRAVEL_MAX_VERTICAL_DELTA = 1.0D;
 diff --git a/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java b/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
-index 73e546cc828850365dae0131bf8d997f58473823..d6c704d8e933d689c3a946d7ef0e8396ac024841 100644
+index 72d69cf3976abef064e2bf10455025536c67082f..b794c097039f6a3f812dd76df407587594d3ac49 100644
 --- a/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
 +++ b/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
 @@ -80,6 +80,7 @@ public class MapItemSavedData extends SavedData {
diff --git a/patches/server/0012-Fix-Pufferfish-and-Purpur-patches.patch b/patches/server/0012-Fix-Pufferfish-and-Purpur-patches.patch
index d96f9dd7..3cb8be87 100644
--- a/patches/server/0012-Fix-Pufferfish-and-Purpur-patches.patch
+++ b/patches/server/0012-Fix-Pufferfish-and-Purpur-patches.patch
@@ -28,7 +28,7 @@ index 23609a71a993fc91271578ee0a541a9c6ec7354f..34f7f74b374d319d0d578e498db7663d
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 9d082b3c06281b0cafe455959d6ef20b8891110e..c842bd59cb612a98d261d31a026d4ae8ce4e455b 100644
+index 3e13ef5a4d3771a0c8eab0721951051a84aba9fa..f185a1a6a924e1f304a8a78028e3722c9668e586 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -300,7 +300,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -40,7 +40,7 @@ index 9d082b3c06281b0cafe455959d6ef20b8891110e..c842bd59cb612a98d261d31a026d4ae8
      // Spigot end
      public final io.papermc.paper.configuration.PaperConfigurations paperConfigurations; // Paper - add paper configuration files
      public final GaleConfigurations galeConfigurations; // Gale - Gale configuration
-@@ -313,7 +313,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -312,7 +312,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public volatile boolean abnormalExit = false; // Paper
      public static final long SERVER_INIT = System.nanoTime(); // Paper - Lag compensation
  
@@ -49,7 +49,7 @@ index 9d082b3c06281b0cafe455959d6ef20b8891110e..c842bd59cb612a98d261d31a026d4ae8
  
      public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
          AtomicReference<S> atomicreference = new AtomicReference();
-@@ -1036,6 +1036,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1035,6 +1035,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  LOGGER.error("[UPnP] Failed to close port {}", this.getPort());
              }
          }
@@ -57,7 +57,7 @@ index 9d082b3c06281b0cafe455959d6ef20b8891110e..c842bd59cb612a98d261d31a026d4ae8
          // CraftBukkit start
          if (this.server != null) {
              this.server.disablePlugins();
-@@ -1298,9 +1299,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1296,9 +1297,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                      tps15.add(currentTps, diff);
  
                      // Backwards compat with bad plugins
@@ -100,7 +100,7 @@ index 01ea21b960b5b32cdb14cefd1c23b50ba5cb8335..e8a89db44ed4f20516a9716bc3f41658
                  // Gale end - MultiPaper - skip unnecessary mob spawning computations
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 0ed4f5a291ef5009a0535273ac52a9fbac150553..fae2574cee5779c4a3ea7aec393f087676327b0e 100644
+index db427ee9dcc30639711ada54fd9323a8aa8e4002..b044de2a7af189e4ee4c8d72212fb8b7612f8a3a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -658,7 +658,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -113,7 +113,7 @@ index 0ed4f5a291ef5009a0535273ac52a9fbac150553..fae2574cee5779c4a3ea7aec393f0876
              j = this.levelData.getDayTime() + 24000L;
              TimeSkipEvent event = new TimeSkipEvent(this.getWorld(), TimeSkipEvent.SkipReason.NIGHT_SKIP, (j - j % 24000L) - this.getDayTime());
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 89d5458c83f4e8ad49e36c634f67302e230fa00f..37b16b4e44f2a807f5524d1ba33b90ca8ce862e1 100644
+index 3f9c6f887763842fd25fe8e9b2352f7fd5e4b57c..320dfb1b173fcada320010a9d2bdeccdc4e2548b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -564,13 +564,29 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -159,7 +159,7 @@ index 89d5458c83f4e8ad49e36c634f67302e230fa00f..37b16b4e44f2a807f5524d1ba33b90ca
          }
          // Pufferfish end - entity TTL
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index cb2d6bb3ab2d07dc0756591be0be76a3f6f8a5d6..27e7086b4e2c71b29aa4a1c825604395a5f35439 100644
+index 568d12f93954c1346210d0d031cf026453fd86c4..75149f653521fec845d8954c8968af28a403152e 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1044,17 +1044,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -306,7 +306,7 @@ index 613ef7dc40f1f2819bb38fecd3793f1c42a8f791..482a0998a3d98ba145f33efdba598971
          "farmer",
          PoiTypes.FARMER,
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index 617043b24fbf073038ffc5252da75c4cfaf85d38..e40f6d244011f6444fbed3fa0f49994ff56f54ce 100644
+index 0f143ed6b3448c8d40eb79dfe19b3d9e4e68d853..cbd510df8f1b886d1c40f431cb236d73f83417b9 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 @@ -77,7 +77,7 @@ public abstract class Projectile extends Entity implements TraceableEntity {
diff --git a/patches/server/0013-Purpur-Configurable-server-mod-name.patch b/patches/server/0013-Purpur-Configurable-server-mod-name.patch
index 8d8882d5..4fc84cb4 100644
--- a/patches/server/0013-Purpur-Configurable-server-mod-name.patch
+++ b/patches/server/0013-Purpur-Configurable-server-mod-name.patch
@@ -7,10 +7,10 @@ Original license: MIT
 Original project: https://github.com/PurpurMC/Purpur
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5071828f4ec318ca457d7c29d5ffaa3de2f43e48..a2541bc74821696a80c86abb3685d284f63acedb 100644
+index f185a1a6a924e1f304a8a78028e3722c9668e586..e6da1d068981f41f631ec3d42bf89eb7d4db2dd7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1938,7 +1938,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1936,7 +1936,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
      public String getServerModName() {
diff --git a/patches/server/0015-Remove-Timings.patch b/patches/server/0015-Remove-Timings.patch
index 42d19321..442b2d1b 100644
--- a/patches/server/0015-Remove-Timings.patch
+++ b/patches/server/0015-Remove-Timings.patch
@@ -838,7 +838,7 @@ index e2c24813f59c2fd075c740ac1842a38f20ed8554..1f7f68aad97ee73763c042837f239bdc
                      } catch (Exception exception) {
                          if (exception instanceof ReportedException) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ea19753d46b185f540084f8c5b97c59de1ba5233..1578fb315db16933059ed9c17b883059762f8603 100644
+index e6da1d068981f41f631ec3d42bf89eb7d4db2dd7..d6f9926ce0b6239821144a8886860c95678b9616 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -187,8 +187,6 @@ import org.bukkit.craftbukkit.CraftRegistry;
@@ -850,7 +850,7 @@ index ea19753d46b185f540084f8c5b97c59de1ba5233..1578fb315db16933059ed9c17b883059
  public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTask> implements ServerInfo, ChunkIOErrorReporter, CommandSource, AutoCloseable, ca.spottedleaf.moonrise.patches.chunk_system.server.ChunkSystemMinecraftServer { // Paper - rewrite chunk system
  
      public static final int SERVER_THREAD_PRIORITY = Integer.getInteger("gale.thread.priority.server", -1); // Gale - server thread priority environment variable
-@@ -1026,7 +1024,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1025,7 +1023,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
          MinecraftServer.LOGGER.info("Stopping server");
          Commands.COMMAND_SENDING_POOL.shutdownNow(); // Paper - Perf: Async command map building; Shutdown and don't bother finishing
@@ -858,7 +858,7 @@ index ea19753d46b185f540084f8c5b97c59de1ba5233..1578fb315db16933059ed9c17b883059
          this.server.spark.disable(); // Paper - spark
          // Purpur start
          if (upnp) {
-@@ -1489,7 +1486,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1487,7 +1484,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      protected void waitUntilNextTick() {
@@ -866,7 +866,7 @@ index ea19753d46b185f540084f8c5b97c59de1ba5233..1578fb315db16933059ed9c17b883059
          long tickOversleepStart = System.nanoTime(); // Gale - YAPFA - last tick time
          this.managedBlock(() -> {
              return !this.canSleepForTickNoOversleep(); // Paper - move oversleep into full server tick
-@@ -1601,15 +1597,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1599,15 +1595,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public void tickServer(BooleanSupplier shouldKeepTicking) {
@@ -884,7 +884,7 @@ index ea19753d46b185f540084f8c5b97c59de1ba5233..1578fb315db16933059ed9c17b883059
          // Paper end
          this.server.spark.tickStart(); // Paper - spark
          new com.destroystokyo.paper.event.server.ServerTickStartEvent(this.tickCount+1).callEvent(); // Paper - Server Tick Events
-@@ -1643,11 +1638,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1641,11 +1636,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.isSaving = false;
          }
          // Paper end - Incremental chunk and player saving
@@ -896,7 +896,7 @@ index ea19753d46b185f540084f8c5b97c59de1ba5233..1578fb315db16933059ed9c17b883059
          // Paper start - Server Tick Events
          long endTime = System.nanoTime();
          long remaining = (TICK_TIME - (endTime - lastTick)) - catchupTime;
-@@ -1668,7 +1659,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1666,7 +1657,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          // Paper end - Add tick times API and /mspt command
          this.logTickMethodTime(i);
          org.spigotmc.WatchdogThread.tick(); // Spigot
@@ -904,7 +904,7 @@ index ea19753d46b185f540084f8c5b97c59de1ba5233..1578fb315db16933059ed9c17b883059
      }
  
      private void logTickMethodTime(long tickStartTime) {
-@@ -1739,9 +1729,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1737,9 +1727,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.getPlayerList().getPlayers().forEach((entityplayer) -> {
              entityplayer.connection.suspendFlushing();
          });
@@ -914,7 +914,7 @@ index ea19753d46b185f540084f8c5b97c59de1ba5233..1578fb315db16933059ed9c17b883059
          // Paper start - Folia scheduler API
          ((io.papermc.paper.threadedregions.scheduler.FoliaGlobalRegionScheduler) Bukkit.getGlobalRegionScheduler()).tick();
          getAllLevels().forEach(level -> {
-@@ -1757,20 +1745,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1755,20 +1743,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          });
          // Paper end - Folia scheduler API
          io.papermc.paper.adventure.providers.ClickCallbackProviderImpl.CALLBACK_MANAGER.handleQueue(this.tickCount); // Paper
@@ -935,7 +935,7 @@ index ea19753d46b185f540084f8c5b97c59de1ba5233..1578fb315db16933059ed9c17b883059
          // Send time updates to everyone, it will get the right time from the world the player is in.
          // Paper start - Perf: Optimize time updates
          for (final ServerLevel level : this.getAllLevels()) {
-@@ -1790,7 +1773,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1788,7 +1771,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              }
          }
          // Paper end - Perf: Optimize time updates
@@ -943,7 +943,7 @@ index ea19753d46b185f540084f8c5b97c59de1ba5233..1578fb315db16933059ed9c17b883059
  
          this.isIteratingOverLevels = true; // Paper - Throw exception on world create while being ticked
          Iterator iterator = this.getAllLevels().iterator(); // Paper - Throw exception on world create while being ticked; move down
-@@ -1809,9 +1791,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1807,9 +1789,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              // CraftBukkit end */
  
              try {
@@ -953,7 +953,7 @@ index ea19753d46b185f540084f8c5b97c59de1ba5233..1578fb315db16933059ed9c17b883059
              } catch (Throwable throwable) {
                  CrashReport crashreport = CrashReport.forThrowable(throwable, "Exception ticking world");
  
-@@ -1823,21 +1803,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1821,21 +1801,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
          this.isIteratingOverLevels = false; // Paper - Throw exception on world create while being ticked
  
diff --git a/patches/server/0022-KeYi-Add-an-option-for-spigot-item-merging-mechanism.patch b/patches/server/0022-KeYi-Add-an-option-for-spigot-item-merging-mechanism.patch
index 95a9cc45..6e05174f 100644
--- a/patches/server/0022-KeYi-Add-an-option-for-spigot-item-merging-mechanism.patch
+++ b/patches/server/0022-KeYi-Add-an-option-for-spigot-item-merging-mechanism.patch
@@ -7,10 +7,10 @@ Original license: MIT
 Original project: https://github.com/KeYiMC/KeYi
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 9ef292d75160089b278ee38d41f65aeb221ea600..1ffd3e8e4d637d4a9f83320b8232d28f482ce281 100644
+index a23cf6bc107220c92fa40c56e8360e1744ec9ab9..066000b6367e808a82f55adf27c6df1e8f98e450 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-@@ -357,7 +357,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -356,7 +356,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
          ItemStack itemstack1 = other.getItem();
  
          if (Objects.equals(this.target, other.target) && ItemEntity.areMergable(itemstack, itemstack1)) {
diff --git a/patches/server/0030-Leaves-Protocol-Core.patch b/patches/server/0030-Leaves-Protocol-Core.patch
index 08ecea49..3ae8d1d9 100644
--- a/patches/server/0030-Leaves-Protocol-Core.patch
+++ b/patches/server/0030-Leaves-Protocol-Core.patch
@@ -49,10 +49,10 @@ index 1967c43ee3a12e63365cc40ee6565307e2fd73cf..6e376d0db5321d8e9b6e0b54617ffd17
  
          assert isValidPath(path);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1578fb315db16933059ed9c17b883059762f8603..4652e1d7f8b49faa36e632b1ce36b010fe1cc582 100644
+index d6f9926ce0b6239821144a8886860c95678b9616..04c1dc92d6404fffffd519f9f48763253737f14d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1809,6 +1809,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1807,6 +1807,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              GameTestTicker.SINGLETON.tick();
          }
  
diff --git a/patches/server/0037-Leaves-Replay-Mod-API.patch b/patches/server/0037-Leaves-Replay-Mod-API.patch
index f18dee32..c847065b 100644
--- a/patches/server/0037-Leaves-Replay-Mod-API.patch
+++ b/patches/server/0037-Leaves-Replay-Mod-API.patch
@@ -116,10 +116,10 @@ index b455c7e9d18bac3654daa8510f85cc21202e254b..1f8d52ee2ad0463b8cb1072190f836ea
                              if (((List) object).size() >= i) {
                                  return (List) object;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 4652e1d7f8b49faa36e632b1ce36b010fe1cc582..69d11753d98f05be5a894268be1a1452ca4f8f8f 100644
+index 04c1dc92d6404fffffd519f9f48763253737f14d..c2049ace0261c0a76b06d7f3da3514e1c12194aa 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1704,7 +1704,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1702,7 +1702,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      private ServerStatus.Players buildPlayerStatus() {
diff --git a/patches/server/0048-Reduce-items-finding-hopper-nearby-check.patch b/patches/server/0048-Reduce-items-finding-hopper-nearby-check.patch
index e994c396..ff0e2126 100644
--- a/patches/server/0048-Reduce-items-finding-hopper-nearby-check.patch
+++ b/patches/server/0048-Reduce-items-finding-hopper-nearby-check.patch
@@ -9,10 +9,10 @@ But still recommend to turn-off `checkForMinecartNearItemWhileActive`
 Since `Reduce-hopper-item-checks.patch` will cause lag under massive dropped items
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 1ffd3e8e4d637d4a9f83320b8232d28f482ce281..fd96a97d35fcd422c3f99aa379a0daf9e5c2a695 100644
+index 066000b6367e808a82f55adf27c6df1e8f98e450..1fe41abcdc28013e2dae4b5c3ee727759fc3890c 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-@@ -245,7 +245,9 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -243,7 +243,9 @@ public class ItemEntity extends Entity implements TraceableEntity {
                  this.discard(EntityRemoveEvent.Cause.DESPAWN); // CraftBukkit - add Bukkit remove cause
                  return; // Gale - EMC - reduce hopper item checks
              }
diff --git a/patches/server/0049-Linear-region-file-format.patch b/patches/server/0049-Linear-region-file-format.patch
index 16c325dd..eef2b9a4 100644
--- a/patches/server/0049-Linear-region-file-format.patch
+++ b/patches/server/0049-Linear-region-file-format.patch
@@ -71,10 +71,10 @@ index 3218cbf84f54daf06e84442d5eb1a36d8da6b215..ec9b27177dc526510e86d85f48f167b4
              synchronized (cache) {
                  regionFile = ((ChunkSystemRegionFileStorage)(Object)cache).moonrise$getRegionFileIfLoaded(chunkX, chunkZ);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 69d11753d98f05be5a894268be1a1452ca4f8f8f..86474d739762f13cb27b396fffb114a33cbc208c 100644
+index c2049ace0261c0a76b06d7f3da3514e1c12194aa..b46c81a22fa6f278646ef9d2066ba57d58436aad 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -969,10 +969,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -968,10 +968,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              while (iterator1.hasNext()) {
                  ServerLevel worldserver2 = (ServerLevel) iterator1.next();
  
diff --git a/patches/server/0053-PaperPR-Rewrite-framed-map-tracker-ticking.patch b/patches/server/0053-PaperPR-Rewrite-framed-map-tracker-ticking.patch
index 6c4b29eb..468eceef 100644
--- a/patches/server/0053-PaperPR-Rewrite-framed-map-tracker-ticking.patch
+++ b/patches/server/0053-PaperPR-Rewrite-framed-map-tracker-ticking.patch
@@ -107,7 +107,7 @@ index cf78531b193ba56991ccb0c4f62844208e4a5706..d6cecc788be59676f0d011323bb5bdab
                      itemstack.consume(1, player);
                  }
 diff --git a/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java b/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
-index d6c704d8e933d689c3a946d7ef0e8396ac024841..1c0b24699e5a076cefd6f7e153d7a51e7a3b8a6e 100644
+index b794c097039f6a3f812dd76df407587594d3ac49..20c1272b381e2eecc814e3547c3daff04c5319f8 100644
 --- a/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
 +++ b/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
 @@ -80,6 +80,16 @@ public class MapItemSavedData extends SavedData {
@@ -130,7 +130,7 @@ index d6c704d8e933d689c3a946d7ef0e8396ac024841..1c0b24699e5a076cefd6f7e153d7a51e
 @@ -353,6 +363,7 @@ public class MapItemSavedData extends SavedData {
          }
  
-         this.setDecorationsDirty();
+         if (mapicon != null) this.setDecorationsDirty(); // Paper - only mark dirty if a change occurs
 +        if (mapicon != null && mapicon.renderOnFrame()) this.dirtyFrameDecorations = true; // Paper
      }
  
diff --git a/patches/server/0056-SparklyPaper-Skip-EntityScheduler-s-executeTick-chec.patch b/patches/server/0056-SparklyPaper-Skip-EntityScheduler-s-executeTick-chec.patch
index d69f40cd..2ff1e557 100644
--- a/patches/server/0056-SparklyPaper-Skip-EntityScheduler-s-executeTick-chec.patch
+++ b/patches/server/0056-SparklyPaper-Skip-EntityScheduler-s-executeTick-chec.patch
@@ -75,10 +75,10 @@ index c03608fec96b51e1867f43d8f42e5aefb1520e46..15b21fa3907db1b77ed5b5d1050a37f4
                  throw new IllegalStateException("Ticking retired scheduler");
              }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 86474d739762f13cb27b396fffb114a33cbc208c..179454a347ca3fc327531e8d2d9321983b859305 100644
+index b46c81a22fa6f278646ef9d2066ba57d58436aad..8f5cc10bbb3d88399358b34253d3e0b540a67c72 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -312,6 +312,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -311,6 +311,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public static final long SERVER_INIT = System.nanoTime(); // Paper - Lag compensation
  
      public gg.pufferfish.pufferfish.util.AsyncExecutor mobSpawnExecutor = new gg.pufferfish.pufferfish.util.AsyncExecutor("Leaf Async Mob Spawn Thread"); // Pufferfish - optimize mob spawning // Leaf - Unify thread name
@@ -86,7 +86,7 @@ index 86474d739762f13cb27b396fffb114a33cbc208c..179454a347ca3fc327531e8d2d932198
  
      public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
          AtomicReference<S> atomicreference = new AtomicReference();
-@@ -1732,6 +1733,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1730,6 +1731,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.server.getScheduler().mainThreadHeartbeat(this.tickCount); // CraftBukkit
          // Paper start - Folia scheduler API
          ((io.papermc.paper.threadedregions.scheduler.FoliaGlobalRegionScheduler) Bukkit.getGlobalRegionScheduler()).tick();
@@ -105,7 +105,7 @@ index 86474d739762f13cb27b396fffb114a33cbc208c..179454a347ca3fc327531e8d2d932198
          getAllLevels().forEach(level -> {
              for (final Entity entity : level.moonrise$getEntityLookup().getAllCopy()) { // Paper - rewrite chunk system
                  if (entity.isRemoved()) {
-@@ -1743,6 +1756,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1741,6 +1754,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  }
              }
          });
diff --git a/patches/server/0100-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch b/patches/server/0100-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch
index ba7c0fe1..0f7f1b58 100644
--- a/patches/server/0100-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch
+++ b/patches/server/0100-Paper-PR-Prevent-zombie-reinforcements-loading-chunk.patch
@@ -12,10 +12,10 @@ before spawning, it checks isSpawnPositionOk() for the position which loads the
 This patch ensures the chunk at the random location is loaded before trying to spawn the reinforcement zombie in it.
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index 5e8f565511751509d1d9c47cd0583bcfbed9b63f..a3ed4e3fcca183967e77411c0c61210ba52bb34d 100644
+index ac9a63c70b5ddfb528eff559ca1464051d8865f4..7836f6142f1066d7f59724929ff7d8a2074bdfed 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-@@ -387,6 +387,12 @@ public class Zombie extends Monster {
+@@ -384,6 +384,12 @@ public class Zombie extends Monster {
                      BlockPos blockposition = new BlockPos(i1, j1, k1);
                      EntityType<?> entitytypes = entityzombie.getType();
  
diff --git a/patches/server/0105-Change-max-stack-count.patch b/patches/server/0105-Change-max-stack-count.patch
index 4e93e3a6..a799e418 100644
--- a/patches/server/0105-Change-max-stack-count.patch
+++ b/patches/server/0105-Change-max-stack-count.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Change max stack count
 TODO - Dreeam: Check shulkerbox unpack whether correct
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index fd96a97d35fcd422c3f99aa379a0daf9e5c2a695..5633ecea8639dd8564eb7f61aa9d366b552407a1 100644
+index 1fe41abcdc28013e2dae4b5c3ee727759fc3890c..18773f975b70f4d871808aa0eb1f7313baf26a91 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-@@ -351,7 +351,13 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -350,7 +350,13 @@ public class ItemEntity extends Entity implements TraceableEntity {
      private boolean isMergable() {
          ItemStack itemstack = this.getItem();
  
@@ -24,7 +24,7 @@ index fd96a97d35fcd422c3f99aa379a0daf9e5c2a695..5633ecea8639dd8564eb7f61aa9d366b
      }
  
      private void tryToMerge(ItemEntity other) {
-@@ -369,11 +375,24 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -368,11 +374,24 @@ public class ItemEntity extends Entity implements TraceableEntity {
      }
  
      public static boolean areMergable(ItemStack stack1, ItemStack stack2) {
@@ -51,7 +51,7 @@ index fd96a97d35fcd422c3f99aa379a0daf9e5c2a695..5633ecea8639dd8564eb7f61aa9d366b
          ItemStack itemstack2 = stack1.copyWithCount(stack1.getCount() + j);
  
          stack2.shrink(j);
-@@ -381,7 +400,14 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -380,7 +399,14 @@ public class ItemEntity extends Entity implements TraceableEntity {
      }
  
      private static void merge(ItemEntity targetEntity, ItemStack stack1, ItemStack stack2) {