diff --git a/patches/server/0237-Use-ConcurrentHashMap-in-JsonList.patch b/patches/server/0237-Use-ConcurrentHashMap-in-JsonList.patch index f0e74c085e..036f0a2a21 100644 --- a/patches/server/0237-Use-ConcurrentHashMap-in-JsonList.patch +++ b/patches/server/0237-Use-ConcurrentHashMap-in-JsonList.patch @@ -36,43 +36,19 @@ index 577d427defdb82f5c6c1d8f766c51653f7b6de52..b76024a8dce1ef79f6cbff7403daffd2 ichatmutablecomponent = Component.translatable("multiplayer.disconnect.banned_ip.reason", ipbanentry.getReason()); diff --git a/src/main/java/net/minecraft/server/players/StoredUserList.java b/src/main/java/net/minecraft/server/players/StoredUserList.java -index 4d6f5e627d386f9ca2d7653b0f485c82a13557f5..09fc086548b9d0f97849f56f41e3a5be87f5091a 100644 +index 4d6f5e627d386f9ca2d7653b0f485c82a13557f5..665120a62525f56912263a3e1b6f12f6c3e15dec 100644 --- a/src/main/java/net/minecraft/server/players/StoredUserList.java +++ b/src/main/java/net/minecraft/server/players/StoredUserList.java -@@ -14,6 +14,8 @@ import java.io.BufferedReader; - import java.io.BufferedWriter; - import java.io.File; - import java.io.IOException; -+import java.lang.reflect.ParameterizedType; // Paper -+import java.lang.reflect.Type; // Paper - import java.nio.charset.StandardCharsets; - import java.util.Collection; - import java.util.Iterator; -@@ -31,7 +33,22 @@ public abstract class StoredUserList> { +@@ -31,7 +31,7 @@ public abstract class StoredUserList> { private static final Logger LOGGER = LogUtils.getLogger(); private static final Gson GSON = (new GsonBuilder()).setPrettyPrinting().create(); private final File file; - private final Map map = Maps.newHashMap(); -+ // Paper - replace HashMap is ConcurrentHashMap -+ private final Map map = Maps.newConcurrentMap(); -+ private boolean e = true; -+ private static final ParameterizedType f = new ParameterizedType() { -+ public Type[] getActualTypeArguments() { -+ return new Type[]{StoredUserEntry.class}; -+ } -+ -+ public Type getRawType() { -+ return List.class; -+ } -+ -+ public Type getOwnerType() { -+ return null; -+ } -+ }; ++ private final Map map = Maps.newConcurrentMap(); // Paper - replace HashMap is ConcurrentHashMap public StoredUserList(File file) { this.file = file; -@@ -54,8 +71,13 @@ public abstract class StoredUserList> { +@@ -54,8 +54,13 @@ public abstract class StoredUserList> { @Nullable public V get(K key) { @@ -88,7 +64,7 @@ index 4d6f5e627d386f9ca2d7653b0f485c82a13557f5..09fc086548b9d0f97849f56f41e3a5be } public void remove(K key) { -@@ -78,7 +100,8 @@ public abstract class StoredUserList> { +@@ -78,7 +83,8 @@ public abstract class StoredUserList> { } public boolean isEmpty() { @@ -98,7 +74,7 @@ index 4d6f5e627d386f9ca2d7653b0f485c82a13557f5..09fc086548b9d0f97849f56f41e3a5be } protected String getKeyForUser(K profile) { -@@ -90,14 +113,14 @@ public abstract class StoredUserList> { +@@ -90,14 +96,14 @@ public abstract class StoredUserList> { } private void removeExpired() { @@ -116,7 +92,7 @@ index 4d6f5e627d386f9ca2d7653b0f485c82a13557f5..09fc086548b9d0f97849f56f41e3a5be } } -@@ -106,9 +129,11 @@ public abstract class StoredUserList> { +@@ -106,9 +112,11 @@ public abstract class StoredUserList> { while (iterator.hasNext()) { K k0 = (K) iterator.next(); // CraftBukkit - decompile error @@ -130,7 +106,7 @@ index 4d6f5e627d386f9ca2d7653b0f485c82a13557f5..09fc086548b9d0f97849f56f41e3a5be } protected abstract StoredUserEntry createEntry(JsonObject json); -@@ -118,6 +143,7 @@ public abstract class StoredUserList> { +@@ -118,6 +126,7 @@ public abstract class StoredUserList> { } public void save() throws IOException { diff --git a/patches/server/0802-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0802-fix-powder-snow-cauldrons-not-turning-to-water.patch index 23bd154f1b..26317d1b0b 100644 --- a/patches/server/0802-fix-powder-snow-cauldrons-not-turning-to-water.patch +++ b/patches/server/0802-fix-powder-snow-cauldrons-not-turning-to-water.patch @@ -7,7 +7,7 @@ Powder snow cauldrons should turn to water when extinguishing an entity diff --git a/src/main/java/net/minecraft/world/level/block/LayeredCauldronBlock.java b/src/main/java/net/minecraft/world/level/block/LayeredCauldronBlock.java -index 7daf2ec30fd31023d326a6149661f38bfc1d646b..43a72941ab553c154633144d358fb204765257f5 100644 +index 7daf2ec30fd31023d326a6149661f38bfc1d646b..93f5e583635a2addeabf2adff9374dcec0b66ee4 100644 --- a/src/main/java/net/minecraft/world/level/block/LayeredCauldronBlock.java +++ b/src/main/java/net/minecraft/world/level/block/LayeredCauldronBlock.java @@ -69,7 +69,7 @@ public class LayeredCauldronBlock extends AbstractCauldronBlock { @@ -27,13 +27,17 @@ index 7daf2ec30fd31023d326a6149661f38bfc1d646b..43a72941ab553c154633144d358fb204 private void handleEntityOnFireInside(BlockState state, Level world, BlockPos pos) { if (this.precipitationType == Biome.Precipitation.SNOW) { LayeredCauldronBlock.lowerFillLevel((BlockState) Blocks.WATER_CAULDRON.defaultBlockState().setValue(LayeredCauldronBlock.LEVEL, (Integer) state.getValue(LayeredCauldronBlock.LEVEL)), world, pos); -@@ -87,6 +88,11 @@ public class LayeredCauldronBlock extends AbstractCauldronBlock { +@@ -87,6 +88,15 @@ public class LayeredCauldronBlock extends AbstractCauldronBlock { } } + // Paper start + protected boolean handleEntityOnFireInsideWithEvent(BlockState state, Level world, BlockPos pos, Entity entity) { -+ return LayeredCauldronBlock.lowerFillLevel(state, world, pos, entity, CauldronLevelChangeEvent.ChangeReason.EXTINGUISH); ++ if (this.precipitationType == Biome.Precipitation.SNOW) { ++ return LayeredCauldronBlock.lowerFillLevel((BlockState) Blocks.WATER_CAULDRON.defaultBlockState().setValue(LayeredCauldronBlock.LEVEL, (Integer) state.getValue(LayeredCauldronBlock.LEVEL)), world, pos, entity, CauldronLevelChangeEvent.ChangeReason.EXTINGUISH); ++ } else { ++ return LayeredCauldronBlock.lowerFillLevel(state, world, pos, entity, CauldronLevelChangeEvent.ChangeReason.EXTINGUISH); ++ } + } + // Paper end diff --git a/patches/server/0840-Add-NamespacedKey-biome-methods.patch b/patches/server/0839-Add-NamespacedKey-biome-methods.patch similarity index 100% rename from patches/server/0840-Add-NamespacedKey-biome-methods.patch rename to patches/server/0839-Add-NamespacedKey-biome-methods.patch diff --git a/patches/server/0839-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0839-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch deleted file mode 100644 index f069b0f0e0..0000000000 --- a/patches/server/0839-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch +++ /dev/null @@ -1,18 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Shane Freeder -Date: Thu, 11 Aug 2022 14:37:33 +0100 -Subject: [PATCH] Use thread safe random in ServerLoginPacketListenerImpl - - -diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -index 83605748ca8cf68c0fc6d99c34f3091183c7a059..601691db6943ae78530d01468e581760f2331b43 100644 ---- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -+++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -@@ -52,6 +52,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener, - private static final java.util.concurrent.ExecutorService authenticatorPool = java.util.concurrent.Executors.newCachedThreadPool(new com.google.common.util.concurrent.ThreadFactoryBuilder().setNameFormat("User Authenticator #%d").setUncaughtExceptionHandler(new DefaultUncaughtExceptionHandler(LOGGER)).build()); // Paper - Cache authenticator threads - private static final int MAX_TICKS_BEFORE_LOGIN = 600; - private static final Component DISCONNECT_UNEXPECTED_QUERY = Component.translatable("multiplayer.disconnect.unexpected_query_response"); -+ private static final RandomSource RANDOM = new org.bukkit.craftbukkit.util.RandomSourceWrapper(new java.util.Random()); // Paper - This is called across threads, make safe - private final byte[] challenge; - final MinecraftServer server; - public final Connection connection; diff --git a/patches/server/0841-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0840-Fix-plugin-loggers-on-server-shutdown.patch similarity index 100% rename from patches/server/0841-Fix-plugin-loggers-on-server-shutdown.patch rename to patches/server/0840-Fix-plugin-loggers-on-server-shutdown.patch diff --git a/patches/server/0842-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0841-Stop-large-look-changes-from-crashing-the-server.patch similarity index 100% rename from patches/server/0842-Stop-large-look-changes-from-crashing-the-server.patch rename to patches/server/0841-Stop-large-look-changes-from-crashing-the-server.patch diff --git a/patches/server/0843-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0842-Fire-EntityChangeBlockEvent-in-more-places.patch similarity index 100% rename from patches/server/0843-Fire-EntityChangeBlockEvent-in-more-places.patch rename to patches/server/0842-Fire-EntityChangeBlockEvent-in-more-places.patch diff --git a/patches/server/0844-Missing-eating-regain-reason.patch b/patches/server/0843-Missing-eating-regain-reason.patch similarity index 100% rename from patches/server/0844-Missing-eating-regain-reason.patch rename to patches/server/0843-Missing-eating-regain-reason.patch diff --git a/patches/server/0845-Missing-effect-cause.patch b/patches/server/0844-Missing-effect-cause.patch similarity index 100% rename from patches/server/0845-Missing-effect-cause.patch rename to patches/server/0844-Missing-effect-cause.patch diff --git a/patches/server/0846-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0845-Added-byte-array-serialization-deserialization-for-P.patch similarity index 100% rename from patches/server/0846-Added-byte-array-serialization-deserialization-for-P.patch rename to patches/server/0845-Added-byte-array-serialization-deserialization-for-P.patch diff --git a/patches/server/0847-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0846-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch similarity index 100% rename from patches/server/0847-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch rename to patches/server/0846-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch diff --git a/patches/server/0848-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0847-Call-BlockPhysicsEvent-more-often.patch similarity index 100% rename from patches/server/0848-Call-BlockPhysicsEvent-more-often.patch rename to patches/server/0847-Call-BlockPhysicsEvent-more-often.patch diff --git a/patches/server/0849-Configurable-chat-thread-limit.patch b/patches/server/0848-Configurable-chat-thread-limit.patch similarity index 100% rename from patches/server/0849-Configurable-chat-thread-limit.patch rename to patches/server/0848-Configurable-chat-thread-limit.patch diff --git a/patches/server/0850-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0849-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch similarity index 100% rename from patches/server/0850-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch rename to patches/server/0849-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch diff --git a/patches/server/0851-fix-Jigsaw-block-kicking-user.patch b/patches/server/0850-fix-Jigsaw-block-kicking-user.patch similarity index 100% rename from patches/server/0851-fix-Jigsaw-block-kicking-user.patch rename to patches/server/0850-fix-Jigsaw-block-kicking-user.patch diff --git a/patches/server/0852-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0851-use-BlockFormEvent-for-mud-converting-into-clay.patch similarity index 100% rename from patches/server/0852-use-BlockFormEvent-for-mud-converting-into-clay.patch rename to patches/server/0851-use-BlockFormEvent-for-mud-converting-into-clay.patch diff --git a/patches/server/0853-Add-getDrops-to-BlockState.patch b/patches/server/0852-Add-getDrops-to-BlockState.patch similarity index 100% rename from patches/server/0853-Add-getDrops-to-BlockState.patch rename to patches/server/0852-Add-getDrops-to-BlockState.patch diff --git a/patches/server/0854-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0853-Fix-a-bunch-of-vanilla-bugs.patch similarity index 99% rename from patches/server/0854-Fix-a-bunch-of-vanilla-bugs.patch rename to patches/server/0853-Fix-a-bunch-of-vanilla-bugs.patch index c5a92a5053..ee79529fe3 100644 --- a/patches/server/0854-Fix-a-bunch-of-vanilla-bugs.patch +++ b/patches/server/0853-Fix-a-bunch-of-vanilla-bugs.patch @@ -436,7 +436,7 @@ index 6e45582f8ea7dd2a46f58369c5581764538bff0d..3ecc92439fc85d224ff52f41c5e34079 + // Paper end } diff --git a/src/main/java/net/minecraft/world/level/block/LayeredCauldronBlock.java b/src/main/java/net/minecraft/world/level/block/LayeredCauldronBlock.java -index 43a72941ab553c154633144d358fb204765257f5..b5e4beb21e1669e5af4da4c3b55a56f83ec5db4f 100644 +index 93f5e583635a2addeabf2adff9374dcec0b66ee4..843926beb1edd897724b512ad915894fa4a2da6c 100644 --- a/src/main/java/net/minecraft/world/level/block/LayeredCauldronBlock.java +++ b/src/main/java/net/minecraft/world/level/block/LayeredCauldronBlock.java @@ -68,7 +68,7 @@ public class LayeredCauldronBlock extends AbstractCauldronBlock { diff --git a/patches/server/0855-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0854-Remove-unnecessary-onTrackingStart-during-navigation.patch similarity index 100% rename from patches/server/0855-Remove-unnecessary-onTrackingStart-during-navigation.patch rename to patches/server/0854-Remove-unnecessary-onTrackingStart-during-navigation.patch diff --git a/patches/server/0856-Fix-custom-piglin-loved-items.patch b/patches/server/0855-Fix-custom-piglin-loved-items.patch similarity index 100% rename from patches/server/0856-Fix-custom-piglin-loved-items.patch rename to patches/server/0855-Fix-custom-piglin-loved-items.patch diff --git a/patches/server/0857-EntityPickupItemEvent-fixes.patch b/patches/server/0856-EntityPickupItemEvent-fixes.patch similarity index 100% rename from patches/server/0857-EntityPickupItemEvent-fixes.patch rename to patches/server/0856-EntityPickupItemEvent-fixes.patch diff --git a/patches/server/0858-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0857-Correctly-handle-interactions-with-items-on-cooldown.patch similarity index 100% rename from patches/server/0858-Correctly-handle-interactions-with-items-on-cooldown.patch rename to patches/server/0857-Correctly-handle-interactions-with-items-on-cooldown.patch diff --git a/patches/server/0859-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0858-Add-PlayerInventorySlotChangeEvent.patch similarity index 100% rename from patches/server/0859-Add-PlayerInventorySlotChangeEvent.patch rename to patches/server/0858-Add-PlayerInventorySlotChangeEvent.patch diff --git a/patches/server/0860-Elder-Guardian-appearance-API.patch b/patches/server/0859-Elder-Guardian-appearance-API.patch similarity index 100% rename from patches/server/0860-Elder-Guardian-appearance-API.patch rename to patches/server/0859-Elder-Guardian-appearance-API.patch diff --git a/patches/server/0861-Allow-changing-bed-s-occupied-property.patch b/patches/server/0860-Allow-changing-bed-s-occupied-property.patch similarity index 100% rename from patches/server/0861-Allow-changing-bed-s-occupied-property.patch rename to patches/server/0860-Allow-changing-bed-s-occupied-property.patch diff --git a/patches/server/0862-Add-entity-knockback-API.patch b/patches/server/0861-Add-entity-knockback-API.patch similarity index 100% rename from patches/server/0862-Add-entity-knockback-API.patch rename to patches/server/0861-Add-entity-knockback-API.patch diff --git a/patches/server/0863-Detect-headless-JREs.patch b/patches/server/0862-Detect-headless-JREs.patch similarity index 100% rename from patches/server/0863-Detect-headless-JREs.patch rename to patches/server/0862-Detect-headless-JREs.patch diff --git a/patches/server/0864-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0863-fixed-entity-vehicle-collision-event-not-called.patch similarity index 100% rename from patches/server/0864-fixed-entity-vehicle-collision-event-not-called.patch rename to patches/server/0863-fixed-entity-vehicle-collision-event-not-called.patch diff --git a/patches/server/0865-optimized-dirt-and-snow-spreading.patch b/patches/server/0864-optimized-dirt-and-snow-spreading.patch similarity index 100% rename from patches/server/0865-optimized-dirt-and-snow-spreading.patch rename to patches/server/0864-optimized-dirt-and-snow-spreading.patch diff --git a/patches/server/0866-Added-EntityToggleSitEvent.patch b/patches/server/0865-Added-EntityToggleSitEvent.patch similarity index 100% rename from patches/server/0866-Added-EntityToggleSitEvent.patch rename to patches/server/0865-Added-EntityToggleSitEvent.patch diff --git a/patches/server/0867-Add-fire-tick-delay-option.patch b/patches/server/0866-Add-fire-tick-delay-option.patch similarity index 100% rename from patches/server/0867-Add-fire-tick-delay-option.patch rename to patches/server/0866-Add-fire-tick-delay-option.patch diff --git a/patches/server/0868-Add-Moving-Piston-API.patch b/patches/server/0867-Add-Moving-Piston-API.patch similarity index 100% rename from patches/server/0868-Add-Moving-Piston-API.patch rename to patches/server/0867-Add-Moving-Piston-API.patch diff --git a/patches/server/0869-Ignore-impossible-spawn-tick.patch b/patches/server/0868-Ignore-impossible-spawn-tick.patch similarity index 100% rename from patches/server/0869-Ignore-impossible-spawn-tick.patch rename to patches/server/0868-Ignore-impossible-spawn-tick.patch diff --git a/patches/server/0870-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0869-Track-projectile-source-for-fireworks-from-dispenser.patch similarity index 100% rename from patches/server/0870-Track-projectile-source-for-fireworks-from-dispenser.patch rename to patches/server/0869-Track-projectile-source-for-fireworks-from-dispenser.patch diff --git a/patches/server/0871-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0870-Fix-EntityArgument-suggestion-permissions-to-align-w.patch similarity index 100% rename from patches/server/0871-Fix-EntityArgument-suggestion-permissions-to-align-w.patch rename to patches/server/0870-Fix-EntityArgument-suggestion-permissions-to-align-w.patch diff --git a/patches/server/0872-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0871-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch similarity index 100% rename from patches/server/0872-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch rename to patches/server/0871-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch diff --git a/patches/server/0873-Prevent-compass-from-loading-chunks.patch b/patches/server/0872-Prevent-compass-from-loading-chunks.patch similarity index 100% rename from patches/server/0873-Prevent-compass-from-loading-chunks.patch rename to patches/server/0872-Prevent-compass-from-loading-chunks.patch diff --git a/patches/server/0874-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0873-Add-PrePlayerAttackEntityEvent.patch similarity index 100% rename from patches/server/0874-Add-PrePlayerAttackEntityEvent.patch rename to patches/server/0873-Add-PrePlayerAttackEntityEvent.patch diff --git a/patches/server/0875-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0874-ensure-reset-EnderDragon-boss-event-name.patch similarity index 100% rename from patches/server/0875-ensure-reset-EnderDragon-boss-event-name.patch rename to patches/server/0874-ensure-reset-EnderDragon-boss-event-name.patch diff --git a/patches/server/0876-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0875-fix-MC-252817-green-map-markers-do-not-disappear.patch similarity index 100% rename from patches/server/0876-fix-MC-252817-green-map-markers-do-not-disappear.patch rename to patches/server/0875-fix-MC-252817-green-map-markers-do-not-disappear.patch diff --git a/patches/server/0877-Add-Player-Warden-Warning-API.patch b/patches/server/0876-Add-Player-Warden-Warning-API.patch similarity index 100% rename from patches/server/0877-Add-Player-Warden-Warning-API.patch rename to patches/server/0876-Add-Player-Warden-Warning-API.patch diff --git a/patches/server/0878-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0877-More-vanilla-friendly-methods-to-update-trades.patch similarity index 100% rename from patches/server/0878-More-vanilla-friendly-methods-to-update-trades.patch rename to patches/server/0877-More-vanilla-friendly-methods-to-update-trades.patch diff --git a/patches/server/0879-Add-paper-dumplisteners-command.patch b/patches/server/0878-Add-paper-dumplisteners-command.patch similarity index 100% rename from patches/server/0879-Add-paper-dumplisteners-command.patch rename to patches/server/0878-Add-paper-dumplisteners-command.patch diff --git a/patches/server/0880-check-global-player-list-where-appropriate.patch b/patches/server/0879-check-global-player-list-where-appropriate.patch similarity index 100% rename from patches/server/0880-check-global-player-list-where-appropriate.patch rename to patches/server/0879-check-global-player-list-where-appropriate.patch diff --git a/patches/server/0881-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0880-Fix-async-entity-add-due-to-fungus-trees.patch similarity index 100% rename from patches/server/0881-Fix-async-entity-add-due-to-fungus-trees.patch rename to patches/server/0880-Fix-async-entity-add-due-to-fungus-trees.patch diff --git a/patches/server/0882-ItemStack-damage-API.patch b/patches/server/0881-ItemStack-damage-API.patch similarity index 100% rename from patches/server/0882-ItemStack-damage-API.patch rename to patches/server/0881-ItemStack-damage-API.patch diff --git a/patches/server/0883-Friction-API.patch b/patches/server/0882-Friction-API.patch similarity index 100% rename from patches/server/0883-Friction-API.patch rename to patches/server/0882-Friction-API.patch diff --git a/patches/server/0884-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0883-Ability-to-control-player-s-insomnia-and-phantoms.patch similarity index 100% rename from patches/server/0884-Ability-to-control-player-s-insomnia-and-phantoms.patch rename to patches/server/0883-Ability-to-control-player-s-insomnia-and-phantoms.patch diff --git a/patches/server/0885-Fix-player-kick-on-shutdown.patch b/patches/server/0884-Fix-player-kick-on-shutdown.patch similarity index 100% rename from patches/server/0885-Fix-player-kick-on-shutdown.patch rename to patches/server/0884-Fix-player-kick-on-shutdown.patch diff --git a/patches/server/0886-Sync-offhand-slot-in-menus.patch b/patches/server/0885-Sync-offhand-slot-in-menus.patch similarity index 100% rename from patches/server/0886-Sync-offhand-slot-in-menus.patch rename to patches/server/0885-Sync-offhand-slot-in-menus.patch diff --git a/patches/server/0887-Player-Entity-Tracking-Events.patch b/patches/server/0886-Player-Entity-Tracking-Events.patch similarity index 100% rename from patches/server/0887-Player-Entity-Tracking-Events.patch rename to patches/server/0886-Player-Entity-Tracking-Events.patch diff --git a/patches/server/0888-Limit-pet-look-distance.patch b/patches/server/0887-Limit-pet-look-distance.patch similarity index 100% rename from patches/server/0888-Limit-pet-look-distance.patch rename to patches/server/0887-Limit-pet-look-distance.patch diff --git a/patches/server/0889-Properly-resend-entities.patch b/patches/server/0888-Properly-resend-entities.patch similarity index 100% rename from patches/server/0889-Properly-resend-entities.patch rename to patches/server/0888-Properly-resend-entities.patch diff --git a/patches/server/0890-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0889-Fixes-and-additions-to-the-SpawnReason-API.patch similarity index 100% rename from patches/server/0890-Fixes-and-additions-to-the-SpawnReason-API.patch rename to patches/server/0889-Fixes-and-additions-to-the-SpawnReason-API.patch diff --git a/patches/server/0891-fix-Instruments.patch b/patches/server/0890-fix-Instruments.patch similarity index 100% rename from patches/server/0891-fix-Instruments.patch rename to patches/server/0890-fix-Instruments.patch diff --git a/patches/server/0892-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0891-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch similarity index 100% rename from patches/server/0892-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch rename to patches/server/0891-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch diff --git a/patches/server/0893-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0892-Fix-inconsistencies-in-dispense-events-regarding-sta.patch similarity index 100% rename from patches/server/0893-Fix-inconsistencies-in-dispense-events-regarding-sta.patch rename to patches/server/0892-Fix-inconsistencies-in-dispense-events-regarding-sta.patch diff --git a/patches/server/0894-Add-BlockLockCheckEvent.patch b/patches/server/0893-Add-BlockLockCheckEvent.patch similarity index 100% rename from patches/server/0894-Add-BlockLockCheckEvent.patch rename to patches/server/0893-Add-BlockLockCheckEvent.patch diff --git a/patches/server/0895-Add-Sneaking-API-for-Entities.patch b/patches/server/0894-Add-Sneaking-API-for-Entities.patch similarity index 100% rename from patches/server/0895-Add-Sneaking-API-for-Entities.patch rename to patches/server/0894-Add-Sneaking-API-for-Entities.patch diff --git a/patches/server/0896-Improve-logging-and-errors.patch b/patches/server/0895-Improve-logging-and-errors.patch similarity index 100% rename from patches/server/0896-Improve-logging-and-errors.patch rename to patches/server/0895-Improve-logging-and-errors.patch diff --git a/patches/server/0897-Improve-PortalEvents.patch b/patches/server/0896-Improve-PortalEvents.patch similarity index 100% rename from patches/server/0897-Improve-PortalEvents.patch rename to patches/server/0896-Improve-PortalEvents.patch diff --git a/patches/server/0898-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0897-Add-config-option-for-spider-worldborder-climbing.patch similarity index 100% rename from patches/server/0898-Add-config-option-for-spider-worldborder-climbing.patch rename to patches/server/0897-Add-config-option-for-spider-worldborder-climbing.patch diff --git a/patches/server/0899-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0898-Add-missing-SpigotConfig-logCommands-check.patch similarity index 100% rename from patches/server/0899-Add-missing-SpigotConfig-logCommands-check.patch rename to patches/server/0898-Add-missing-SpigotConfig-logCommands-check.patch diff --git a/patches/server/0900-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0899-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch similarity index 100% rename from patches/server/0900-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch rename to patches/server/0899-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch diff --git a/patches/server/0901-Flying-Fall-Damage.patch b/patches/server/0900-Flying-Fall-Damage.patch similarity index 100% rename from patches/server/0901-Flying-Fall-Damage.patch rename to patches/server/0900-Flying-Fall-Damage.patch diff --git a/patches/server/0902-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/server/0901-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch similarity index 100% rename from patches/server/0902-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch rename to patches/server/0901-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch diff --git a/patches/server/0903-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0902-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch similarity index 100% rename from patches/server/0903-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch rename to patches/server/0902-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch diff --git a/patches/server/0904-config-for-disabling-entity-tag-tags.patch b/patches/server/0903-config-for-disabling-entity-tag-tags.patch similarity index 100% rename from patches/server/0904-config-for-disabling-entity-tag-tags.patch rename to patches/server/0903-config-for-disabling-entity-tag-tags.patch diff --git a/patches/server/0905-Use-single-player-info-update-packet-on-join.patch b/patches/server/0904-Use-single-player-info-update-packet-on-join.patch similarity index 100% rename from patches/server/0905-Use-single-player-info-update-packet-on-join.patch rename to patches/server/0904-Use-single-player-info-update-packet-on-join.patch diff --git a/patches/server/0906-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0905-Correctly-shrink-items-during-EntityResurrectEvent.patch similarity index 100% rename from patches/server/0906-Correctly-shrink-items-during-EntityResurrectEvent.patch rename to patches/server/0905-Correctly-shrink-items-during-EntityResurrectEvent.patch diff --git a/patches/server/0907-Win-Screen-API.patch b/patches/server/0906-Win-Screen-API.patch similarity index 100% rename from patches/server/0907-Win-Screen-API.patch rename to patches/server/0906-Win-Screen-API.patch diff --git a/patches/server/0908-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0907-Remove-CraftItemStack-setAmount-null-assignment.patch similarity index 100% rename from patches/server/0908-Remove-CraftItemStack-setAmount-null-assignment.patch rename to patches/server/0907-Remove-CraftItemStack-setAmount-null-assignment.patch diff --git a/patches/server/0909-Fix-force-opening-enchantment-tables.patch b/patches/server/0908-Fix-force-opening-enchantment-tables.patch similarity index 100% rename from patches/server/0909-Fix-force-opening-enchantment-tables.patch rename to patches/server/0908-Fix-force-opening-enchantment-tables.patch diff --git a/patches/server/0910-Add-Entity-Body-Yaw-API.patch b/patches/server/0909-Add-Entity-Body-Yaw-API.patch similarity index 100% rename from patches/server/0910-Add-Entity-Body-Yaw-API.patch rename to patches/server/0909-Add-Entity-Body-Yaw-API.patch diff --git a/patches/server/0911-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0910-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch similarity index 100% rename from patches/server/0911-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch rename to patches/server/0910-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch diff --git a/patches/server/0912-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0911-Update-the-flag-when-a-captured-block-state-is-outda.patch similarity index 100% rename from patches/server/0912-Update-the-flag-when-a-captured-block-state-is-outda.patch rename to patches/server/0911-Update-the-flag-when-a-captured-block-state-is-outda.patch diff --git a/patches/server/0913-Add-EntityFertilizeEggEvent.patch b/patches/server/0912-Add-EntityFertilizeEggEvent.patch similarity index 100% rename from patches/server/0913-Add-EntityFertilizeEggEvent.patch rename to patches/server/0912-Add-EntityFertilizeEggEvent.patch diff --git a/patches/server/0914-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0913-Fix-HumanEntity-drop-not-updating-the-client-inv.patch similarity index 100% rename from patches/server/0914-Fix-HumanEntity-drop-not-updating-the-client-inv.patch rename to patches/server/0913-Fix-HumanEntity-drop-not-updating-the-client-inv.patch diff --git a/patches/server/0915-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0914-Add-CompostItemEvent-and-EntityCompostItemEvent.patch similarity index 100% rename from patches/server/0915-Add-CompostItemEvent-and-EntityCompostItemEvent.patch rename to patches/server/0914-Add-CompostItemEvent-and-EntityCompostItemEvent.patch diff --git a/patches/server/0916-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0915-Correctly-handle-ArmorStand-invisibility.patch similarity index 100% rename from patches/server/0916-Correctly-handle-ArmorStand-invisibility.patch rename to patches/server/0915-Correctly-handle-ArmorStand-invisibility.patch diff --git a/patches/server/0917-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0916-Fix-advancement-triggers-for-entity-damage.patch similarity index 100% rename from patches/server/0917-Fix-advancement-triggers-for-entity-damage.patch rename to patches/server/0916-Fix-advancement-triggers-for-entity-damage.patch diff --git a/patches/server/0918-Fix-text-display-error-on-spawn.patch b/patches/server/0917-Fix-text-display-error-on-spawn.patch similarity index 100% rename from patches/server/0918-Fix-text-display-error-on-spawn.patch rename to patches/server/0917-Fix-text-display-error-on-spawn.patch diff --git a/patches/server/0919-Fix-certain-inventories-returning-null-Locations.patch b/patches/server/0918-Fix-certain-inventories-returning-null-Locations.patch similarity index 100% rename from patches/server/0919-Fix-certain-inventories-returning-null-Locations.patch rename to patches/server/0918-Fix-certain-inventories-returning-null-Locations.patch diff --git a/patches/server/0920-Add-Shearable-API.patch b/patches/server/0919-Add-Shearable-API.patch similarity index 100% rename from patches/server/0920-Add-Shearable-API.patch rename to patches/server/0919-Add-Shearable-API.patch diff --git a/patches/server/0921-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0920-Fix-SpawnEggMeta-get-setSpawnedType.patch similarity index 100% rename from patches/server/0921-Fix-SpawnEggMeta-get-setSpawnedType.patch rename to patches/server/0920-Fix-SpawnEggMeta-get-setSpawnedType.patch diff --git a/patches/server/0922-Optimize-Hoppers.patch b/patches/server/0921-Optimize-Hoppers.patch similarity index 100% rename from patches/server/0922-Optimize-Hoppers.patch rename to patches/server/0921-Optimize-Hoppers.patch diff --git a/patches/server/0923-Fix-beehives-generating-from-using-bonemeal.patch b/patches/server/0922-Fix-beehives-generating-from-using-bonemeal.patch similarity index 100% rename from patches/server/0923-Fix-beehives-generating-from-using-bonemeal.patch rename to patches/server/0922-Fix-beehives-generating-from-using-bonemeal.patch diff --git a/patches/server/0924-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0923-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch similarity index 100% rename from patches/server/0924-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch rename to patches/server/0923-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch diff --git a/patches/server/0925-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0924-Treat-sequence-violations-like-they-should-be.patch similarity index 100% rename from patches/server/0925-Treat-sequence-violations-like-they-should-be.patch rename to patches/server/0924-Treat-sequence-violations-like-they-should-be.patch diff --git a/patches/server/0926-remove-duplicate-animate-packet-for-records.patch b/patches/server/0925-remove-duplicate-animate-packet-for-records.patch similarity index 100% rename from patches/server/0926-remove-duplicate-animate-packet-for-records.patch rename to patches/server/0925-remove-duplicate-animate-packet-for-records.patch diff --git a/patches/server/0927-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0926-Prevent-causing-expired-keys-from-impacting-new-join.patch similarity index 100% rename from patches/server/0927-Prevent-causing-expired-keys-from-impacting-new-join.patch rename to patches/server/0926-Prevent-causing-expired-keys-from-impacting-new-join.patch diff --git a/patches/server/0928-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0927-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch similarity index 100% rename from patches/server/0928-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch rename to patches/server/0927-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch diff --git a/patches/server/0929-Use-array-for-gamerule-storage.patch b/patches/server/0928-Use-array-for-gamerule-storage.patch similarity index 100% rename from patches/server/0929-Use-array-for-gamerule-storage.patch rename to patches/server/0928-Use-array-for-gamerule-storage.patch diff --git a/patches/server/0930-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0929-Fix-a-couple-of-upstream-bed-issues.patch similarity index 100% rename from patches/server/0930-Fix-a-couple-of-upstream-bed-issues.patch rename to patches/server/0929-Fix-a-couple-of-upstream-bed-issues.patch diff --git a/patches/server/0931-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0930-Fix-demo-flag-not-enabling-demo-mode.patch similarity index 100% rename from patches/server/0931-Fix-demo-flag-not-enabling-demo-mode.patch rename to patches/server/0930-Fix-demo-flag-not-enabling-demo-mode.patch diff --git a/patches/server/0932-Add-Mob-Experience-reward-API.patch b/patches/server/0931-Add-Mob-Experience-reward-API.patch similarity index 100% rename from patches/server/0932-Add-Mob-Experience-reward-API.patch rename to patches/server/0931-Add-Mob-Experience-reward-API.patch diff --git a/patches/server/0933-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0932-Break-redstone-on-top-of-trap-doors-early.patch similarity index 100% rename from patches/server/0933-Break-redstone-on-top-of-trap-doors-early.patch rename to patches/server/0932-Break-redstone-on-top-of-trap-doors-early.patch diff --git a/patches/server/0934-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0933-Fix-DamageCause-for-Falling-Blocks.patch similarity index 100% rename from patches/server/0934-Fix-DamageCause-for-Falling-Blocks.patch rename to patches/server/0933-Fix-DamageCause-for-Falling-Blocks.patch diff --git a/patches/server/0935-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0934-Avoid-Lazy-Initialization-for-Enum-Fields.patch similarity index 100% rename from patches/server/0935-Avoid-Lazy-Initialization-for-Enum-Fields.patch rename to patches/server/0934-Avoid-Lazy-Initialization-for-Enum-Fields.patch diff --git a/patches/server/0936-More-accurate-isInOpenWater-impl.patch b/patches/server/0935-More-accurate-isInOpenWater-impl.patch similarity index 100% rename from patches/server/0936-More-accurate-isInOpenWater-impl.patch rename to patches/server/0935-More-accurate-isInOpenWater-impl.patch diff --git a/patches/server/0937-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0936-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch similarity index 100% rename from patches/server/0937-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch rename to patches/server/0936-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch diff --git a/patches/server/0938-Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/server/0937-Optimise-recalcBlockCounts-for-empty-sections.patch similarity index 100% rename from patches/server/0938-Optimise-recalcBlockCounts-for-empty-sections.patch rename to patches/server/0937-Optimise-recalcBlockCounts-for-empty-sections.patch diff --git a/patches/server/0939-Expand-PlayerItemMendEvent.patch b/patches/server/0938-Expand-PlayerItemMendEvent.patch similarity index 100% rename from patches/server/0939-Expand-PlayerItemMendEvent.patch rename to patches/server/0938-Expand-PlayerItemMendEvent.patch diff --git a/patches/server/0940-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0939-Refresh-ProjectileSource-for-projectiles.patch similarity index 100% rename from patches/server/0940-Refresh-ProjectileSource-for-projectiles.patch rename to patches/server/0939-Refresh-ProjectileSource-for-projectiles.patch diff --git a/patches/server/0941-Add-transient-modifier-API.patch b/patches/server/0940-Add-transient-modifier-API.patch similarity index 100% rename from patches/server/0941-Add-transient-modifier-API.patch rename to patches/server/0940-Add-transient-modifier-API.patch diff --git a/patches/server/0942-Fix-block-place-logic.patch b/patches/server/0941-Fix-block-place-logic.patch similarity index 100% rename from patches/server/0942-Fix-block-place-logic.patch rename to patches/server/0941-Fix-block-place-logic.patch diff --git a/patches/server/0943-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0942-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch similarity index 100% rename from patches/server/0943-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch rename to patches/server/0942-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch diff --git a/patches/server/0944-Ignore-inline-definitions-of-trim-material-pattern.patch b/patches/server/0943-Ignore-inline-definitions-of-trim-material-pattern.patch similarity index 100% rename from patches/server/0944-Ignore-inline-definitions-of-trim-material-pattern.patch rename to patches/server/0943-Ignore-inline-definitions-of-trim-material-pattern.patch diff --git a/patches/server/0945-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0944-Call-BlockGrowEvent-for-missing-blocks.patch similarity index 100% rename from patches/server/0945-Call-BlockGrowEvent-for-missing-blocks.patch rename to patches/server/0944-Call-BlockGrowEvent-for-missing-blocks.patch diff --git a/patches/server/0946-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0945-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch similarity index 100% rename from patches/server/0946-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch rename to patches/server/0945-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch diff --git a/patches/server/0947-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0946-fix-MapLike-spam-for-missing-key-selector.patch similarity index 100% rename from patches/server/0947-fix-MapLike-spam-for-missing-key-selector.patch rename to patches/server/0946-fix-MapLike-spam-for-missing-key-selector.patch diff --git a/patches/server/0948-Fix-sniffer-removeExploredLocation.patch b/patches/server/0947-Fix-sniffer-removeExploredLocation.patch similarity index 100% rename from patches/server/0948-Fix-sniffer-removeExploredLocation.patch rename to patches/server/0947-Fix-sniffer-removeExploredLocation.patch diff --git a/patches/server/0949-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0948-Add-method-to-remove-all-active-potion-effects.patch similarity index 100% rename from patches/server/0949-Add-method-to-remove-all-active-potion-effects.patch rename to patches/server/0948-Add-method-to-remove-all-active-potion-effects.patch diff --git a/patches/server/0950-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch b/patches/server/0949-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch similarity index 100% rename from patches/server/0950-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch rename to patches/server/0949-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch diff --git a/patches/server/0951-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0950-Fix-incorrect-crafting-result-amount-for-fireworks.patch similarity index 100% rename from patches/server/0951-Fix-incorrect-crafting-result-amount-for-fireworks.patch rename to patches/server/0950-Fix-incorrect-crafting-result-amount-for-fireworks.patch diff --git a/patches/server/0952-Properly-Cancel-Usable-Items.patch b/patches/server/0951-Properly-Cancel-Usable-Items.patch similarity index 100% rename from patches/server/0952-Properly-Cancel-Usable-Items.patch rename to patches/server/0951-Properly-Cancel-Usable-Items.patch diff --git a/patches/server/0953-Add-event-for-player-editing-sign.patch b/patches/server/0952-Add-event-for-player-editing-sign.patch similarity index 100% rename from patches/server/0953-Add-event-for-player-editing-sign.patch rename to patches/server/0952-Add-event-for-player-editing-sign.patch diff --git a/patches/server/0954-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0953-Only-tick-item-frames-if-players-can-see-it.patch similarity index 100% rename from patches/server/0954-Only-tick-item-frames-if-players-can-see-it.patch rename to patches/server/0953-Only-tick-item-frames-if-players-can-see-it.patch diff --git a/patches/server/0955-Improve-command-function-perm-level-checks.patch b/patches/server/0954-Improve-command-function-perm-level-checks.patch similarity index 100% rename from patches/server/0955-Improve-command-function-perm-level-checks.patch rename to patches/server/0954-Improve-command-function-perm-level-checks.patch diff --git a/patches/server/0956-Add-option-to-disable-block-updates.patch b/patches/server/0955-Add-option-to-disable-block-updates.patch similarity index 100% rename from patches/server/0956-Add-option-to-disable-block-updates.patch rename to patches/server/0955-Add-option-to-disable-block-updates.patch diff --git a/patches/server/0957-Call-missing-BlockDispenseEvent.patch b/patches/server/0956-Call-missing-BlockDispenseEvent.patch similarity index 100% rename from patches/server/0957-Call-missing-BlockDispenseEvent.patch rename to patches/server/0956-Call-missing-BlockDispenseEvent.patch diff --git a/patches/server/0958-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0957-Don-t-load-chunks-for-supporting-block-checks.patch similarity index 100% rename from patches/server/0958-Don-t-load-chunks-for-supporting-block-checks.patch rename to patches/server/0957-Don-t-load-chunks-for-supporting-block-checks.patch diff --git a/patches/server/0959-Optimize-player-lookups-for-beacons.patch b/patches/server/0958-Optimize-player-lookups-for-beacons.patch similarity index 100% rename from patches/server/0959-Optimize-player-lookups-for-beacons.patch rename to patches/server/0958-Optimize-player-lookups-for-beacons.patch diff --git a/patches/server/0960-Add-Sign-getInteractableSideFor.patch b/patches/server/0959-Add-Sign-getInteractableSideFor.patch similarity index 100% rename from patches/server/0960-Add-Sign-getInteractableSideFor.patch rename to patches/server/0959-Add-Sign-getInteractableSideFor.patch diff --git a/patches/server/0961-Array-backed-synched-entity-data.patch b/patches/server/0960-Array-backed-synched-entity-data.patch similarity index 100% rename from patches/server/0961-Array-backed-synched-entity-data.patch rename to patches/server/0960-Array-backed-synched-entity-data.patch diff --git a/patches/server/0962-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0961-fix-item-meta-for-tadpole-buckets.patch similarity index 100% rename from patches/server/0962-fix-item-meta-for-tadpole-buckets.patch rename to patches/server/0961-fix-item-meta-for-tadpole-buckets.patch diff --git a/patches/server/0963-Suppress-Item-Meta-Validation-Checks.patch b/patches/server/0962-Suppress-Item-Meta-Validation-Checks.patch similarity index 100% rename from patches/server/0963-Suppress-Item-Meta-Validation-Checks.patch rename to patches/server/0962-Suppress-Item-Meta-Validation-Checks.patch diff --git a/patches/server/0964-Fix-BanList-API.patch b/patches/server/0963-Fix-BanList-API.patch similarity index 100% rename from patches/server/0964-Fix-BanList-API.patch rename to patches/server/0963-Fix-BanList-API.patch diff --git a/patches/server/0965-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0964-Determine-lava-and-water-fluid-explosion-resistance-.patch similarity index 100% rename from patches/server/0965-Determine-lava-and-water-fluid-explosion-resistance-.patch rename to patches/server/0964-Determine-lava-and-water-fluid-explosion-resistance-.patch diff --git a/patches/server/0966-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0965-Fix-possible-NPE-on-painting-creation.patch similarity index 100% rename from patches/server/0966-Fix-possible-NPE-on-painting-creation.patch rename to patches/server/0965-Fix-possible-NPE-on-painting-creation.patch diff --git a/patches/server/0967-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0966-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch similarity index 100% rename from patches/server/0967-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch rename to patches/server/0966-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch diff --git a/patches/server/0968-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0967-ExperienceOrb-should-call-EntitySpawnEvent.patch similarity index 100% rename from patches/server/0968-ExperienceOrb-should-call-EntitySpawnEvent.patch rename to patches/server/0967-ExperienceOrb-should-call-EntitySpawnEvent.patch diff --git a/patches/server/0969-Don-t-tick-signs.patch b/patches/server/0968-Don-t-tick-signs.patch similarity index 100% rename from patches/server/0969-Don-t-tick-signs.patch rename to patches/server/0968-Don-t-tick-signs.patch diff --git a/patches/server/0970-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0969-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch similarity index 100% rename from patches/server/0970-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch rename to patches/server/0969-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch diff --git a/patches/server/0971-Add-whitelist-events.patch b/patches/server/0970-Add-whitelist-events.patch similarity index 100% rename from patches/server/0971-Add-whitelist-events.patch rename to patches/server/0970-Add-whitelist-events.patch diff --git a/patches/server/0972-Implement-PlayerFailMoveEvent.patch b/patches/server/0971-Implement-PlayerFailMoveEvent.patch similarity index 100% rename from patches/server/0972-Implement-PlayerFailMoveEvent.patch rename to patches/server/0971-Implement-PlayerFailMoveEvent.patch diff --git a/patches/server/0973-Folia-scheduler-and-owned-region-API.patch b/patches/server/0972-Folia-scheduler-and-owned-region-API.patch similarity index 100% rename from patches/server/0973-Folia-scheduler-and-owned-region-API.patch rename to patches/server/0972-Folia-scheduler-and-owned-region-API.patch diff --git a/patches/server/0974-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0973-Only-erase-allay-memory-on-non-item-targets.patch similarity index 100% rename from patches/server/0974-Only-erase-allay-memory-on-non-item-targets.patch rename to patches/server/0973-Only-erase-allay-memory-on-non-item-targets.patch diff --git a/patches/server/0975-API-for-updating-recipes-on-clients.patch b/patches/server/0974-API-for-updating-recipes-on-clients.patch similarity index 100% rename from patches/server/0975-API-for-updating-recipes-on-clients.patch rename to patches/server/0974-API-for-updating-recipes-on-clients.patch diff --git a/patches/server/0976-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0975-Fix-rotation-when-spawning-display-entities.patch similarity index 100% rename from patches/server/0976-Fix-rotation-when-spawning-display-entities.patch rename to patches/server/0975-Fix-rotation-when-spawning-display-entities.patch diff --git a/patches/server/0977-Only-capture-actual-tree-growth.patch b/patches/server/0976-Only-capture-actual-tree-growth.patch similarity index 100% rename from patches/server/0977-Only-capture-actual-tree-growth.patch rename to patches/server/0976-Only-capture-actual-tree-growth.patch diff --git a/patches/server/0978-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0977-Use-correct-source-for-mushroom-block-spread-event.patch similarity index 100% rename from patches/server/0978-Use-correct-source-for-mushroom-block-spread-event.patch rename to patches/server/0977-Use-correct-source-for-mushroom-block-spread-event.patch diff --git a/patches/server/0979-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0978-Respect-randomizeData-on-more-entities-when-spawning.patch similarity index 100% rename from patches/server/0979-Respect-randomizeData-on-more-entities-when-spawning.patch rename to patches/server/0978-Respect-randomizeData-on-more-entities-when-spawning.patch diff --git a/patches/server/0980-Use-correct-seed-on-api-world-load.patch b/patches/server/0979-Use-correct-seed-on-api-world-load.patch similarity index 100% rename from patches/server/0980-Use-correct-seed-on-api-world-load.patch rename to patches/server/0979-Use-correct-seed-on-api-world-load.patch diff --git a/patches/server/0981-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0980-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch similarity index 100% rename from patches/server/0981-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch rename to patches/server/0980-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch diff --git a/patches/server/0982-Cache-map-ids-on-item-frames.patch b/patches/server/0981-Cache-map-ids-on-item-frames.patch similarity index 100% rename from patches/server/0982-Cache-map-ids-on-item-frames.patch rename to patches/server/0981-Cache-map-ids-on-item-frames.patch diff --git a/patches/server/0983-Fix-custom-statistic-criteria-creation.patch b/patches/server/0982-Fix-custom-statistic-criteria-creation.patch similarity index 100% rename from patches/server/0983-Fix-custom-statistic-criteria-creation.patch rename to patches/server/0982-Fix-custom-statistic-criteria-creation.patch diff --git a/patches/server/0984-Bandaid-fix-for-Effect.patch b/patches/server/0983-Bandaid-fix-for-Effect.patch similarity index 100% rename from patches/server/0984-Bandaid-fix-for-Effect.patch rename to patches/server/0983-Bandaid-fix-for-Effect.patch diff --git a/patches/server/0985-SculkCatalyst-bloom-API.patch b/patches/server/0984-SculkCatalyst-bloom-API.patch similarity index 100% rename from patches/server/0985-SculkCatalyst-bloom-API.patch rename to patches/server/0984-SculkCatalyst-bloom-API.patch diff --git a/patches/server/0986-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0985-API-for-an-entity-s-scoreboard-name.patch similarity index 100% rename from patches/server/0986-API-for-an-entity-s-scoreboard-name.patch rename to patches/server/0985-API-for-an-entity-s-scoreboard-name.patch diff --git a/patches/server/0987-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/0986-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch similarity index 100% rename from patches/server/0987-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch rename to patches/server/0986-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch diff --git a/patches/server/0988-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0987-Deprecate-and-replace-methods-with-old-StructureType.patch similarity index 100% rename from patches/server/0988-Deprecate-and-replace-methods-with-old-StructureType.patch rename to patches/server/0987-Deprecate-and-replace-methods-with-old-StructureType.patch diff --git a/patches/server/0989-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0988-Don-t-tab-complete-namespaced-commands-if-send-names.patch similarity index 100% rename from patches/server/0989-Don-t-tab-complete-namespaced-commands-if-send-names.patch rename to patches/server/0988-Don-t-tab-complete-namespaced-commands-if-send-names.patch diff --git a/patches/server/0990-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0989-Properly-handle-BlockBreakEvent-isDropItems.patch similarity index 100% rename from patches/server/0990-Properly-handle-BlockBreakEvent-isDropItems.patch rename to patches/server/0989-Properly-handle-BlockBreakEvent-isDropItems.patch diff --git a/patches/server/0991-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0990-Fire-entity-death-event-for-ender-dragon.patch similarity index 100% rename from patches/server/0991-Fire-entity-death-event-for-ender-dragon.patch rename to patches/server/0990-Fire-entity-death-event-for-ender-dragon.patch diff --git a/patches/server/0992-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0991-Configurable-entity-tracking-range-by-Y-coordinate.patch similarity index 100% rename from patches/server/0992-Configurable-entity-tracking-range-by-Y-coordinate.patch rename to patches/server/0991-Configurable-entity-tracking-range-by-Y-coordinate.patch diff --git a/patches/server/0993-Add-Listing-API-for-Player.patch b/patches/server/0992-Add-Listing-API-for-Player.patch similarity index 100% rename from patches/server/0993-Add-Listing-API-for-Player.patch rename to patches/server/0992-Add-Listing-API-for-Player.patch diff --git a/patches/server/0994-Configurable-Region-Compression-Format.patch b/patches/server/0993-Configurable-Region-Compression-Format.patch similarity index 100% rename from patches/server/0994-Configurable-Region-Compression-Format.patch rename to patches/server/0993-Configurable-Region-Compression-Format.patch diff --git a/patches/server/0995-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/server/0994-Expose-clicked-BlockFace-during-BlockDamageEvent.patch similarity index 100% rename from patches/server/0995-Expose-clicked-BlockFace-during-BlockDamageEvent.patch rename to patches/server/0994-Expose-clicked-BlockFace-during-BlockDamageEvent.patch diff --git a/patches/server/0996-Fix-NPE-on-Boat-getStatus.patch b/patches/server/0995-Fix-NPE-on-Boat-getStatus.patch similarity index 100% rename from patches/server/0996-Fix-NPE-on-Boat-getStatus.patch rename to patches/server/0995-Fix-NPE-on-Boat-getStatus.patch diff --git a/patches/server/0997-Expand-Pose-API.patch b/patches/server/0996-Expand-Pose-API.patch similarity index 100% rename from patches/server/0997-Expand-Pose-API.patch rename to patches/server/0996-Expand-Pose-API.patch diff --git a/patches/server/0998-More-DragonBattle-API.patch b/patches/server/0997-More-DragonBattle-API.patch similarity index 100% rename from patches/server/0998-More-DragonBattle-API.patch rename to patches/server/0997-More-DragonBattle-API.patch diff --git a/patches/server/0999-Deep-clone-unhandled-nbt-tags.patch b/patches/server/0998-Deep-clone-unhandled-nbt-tags.patch similarity index 100% rename from patches/server/0999-Deep-clone-unhandled-nbt-tags.patch rename to patches/server/0998-Deep-clone-unhandled-nbt-tags.patch diff --git a/patches/server/1000-Add-PlayerPickItemEvent.patch b/patches/server/0999-Add-PlayerPickItemEvent.patch similarity index 100% rename from patches/server/1000-Add-PlayerPickItemEvent.patch rename to patches/server/0999-Add-PlayerPickItemEvent.patch diff --git a/patches/server/1001-Improve-performance-of-mass-crafts.patch b/patches/server/1000-Improve-performance-of-mass-crafts.patch similarity index 100% rename from patches/server/1001-Improve-performance-of-mass-crafts.patch rename to patches/server/1000-Improve-performance-of-mass-crafts.patch diff --git a/patches/server/1002-Allow-trident-custom-damage.patch b/patches/server/1001-Allow-trident-custom-damage.patch similarity index 100% rename from patches/server/1002-Allow-trident-custom-damage.patch rename to patches/server/1001-Allow-trident-custom-damage.patch diff --git a/patches/server/1003-Expose-hand-during-BlockCanBuildEvent.patch b/patches/server/1002-Expose-hand-during-BlockCanBuildEvent.patch similarity index 100% rename from patches/server/1003-Expose-hand-during-BlockCanBuildEvent.patch rename to patches/server/1002-Expose-hand-during-BlockCanBuildEvent.patch diff --git a/patches/server/1004-Optimize-nearest-structure-border-iteration.patch b/patches/server/1003-Optimize-nearest-structure-border-iteration.patch similarity index 100% rename from patches/server/1004-Optimize-nearest-structure-border-iteration.patch rename to patches/server/1003-Optimize-nearest-structure-border-iteration.patch diff --git a/patches/server/1005-Implement-OfflinePlayer-isConnected.patch b/patches/server/1004-Implement-OfflinePlayer-isConnected.patch similarity index 100% rename from patches/server/1005-Implement-OfflinePlayer-isConnected.patch rename to patches/server/1004-Implement-OfflinePlayer-isConnected.patch diff --git a/patches/server/1006-Fix-inventory-desync.patch b/patches/server/1005-Fix-inventory-desync.patch similarity index 100% rename from patches/server/1006-Fix-inventory-desync.patch rename to patches/server/1005-Fix-inventory-desync.patch diff --git a/patches/server/1007-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/1006-Add-titleOverride-to-InventoryOpenEvent.patch similarity index 100% rename from patches/server/1007-Add-titleOverride-to-InventoryOpenEvent.patch rename to patches/server/1006-Add-titleOverride-to-InventoryOpenEvent.patch diff --git a/patches/server/1008-Configure-sniffer-egg-hatch-time.patch b/patches/server/1007-Configure-sniffer-egg-hatch-time.patch similarity index 100% rename from patches/server/1008-Configure-sniffer-egg-hatch-time.patch rename to patches/server/1007-Configure-sniffer-egg-hatch-time.patch diff --git a/patches/server/1009-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/1008-Do-crystal-portal-proximity-check-before-entity-look.patch similarity index 100% rename from patches/server/1009-Do-crystal-portal-proximity-check-before-entity-look.patch rename to patches/server/1008-Do-crystal-portal-proximity-check-before-entity-look.patch diff --git a/patches/server/1010-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/1009-Skip-POI-finding-if-stuck-in-vehicle.patch similarity index 100% rename from patches/server/1010-Skip-POI-finding-if-stuck-in-vehicle.patch rename to patches/server/1009-Skip-POI-finding-if-stuck-in-vehicle.patch diff --git a/patches/server/1011-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/1010-Add-slot-sanity-checks-in-container-clicks.patch similarity index 100% rename from patches/server/1011-Add-slot-sanity-checks-in-container-clicks.patch rename to patches/server/1010-Add-slot-sanity-checks-in-container-clicks.patch diff --git a/patches/server/1012-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/1011-Call-BlockRedstoneEvents-for-lecterns.patch similarity index 100% rename from patches/server/1012-Call-BlockRedstoneEvents-for-lecterns.patch rename to patches/server/1011-Call-BlockRedstoneEvents-for-lecterns.patch diff --git a/patches/server/1013-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/1012-Allow-proper-checking-of-empty-item-stacks.patch similarity index 100% rename from patches/server/1013-Allow-proper-checking-of-empty-item-stacks.patch rename to patches/server/1012-Allow-proper-checking-of-empty-item-stacks.patch diff --git a/patches/server/1014-Fix-silent-equipment-change-for-mobs.patch b/patches/server/1013-Fix-silent-equipment-change-for-mobs.patch similarity index 100% rename from patches/server/1014-Fix-silent-equipment-change-for-mobs.patch rename to patches/server/1013-Fix-silent-equipment-change-for-mobs.patch diff --git a/patches/server/1015-Fix-spigot-s-Forced-Stats.patch b/patches/server/1014-Fix-spigot-s-Forced-Stats.patch similarity index 100% rename from patches/server/1015-Fix-spigot-s-Forced-Stats.patch rename to patches/server/1014-Fix-spigot-s-Forced-Stats.patch diff --git a/patches/server/1016-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/1015-Add-missing-InventoryHolders-to-inventories.patch similarity index 100% rename from patches/server/1016-Add-missing-InventoryHolders-to-inventories.patch rename to patches/server/1015-Add-missing-InventoryHolders-to-inventories.patch diff --git a/patches/server/1017-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/1016-Do-not-read-tile-entities-in-chunks-that-are-positio.patch similarity index 100% rename from patches/server/1017-Do-not-read-tile-entities-in-chunks-that-are-positio.patch rename to patches/server/1016-Do-not-read-tile-entities-in-chunks-that-are-positio.patch diff --git a/patches/server/1018-Actually-optimise-explosions.patch b/patches/server/1017-Actually-optimise-explosions.patch similarity index 100% rename from patches/server/1018-Actually-optimise-explosions.patch rename to patches/server/1017-Actually-optimise-explosions.patch diff --git a/patches/server/1019-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/1018-Add-missing-logs-for-log-ips-config-option.patch similarity index 100% rename from patches/server/1019-Add-missing-logs-for-log-ips-config-option.patch rename to patches/server/1018-Add-missing-logs-for-log-ips-config-option.patch diff --git a/patches/server/1020-Remove-Spigot-Bug-Fix-for-MC-109346.patch b/patches/server/1019-Remove-Spigot-Bug-Fix-for-MC-109346.patch similarity index 100% rename from patches/server/1020-Remove-Spigot-Bug-Fix-for-MC-109346.patch rename to patches/server/1019-Remove-Spigot-Bug-Fix-for-MC-109346.patch diff --git a/patches/server/1021-Fix-SuspiciousStewMeta.patch b/patches/server/1020-Fix-SuspiciousStewMeta.patch similarity index 100% rename from patches/server/1021-Fix-SuspiciousStewMeta.patch rename to patches/server/1020-Fix-SuspiciousStewMeta.patch diff --git a/patches/server/1022-Optimise-chunk-tick-iteration.patch b/patches/server/1021-Optimise-chunk-tick-iteration.patch similarity index 100% rename from patches/server/1022-Optimise-chunk-tick-iteration.patch rename to patches/server/1021-Optimise-chunk-tick-iteration.patch diff --git a/patches/server/1023-Lag-compensation-ticks.patch b/patches/server/1022-Lag-compensation-ticks.patch similarity index 98% rename from patches/server/1023-Lag-compensation-ticks.patch rename to patches/server/1022-Lag-compensation-ticks.patch index 582278f2b7..1af1b07a75 100644 --- a/patches/server/1023-Lag-compensation-ticks.patch +++ b/patches/server/1022-Lag-compensation-ticks.patch @@ -8,7 +8,7 @@ Areas affected by lag comepnsation: - Eating food items diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index e7bcb076788cefa94b70e455bef1f9653cec6415..98153bf0359db8d5a94fa6f75a05373e4e7cc4ae 100644 +index a8f9f4e23575cb58045f9d8efe011a60a51dbd7a..34f19ac897a30c0c4e3ab406013fcca1c8b7db93 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -311,6 +311,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop