diff --git a/patches/removed/server/0035-Optimize-entity-coordinate-key.patch b/patches/server/0036-Optimize-entity-coordinate-key.patch
similarity index 99%
rename from patches/removed/server/0035-Optimize-entity-coordinate-key.patch
rename to patches/server/0036-Optimize-entity-coordinate-key.patch
index 79c94d6..b9e6c8d 100644
--- a/patches/removed/server/0035-Optimize-entity-coordinate-key.patch
+++ b/patches/server/0036-Optimize-entity-coordinate-key.patch
@@ -3,8 +3,6 @@ From: Martijn Muijsers <martijnmuijsers@live.nl>
 Date: Wed, 23 Nov 2022 23:32:51 +0100
 Subject: [PATCH] Optimize entity coordinate key
 
-Removed since 1.21
-
 License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org
 
diff --git a/patches/server/0036-Reduce-in-wall-checks.patch b/patches/server/0037-Reduce-in-wall-checks.patch
similarity index 100%
rename from patches/server/0036-Reduce-in-wall-checks.patch
rename to patches/server/0037-Reduce-in-wall-checks.patch
diff --git a/patches/server/0037-Make-chat-order-verification-configurable.patch b/patches/server/0038-Make-chat-order-verification-configurable.patch
similarity index 100%
rename from patches/server/0037-Make-chat-order-verification-configurable.patch
rename to patches/server/0038-Make-chat-order-verification-configurable.patch
diff --git a/patches/server/0038-Make-ender-dragon-respawn-attempt-after-placing-end-.patch b/patches/server/0039-Make-ender-dragon-respawn-attempt-after-placing-end-.patch
similarity index 100%
rename from patches/server/0038-Make-ender-dragon-respawn-attempt-after-placing-end-.patch
rename to patches/server/0039-Make-ender-dragon-respawn-attempt-after-placing-end-.patch
diff --git a/patches/server/0039-Make-saving-fireworks-configurable.patch b/patches/server/0040-Make-saving-fireworks-configurable.patch
similarity index 100%
rename from patches/server/0039-Make-saving-fireworks-configurable.patch
rename to patches/server/0040-Make-saving-fireworks-configurable.patch
diff --git a/patches/server/0040-Reduce-hopper-item-checks.patch b/patches/server/0041-Reduce-hopper-item-checks.patch
similarity index 100%
rename from patches/server/0040-Reduce-hopper-item-checks.patch
rename to patches/server/0041-Reduce-hopper-item-checks.patch
diff --git a/patches/server/0041-Reduce-villager-item-re-pickup.patch b/patches/server/0042-Reduce-villager-item-re-pickup.patch
similarity index 97%
rename from patches/server/0041-Reduce-villager-item-re-pickup.patch
rename to patches/server/0042-Reduce-villager-item-re-pickup.patch
index 8d64a28..cafa99b 100644
--- a/patches/server/0041-Reduce-villager-item-re-pickup.patch
+++ b/patches/server/0042-Reduce-villager-item-re-pickup.patch
@@ -48,7 +48,7 @@ index d98b28e9488a5a7736719cf656736bb026ec8c7e..74fe07a3737728b67987ef794103346c
          org.bukkit.event.entity.EntityDropItemEvent event = new org.bukkit.event.entity.EntityDropItemEvent(entity.getBukkitEntity(), (org.bukkit.entity.Item) entityitem.getBukkitEntity());
          entityitem.level().getCraftServer().getPluginManager().callEvent(event);
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index c869a559b67ecdfb8f9617e1f54fb9c28bb3c766..28afbf8da166377b295302e6ea7c602da70100b1 100644
+index a52de3800a3e4b8ff6a521c8c5edcca9d49f7473..9ac3c235a7adc42af1ba22aaa4efbce5b006f98d 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 @@ -56,6 +56,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
diff --git a/patches/server/0042-Variable-entity-wake-up-duration.patch b/patches/server/0043-Variable-entity-wake-up-duration.patch
similarity index 97%
rename from patches/server/0042-Variable-entity-wake-up-duration.patch
rename to patches/server/0043-Variable-entity-wake-up-duration.patch
index 30d24cd..3d32775 100644
--- a/patches/server/0042-Variable-entity-wake-up-duration.patch
+++ b/patches/server/0043-Variable-entity-wake-up-duration.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/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index 28afbf8da166377b295302e6ea7c602da70100b1..f8a561d91686d6df89a7374ca223972e435978c9 100644
+index 9ac3c235a7adc42af1ba22aaa4efbce5b006f98d..42306d45d3b8f7807b344422fca7382eec52cde2 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 @@ -96,6 +96,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
diff --git a/patches/server/0043-Do-not-process-chat-commands-before-player-has-joine.patch b/patches/server/0044-Do-not-process-chat-commands-before-player-has-joine.patch
similarity index 97%
rename from patches/server/0043-Do-not-process-chat-commands-before-player-has-joine.patch
rename to patches/server/0044-Do-not-process-chat-commands-before-player-has-joine.patch
index e875af2..725a1aa 100644
--- a/patches/server/0043-Do-not-process-chat-commands-before-player-has-joine.patch
+++ b/patches/server/0044-Do-not-process-chat-commands-before-player-has-joine.patch
@@ -25,7 +25,7 @@ index e2633083327853b87a265aab93d7eba5c5f980a7..36d009fb72351457fc238b250b097878
      public boolean isRealPlayer; // Paper
      public com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper - PlayerNaturallySpawnCreaturesEvent
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 13adcb90134f03cf951c3e7eaa3123e033224df6..4ff3dbb9c1bcac000e4ed293cbc1a48aa1738e8f 100644
+index 0563a4273f8cbb4ca9af52f6f708d43967575252..3581cd89052f6cc304bbf16ef406e6132b1a7e50 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2285,7 +2285,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
diff --git a/patches/server/0044-Do-not-log-invalid-statistics.patch b/patches/server/0045-Do-not-log-invalid-statistics.patch
similarity index 100%
rename from patches/server/0044-Do-not-log-invalid-statistics.patch
rename to patches/server/0045-Do-not-log-invalid-statistics.patch
diff --git a/patches/server/0045-Do-not-log-empty-message-warnings.patch b/patches/server/0046-Do-not-log-empty-message-warnings.patch
similarity index 96%
rename from patches/server/0045-Do-not-log-empty-message-warnings.patch
rename to patches/server/0046-Do-not-log-empty-message-warnings.patch
index e3f9e36..eb3f283 100644
--- a/patches/server/0045-Do-not-log-empty-message-warnings.patch
+++ b/patches/server/0046-Do-not-log-empty-message-warnings.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/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 4ff3dbb9c1bcac000e4ed293cbc1a48aa1738e8f..f9647ce528d23743f687249ecaa6b51cfa3e62d2 100644
+index 3581cd89052f6cc304bbf16ef406e6132b1a7e50..966c93c1fe51ff07d92b90d5e0ae0aa7a632172b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -194,6 +194,7 @@ import net.minecraft.world.phys.shapes.BooleanOp;
diff --git a/patches/server/0046-Do-not-log-ignored-advancements.patch b/patches/server/0047-Do-not-log-ignored-advancements.patch
similarity index 100%
rename from patches/server/0046-Do-not-log-ignored-advancements.patch
rename to patches/server/0047-Do-not-log-ignored-advancements.patch
diff --git a/patches/server/0047-Do-not-log-setBlock-in-far-chunks.patch b/patches/server/0048-Do-not-log-setBlock-in-far-chunks.patch
similarity index 100%
rename from patches/server/0047-Do-not-log-setBlock-in-far-chunks.patch
rename to patches/server/0048-Do-not-log-setBlock-in-far-chunks.patch
diff --git a/patches/server/0048-Do-not-log-unrecognized-recipes.patch b/patches/server/0049-Do-not-log-unrecognized-recipes.patch
similarity index 100%
rename from patches/server/0048-Do-not-log-unrecognized-recipes.patch
rename to patches/server/0049-Do-not-log-unrecognized-recipes.patch
diff --git a/patches/server/0049-Do-not-log-legacy-Material-initialization.patch b/patches/server/0050-Do-not-log-legacy-Material-initialization.patch
similarity index 100%
rename from patches/server/0049-Do-not-log-legacy-Material-initialization.patch
rename to patches/server/0050-Do-not-log-legacy-Material-initialization.patch
diff --git a/patches/server/0050-Do-not-log-plugin-library-loads.patch b/patches/server/0051-Do-not-log-plugin-library-loads.patch
similarity index 100%
rename from patches/server/0050-Do-not-log-plugin-library-loads.patch
rename to patches/server/0051-Do-not-log-plugin-library-loads.patch
diff --git a/patches/server/0051-Do-not-log-expired-message-warnings.patch b/patches/server/0052-Do-not-log-expired-message-warnings.patch
similarity index 100%
rename from patches/server/0051-Do-not-log-expired-message-warnings.patch
rename to patches/server/0052-Do-not-log-expired-message-warnings.patch
diff --git a/patches/server/0052-Do-not-log-Not-Secure-marker.patch b/patches/server/0053-Do-not-log-Not-Secure-marker.patch
similarity index 100%
rename from patches/server/0052-Do-not-log-Not-Secure-marker.patch
rename to patches/server/0053-Do-not-log-Not-Secure-marker.patch
diff --git a/patches/server/0053-Do-not-log-disconnections-with-null-id.patch b/patches/server/0054-Do-not-log-disconnections-with-null-id.patch
similarity index 100%
rename from patches/server/0053-Do-not-log-disconnections-with-null-id.patch
rename to patches/server/0054-Do-not-log-disconnections-with-null-id.patch
diff --git a/patches/server/0054-Do-not-log-run-as-root-warning.patch b/patches/server/0055-Do-not-log-run-as-root-warning.patch
similarity index 100%
rename from patches/server/0054-Do-not-log-run-as-root-warning.patch
rename to patches/server/0055-Do-not-log-run-as-root-warning.patch
diff --git a/patches/server/0055-Do-not-log-offline-mode-warning.patch b/patches/server/0056-Do-not-log-offline-mode-warning.patch
similarity index 100%
rename from patches/server/0055-Do-not-log-offline-mode-warning.patch
rename to patches/server/0056-Do-not-log-offline-mode-warning.patch
diff --git a/patches/server/0056-Softly-log-invalid-pool-element-errors.patch b/patches/server/0057-Softly-log-invalid-pool-element-errors.patch
similarity index 100%
rename from patches/server/0056-Softly-log-invalid-pool-element-errors.patch
rename to patches/server/0057-Softly-log-invalid-pool-element-errors.patch
diff --git a/patches/server/0057-Fix-outdated-server-showing-in-ping-before-server-fu.patch b/patches/server/0058-Fix-outdated-server-showing-in-ping-before-server-fu.patch
similarity index 100%
rename from patches/server/0057-Fix-outdated-server-showing-in-ping-before-server-fu.patch
rename to patches/server/0058-Fix-outdated-server-showing-in-ping-before-server-fu.patch
diff --git a/patches/server/0058-Fix-MC-238526.patch b/patches/server/0059-Fix-MC-238526.patch
similarity index 97%
rename from patches/server/0058-Fix-MC-238526.patch
rename to patches/server/0059-Fix-MC-238526.patch
index 6cdea76..fe6afb9 100644
--- a/patches/server/0058-Fix-MC-238526.patch
+++ b/patches/server/0059-Fix-MC-238526.patch
@@ -49,7 +49,7 @@ index c9cabb061ebc9172647304431cc3fb2593dd47ba..68375718c4c9ba46439e49cd82a5267a
      }
  }
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index f8a561d91686d6df89a7374ca223972e435978c9..14f4a9fe5e8c185d1d8e6201bff24aabee43a634 100644
+index 42306d45d3b8f7807b344422fca7382eec52cde2..fff9f552a9b3cc4913837077857c78826bf1bdb0 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 @@ -96,6 +96,16 @@ public class GaleWorldConfiguration extends ConfigurationPart {
diff --git a/patches/server/0059-Fix-cow-rotation-when-shearing-mooshroom.patch b/patches/server/0060-Fix-cow-rotation-when-shearing-mooshroom.patch
similarity index 97%
rename from patches/server/0059-Fix-cow-rotation-when-shearing-mooshroom.patch
rename to patches/server/0060-Fix-cow-rotation-when-shearing-mooshroom.patch
index 2a3cfb2..02e009a 100644
--- a/patches/server/0059-Fix-cow-rotation-when-shearing-mooshroom.patch
+++ b/patches/server/0060-Fix-cow-rotation-when-shearing-mooshroom.patch
@@ -64,7 +64,7 @@ index 0c21959f57ae88fcd0a4d6dc911c1ce347c96528..5707c6287a691030841fa973e8f7f34a
                      entitycow.setPersistenceRequired();
                  }
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index 14f4a9fe5e8c185d1d8e6201bff24aabee43a634..223983565d08c0a803afb27433aee31a4267c364 100644
+index fff9f552a9b3cc4913837077857c78826bf1bdb0..3fa354ceef3ec5ab9bca3f13f23aca586dfe09c4 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 @@ -99,6 +99,8 @@ public class GaleWorldConfiguration extends ConfigurationPart {
diff --git a/patches/server/0060-Fix-MC-121706.patch b/patches/server/0061-Fix-MC-121706.patch
similarity index 97%
rename from patches/server/0060-Fix-MC-121706.patch
rename to patches/server/0061-Fix-MC-121706.patch
index 327f02b..d7b61d0 100644
--- a/patches/server/0060-Fix-MC-121706.patch
+++ b/patches/server/0061-Fix-MC-121706.patch
@@ -65,7 +65,7 @@ index 515c1f671cb2c3a7cc23053aedf404bbbe77af3e..df002c7277a718dc156d2d5271fa4768
              }
  
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index 223983565d08c0a803afb27433aee31a4267c364..bcb7e0feda3aafd9a0c7e4a7ed41c867081df693 100644
+index 3fa354ceef3ec5ab9bca3f13f23aca586dfe09c4..c53cb97b271ca5390b544a1af66182e3c4aefc74 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 @@ -106,6 +106,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
diff --git a/patches/server/0061-Fix-MC-110386.patch b/patches/server/0062-Fix-MC-110386.patch
similarity index 96%
rename from patches/server/0061-Fix-MC-110386.patch
rename to patches/server/0062-Fix-MC-110386.patch
index 1cbfc62..4f6a7e4 100644
--- a/patches/server/0061-Fix-MC-110386.patch
+++ b/patches/server/0062-Fix-MC-110386.patch
@@ -35,7 +35,7 @@ index 80ef4b6649da3049f21624926fa38595d76c5da5..7ce47abc44e0dfe8ff90afeb25b14d8d
      }
  }
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index bcb7e0feda3aafd9a0c7e4a7ed41c867081df693..cb1e4ec01764c1be430ae45937706862a74afd26 100644
+index c53cb97b271ca5390b544a1af66182e3c4aefc74..266079aed0610e0fa9e35da81680b7f388a8844a 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 @@ -111,6 +111,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
diff --git a/patches/server/0062-Fix-MC-31819.patch b/patches/server/0063-Fix-MC-31819.patch
similarity index 96%
rename from patches/server/0062-Fix-MC-31819.patch
rename to patches/server/0063-Fix-MC-31819.patch
index 956a87b..8743fad 100644
--- a/patches/server/0062-Fix-MC-31819.patch
+++ b/patches/server/0063-Fix-MC-31819.patch
@@ -35,7 +35,7 @@ index 09bcbc0ae36e4e69fee87a7e0c49acf496117a39..81fdab6a5fbc39cb942f7b07a132a8f1
          if (!this.abilities.invulnerable) {
              if (!this.level().isClientSide) {
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index cb1e4ec01764c1be430ae45937706862a74afd26..7f9c5012defeac5ae558e46d8fca6889fb1d0872 100644
+index 266079aed0610e0fa9e35da81680b7f388a8844a..e3e4459da020a85a66360e761adbf6e55920c6c5 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 @@ -116,6 +116,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
diff --git a/patches/server/0063-Fix-MC-26304.patch b/patches/server/0064-Fix-MC-26304.patch
similarity index 100%
rename from patches/server/0063-Fix-MC-26304.patch
rename to patches/server/0064-Fix-MC-26304.patch
diff --git a/patches/server/0064-Make-arrow-movement-resetting-despawn-counter-config.patch b/patches/server/0065-Make-arrow-movement-resetting-despawn-counter-config.patch
similarity index 94%
rename from patches/server/0064-Make-arrow-movement-resetting-despawn-counter-config.patch
rename to patches/server/0065-Make-arrow-movement-resetting-despawn-counter-config.patch
index d5392bf..3f6bf01 100644
--- a/patches/server/0064-Make-arrow-movement-resetting-despawn-counter-config.patch
+++ b/patches/server/0065-Make-arrow-movement-resetting-despawn-counter-config.patch
@@ -42,7 +42,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
-index ddf47dab1ab92c45e3eea09239d418a9798ed59e..95ac8f4af849523e25b95b624d59f9f5ae5877b4 100644
+index 9ca29b3d4bf8bca5f51f3644e12fcbec2cb5d35e..6b652424786841f147f1c55617defd0e2a994b5f 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
 @@ -356,7 +356,7 @@ public abstract class AbstractArrow extends Projectile {
@@ -55,7 +55,7 @@ index ddf47dab1ab92c45e3eea09239d418a9798ed59e..95ac8f4af849523e25b95b624d59f9f5
  
      @Override
 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
-index 7f9c5012defeac5ae558e46d8fca6889fb1d0872..d7743dc516032a7c8942bce116244e7893e79e0b 100644
+index e3e4459da020a85a66360e761adbf6e55920c6c5..f459d398cf9e274b8551540c8a1f707bd609ecb9 100644
 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
 @@ -123,6 +123,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
diff --git a/patches/server/0065-Make-logging-login-locations-configurable.patch b/patches/server/0066-Make-logging-login-locations-configurable.patch
similarity index 100%
rename from patches/server/0065-Make-logging-login-locations-configurable.patch
rename to patches/server/0066-Make-logging-login-locations-configurable.patch
diff --git a/patches/server/0066-Reduce-array-allocations.patch b/patches/server/0067-Reduce-array-allocations.patch
similarity index 100%
rename from patches/server/0066-Reduce-array-allocations.patch
rename to patches/server/0067-Reduce-array-allocations.patch
diff --git a/patches/server/0067-Optimize-sun-burn-tick.patch b/patches/server/0068-Optimize-sun-burn-tick.patch
similarity index 95%
rename from patches/server/0067-Optimize-sun-burn-tick.patch
rename to patches/server/0068-Optimize-sun-burn-tick.patch
index e2a435c..4a5a776 100644
--- a/patches/server/0067-Optimize-sun-burn-tick.patch
+++ b/patches/server/0068-Optimize-sun-burn-tick.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/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 7349dee46483632cffa88d11694e2cd3a6fad911..93c48dd6b87d5bb7ba5a83b7c0f6c64544416bfc 100644
+index 8e79c569eb6b49382d1335ab8a247506db6afe95..8fe992f191819f828ebc5c1986572569a09d52a9 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -314,7 +314,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -22,7 +22,7 @@ index 7349dee46483632cffa88d11694e2cd3a6fad911..93c48dd6b87d5bb7ba5a83b7c0f6c645
      public double zo;
 -    private Vec3 position;
 +    public Vec3 position; // Gale - JettPack - optimize sun burn tick - private -> public
-     private BlockPos blockPosition;
+     public BlockPos blockPosition; // Gale - Pufferfish - optimize entity coordinate key - private -> public
      private ChunkPos chunkPosition;
      private Vec3 deltaMovement;
 @@ -2061,9 +2061,19 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0068-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch b/patches/server/0069-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch
similarity index 100%
rename from patches/server/0068-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch
rename to patches/server/0069-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch
diff --git a/patches/server/0069-Replace-game-rules-map-with-optimized-collection.patch b/patches/server/0070-Replace-game-rules-map-with-optimized-collection.patch
similarity index 100%
rename from patches/server/0069-Replace-game-rules-map-with-optimized-collection.patch
rename to patches/server/0070-Replace-game-rules-map-with-optimized-collection.patch
diff --git a/patches/server/0070-Replace-class-map-with-optimized-collection.patch b/patches/server/0071-Replace-class-map-with-optimized-collection.patch
similarity index 100%
rename from patches/server/0070-Replace-class-map-with-optimized-collection.patch
rename to patches/server/0071-Replace-class-map-with-optimized-collection.patch
diff --git a/patches/server/0071-Replace-throttle-tracker-map-with-optimized-collecti.patch b/patches/server/0072-Replace-throttle-tracker-map-with-optimized-collecti.patch
similarity index 100%
rename from patches/server/0071-Replace-throttle-tracker-map-with-optimized-collecti.patch
rename to patches/server/0072-Replace-throttle-tracker-map-with-optimized-collecti.patch
diff --git a/patches/server/0072-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch b/patches/server/0073-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch
similarity index 100%
rename from patches/server/0072-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch
rename to patches/server/0073-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch
diff --git a/patches/server/0073-Cache-BlockStatePairKey-hash.patch b/patches/server/0074-Cache-BlockStatePairKey-hash.patch
similarity index 100%
rename from patches/server/0073-Cache-BlockStatePairKey-hash.patch
rename to patches/server/0074-Cache-BlockStatePairKey-hash.patch
diff --git a/patches/server/0074-Replace-division-by-multiplication-in-CubePointRange.patch b/patches/server/0075-Replace-division-by-multiplication-in-CubePointRange.patch
similarity index 100%
rename from patches/server/0074-Replace-division-by-multiplication-in-CubePointRange.patch
rename to patches/server/0075-Replace-division-by-multiplication-in-CubePointRange.patch
diff --git a/patches/server/0075-Replace-parts-by-size-in-CubePointRange.patch b/patches/server/0076-Replace-parts-by-size-in-CubePointRange.patch
similarity index 100%
rename from patches/server/0075-Replace-parts-by-size-in-CubePointRange.patch
rename to patches/server/0076-Replace-parts-by-size-in-CubePointRange.patch
diff --git a/patches/server/0076-Check-frozen-ticks-before-landing-block.patch b/patches/server/0077-Check-frozen-ticks-before-landing-block.patch
similarity index 100%
rename from patches/server/0076-Check-frozen-ticks-before-landing-block.patch
rename to patches/server/0077-Check-frozen-ticks-before-landing-block.patch
diff --git a/patches/server/0077-Faster-chunk-serialization.patch b/patches/server/0078-Faster-chunk-serialization.patch
similarity index 100%
rename from patches/server/0077-Faster-chunk-serialization.patch
rename to patches/server/0078-Faster-chunk-serialization.patch
diff --git a/patches/server/0078-Update-boss-bar-within-tick.patch b/patches/server/0079-Update-boss-bar-within-tick.patch
similarity index 100%
rename from patches/server/0078-Update-boss-bar-within-tick.patch
rename to patches/server/0079-Update-boss-bar-within-tick.patch
diff --git a/patches/server/0079-Cache-world-generator-sea-level.patch b/patches/server/0080-Cache-world-generator-sea-level.patch
similarity index 100%
rename from patches/server/0079-Cache-world-generator-sea-level.patch
rename to patches/server/0080-Cache-world-generator-sea-level.patch
diff --git a/patches/server/0080-Skip-secondary-POI-sensor-if-absent.patch b/patches/server/0081-Skip-secondary-POI-sensor-if-absent.patch
similarity index 100%
rename from patches/server/0080-Skip-secondary-POI-sensor-if-absent.patch
rename to patches/server/0081-Skip-secondary-POI-sensor-if-absent.patch
diff --git a/patches/server/0081-Optimize-villager-data-storage.patch b/patches/server/0082-Optimize-villager-data-storage.patch
similarity index 100%
rename from patches/server/0081-Optimize-villager-data-storage.patch
rename to patches/server/0082-Optimize-villager-data-storage.patch
diff --git a/patches/server/0082-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0083-Skip-entity-move-if-movement-is-zero.patch
similarity index 100%
rename from patches/server/0082-Skip-entity-move-if-movement-is-zero.patch
rename to patches/server/0083-Skip-entity-move-if-movement-is-zero.patch
diff --git a/patches/server/0083-Store-mob-counts-in-an-array.patch b/patches/server/0084-Store-mob-counts-in-an-array.patch
similarity index 100%
rename from patches/server/0083-Store-mob-counts-in-an-array.patch
rename to patches/server/0084-Store-mob-counts-in-an-array.patch
diff --git a/patches/server/0084-Use-linked-map-for-entity-trackers.patch b/patches/server/0085-Use-linked-map-for-entity-trackers.patch
similarity index 100%
rename from patches/server/0084-Use-linked-map-for-entity-trackers.patch
rename to patches/server/0085-Use-linked-map-for-entity-trackers.patch
diff --git a/patches/server/0085-Optimize-noise-generation.patch b/patches/server/0086-Optimize-noise-generation.patch
similarity index 100%
rename from patches/server/0085-Optimize-noise-generation.patch
rename to patches/server/0086-Optimize-noise-generation.patch
diff --git a/patches/server/0086-Optimize-sheep-offspring-color.patch b/patches/server/0087-Optimize-sheep-offspring-color.patch
similarity index 100%
rename from patches/server/0086-Optimize-sheep-offspring-color.patch
rename to patches/server/0087-Optimize-sheep-offspring-color.patch
diff --git a/patches/server/0087-Hide-flames-on-entities-with-fire-resistance.patch b/patches/server/0088-Hide-flames-on-entities-with-fire-resistance.patch
similarity index 100%
rename from patches/server/0087-Hide-flames-on-entities-with-fire-resistance.patch
rename to patches/server/0088-Hide-flames-on-entities-with-fire-resistance.patch
diff --git a/patches/server/0088-Skip-cloning-advancement-criteria.patch b/patches/server/0089-Skip-cloning-advancement-criteria.patch
similarity index 100%
rename from patches/server/0088-Skip-cloning-advancement-criteria.patch
rename to patches/server/0089-Skip-cloning-advancement-criteria.patch
diff --git a/patches/server/0089-Reduce-block-destruction-packet-allocations.patch b/patches/server/0090-Reduce-block-destruction-packet-allocations.patch
similarity index 95%
rename from patches/server/0089-Reduce-block-destruction-packet-allocations.patch
rename to patches/server/0090-Reduce-block-destruction-packet-allocations.patch
index dc6e583..a68f5ab 100644
--- a/patches/server/0089-Reduce-block-destruction-packet-allocations.patch
+++ b/patches/server/0090-Reduce-block-destruction-packet-allocations.patch
@@ -13,7 +13,7 @@ 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 1f2af396b7cddbbbb9a200bc6272309941f10e5b..b5491374f17c93310cba14a29ade7f416dd68ab4 100644
+index bfefe93b1ab4facd4874210609ecbe244a4cff0d..0bc8711b91d81f37e65be17c3895a0dcfbe4f94e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -1576,7 +1576,17 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
diff --git a/patches/server/0090-Spread-out-sending-all-player-info.patch b/patches/server/0091-Spread-out-sending-all-player-info.patch
similarity index 100%
rename from patches/server/0090-Spread-out-sending-all-player-info.patch
rename to patches/server/0091-Spread-out-sending-all-player-info.patch
diff --git a/patches/server/0091-Optimize-player-list-for-sending-player-info.patch b/patches/server/0092-Optimize-player-list-for-sending-player-info.patch
similarity index 100%
rename from patches/server/0091-Optimize-player-list-for-sending-player-info.patch
rename to patches/server/0092-Optimize-player-list-for-sending-player-info.patch
diff --git a/patches/server/0092-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch b/patches/server/0093-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch
similarity index 100%
rename from patches/server/0092-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch
rename to patches/server/0093-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch
diff --git a/patches/server/0093-Send-multiple-keep-alive-packets.patch b/patches/server/0094-Send-multiple-keep-alive-packets.patch
similarity index 100%
rename from patches/server/0093-Send-multiple-keep-alive-packets.patch
rename to patches/server/0094-Send-multiple-keep-alive-packets.patch
diff --git a/patches/server/0094-Make-slow-login-timeout-configurable.patch b/patches/server/0095-Make-slow-login-timeout-configurable.patch
similarity index 100%
rename from patches/server/0094-Make-slow-login-timeout-configurable.patch
rename to patches/server/0095-Make-slow-login-timeout-configurable.patch
diff --git a/patches/server/0095-Load-portal-destination-chunk-before-entity-teleport.patch b/patches/server/0096-Load-portal-destination-chunk-before-entity-teleport.patch
similarity index 100%
rename from patches/server/0095-Load-portal-destination-chunk-before-entity-teleport.patch
rename to patches/server/0096-Load-portal-destination-chunk-before-entity-teleport.patch
diff --git a/patches/server/0096-Don-t-load-chunks-to-spawn-phantoms.patch b/patches/server/0097-Don-t-load-chunks-to-spawn-phantoms.patch
similarity index 100%
rename from patches/server/0096-Don-t-load-chunks-to-spawn-phantoms.patch
rename to patches/server/0097-Don-t-load-chunks-to-spawn-phantoms.patch
diff --git a/patches/server/0097-Don-t-load-chunks-to-activate-climbing-entities.patch b/patches/server/0098-Don-t-load-chunks-to-activate-climbing-entities.patch
similarity index 100%
rename from patches/server/0097-Don-t-load-chunks-to-activate-climbing-entities.patch
rename to patches/server/0098-Don-t-load-chunks-to-activate-climbing-entities.patch
diff --git a/patches/server/0098-Broadcast-crit-animations-as-the-entity-being-critte.patch b/patches/server/0099-Broadcast-crit-animations-as-the-entity-being-critte.patch
similarity index 100%
rename from patches/server/0098-Broadcast-crit-animations-as-the-entity-being-critte.patch
rename to patches/server/0099-Broadcast-crit-animations-as-the-entity-being-critte.patch
diff --git a/patches/server/0099-Ignore-null-legacy-structure-data.patch b/patches/server/0100-Ignore-null-legacy-structure-data.patch
similarity index 100%
rename from patches/server/0099-Ignore-null-legacy-structure-data.patch
rename to patches/server/0100-Ignore-null-legacy-structure-data.patch
diff --git a/patches/server/0100-Skip-unnecessary-mob-spawning-computations.patch b/patches/server/0101-Skip-unnecessary-mob-spawning-computations.patch
similarity index 100%
rename from patches/server/0100-Skip-unnecessary-mob-spawning-computations.patch
rename to patches/server/0101-Skip-unnecessary-mob-spawning-computations.patch
diff --git a/patches/server/0101-Prevent-entities-random-strolling-into-non-ticking-c.patch b/patches/server/0102-Prevent-entities-random-strolling-into-non-ticking-c.patch
similarity index 100%
rename from patches/server/0101-Prevent-entities-random-strolling-into-non-ticking-c.patch
rename to patches/server/0102-Prevent-entities-random-strolling-into-non-ticking-c.patch
diff --git a/patches/server/0102-Do-not-place-player-in-world-if-kicked-before-being-.patch b/patches/server/0103-Do-not-place-player-in-world-if-kicked-before-being-.patch
similarity index 100%
rename from patches/server/0102-Do-not-place-player-in-world-if-kicked-before-being-.patch
rename to patches/server/0103-Do-not-place-player-in-world-if-kicked-before-being-.patch
diff --git a/patches/server/0103-CraftBukkit-UUID-to-world-map.patch b/patches/server/0104-CraftBukkit-UUID-to-world-map.patch
similarity index 100%
rename from patches/server/0103-CraftBukkit-UUID-to-world-map.patch
rename to patches/server/0104-CraftBukkit-UUID-to-world-map.patch
diff --git a/patches/server/0104-Global-EULA-file.patch b/patches/server/0105-Global-EULA-file.patch
similarity index 100%
rename from patches/server/0104-Global-EULA-file.patch
rename to patches/server/0105-Global-EULA-file.patch
diff --git a/patches/server/0105-Specific-interval-TPS-API.patch b/patches/server/0106-Specific-interval-TPS-API.patch
similarity index 100%
rename from patches/server/0105-Specific-interval-TPS-API.patch
rename to patches/server/0106-Specific-interval-TPS-API.patch
diff --git a/patches/server/0106-5-second-TPS-average.patch b/patches/server/0107-5-second-TPS-average.patch
similarity index 100%
rename from patches/server/0106-5-second-TPS-average.patch
rename to patches/server/0107-5-second-TPS-average.patch
diff --git a/patches/server/0107-Measure-last-tick-time.patch b/patches/server/0108-Measure-last-tick-time.patch
similarity index 100%
rename from patches/server/0107-Measure-last-tick-time.patch
rename to patches/server/0108-Measure-last-tick-time.patch
diff --git a/patches/server/0108-Last-tick-time-API.patch b/patches/server/0109-Last-tick-time-API.patch
similarity index 100%
rename from patches/server/0108-Last-tick-time-API.patch
rename to patches/server/0109-Last-tick-time-API.patch
diff --git a/patches/server/0109-Show-last-tick-time-in-tps-command.patch b/patches/server/0110-Show-last-tick-time-in-tps-command.patch
similarity index 100%
rename from patches/server/0109-Show-last-tick-time-in-tps-command.patch
rename to patches/server/0110-Show-last-tick-time-in-tps-command.patch
diff --git a/patches/server/0110-Increase-time-statistics-in-intervals.patch b/patches/server/0111-Increase-time-statistics-in-intervals.patch
similarity index 100%
rename from patches/server/0110-Increase-time-statistics-in-intervals.patch
rename to patches/server/0111-Increase-time-statistics-in-intervals.patch
diff --git a/patches/server/0111-For-collision-check-has-physics-before-same-vehicle.patch b/patches/server/0112-For-collision-check-has-physics-before-same-vehicle.patch
similarity index 100%
rename from patches/server/0111-For-collision-check-has-physics-before-same-vehicle.patch
rename to patches/server/0112-For-collision-check-has-physics-before-same-vehicle.patch
diff --git a/patches/server/0112-Skip-negligible-planar-movement-multiplication.patch b/patches/server/0113-Skip-negligible-planar-movement-multiplication.patch
similarity index 100%
rename from patches/server/0112-Skip-negligible-planar-movement-multiplication.patch
rename to patches/server/0113-Skip-negligible-planar-movement-multiplication.patch
diff --git a/patches/server/0113-Optimize-matching-item-checks.patch b/patches/server/0114-Optimize-matching-item-checks.patch
similarity index 100%
rename from patches/server/0113-Optimize-matching-item-checks.patch
rename to patches/server/0114-Optimize-matching-item-checks.patch
diff --git a/patches/server/0114-Pre-compute-VarLong-sizes.patch b/patches/server/0115-Pre-compute-VarLong-sizes.patch
similarity index 100%
rename from patches/server/0114-Pre-compute-VarLong-sizes.patch
rename to patches/server/0115-Pre-compute-VarLong-sizes.patch
diff --git a/patches/server/0115-Optimize-VarInt-write-and-VarLong-write.patch b/patches/server/0116-Optimize-VarInt-write-and-VarLong-write.patch
similarity index 100%
rename from patches/server/0115-Optimize-VarInt-write-and-VarLong-write.patch
rename to patches/server/0116-Optimize-VarInt-write-and-VarLong-write.patch
diff --git a/patches/server/0116-Reduce-RandomSource-instances.patch b/patches/server/0117-Reduce-RandomSource-instances.patch
similarity index 100%
rename from patches/server/0116-Reduce-RandomSource-instances.patch
rename to patches/server/0117-Reduce-RandomSource-instances.patch
diff --git a/patches/server/0117-Add-xor-shift-random.patch b/patches/server/0118-Add-xor-shift-random.patch
similarity index 100%
rename from patches/server/0117-Add-xor-shift-random.patch
rename to patches/server/0118-Add-xor-shift-random.patch
diff --git a/patches/server/0118-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch b/patches/server/0119-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch
similarity index 100%
rename from patches/server/0118-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch
rename to patches/server/0119-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch
diff --git a/patches/server/0119-Initialize-line-of-sight-cache-with-low-capacity.patch b/patches/server/0120-Initialize-line-of-sight-cache-with-low-capacity.patch
similarity index 100%
rename from patches/server/0119-Initialize-line-of-sight-cache-with-low-capacity.patch
rename to patches/server/0120-Initialize-line-of-sight-cache-with-low-capacity.patch
diff --git a/patches/server/0120-Reduce-line-of-sight-updates-and-cache-lookups.patch b/patches/server/0121-Reduce-line-of-sight-updates-and-cache-lookups.patch
similarity index 100%
rename from patches/server/0120-Reduce-line-of-sight-updates-and-cache-lookups.patch
rename to patches/server/0121-Reduce-line-of-sight-updates-and-cache-lookups.patch
diff --git a/patches/server/0121-Server-thread-priority-environment-variable.patch b/patches/server/0122-Server-thread-priority-environment-variable.patch
similarity index 100%
rename from patches/server/0121-Server-thread-priority-environment-variable.patch
rename to patches/server/0122-Server-thread-priority-environment-variable.patch
diff --git a/patches/server/0122-Virtual-thread-support.patch b/patches/server/0123-Virtual-thread-support.patch
similarity index 100%
rename from patches/server/0122-Virtual-thread-support.patch
rename to patches/server/0123-Virtual-thread-support.patch