diff --git a/patches/work/server/0023-Move-random-tick-random.patch b/patches/server/0023-Move-random-tick-random.patch
similarity index 85%
rename from patches/work/server/0023-Move-random-tick-random.patch
rename to patches/server/0023-Move-random-tick-random.patch
index bc018d8..49c6e2d 100644
--- a/patches/work/server/0023-Move-random-tick-random.patch
+++ b/patches/server/0023-Move-random-tick-random.patch
@@ -19,10 +19,10 @@ require it to be initialized earlier. By moving it to the superclass, we
 initialize it earlier, ensuring that it is available sooner.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index db21e92d1e81e34a80342581107e20a314415481..10723ae32ff7c293ee6c67d8a62e1af6edf971c2 100644
+index 55c81b6fa0173ba32cd3f3cee448147ad55418d7..920e2d9441ddf007581875b80de7827d716a6972 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -961,7 +961,6 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -794,7 +794,6 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
      }
      // Paper start - optimise random block ticking
      private final BlockPos.MutableBlockPos chunkTickMutablePosition = new BlockPos.MutableBlockPos();
@@ -31,10 +31,10 @@ index db21e92d1e81e34a80342581107e20a314415481..10723ae32ff7c293ee6c67d8a62e1af6
  
      public void tickChunk(LevelChunk chunk, int randomTickSpeed) {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 118d1a5aedce3f478f47b9e36cf419c15f3bd7ca..42750bdde718f9047f008afbb12c0836e9c3d089 100644
+index 91944ff33143ed28fa05be521375ead0768eb25b..9dd13830edf495d2fc55940e8d7f9cc20cf1936d 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -182,6 +182,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -183,6 +183,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
      public final Map<Explosion.CacheKey, Float> explosionDensityCache = new HashMap<>(); // Paper - Optimize explosions
      public java.util.ArrayDeque<net.minecraft.world.level.block.RedstoneTorchBlock.Toggle> redstoneUpdateInfos; // Paper - Faster redstone torch rapid clock removal; Move from Map in BlockRedstoneTorch to here
  
diff --git a/patches/work/server/0023-Optimize-random-calls-in-chunk-ticking.patch b/patches/server/0024-Optimize-random-calls-in-chunk-ticking.patch
similarity index 85%
rename from patches/work/server/0023-Optimize-random-calls-in-chunk-ticking.patch
rename to patches/server/0024-Optimize-random-calls-in-chunk-ticking.patch
index 8426912..c333d59 100644
--- a/patches/work/server/0023-Optimize-random-calls-in-chunk-ticking.patch
+++ b/patches/server/0024-Optimize-random-calls-in-chunk-ticking.patch
@@ -52,10 +52,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 4d12a8972007377b6541143e9a29b78b825cff68..a65c844d9dc715f75849e5cb665250dfa036af08 100644
+index ebae8578a2d0dfd0d329861f45d0f278fea1dd85..4200f3020b64160d3295995d8d9db1172f30573e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-@@ -483,6 +483,7 @@ public class ServerChunkCache extends ChunkSource {
+@@ -423,6 +423,7 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
                  }
              }
  
@@ -64,27 +64,28 @@ index 4d12a8972007377b6541143e9a29b78b825cff68..a65c844d9dc715f75849e5cb665250df
                  this.level.timings.countNaturalMobs.startTiming(); // Paper - timings
                  int k = this.distanceManager.getNaturalSpawnChunkCount();
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index e018f5686406b58e09c9b62a9bcd4982c8aed905..896eedb9fc2cf99ccba0342993036fd00d19782a 100644
+index 920e2d9441ddf007581875b80de7827d716a6972..9eb143508ace36756af8f728cfc13d24299dc8b1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -777,13 +777,15 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
-         });
-     }
+@@ -796,6 +796,8 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+     private final BlockPos.MutableBlockPos chunkTickMutablePosition = new BlockPos.MutableBlockPos();
+     // Paper end
  
 +    private int currentIceAndSnowTick = 0; protected void resetIceAndSnowTick() { this.currentIceAndSnowTick = this.randomTickRandom.nextInt(16); } // Gale - Airplane - optimize random calls in chunk ticking
 +
      public void tickChunk(LevelChunk chunk, int randomTickSpeed) {
          ChunkPos chunkcoordintpair = chunk.getPos();
          boolean flag = this.isRaining();
-         int j = chunkcoordintpair.getMinBlockX();
-         int k = chunkcoordintpair.getMinBlockZ();
+@@ -804,7 +806,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+ 
+         final BlockPos.MutableBlockPos blockposition = this.chunkTickMutablePosition; // Paper - use mutable to reduce allocation rate, final to force compile fail on change
  
 -        if (!this.paperConfig().environment.disableThunder && flag && this.isThundering() && this.spigotConfig.thunderChance > 0 && this.random.nextInt(this.spigotConfig.thunderChance) == 0) { // Spigot // Paper - Option to disable thunder
 +        if (!this.paperConfig().environment.disableThunder && flag && this.isThundering() && this.spigotConfig.thunderChance > 0 && /*this.random.nextInt(this.spigotConfig.thunderChance) == 0*/ chunk.shouldDoLightning(this.random)) { // Spigot // Paper - Option to disable thunder // Gale - Airplane - optimize random calls in chunk ticking - replace random with shouldDoLightning
-             BlockPos blockposition = this.findLightningTargetAround(this.getBlockRandomPos(j, 0, k, 15));
+             blockposition.set(this.findLightningTargetAround(this.getBlockRandomPos(j, 0, k, 15))); // Paper
  
              if (this.isRainingAt(blockposition)) {
-@@ -811,7 +813,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -832,7 +834,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
              }
          }
  
@@ -92,9 +93,9 @@ index e018f5686406b58e09c9b62a9bcd4982c8aed905..896eedb9fc2cf99ccba0342993036fd0
 +        if (!this.paperConfig().environment.disableIceAndSnow && (this.currentIceAndSnowTick++ & 15) == 0) { // Paper - Option to disable ice and snow // Gale - Airplane - optimize random calls in chunk ticking - optimize further random ticking
          for (int l = 0; l < randomTickSpeed; ++l) {
              if (this.random.nextInt(48) == 0) {
-                 this.tickPrecipitation(this.getBlockRandomPos(j, 0, k, 15));
+                 // Paper start
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 715a39cf1d075e0ef7f32c9066714a21b46f64b0..60356b1c7afd23e43861f6ddc7ac9a7ad3dde4e2 100644
+index 5752576087e5ff411ff8c89fde7a761083945c23..f15b81fd738825543eecf6eb4afc007fe828090d 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -85,6 +85,18 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
diff --git a/patches/server/0023-Reduce-enderman-teleport-chunk-lookups.patch b/patches/server/0025-Reduce-enderman-teleport-chunk-lookups.patch
similarity index 100%
rename from patches/server/0023-Reduce-enderman-teleport-chunk-lookups.patch
rename to patches/server/0025-Reduce-enderman-teleport-chunk-lookups.patch
diff --git a/patches/server/0024-Reduce-acquire-POI-for-stuck-entities.patch b/patches/server/0026-Reduce-acquire-POI-for-stuck-entities.patch
similarity index 98%
rename from patches/server/0024-Reduce-acquire-POI-for-stuck-entities.patch
rename to patches/server/0026-Reduce-acquire-POI-for-stuck-entities.patch
index 28c9de5..24e340f 100644
--- a/patches/server/0024-Reduce-acquire-POI-for-stuck-entities.patch
+++ b/patches/server/0026-Reduce-acquire-POI-for-stuck-entities.patch
@@ -31,7 +31,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java b/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java
-index e8aa27547e3fa1a42720889c7038d4fb0273e7b5..f053ee19875e6c1586ffe4ebb0284172af5fbb23 100644
+index e1b6fe9ecda25f86431baf414f1bfd3a26a8b2bd..b5242f2d450f863a3eb774d8a14bb00cbe699a16 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java
 @@ -13,6 +13,7 @@ import net.minecraft.core.BlockPos;
diff --git a/patches/server/0025-Remove-iterators-from-Inventory-contains.patch b/patches/server/0027-Remove-iterators-from-Inventory-contains.patch
similarity index 100%
rename from patches/server/0025-Remove-iterators-from-Inventory-contains.patch
rename to patches/server/0027-Remove-iterators-from-Inventory-contains.patch
diff --git a/patches/server/0026-Check-targeting-range-before-getting-visibility.patch b/patches/server/0028-Check-targeting-range-before-getting-visibility.patch
similarity index 100%
rename from patches/server/0026-Check-targeting-range-before-getting-visibility.patch
rename to patches/server/0028-Check-targeting-range-before-getting-visibility.patch
diff --git a/patches/server/0027-Print-stack-trace-for-plugins-not-shutting-down-task.patch b/patches/server/0029-Print-stack-trace-for-plugins-not-shutting-down-task.patch
similarity index 100%
rename from patches/server/0027-Print-stack-trace-for-plugins-not-shutting-down-task.patch
rename to patches/server/0029-Print-stack-trace-for-plugins-not-shutting-down-task.patch
diff --git a/patches/server/0028-Improve-fluid-direction-caching.patch b/patches/server/0030-Improve-fluid-direction-caching.patch
similarity index 100%
rename from patches/server/0028-Improve-fluid-direction-caching.patch
rename to patches/server/0030-Improve-fluid-direction-caching.patch
diff --git a/patches/server/0029-Cache-on-climbable-check.patch b/patches/server/0031-Cache-on-climbable-check.patch
similarity index 100%
rename from patches/server/0029-Cache-on-climbable-check.patch
rename to patches/server/0031-Cache-on-climbable-check.patch
diff --git a/patches/server/0030-Make-EntityCollisionContext-a-live-representation.patch b/patches/server/0032-Make-EntityCollisionContext-a-live-representation.patch
similarity index 100%
rename from patches/server/0030-Make-EntityCollisionContext-a-live-representation.patch
rename to patches/server/0032-Make-EntityCollisionContext-a-live-representation.patch
diff --git a/patches/work/server/0033-Improve-container-checking-with-a-bitset.patch b/patches/server/0033-Improve-container-checking-with-a-bitset.patch
similarity index 99%
rename from patches/work/server/0033-Improve-container-checking-with-a-bitset.patch
rename to patches/server/0033-Improve-container-checking-with-a-bitset.patch
index 27c9132..0124efc 100644
--- a/patches/work/server/0033-Improve-container-checking-with-a-bitset.patch
+++ b/patches/server/0033-Improve-container-checking-with-a-bitset.patch
@@ -188,7 +188,7 @@ index 241fec02e6869c638d3a160819b32173a081467b..1380f521de979b8734ebd13dd420b312
      public int getContainerSize() {
          return this.container1.getContainerSize() + this.container2.getContainerSize();
 diff --git a/src/main/java/net/minecraft/world/Container.java b/src/main/java/net/minecraft/world/Container.java
-index f402dbbfe3a443e6bc51f88b85abe937852b52f0..2c6388d892d0b58ba1800b795418fc9541c3b94c 100644
+index 5db5ba026462ca642dcee718af732f80fadabef5..bd31beb514bf7607eeefebf3c027264b2c6949ab 100644
 --- a/src/main/java/net/minecraft/world/Container.java
 +++ b/src/main/java/net/minecraft/world/Container.java
 @@ -3,6 +3,8 @@ package net.minecraft.world;
diff --git a/patches/server/0032-Better-checking-for-useless-move-packets.patch b/patches/server/0034-Better-checking-for-useless-move-packets.patch
similarity index 100%
rename from patches/server/0032-Better-checking-for-useless-move-packets.patch
rename to patches/server/0034-Better-checking-for-useless-move-packets.patch
diff --git a/patches/server/0031-Use-aging-cache-for-biome-temperatures.patch b/patches/server/0035-Use-aging-cache-for-biome-temperatures.patch
similarity index 100%
rename from patches/server/0031-Use-aging-cache-for-biome-temperatures.patch
rename to patches/server/0035-Use-aging-cache-for-biome-temperatures.patch
diff --git a/patches/server/0033-Inline-level-height.patch b/patches/server/0036-Inline-level-height.patch
similarity index 94%
rename from patches/server/0033-Inline-level-height.patch
rename to patches/server/0036-Inline-level-height.patch
index 4b322ae..21a266c 100644
--- a/patches/server/0033-Inline-level-height.patch
+++ b/patches/server/0036-Inline-level-height.patch
@@ -31,10 +31,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 93c2c9f06fb6e2c8b1c5af50b81ed68a4638027c..f489b74217b5cab017cbcade7e19fb7b8ec94f7c 100644
+index 9dd13830edf495d2fc55940e8d7f9cc20cf1936d..8b0c42c8e89f85c8cabcb74bd9a087f34b1c1dfc 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -264,6 +264,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
+@@ -266,6 +266,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
      }
      // Paper end - rewrite chunk system
  
@@ -50,7 +50,7 @@ index 93c2c9f06fb6e2c8b1c5af50b81ed68a4638027c..f489b74217b5cab017cbcade7e19fb7b
      protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, RegistryAccess iregistrycustom, Holder<DimensionType> holder, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.function.Function<org.spigotmc.SpigotWorldConfig, io.papermc.paper.configuration.WorldConfiguration> paperWorldConfigCreator, java.util.function.Function<org.spigotmc.SpigotWorldConfig, GaleWorldConfiguration> galeWorldConfigCreator, java.util.concurrent.Executor executor) { // Paper - create paper world config & Anti-Xray // Gale - Gale configuration // Gale - Purpur - remove vanilla profiler
          this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
          this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper - create paper world config
-@@ -283,6 +292,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
+@@ -285,6 +294,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
          this.dimensionTypeRegistration = holder;
          final DimensionType dimensionmanager = (DimensionType) holder.value();
  
diff --git a/patches/work/server/0035-Use-ThreadUnsafeRandom-for-mob-spawning.patch b/patches/server/0037-Use-ThreadUnsafeRandom-for-mob-spawning.patch
similarity index 100%
rename from patches/work/server/0035-Use-ThreadUnsafeRandom-for-mob-spawning.patch
rename to patches/server/0037-Use-ThreadUnsafeRandom-for-mob-spawning.patch
diff --git a/patches/server/0034-Remove-streams-and-iterators-from-range-check.patch b/patches/server/0038-Remove-streams-and-iterators-from-range-check.patch
similarity index 100%
rename from patches/server/0034-Remove-streams-and-iterators-from-range-check.patch
rename to patches/server/0038-Remove-streams-and-iterators-from-range-check.patch
diff --git a/patches/server/0035-Block-goal-does-not-load-chunks.patch b/patches/server/0039-Block-goal-does-not-load-chunks.patch
similarity index 100%
rename from patches/server/0035-Block-goal-does-not-load-chunks.patch
rename to patches/server/0039-Block-goal-does-not-load-chunks.patch
diff --git a/patches/server/0036-Reduce-entity-allocations.patch b/patches/server/0040-Reduce-entity-allocations.patch
similarity index 100%
rename from patches/server/0036-Reduce-entity-allocations.patch
rename to patches/server/0040-Reduce-entity-allocations.patch
diff --git a/patches/server/0037-Remove-lambda-from-ticking-guard.patch b/patches/server/0041-Remove-lambda-from-ticking-guard.patch
similarity index 95%
rename from patches/server/0037-Remove-lambda-from-ticking-guard.patch
rename to patches/server/0041-Remove-lambda-from-ticking-guard.patch
index cc38ec7..58ccc29 100644
--- a/patches/server/0037-Remove-lambda-from-ticking-guard.patch
+++ b/patches/server/0041-Remove-lambda-from-ticking-guard.patch
@@ -31,7 +31,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 55c81b6fa0173ba32cd3f3cee448147ad55418d7..75f13e33f94b42bccbabfe1e7533c2ad2b42f105 100644
+index 9eb143508ace36756af8f728cfc13d24299dc8b1..461124b92e67690758b94d95c592be9206f8fbea 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -733,7 +733,20 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -57,10 +57,10 @@ index 55c81b6fa0173ba32cd3f3cee448147ad55418d7..75f13e33f94b42bccbabfe1e7533c2ad
                      }
                  }
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 394a4bb7bbb072f03887a37d58c53a3783d2c44a..318ae232551b982c52ec609cc97649f206fd96b6 100644
+index 8b0c42c8e89f85c8cabcb74bd9a087f34b1c1dfc..2508e1bc36909ba024a379bc2e215c61bd8a41e8 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1007,15 +1007,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
+@@ -1009,15 +1009,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
          try {
              tickConsumer.accept(entity);
          } catch (Throwable throwable) {
diff --git a/patches/server/0038-Reduce-entity-fluid-lookups-if-no-fluids.patch b/patches/server/0042-Reduce-entity-fluid-lookups-if-no-fluids.patch
similarity index 100%
rename from patches/server/0038-Reduce-entity-fluid-lookups-if-no-fluids.patch
rename to patches/server/0042-Reduce-entity-fluid-lookups-if-no-fluids.patch
diff --git a/patches/server/0039-SIMD-support.patch b/patches/server/0043-SIMD-support.patch
similarity index 100%
rename from patches/server/0039-SIMD-support.patch
rename to patches/server/0043-SIMD-support.patch
diff --git a/patches/server/0040-Make-book-writing-configurable.patch b/patches/server/0044-Make-book-writing-configurable.patch
similarity index 100%
rename from patches/server/0040-Make-book-writing-configurable.patch
rename to patches/server/0044-Make-book-writing-configurable.patch
diff --git a/patches/server/0041-Optimize-entity-coordinate-key.patch b/patches/server/0045-Optimize-entity-coordinate-key.patch
similarity index 100%
rename from patches/server/0041-Optimize-entity-coordinate-key.patch
rename to patches/server/0045-Optimize-entity-coordinate-key.patch
diff --git a/patches/server/0042-Reduce-in-wall-checks.patch b/patches/server/0046-Reduce-in-wall-checks.patch
similarity index 97%
rename from patches/server/0042-Reduce-in-wall-checks.patch
rename to patches/server/0046-Reduce-in-wall-checks.patch
index f205806..82f37e7 100644
--- a/patches/server/0042-Reduce-in-wall-checks.patch
+++ b/patches/server/0046-Reduce-in-wall-checks.patch
@@ -28,7 +28,7 @@ but is so much cheaper than the suffocation check that it's worth
 keeping it.
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 1129a5301fa98bbcc97a9a6285922ded590dc430..e70d2a9005f1ba5d6bdd08a70c8de99295759018 100644
+index daa8c9019bcd7062508444f1bd6e04bfb7daeb7b..b06766a45138e40022e4131832c8d6288e7f6c48 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -447,7 +447,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0043-Make-chat-order-verification-configurable.patch b/patches/server/0047-Make-chat-order-verification-configurable.patch
similarity index 100%
rename from patches/server/0043-Make-chat-order-verification-configurable.patch
rename to patches/server/0047-Make-chat-order-verification-configurable.patch
diff --git a/patches/server/0044-Make-ender-dragon-respawn-attempt-after-placing-end-.patch b/patches/server/0048-Make-ender-dragon-respawn-attempt-after-placing-end-.patch
similarity index 100%
rename from patches/server/0044-Make-ender-dragon-respawn-attempt-after-placing-end-.patch
rename to patches/server/0048-Make-ender-dragon-respawn-attempt-after-placing-end-.patch
diff --git a/patches/server/0045-Make-saving-fireworks-configurable.patch b/patches/server/0049-Make-saving-fireworks-configurable.patch
similarity index 100%
rename from patches/server/0045-Make-saving-fireworks-configurable.patch
rename to patches/server/0049-Make-saving-fireworks-configurable.patch
diff --git a/patches/server/0046-Reduce-hopper-item-checks.patch b/patches/server/0050-Reduce-hopper-item-checks.patch
similarity index 98%
rename from patches/server/0046-Reduce-hopper-item-checks.patch
rename to patches/server/0050-Reduce-hopper-item-checks.patch
index 8dcb8f6..2d2ea93 100644
--- a/patches/server/0046-Reduce-hopper-item-checks.patch
+++ b/patches/server/0050-Reduce-hopper-item-checks.patch
@@ -120,7 +120,7 @@ index 5f042e294db605827000123252b0df646968f897..e1cc15f28fe8da23b74ff4504c5b2da2
  
      double getLevelY();
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-index 8310d132006043e93c612890514c4c7f3eb1c74d..59ab63dd7352abc47575daa3e829832a4793ea3f 100644
+index 55a5fad40f39b467ba933b2e0778998a54dbb8b2..21a1a880d49db917528d919ef7dd5cabbc8e2568 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 @@ -11,6 +11,7 @@ import net.minecraft.core.NonNullList;
@@ -139,7 +139,7 @@ index 8310d132006043e93c612890514c4c7f3eb1c74d..59ab63dd7352abc47575daa3e829832a
  import net.minecraft.world.inventory.AbstractContainerMenu;
  import net.minecraft.world.inventory.HopperMenu;
  import net.minecraft.world.item.ItemStack;
-@@ -563,7 +565,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
+@@ -589,7 +591,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
          } else {
              boolean flag = hopper.isGridAligned() && iblockdata.isCollisionShapeFullBlock(world, blockposition) && !iblockdata.is(BlockTags.DOES_NOT_BLOCK_HOPPERS);
  
@@ -148,7 +148,7 @@ index 8310d132006043e93c612890514c4c7f3eb1c74d..59ab63dd7352abc47575daa3e829832a
                  Iterator iterator = HopperBlockEntity.getItemsAtAndAbove(world, hopper).iterator();
  
                  while (iterator.hasNext()) {
-@@ -872,6 +874,31 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
+@@ -898,6 +900,31 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
          return first.getCount() < first.getMaxStackSize() && ItemStack.isSameItemSameComponents(first, second); // Paper - Perf: Optimize Hoppers; used to return true for full itemstacks?!
      }
  
diff --git a/patches/server/0047-Reduce-villager-item-re-pickup.patch b/patches/server/0051-Reduce-villager-item-re-pickup.patch
similarity index 100%
rename from patches/server/0047-Reduce-villager-item-re-pickup.patch
rename to patches/server/0051-Reduce-villager-item-re-pickup.patch
diff --git a/patches/server/0048-Variable-entity-wake-up-duration.patch b/patches/server/0052-Variable-entity-wake-up-duration.patch
similarity index 100%
rename from patches/server/0048-Variable-entity-wake-up-duration.patch
rename to patches/server/0052-Variable-entity-wake-up-duration.patch
diff --git a/patches/server/0049-Do-not-process-chat-commands-before-player-has-joine.patch b/patches/server/0053-Do-not-process-chat-commands-before-player-has-joine.patch
similarity index 97%
rename from patches/server/0049-Do-not-process-chat-commands-before-player-has-joine.patch
rename to patches/server/0053-Do-not-process-chat-commands-before-player-has-joine.patch
index 922dce5..97cbcc2 100644
--- a/patches/server/0049-Do-not-process-chat-commands-before-player-has-joine.patch
+++ b/patches/server/0053-Do-not-process-chat-commands-before-player-has-joine.patch
@@ -38,7 +38,7 @@ index 13adcb90134f03cf951c3e7eaa3123e033224df6..4ff3dbb9c1bcac000e4ed293cbc1a48a
              // CraftBukkit start
              if (sync) {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index ef177f21d654d69c128f3f39ea58f2d8ee598628..c6dc88ce33fa15673fc271e70f6d82dd4d514ede 100644
+index 5f20606cc2c79ad9a4c4d4d6c9e6a2a31a88b282..b6236d28c6ef3b94625950eb5934ebb11c14c9f4 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -350,6 +350,8 @@ public abstract class PlayerList {
diff --git a/patches/server/0050-Do-not-log-invalid-statistics.patch b/patches/server/0054-Do-not-log-invalid-statistics.patch
similarity index 100%
rename from patches/server/0050-Do-not-log-invalid-statistics.patch
rename to patches/server/0054-Do-not-log-invalid-statistics.patch
diff --git a/patches/server/0051-Do-not-log-empty-message-warnings.patch b/patches/server/0055-Do-not-log-empty-message-warnings.patch
similarity index 100%
rename from patches/server/0051-Do-not-log-empty-message-warnings.patch
rename to patches/server/0055-Do-not-log-empty-message-warnings.patch
diff --git a/patches/server/0052-Do-not-log-ignored-advancements.patch b/patches/server/0056-Do-not-log-ignored-advancements.patch
similarity index 100%
rename from patches/server/0052-Do-not-log-ignored-advancements.patch
rename to patches/server/0056-Do-not-log-ignored-advancements.patch
diff --git a/patches/server/0053-Do-not-log-setBlock-in-far-chunks.patch b/patches/server/0057-Do-not-log-setBlock-in-far-chunks.patch
similarity index 100%
rename from patches/server/0053-Do-not-log-setBlock-in-far-chunks.patch
rename to patches/server/0057-Do-not-log-setBlock-in-far-chunks.patch
diff --git a/patches/server/0054-Do-not-log-unrecognized-recipes.patch b/patches/server/0058-Do-not-log-unrecognized-recipes.patch
similarity index 100%
rename from patches/server/0054-Do-not-log-unrecognized-recipes.patch
rename to patches/server/0058-Do-not-log-unrecognized-recipes.patch
diff --git a/patches/server/0055-Do-not-log-legacy-Material-initialization.patch b/patches/server/0059-Do-not-log-legacy-Material-initialization.patch
similarity index 100%
rename from patches/server/0055-Do-not-log-legacy-Material-initialization.patch
rename to patches/server/0059-Do-not-log-legacy-Material-initialization.patch
diff --git a/patches/server/0056-Do-not-log-plugin-library-loads.patch b/patches/server/0060-Do-not-log-plugin-library-loads.patch
similarity index 100%
rename from patches/server/0056-Do-not-log-plugin-library-loads.patch
rename to patches/server/0060-Do-not-log-plugin-library-loads.patch
diff --git a/patches/server/0057-Do-not-log-expired-message-warnings.patch b/patches/server/0061-Do-not-log-expired-message-warnings.patch
similarity index 100%
rename from patches/server/0057-Do-not-log-expired-message-warnings.patch
rename to patches/server/0061-Do-not-log-expired-message-warnings.patch
diff --git a/patches/server/0058-Do-not-log-Not-Secure-marker.patch b/patches/server/0062-Do-not-log-Not-Secure-marker.patch
similarity index 100%
rename from patches/server/0058-Do-not-log-Not-Secure-marker.patch
rename to patches/server/0062-Do-not-log-Not-Secure-marker.patch
diff --git a/patches/server/0059-Do-not-log-disconnections-with-null-id.patch b/patches/server/0063-Do-not-log-disconnections-with-null-id.patch
similarity index 100%
rename from patches/server/0059-Do-not-log-disconnections-with-null-id.patch
rename to patches/server/0063-Do-not-log-disconnections-with-null-id.patch
diff --git a/patches/server/0060-Do-not-log-run-as-root-warning.patch b/patches/server/0064-Do-not-log-run-as-root-warning.patch
similarity index 100%
rename from patches/server/0060-Do-not-log-run-as-root-warning.patch
rename to patches/server/0064-Do-not-log-run-as-root-warning.patch
diff --git a/patches/server/0061-Do-not-log-offline-mode-warning.patch b/patches/server/0065-Do-not-log-offline-mode-warning.patch
similarity index 100%
rename from patches/server/0061-Do-not-log-offline-mode-warning.patch
rename to patches/server/0065-Do-not-log-offline-mode-warning.patch
diff --git a/patches/server/0062-Softly-log-invalid-pool-element-errors.patch b/patches/server/0066-Softly-log-invalid-pool-element-errors.patch
similarity index 100%
rename from patches/server/0062-Softly-log-invalid-pool-element-errors.patch
rename to patches/server/0066-Softly-log-invalid-pool-element-errors.patch
diff --git a/patches/server/0063-Fix-outdated-server-showing-in-ping-before-server-fu.patch b/patches/server/0067-Fix-outdated-server-showing-in-ping-before-server-fu.patch
similarity index 100%
rename from patches/server/0063-Fix-outdated-server-showing-in-ping-before-server-fu.patch
rename to patches/server/0067-Fix-outdated-server-showing-in-ping-before-server-fu.patch
diff --git a/patches/server/0064-Fix-MC-238526.patch b/patches/server/0068-Fix-MC-238526.patch
similarity index 100%
rename from patches/server/0064-Fix-MC-238526.patch
rename to patches/server/0068-Fix-MC-238526.patch
diff --git a/patches/server/0065-Fix-cow-rotation-when-shearing-mooshroom.patch b/patches/server/0069-Fix-cow-rotation-when-shearing-mooshroom.patch
similarity index 100%
rename from patches/server/0065-Fix-cow-rotation-when-shearing-mooshroom.patch
rename to patches/server/0069-Fix-cow-rotation-when-shearing-mooshroom.patch
diff --git a/patches/server/0066-Fix-MC-121706.patch b/patches/server/0070-Fix-MC-121706.patch
similarity index 100%
rename from patches/server/0066-Fix-MC-121706.patch
rename to patches/server/0070-Fix-MC-121706.patch
diff --git a/patches/server/0067-Fix-MC-110386.patch b/patches/server/0071-Fix-MC-110386.patch
similarity index 100%
rename from patches/server/0067-Fix-MC-110386.patch
rename to patches/server/0071-Fix-MC-110386.patch
diff --git a/patches/server/0068-Fix-MC-31819.patch b/patches/server/0072-Fix-MC-31819.patch
similarity index 100%
rename from patches/server/0068-Fix-MC-31819.patch
rename to patches/server/0072-Fix-MC-31819.patch
diff --git a/patches/server/0069-Fix-MC-26304.patch b/patches/server/0073-Fix-MC-26304.patch
similarity index 100%
rename from patches/server/0069-Fix-MC-26304.patch
rename to patches/server/0073-Fix-MC-26304.patch
diff --git a/patches/server/0070-Make-arrow-movement-resetting-despawn-counter-config.patch b/patches/server/0074-Make-arrow-movement-resetting-despawn-counter-config.patch
similarity index 100%
rename from patches/server/0070-Make-arrow-movement-resetting-despawn-counter-config.patch
rename to patches/server/0074-Make-arrow-movement-resetting-despawn-counter-config.patch
diff --git a/patches/server/0071-Make-logging-login-locations-configurable.patch b/patches/server/0075-Make-logging-login-locations-configurable.patch
similarity index 96%
rename from patches/server/0071-Make-logging-login-locations-configurable.patch
rename to patches/server/0075-Make-logging-login-locations-configurable.patch
index 26265d1..040d054 100644
--- a/patches/server/0071-Make-logging-login-locations-configurable.patch
+++ b/patches/server/0075-Make-logging-login-locations-configurable.patch
@@ -13,7 +13,7 @@ As part of: JettPack (https://gitlab.com/Titaniumtown/JettPack)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index cd844069b1fcb0a26c940724ee53b7e06d4280ed..cf834a2cc39ecd058325d2ef9eb647289648bd8e 100644
+index a34407257d6281e499498247712a2291c67aed25..aabca85eb35085511b24ace968d3bf1b85303445 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -483,7 +483,13 @@ public abstract class PlayerList {
diff --git a/patches/server/0072-Reduce-array-allocations.patch b/patches/server/0076-Reduce-array-allocations.patch
similarity index 99%
rename from patches/server/0072-Reduce-array-allocations.patch
rename to patches/server/0076-Reduce-array-allocations.patch
index ffe6763..1d13661 100644
--- a/patches/server/0072-Reduce-array-allocations.patch
+++ b/patches/server/0076-Reduce-array-allocations.patch
@@ -573,10 +573,10 @@ index 7c3e561f2ca2522ab8336487c0307e1b69a397a8..a7ee93c0d94be3bb6c8ea8e8ca7f8abf
              String[] strings = new String[pattern.size() - l - k];
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 318ae232551b982c52ec609cc97649f206fd96b6..f23e4e0b2298eb509679cb63a08abe1a68c68c1f 100644
+index 2508e1bc36909ba024a379bc2e215c61bd8a41e8..3b94e292881f631656450638592e69b91ae0a39f 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1289,7 +1289,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
+@@ -1291,7 +1291,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
      public org.bukkit.entity.Entity[] getChunkEntities(int chunkX, int chunkZ) {
          ca.spottedleaf.moonrise.patches.chunk_system.level.entity.ChunkEntitySlices slices = ((ServerLevel)this).moonrise$getEntityLookup().getChunk(chunkX, chunkZ);
          if (slices == null) {
diff --git a/patches/server/0073-Optimize-sun-burn-tick.patch b/patches/server/0077-Optimize-sun-burn-tick.patch
similarity index 100%
rename from patches/server/0073-Optimize-sun-burn-tick.patch
rename to patches/server/0077-Optimize-sun-burn-tick.patch
diff --git a/patches/server/0074-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch b/patches/server/0078-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch
similarity index 100%
rename from patches/server/0074-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch
rename to patches/server/0078-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch
diff --git a/patches/server/0075-Replace-game-rules-map-with-optimized-collection.patch b/patches/server/0079-Replace-game-rules-map-with-optimized-collection.patch
similarity index 100%
rename from patches/server/0075-Replace-game-rules-map-with-optimized-collection.patch
rename to patches/server/0079-Replace-game-rules-map-with-optimized-collection.patch
diff --git a/patches/server/0076-Replace-class-map-with-optimized-collection.patch b/patches/server/0080-Replace-class-map-with-optimized-collection.patch
similarity index 100%
rename from patches/server/0076-Replace-class-map-with-optimized-collection.patch
rename to patches/server/0080-Replace-class-map-with-optimized-collection.patch
diff --git a/patches/server/0077-Replace-throttle-tracker-map-with-optimized-collecti.patch b/patches/server/0081-Replace-throttle-tracker-map-with-optimized-collecti.patch
similarity index 100%
rename from patches/server/0077-Replace-throttle-tracker-map-with-optimized-collecti.patch
rename to patches/server/0081-Replace-throttle-tracker-map-with-optimized-collecti.patch
diff --git a/patches/server/0078-Replace-shape-full-block-cache-with-hashtable.patch b/patches/server/0082-Replace-shape-full-block-cache-with-hashtable.patch
similarity index 100%
rename from patches/server/0078-Replace-shape-full-block-cache-with-hashtable.patch
rename to patches/server/0082-Replace-shape-full-block-cache-with-hashtable.patch
diff --git a/patches/server/0079-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch b/patches/server/0083-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch
similarity index 100%
rename from patches/server/0079-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch
rename to patches/server/0083-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch
diff --git a/patches/server/0080-Cache-BlockStatePairKey-hash.patch b/patches/server/0084-Cache-BlockStatePairKey-hash.patch
similarity index 100%
rename from patches/server/0080-Cache-BlockStatePairKey-hash.patch
rename to patches/server/0084-Cache-BlockStatePairKey-hash.patch
diff --git a/patches/server/0081-Replace-division-by-multiplication-in-CubePointRange.patch b/patches/server/0085-Replace-division-by-multiplication-in-CubePointRange.patch
similarity index 100%
rename from patches/server/0081-Replace-division-by-multiplication-in-CubePointRange.patch
rename to patches/server/0085-Replace-division-by-multiplication-in-CubePointRange.patch
diff --git a/patches/server/0082-Replace-parts-by-size-in-CubePointRange.patch b/patches/server/0086-Replace-parts-by-size-in-CubePointRange.patch
similarity index 100%
rename from patches/server/0082-Replace-parts-by-size-in-CubePointRange.patch
rename to patches/server/0086-Replace-parts-by-size-in-CubePointRange.patch
diff --git a/patches/server/0083-Check-frozen-ticks-before-landing-block.patch b/patches/server/0087-Check-frozen-ticks-before-landing-block.patch
similarity index 95%
rename from patches/server/0083-Check-frozen-ticks-before-landing-block.patch
rename to patches/server/0087-Check-frozen-ticks-before-landing-block.patch
index d454fc5..0f1ab4d 100644
--- a/patches/server/0083-Check-frozen-ticks-before-landing-block.patch
+++ b/patches/server/0087-Check-frozen-ticks-before-landing-block.patch
@@ -13,7 +13,7 @@ As part of: Lithium (https://github.com/CaffeineMC/lithium-fabric)
 Licensed under: LGPL-3.0 (https://www.gnu.org/licenses/lgpl-3.0.html)
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 2a96e5cc0ff99c127fe6e4b1b0a1c9fe1424ed73..79d8a70dc38d13e160b40791d2c317050475827f 100644
+index 6ae8d4f50c6a4beab511ab9fdf540fb7a3ddd5d3..6b1b16c0ade335058834c01d9d760ef0a76928ca 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -565,11 +565,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0084-Faster-chunk-serialization.patch b/patches/server/0088-Faster-chunk-serialization.patch
similarity index 100%
rename from patches/server/0084-Faster-chunk-serialization.patch
rename to patches/server/0088-Faster-chunk-serialization.patch
diff --git a/patches/server/0085-Update-boss-bar-within-tick.patch b/patches/server/0089-Update-boss-bar-within-tick.patch
similarity index 100%
rename from patches/server/0085-Update-boss-bar-within-tick.patch
rename to patches/server/0089-Update-boss-bar-within-tick.patch
diff --git a/patches/server/0086-Cache-ominous-banner-item.patch b/patches/server/0090-Cache-ominous-banner-item.patch
similarity index 100%
rename from patches/server/0086-Cache-ominous-banner-item.patch
rename to patches/server/0090-Cache-ominous-banner-item.patch
diff --git a/patches/server/0087-Cache-world-generator-sea-level.patch b/patches/server/0091-Cache-world-generator-sea-level.patch
similarity index 100%
rename from patches/server/0087-Cache-world-generator-sea-level.patch
rename to patches/server/0091-Cache-world-generator-sea-level.patch
diff --git a/patches/server/0088-Skip-secondary-POI-sensor-if-absent.patch b/patches/server/0092-Skip-secondary-POI-sensor-if-absent.patch
similarity index 100%
rename from patches/server/0088-Skip-secondary-POI-sensor-if-absent.patch
rename to patches/server/0092-Skip-secondary-POI-sensor-if-absent.patch
diff --git a/patches/server/0089-Optimize-villager-data-storage.patch b/patches/server/0093-Optimize-villager-data-storage.patch
similarity index 99%
rename from patches/server/0089-Optimize-villager-data-storage.patch
rename to patches/server/0093-Optimize-villager-data-storage.patch
index 6c87ae4..6147995 100644
--- a/patches/server/0089-Optimize-villager-data-storage.patch
+++ b/patches/server/0093-Optimize-villager-data-storage.patch
@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/src/main/java/net/minecraft/world/Container.java b/src/main/java/net/minecraft/world/Container.java
-index 5db5ba026462ca642dcee718af732f80fadabef5..cd380ceb40d38acc7eef289ded11259388becabd 100644
+index bd31beb514bf7607eeefebf3c027264b2c6949ab..70e6711c11361dae6d1f3b70582efe78f4bd7c07 100644
 --- a/src/main/java/net/minecraft/world/Container.java
 +++ b/src/main/java/net/minecraft/world/Container.java
-@@ -71,6 +71,20 @@ public interface Container extends Clearable {
+@@ -130,6 +130,20 @@ public interface Container extends Clearable {
          });
      }
  
diff --git a/patches/server/0090-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0094-Skip-entity-move-if-movement-is-zero.patch
similarity index 100%
rename from patches/server/0090-Skip-entity-move-if-movement-is-zero.patch
rename to patches/server/0094-Skip-entity-move-if-movement-is-zero.patch
diff --git a/patches/server/0091-Store-mob-counts-in-an-array.patch b/patches/server/0095-Store-mob-counts-in-an-array.patch
similarity index 100%
rename from patches/server/0091-Store-mob-counts-in-an-array.patch
rename to patches/server/0095-Store-mob-counts-in-an-array.patch
diff --git a/patches/server/0092-Use-linked-map-for-entity-trackers.patch b/patches/server/0096-Use-linked-map-for-entity-trackers.patch
similarity index 100%
rename from patches/server/0092-Use-linked-map-for-entity-trackers.patch
rename to patches/server/0096-Use-linked-map-for-entity-trackers.patch
diff --git a/patches/server/0093-Optimize-noise-generation.patch b/patches/server/0097-Optimize-noise-generation.patch
similarity index 100%
rename from patches/server/0093-Optimize-noise-generation.patch
rename to patches/server/0097-Optimize-noise-generation.patch
diff --git a/patches/server/0094-Optimize-sheep-offspring-color.patch b/patches/server/0098-Optimize-sheep-offspring-color.patch
similarity index 100%
rename from patches/server/0094-Optimize-sheep-offspring-color.patch
rename to patches/server/0098-Optimize-sheep-offspring-color.patch
diff --git a/patches/server/0095-Hide-flames-on-entities-with-fire-resistance.patch b/patches/server/0099-Hide-flames-on-entities-with-fire-resistance.patch
similarity index 100%
rename from patches/server/0095-Hide-flames-on-entities-with-fire-resistance.patch
rename to patches/server/0099-Hide-flames-on-entities-with-fire-resistance.patch
diff --git a/patches/server/0096-Skip-cloning-advancement-criteria.patch b/patches/server/0100-Skip-cloning-advancement-criteria.patch
similarity index 100%
rename from patches/server/0096-Skip-cloning-advancement-criteria.patch
rename to patches/server/0100-Skip-cloning-advancement-criteria.patch
diff --git a/patches/server/0097-Reduce-block-destruction-packet-allocations.patch b/patches/server/0101-Reduce-block-destruction-packet-allocations.patch
similarity index 89%
rename from patches/server/0097-Reduce-block-destruction-packet-allocations.patch
rename to patches/server/0101-Reduce-block-destruction-packet-allocations.patch
index 01fdc2b..36be151 100644
--- a/patches/server/0097-Reduce-block-destruction-packet-allocations.patch
+++ b/patches/server/0101-Reduce-block-destruction-packet-allocations.patch
@@ -13,10 +13,10 @@ As part of: SportPaper (https://github.com/Electroid/SportPaper)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 75f13e33f94b42bccbabfe1e7533c2ad2b42f105..4cbbec2b372158c13f6305c23c29798c8b52779f 100644
+index 461124b92e67690758b94d95c592be9206f8fbea..0d1c24dc6da1541e934aeb6294f748d0ed358318 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -1528,7 +1528,17 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -1529,7 +1529,17 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
  
      @Override
      public void destroyBlockProgress(int entityId, BlockPos pos, int progress) {
@@ -35,7 +35,7 @@ index 75f13e33f94b42bccbabfe1e7533c2ad2b42f105..4cbbec2b372158c13f6305c23c29798c
  
          // CraftBukkit start
          Player entityhuman = null;
-@@ -1562,7 +1572,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+@@ -1563,7 +1573,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
                  // CraftBukkit end
  
                  if (d0 * d0 + d1 * d1 + d2 * d2 < 1024.0D) {
diff --git a/patches/server/0098-Spread-out-sending-all-player-info.patch b/patches/server/0102-Spread-out-sending-all-player-info.patch
similarity index 100%
rename from patches/server/0098-Spread-out-sending-all-player-info.patch
rename to patches/server/0102-Spread-out-sending-all-player-info.patch
diff --git a/patches/server/0099-Optimize-player-list-for-sending-player-info.patch b/patches/server/0103-Optimize-player-list-for-sending-player-info.patch
similarity index 100%
rename from patches/server/0099-Optimize-player-list-for-sending-player-info.patch
rename to patches/server/0103-Optimize-player-list-for-sending-player-info.patch
diff --git a/patches/server/0100-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch b/patches/server/0104-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch
similarity index 100%
rename from patches/server/0100-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch
rename to patches/server/0104-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch
diff --git a/patches/server/0101-Send-multiple-keep-alive-packets.patch b/patches/server/0105-Send-multiple-keep-alive-packets.patch
similarity index 100%
rename from patches/server/0101-Send-multiple-keep-alive-packets.patch
rename to patches/server/0105-Send-multiple-keep-alive-packets.patch
diff --git a/patches/server/0102-Make-slow-login-timeout-configurable.patch b/patches/server/0106-Make-slow-login-timeout-configurable.patch
similarity index 100%
rename from patches/server/0102-Make-slow-login-timeout-configurable.patch
rename to patches/server/0106-Make-slow-login-timeout-configurable.patch
diff --git a/patches/server/0103-Load-portal-destination-chunk-before-entity-teleport.patch b/patches/server/0107-Load-portal-destination-chunk-before-entity-teleport.patch
similarity index 100%
rename from patches/server/0103-Load-portal-destination-chunk-before-entity-teleport.patch
rename to patches/server/0107-Load-portal-destination-chunk-before-entity-teleport.patch
diff --git a/patches/server/0104-Don-t-load-chunks-to-spawn-phantoms.patch b/patches/server/0108-Don-t-load-chunks-to-spawn-phantoms.patch
similarity index 100%
rename from patches/server/0104-Don-t-load-chunks-to-spawn-phantoms.patch
rename to patches/server/0108-Don-t-load-chunks-to-spawn-phantoms.patch
diff --git a/patches/server/0105-Don-t-load-chunks-to-activate-climbing-entities.patch b/patches/server/0109-Don-t-load-chunks-to-activate-climbing-entities.patch
similarity index 100%
rename from patches/server/0105-Don-t-load-chunks-to-activate-climbing-entities.patch
rename to patches/server/0109-Don-t-load-chunks-to-activate-climbing-entities.patch
diff --git a/patches/server/0106-Broadcast-crit-animations-as-the-entity-being-critte.patch b/patches/server/0110-Broadcast-crit-animations-as-the-entity-being-critte.patch
similarity index 100%
rename from patches/server/0106-Broadcast-crit-animations-as-the-entity-being-critte.patch
rename to patches/server/0110-Broadcast-crit-animations-as-the-entity-being-critte.patch
diff --git a/patches/server/0107-Ignore-null-legacy-structure-data.patch b/patches/server/0111-Ignore-null-legacy-structure-data.patch
similarity index 100%
rename from patches/server/0107-Ignore-null-legacy-structure-data.patch
rename to patches/server/0111-Ignore-null-legacy-structure-data.patch
diff --git a/patches/server/0108-Skip-unnecessary-mob-spawning-computations.patch b/patches/server/0112-Skip-unnecessary-mob-spawning-computations.patch
similarity index 90%
rename from patches/server/0108-Skip-unnecessary-mob-spawning-computations.patch
rename to patches/server/0112-Skip-unnecessary-mob-spawning-computations.patch
index c1a7680..a2c5259 100644
--- a/patches/server/0108-Skip-unnecessary-mob-spawning-computations.patch
+++ b/patches/server/0112-Skip-unnecessary-mob-spawning-computations.patch
@@ -13,12 +13,12 @@ As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index ebae8578a2d0dfd0d329861f45d0f278fea1dd85..280fc455064dcc08ffaaceb8336ed0aada2c8d11 100644
+index 4200f3020b64160d3295995d8d9db1172f30573e..ed53e5698e2217c7b6847fd8369bff93e7b32f4d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-@@ -424,11 +424,16 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
-             }
+@@ -425,11 +425,16 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
  
+             this.level.resetIceAndSnowTick(); // Gale - Airplane - optimize random calls in chunk ticking - reset ice & snow tick random
              if (this.level.tickRateManager().runsNormally()) {
 +                // Gale start - MultiPaper - skip unnecessary mob spawning computations
 +                NaturalSpawner.SpawnState spawnercreature_d; // moved down
@@ -34,7 +34,7 @@ index ebae8578a2d0dfd0d329861f45d0f278fea1dd85..280fc455064dcc08ffaaceb8336ed0aa
                  if ((this.spawnFriendlies || this.spawnEnemies) && this.level.paperConfig().entities.spawning.perPlayerMobSpawns) { // don't count mobs when animals and monsters are disabled
                      // re-set mob counts
                      for (ServerPlayer player : this.level.players) {
-@@ -452,7 +457,11 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
+@@ -453,7 +458,11 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
                  this.level.timings.countNaturalMobs.stopTiming(); // Paper - timings
  
                  this.lastSpawnState = spawnercreature_d;
@@ -47,7 +47,7 @@ index ebae8578a2d0dfd0d329861f45d0f278fea1dd85..280fc455064dcc08ffaaceb8336ed0aa
  
                  Util.shuffle(list, this.level.random);
                  // Paper start - PlayerNaturallySpawnCreaturesEvent
-@@ -475,7 +484,7 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
+@@ -476,7 +485,7 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
  
                      if (this.level.isNaturalSpawningAllowed(chunkcoordintpair) && this.chunkMap.anyPlayerCloseEnoughForSpawning(chunkcoordintpair)) {
                          chunk1.incrementInhabitedTime(j);
@@ -56,7 +56,7 @@ index ebae8578a2d0dfd0d329861f45d0f278fea1dd85..280fc455064dcc08ffaaceb8336ed0aa
                              NaturalSpawner.spawnForChunk(this.level, chunk1, spawnercreature_d, this.spawnFriendlies, this.spawnEnemies, flag1);
                          }
  
-@@ -506,6 +515,20 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
+@@ -507,6 +516,20 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
          }
      }
  
diff --git a/patches/server/0109-Prevent-entities-random-strolling-into-non-ticking-c.patch b/patches/server/0113-Prevent-entities-random-strolling-into-non-ticking-c.patch
similarity index 100%
rename from patches/server/0109-Prevent-entities-random-strolling-into-non-ticking-c.patch
rename to patches/server/0113-Prevent-entities-random-strolling-into-non-ticking-c.patch
diff --git a/patches/server/0110-Do-not-place-player-in-world-if-kicked-before-being-.patch b/patches/server/0114-Do-not-place-player-in-world-if-kicked-before-being-.patch
similarity index 94%
rename from patches/server/0110-Do-not-place-player-in-world-if-kicked-before-being-.patch
rename to patches/server/0114-Do-not-place-player-in-world-if-kicked-before-being-.patch
index ee3e053..bde99a4 100644
--- a/patches/server/0110-Do-not-place-player-in-world-if-kicked-before-being-.patch
+++ b/patches/server/0114-Do-not-place-player-in-world-if-kicked-before-being-.patch
@@ -14,7 +14,7 @@ As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index a8d0e6566183f440f8e2732e10b390ba8b6ed517..b74f809138d657bcfcaa68fc30984e591b1e908b 100644
+index 876bffc0d03cd3a781c4139a9b5e4858215afdc9..28354aa3ed55f7a86c210f805b1aecb5ae06b466 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -275,6 +275,13 @@ public abstract class PlayerList {
diff --git a/patches/server/0111-CraftBukkit-UUID-to-world-map.patch b/patches/server/0115-CraftBukkit-UUID-to-world-map.patch
similarity index 100%
rename from patches/server/0111-CraftBukkit-UUID-to-world-map.patch
rename to patches/server/0115-CraftBukkit-UUID-to-world-map.patch
diff --git a/patches/server/0112-Global-EULA-file.patch b/patches/server/0116-Global-EULA-file.patch
similarity index 100%
rename from patches/server/0112-Global-EULA-file.patch
rename to patches/server/0116-Global-EULA-file.patch
diff --git a/patches/server/0113-Specific-interval-TPS-API.patch b/patches/server/0117-Specific-interval-TPS-API.patch
similarity index 100%
rename from patches/server/0113-Specific-interval-TPS-API.patch
rename to patches/server/0117-Specific-interval-TPS-API.patch
diff --git a/patches/server/0114-5-second-TPS-average.patch b/patches/server/0118-5-second-TPS-average.patch
similarity index 100%
rename from patches/server/0114-5-second-TPS-average.patch
rename to patches/server/0118-5-second-TPS-average.patch
diff --git a/patches/server/0115-Measure-last-tick-time.patch b/patches/server/0119-Measure-last-tick-time.patch
similarity index 100%
rename from patches/server/0115-Measure-last-tick-time.patch
rename to patches/server/0119-Measure-last-tick-time.patch
diff --git a/patches/server/0116-Last-tick-time-API.patch b/patches/server/0120-Last-tick-time-API.patch
similarity index 100%
rename from patches/server/0116-Last-tick-time-API.patch
rename to patches/server/0120-Last-tick-time-API.patch
diff --git a/patches/server/0117-Show-last-tick-time-in-tps-command.patch b/patches/server/0121-Show-last-tick-time-in-tps-command.patch
similarity index 100%
rename from patches/server/0117-Show-last-tick-time-in-tps-command.patch
rename to patches/server/0121-Show-last-tick-time-in-tps-command.patch
diff --git a/patches/server/0118-Increase-time-statistics-in-intervals.patch b/patches/server/0122-Increase-time-statistics-in-intervals.patch
similarity index 100%
rename from patches/server/0118-Increase-time-statistics-in-intervals.patch
rename to patches/server/0122-Increase-time-statistics-in-intervals.patch
diff --git a/patches/server/0119-For-collision-check-has-physics-before-same-vehicle.patch b/patches/server/0123-For-collision-check-has-physics-before-same-vehicle.patch
similarity index 100%
rename from patches/server/0119-For-collision-check-has-physics-before-same-vehicle.patch
rename to patches/server/0123-For-collision-check-has-physics-before-same-vehicle.patch
diff --git a/patches/server/0120-Skip-negligible-planar-movement-multiplication.patch b/patches/server/0124-Skip-negligible-planar-movement-multiplication.patch
similarity index 100%
rename from patches/server/0120-Skip-negligible-planar-movement-multiplication.patch
rename to patches/server/0124-Skip-negligible-planar-movement-multiplication.patch
diff --git a/patches/server/0121-Optimize-matching-item-checks.patch b/patches/server/0125-Optimize-matching-item-checks.patch
similarity index 100%
rename from patches/server/0121-Optimize-matching-item-checks.patch
rename to patches/server/0125-Optimize-matching-item-checks.patch
diff --git a/patches/server/0122-Pre-compute-VarLong-sizes.patch b/patches/server/0126-Pre-compute-VarLong-sizes.patch
similarity index 100%
rename from patches/server/0122-Pre-compute-VarLong-sizes.patch
rename to patches/server/0126-Pre-compute-VarLong-sizes.patch
diff --git a/patches/server/0123-Optimize-VarInt-write-and-VarLong-write.patch b/patches/server/0127-Optimize-VarInt-write-and-VarLong-write.patch
similarity index 100%
rename from patches/server/0123-Optimize-VarInt-write-and-VarLong-write.patch
rename to patches/server/0127-Optimize-VarInt-write-and-VarLong-write.patch
diff --git a/patches/server/0124-Reduce-RandomSource-instances.patch b/patches/server/0128-Reduce-RandomSource-instances.patch
similarity index 100%
rename from patches/server/0124-Reduce-RandomSource-instances.patch
rename to patches/server/0128-Reduce-RandomSource-instances.patch
diff --git a/patches/server/0125-Add-xor-shift-random.patch b/patches/server/0129-Add-xor-shift-random.patch
similarity index 100%
rename from patches/server/0125-Add-xor-shift-random.patch
rename to patches/server/0129-Add-xor-shift-random.patch
diff --git a/patches/server/0126-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch b/patches/server/0130-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch
similarity index 95%
rename from patches/server/0126-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch
rename to patches/server/0130-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch
index 8e52074..a68d7a0 100644
--- a/patches/server/0126-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch
+++ b/patches/server/0130-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch
@@ -18,7 +18,7 @@ this patch is focused around the sensors used for ai
 delete the line of sight cache less often and use a faster nearby comparison
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index a1e8495656a575c0d31abd12c69f0ba4427752ce..88bb6eb1a8c6551cb7fe71893f2e7f3c9db8c7bd 100644
+index 15ba997a722530a5461d3a66b9fbed26b5312a37..3c13810d03bf1c343195b9366554a046ff6112da 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1029,10 +1029,9 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0127-Initialize-line-of-sight-cache-with-low-capacity.patch b/patches/server/0131-Initialize-line-of-sight-cache-with-low-capacity.patch
similarity index 100%
rename from patches/server/0127-Initialize-line-of-sight-cache-with-low-capacity.patch
rename to patches/server/0131-Initialize-line-of-sight-cache-with-low-capacity.patch
diff --git a/patches/server/0128-Reduce-line-of-sight-updates-and-cache-lookups.patch b/patches/server/0132-Reduce-line-of-sight-updates-and-cache-lookups.patch
similarity index 100%
rename from patches/server/0128-Reduce-line-of-sight-updates-and-cache-lookups.patch
rename to patches/server/0132-Reduce-line-of-sight-updates-and-cache-lookups.patch
diff --git a/patches/server/0129-Server-thread-priority-environment-variable.patch b/patches/server/0133-Server-thread-priority-environment-variable.patch
similarity index 95%
rename from patches/server/0129-Server-thread-priority-environment-variable.patch
rename to patches/server/0133-Server-thread-priority-environment-variable.patch
index 9cade40..3a7b862 100644
--- a/patches/server/0129-Server-thread-priority-environment-variable.patch
+++ b/patches/server/0133-Server-thread-priority-environment-variable.patch
@@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5b2f18705b1b1da5c431b9061d5e5da5deab1589..25d1b4512f81802c658a5e0a03c8212ad69ac04e 100644
+index 564c1d0a04aff45f7f5bb598b9480ce7e8323b52..603c50248cf8ea5b1d55cdd1c84c7d49b1c5f8ff 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -191,6 +191,8 @@ import co.aikar.timings.MinecraftTimings; // Paper
diff --git a/patches/server/0130-Virtual-thread-support.patch b/patches/server/0134-Virtual-thread-support.patch
similarity index 100%
rename from patches/server/0130-Virtual-thread-support.patch
rename to patches/server/0134-Virtual-thread-support.patch