diff --git a/patches/server/0009-MC-Utils.patch b/patches/server/0009-MC-Utils.patch index 8ace4e3739..f4ec305721 100644 --- a/patches/server/0009-MC-Utils.patch +++ b/patches/server/0009-MC-Utils.patch @@ -4416,18 +4416,10 @@ index 3e5a85a7ad6149b04622c254fbc2e174896a4128..3f662692ed4846e026a9d48595e7b3b2 + } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 40adb6117b9e0d5f70103113202a07715e403e2a..cef1761cdaf3e456695f2de61f4295fb99361914 100644 +index 40adb6117b9e0d5f70103113202a07715e403e2a..c9cab509796599b13ca3422de1049aed78348704 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -310,6 +310,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop S spin(Function serverFactory) { - AtomicReference atomicreference = new AtomicReference(); -@@ -973,6 +974,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop processQueue = new java.util.concurrent.ConcurrentLinkedQueue(); public int autosavePeriod; -@@ -384,7 +383,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop implements ServerInfo, ChunkIOErrorReporter, CommandSource, AutoCloseable { -@@ -912,6 +912,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0 && this.ticksUntilAutosave <= 0) { this.ticksUntilAutosave = this.autosavePeriod; // CraftBukkit end @@ -807,7 +807,7 @@ index 5a4cdbc4b92a48c614564e4e421f05a9eb5b072b..d76dae9ce9022308b316080ac48b7030 this.profiler.push("tallying"); long j = Util.getNanos() - i; int k = this.tickCount % 100; -@@ -1358,8 +1382,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { entityplayer.connection.suspendFlushing(); }); @@ -851,7 +851,7 @@ index 5a4cdbc4b92a48c614564e4e421f05a9eb5b072b..d76dae9ce9022308b316080ac48b7030 // Send time updates to everyone, it will get the right time from the world the player is in. if (this.tickCount % 20 == 0) { for (int i = 0; i < this.getPlayerList().players.size(); ++i) { -@@ -1457,7 +1480,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { -@@ -2548,9 +2550,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { MinecraftServer.LOGGER.error("Uncaught exception in server thread", throwable); }); diff --git a/patches/server/0262-Optimize-World-Time-Updates.patch b/patches/server/0262-Optimize-World-Time-Updates.patch index 1ce97af599..ab47d03d57 100644 --- a/patches/server/0262-Optimize-World-Time-Updates.patch +++ b/patches/server/0262-Optimize-World-Time-Updates.patch @@ -8,10 +8,10 @@ the updates per world, so that we can re-use the same packet object for every player unless they have per-player time enabled. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 995ee6b2af01a14d61a031008dd05518668a98ae..0b266d3855723752d7789340f5d98ea106a97722 100644 +index f3f3f80f14bc1df13b80033aa143fcccab6f3a31..699191356a9d873fa6bbe04ea3e5db91eb2db41d 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1562,12 +1562,24 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop -Date: Sun, 24 Mar 2019 18:09:20 -0400 -Subject: [PATCH] don't go below 0 for pickupDelay, breaks picking up items - -vanilla checks for == 0 - -diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java -index f9dfd6e7b610cfee75524a525ab0e72bed5522da..6dfa43036afeba75a7ecc5a82637f081624d5c69 100644 ---- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java -+++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java -@@ -149,6 +149,7 @@ public class ItemEntity extends Entity implements TraceableEntity { - // CraftBukkit start - Use wall time for pickup and despawn timers - int elapsedTicks = MinecraftServer.currentTick - this.lastTick; - if (this.pickupDelay != 32767) this.pickupDelay -= elapsedTicks; -+ this.pickupDelay = Math.max(0, this.pickupDelay); // Paper - don't go below 0 - if (this.age != -32768) this.age += elapsedTicks; - this.lastTick = MinecraftServer.currentTick; - // CraftBukkit end -@@ -234,6 +235,7 @@ public class ItemEntity extends Entity implements TraceableEntity { - // CraftBukkit start - Use wall time for pickup and despawn timers - int elapsedTicks = MinecraftServer.currentTick - this.lastTick; - if (this.pickupDelay != 32767) this.pickupDelay -= elapsedTicks; -+ this.pickupDelay = Math.max(0, this.pickupDelay); // Paper - don't go below 0 - if (this.age != -32768) this.age += elapsedTicks; - this.lastTick = MinecraftServer.currentTick; - // CraftBukkit end diff --git a/patches/server/0285-PlayerDeathEvent-getItemsToKeep.patch b/patches/server/0284-PlayerDeathEvent-getItemsToKeep.patch similarity index 100% rename from patches/server/0285-PlayerDeathEvent-getItemsToKeep.patch rename to patches/server/0284-PlayerDeathEvent-getItemsToKeep.patch diff --git a/patches/server/0286-Optimize-Captured-BlockEntity-Lookup.patch b/patches/server/0285-Optimize-Captured-BlockEntity-Lookup.patch similarity index 100% rename from patches/server/0286-Optimize-Captured-BlockEntity-Lookup.patch rename to patches/server/0285-Optimize-Captured-BlockEntity-Lookup.patch diff --git a/patches/server/0287-Mob-Spawner-API-Enhancements.patch b/patches/server/0286-Mob-Spawner-API-Enhancements.patch similarity index 100% rename from patches/server/0287-Mob-Spawner-API-Enhancements.patch rename to patches/server/0286-Mob-Spawner-API-Enhancements.patch diff --git a/patches/server/0288-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/server/0287-Fix-CB-call-to-changed-postToMainThread-method.patch similarity index 100% rename from patches/server/0288-Fix-CB-call-to-changed-postToMainThread-method.patch rename to patches/server/0287-Fix-CB-call-to-changed-postToMainThread-method.patch diff --git a/patches/server/0289-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/server/0288-Fix-sounds-when-item-frames-are-modified-MC-123450.patch similarity index 100% rename from patches/server/0289-Fix-sounds-when-item-frames-are-modified-MC-123450.patch rename to patches/server/0288-Fix-sounds-when-item-frames-are-modified-MC-123450.patch diff --git a/patches/server/0290-Implement-CraftBlockSoundGroup.patch b/patches/server/0289-Implement-CraftBlockSoundGroup.patch similarity index 100% rename from patches/server/0290-Implement-CraftBlockSoundGroup.patch rename to patches/server/0289-Implement-CraftBlockSoundGroup.patch diff --git a/patches/server/0291-Expose-the-internal-current-tick.patch b/patches/server/0290-Expose-the-internal-current-tick.patch similarity index 100% rename from patches/server/0291-Expose-the-internal-current-tick.patch rename to patches/server/0290-Expose-the-internal-current-tick.patch diff --git a/patches/server/0292-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/server/0291-Show-blockstate-location-if-we-failed-to-read-it.patch similarity index 94% rename from patches/server/0292-Show-blockstate-location-if-we-failed-to-read-it.patch rename to patches/server/0291-Show-blockstate-location-if-we-failed-to-read-it.patch index 35f4f6c443..c12cf5a95d 100644 --- a/patches/server/0292-Show-blockstate-location-if-we-failed-to-read-it.patch +++ b/patches/server/0291-Show-blockstate-location-if-we-failed-to-read-it.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Show blockstate location if we failed to read it diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java -index a7bb7d263cb981fcf6dd35a3b32270e89e96945a..92133f16c192f5caf9962a08401ff914550747f8 100644 +index 1ca25dfdb9ec5c3a4d26b71484e1326e1f50b40d..302955eed07d3af91f90875583c70a236bbe11b2 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java @@ -32,6 +32,7 @@ public class CraftBlockEntityState extends CraftBlockStat diff --git a/patches/server/0293-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/server/0292-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch similarity index 100% rename from patches/server/0293-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch rename to patches/server/0292-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch diff --git a/patches/server/0294-Configurable-projectile-relative-velocity.patch b/patches/server/0293-Configurable-projectile-relative-velocity.patch similarity index 100% rename from patches/server/0294-Configurable-projectile-relative-velocity.patch rename to patches/server/0293-Configurable-projectile-relative-velocity.patch diff --git a/patches/server/0295-offset-item-frame-ticking.patch b/patches/server/0294-offset-item-frame-ticking.patch similarity index 100% rename from patches/server/0295-offset-item-frame-ticking.patch rename to patches/server/0294-offset-item-frame-ticking.patch diff --git a/patches/server/0296-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0295-Prevent-consuming-the-wrong-itemstack.patch similarity index 100% rename from patches/server/0296-Prevent-consuming-the-wrong-itemstack.patch rename to patches/server/0295-Prevent-consuming-the-wrong-itemstack.patch diff --git a/patches/server/0297-Dont-send-unnecessary-sign-update.patch b/patches/server/0296-Dont-send-unnecessary-sign-update.patch similarity index 100% rename from patches/server/0297-Dont-send-unnecessary-sign-update.patch rename to patches/server/0296-Dont-send-unnecessary-sign-update.patch diff --git a/patches/server/0298-Add-option-to-disable-pillager-patrols.patch b/patches/server/0297-Add-option-to-disable-pillager-patrols.patch similarity index 100% rename from patches/server/0298-Add-option-to-disable-pillager-patrols.patch rename to patches/server/0297-Add-option-to-disable-pillager-patrols.patch diff --git a/patches/server/0299-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0298-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch similarity index 100% rename from patches/server/0299-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch rename to patches/server/0298-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch diff --git a/patches/server/0300-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/server/0299-MC-145656-Fix-Follow-Range-Initial-Target.patch similarity index 100% rename from patches/server/0300-MC-145656-Fix-Follow-Range-Initial-Target.patch rename to patches/server/0299-MC-145656-Fix-Follow-Range-Initial-Target.patch diff --git a/patches/server/0301-Duplicate-UUID-Resolve-Option.patch b/patches/server/0300-Duplicate-UUID-Resolve-Option.patch similarity index 100% rename from patches/server/0301-Duplicate-UUID-Resolve-Option.patch rename to patches/server/0300-Duplicate-UUID-Resolve-Option.patch diff --git a/patches/server/0302-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0301-PlayerDeathEvent-shouldDropExperience.patch similarity index 100% rename from patches/server/0302-PlayerDeathEvent-shouldDropExperience.patch rename to patches/server/0301-PlayerDeathEvent-shouldDropExperience.patch diff --git a/patches/server/0303-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0302-Prevent-bees-loading-chunks-checking-hive-position.patch similarity index 100% rename from patches/server/0303-Prevent-bees-loading-chunks-checking-hive-position.patch rename to patches/server/0302-Prevent-bees-loading-chunks-checking-hive-position.patch diff --git a/patches/server/0304-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0303-Don-t-load-Chunks-from-Hoppers-and-other-things.patch similarity index 100% rename from patches/server/0304-Don-t-load-Chunks-from-Hoppers-and-other-things.patch rename to patches/server/0303-Don-t-load-Chunks-from-Hoppers-and-other-things.patch diff --git a/patches/server/0305-Optimise-EntityGetter-getPlayerByUUID.patch b/patches/server/0304-Optimise-EntityGetter-getPlayerByUUID.patch similarity index 100% rename from patches/server/0305-Optimise-EntityGetter-getPlayerByUUID.patch rename to patches/server/0304-Optimise-EntityGetter-getPlayerByUUID.patch diff --git a/patches/server/0306-Fix-items-not-falling-correctly.patch b/patches/server/0305-Fix-items-not-falling-correctly.patch similarity index 93% rename from patches/server/0306-Fix-items-not-falling-correctly.patch rename to patches/server/0305-Fix-items-not-falling-correctly.patch index aaff528185..5be02c3b7b 100644 --- a/patches/server/0306-Fix-items-not-falling-correctly.patch +++ b/patches/server/0305-Fix-items-not-falling-correctly.patch @@ -15,10 +15,10 @@ This patch resolves the conflict by offsetting checking Spigot's entity activation range check from an item's move method. diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java -index 6dfa43036afeba75a7ecc5a82637f081624d5c69..8351e46f667a8f8dd96d97ec15c0165261a2fab4 100644 +index f9dfd6e7b610cfee75524a525ab0e72bed5522da..e110296a95441a13ec431d897796326b0277edb1 100644 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java -@@ -176,7 +176,7 @@ public class ItemEntity extends Entity implements TraceableEntity { +@@ -175,7 +175,7 @@ public class ItemEntity extends Entity implements TraceableEntity { } } diff --git a/patches/server/0307-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0306-Optimize-call-to-getFluid-for-explosions.patch similarity index 100% rename from patches/server/0307-Optimize-call-to-getFluid-for-explosions.patch rename to patches/server/0306-Optimize-call-to-getFluid-for-explosions.patch diff --git a/patches/server/0308-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/server/0307-Guard-against-serializing-mismatching-chunk-coordina.patch similarity index 100% rename from patches/server/0308-Guard-against-serializing-mismatching-chunk-coordina.patch rename to patches/server/0307-Guard-against-serializing-mismatching-chunk-coordina.patch diff --git a/patches/server/0309-Alternative-item-despawn-rate.patch b/patches/server/0308-Alternative-item-despawn-rate.patch similarity index 88% rename from patches/server/0309-Alternative-item-despawn-rate.patch rename to patches/server/0308-Alternative-item-despawn-rate.patch index 5f9a648f99..d4e1a80c7c 100644 --- a/patches/server/0309-Alternative-item-despawn-rate.patch +++ b/patches/server/0308-Alternative-item-despawn-rate.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Alternative item-despawn-rate Co-authored-by: Noah van der Aa diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java -index 8351e46f667a8f8dd96d97ec15c0165261a2fab4..2e550c7db6cebc941590c35337fd47416407a5aa 100644 +index e110296a95441a13ec431d897796326b0277edb1..c724359995d65c88e7f365eea55f3e4382a46ddd 100644 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java @@ -62,6 +62,7 @@ public class ItemEntity extends Entity implements TraceableEntity { @@ -17,7 +17,7 @@ index 8351e46f667a8f8dd96d97ec15c0165261a2fab4..2e550c7db6cebc941590c35337fd4741 public ItemEntity(EntityType type, Level world) { super(type, world); -@@ -216,7 +217,7 @@ public class ItemEntity extends Entity implements TraceableEntity { +@@ -215,7 +216,7 @@ public class ItemEntity extends Entity implements TraceableEntity { } } @@ -26,7 +26,7 @@ index 8351e46f667a8f8dd96d97ec15c0165261a2fab4..2e550c7db6cebc941590c35337fd4741 // CraftBukkit start - fire ItemDespawnEvent if (CraftEventFactory.callItemDespawnEvent(this).isCancelled()) { this.age = 0; -@@ -240,7 +241,7 @@ public class ItemEntity extends Entity implements TraceableEntity { +@@ -238,7 +239,7 @@ public class ItemEntity extends Entity implements TraceableEntity { this.lastTick = MinecraftServer.currentTick; // CraftBukkit end @@ -35,7 +35,7 @@ index 8351e46f667a8f8dd96d97ec15c0165261a2fab4..2e550c7db6cebc941590c35337fd4741 // CraftBukkit start - fire ItemDespawnEvent if (org.bukkit.craftbukkit.event.CraftEventFactory.callItemDespawnEvent(this).isCancelled()) { this.age = 0; -@@ -296,7 +297,7 @@ public class ItemEntity extends Entity implements TraceableEntity { +@@ -294,7 +295,7 @@ public class ItemEntity extends Entity implements TraceableEntity { private boolean isMergable() { ItemStack itemstack = this.getItem(); @@ -44,7 +44,7 @@ index 8351e46f667a8f8dd96d97ec15c0165261a2fab4..2e550c7db6cebc941590c35337fd4741 } private void tryToMerge(ItemEntity other) { -@@ -544,6 +545,7 @@ public class ItemEntity extends Entity implements TraceableEntity { +@@ -542,6 +543,7 @@ public class ItemEntity extends Entity implements TraceableEntity { public void setItem(ItemStack stack) { this.getEntityData().set(ItemEntity.DATA_ITEM, stack); @@ -52,7 +52,7 @@ index 8351e46f667a8f8dd96d97ec15c0165261a2fab4..2e550c7db6cebc941590c35337fd4741 } @Override -@@ -598,7 +600,7 @@ public class ItemEntity extends Entity implements TraceableEntity { +@@ -596,7 +598,7 @@ public class ItemEntity extends Entity implements TraceableEntity { public void makeFakeItem() { this.setNeverPickUp(); diff --git a/patches/server/0310-Tracking-Range-Improvements.patch b/patches/server/0309-Tracking-Range-Improvements.patch similarity index 100% rename from patches/server/0310-Tracking-Range-Improvements.patch rename to patches/server/0309-Tracking-Range-Improvements.patch diff --git a/patches/server/0311-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0310-Bees-get-gravity-in-void.-Fixes-MC-167279.patch similarity index 100% rename from patches/server/0311-Bees-get-gravity-in-void.-Fixes-MC-167279.patch rename to patches/server/0310-Bees-get-gravity-in-void.-Fixes-MC-167279.patch diff --git a/patches/server/0312-Improve-Block-breakNaturally-API.patch b/patches/server/0311-Improve-Block-breakNaturally-API.patch similarity index 100% rename from patches/server/0312-Improve-Block-breakNaturally-API.patch rename to patches/server/0311-Improve-Block-breakNaturally-API.patch diff --git a/patches/server/0313-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0312-Optimise-getChunkAt-calls-for-loaded-chunks.patch similarity index 100% rename from patches/server/0313-Optimise-getChunkAt-calls-for-loaded-chunks.patch rename to patches/server/0312-Optimise-getChunkAt-calls-for-loaded-chunks.patch diff --git a/patches/server/0314-Add-debug-for-sync-chunk-loads.patch b/patches/server/0313-Add-debug-for-sync-chunk-loads.patch similarity index 100% rename from patches/server/0314-Add-debug-for-sync-chunk-loads.patch rename to patches/server/0313-Add-debug-for-sync-chunk-loads.patch diff --git a/patches/server/0315-Improve-java-version-check.patch b/patches/server/0314-Improve-java-version-check.patch similarity index 100% rename from patches/server/0315-Improve-java-version-check.patch rename to patches/server/0314-Improve-java-version-check.patch diff --git a/patches/server/0316-Add-ThrownEggHatchEvent.patch b/patches/server/0315-Add-ThrownEggHatchEvent.patch similarity index 100% rename from patches/server/0316-Add-ThrownEggHatchEvent.patch rename to patches/server/0315-Add-ThrownEggHatchEvent.patch diff --git a/patches/server/0317-Entity-Jump-API.patch b/patches/server/0316-Entity-Jump-API.patch similarity index 100% rename from patches/server/0317-Entity-Jump-API.patch rename to patches/server/0316-Entity-Jump-API.patch diff --git a/patches/server/0318-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0317-Add-option-to-nerf-pigmen-from-nether-portals.patch similarity index 100% rename from patches/server/0318-Add-option-to-nerf-pigmen-from-nether-portals.patch rename to patches/server/0317-Add-option-to-nerf-pigmen-from-nether-portals.patch diff --git a/patches/server/0319-Make-the-GUI-graph-fancier.patch b/patches/server/0318-Make-the-GUI-graph-fancier.patch similarity index 100% rename from patches/server/0319-Make-the-GUI-graph-fancier.patch rename to patches/server/0318-Make-the-GUI-graph-fancier.patch diff --git a/patches/server/0320-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0319-add-hand-to-BlockMultiPlaceEvent.patch similarity index 93% rename from patches/server/0320-add-hand-to-BlockMultiPlaceEvent.patch rename to patches/server/0319-add-hand-to-BlockMultiPlaceEvent.patch index 56eb680f94..078a0ba255 100644 --- a/patches/server/0320-add-hand-to-BlockMultiPlaceEvent.patch +++ b/patches/server/0319-add-hand-to-BlockMultiPlaceEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] add hand to BlockMultiPlaceEvent diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 6a018f9c289a539b07855d75e4cc2d3c2828ded1..e25ca301a4b9b252d3f75013e4e14df9b14aa7b9 100644 +index 8172a75aef7c3dcdd92817f148466a4cad4c78ed..235ac5c12dab593da3a40e348a010ff626ce74a3 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -412,13 +412,18 @@ public class CraftEventFactory { diff --git a/patches/server/0321-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0320-Validate-tripwire-hook-placement-before-update.patch similarity index 100% rename from patches/server/0321-Validate-tripwire-hook-placement-before-update.patch rename to patches/server/0320-Validate-tripwire-hook-placement-before-update.patch diff --git a/patches/server/0322-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0321-Add-option-to-allow-iron-golems-to-spawn-in-air.patch similarity index 100% rename from patches/server/0322-Add-option-to-allow-iron-golems-to-spawn-in-air.patch rename to patches/server/0321-Add-option-to-allow-iron-golems-to-spawn-in-air.patch diff --git a/patches/server/0323-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0322-Configurable-chance-of-villager-zombie-infection.patch similarity index 100% rename from patches/server/0323-Configurable-chance-of-villager-zombie-infection.patch rename to patches/server/0322-Configurable-chance-of-villager-zombie-infection.patch diff --git a/patches/server/0324-Optimise-Chunk-getFluid.patch b/patches/server/0323-Optimise-Chunk-getFluid.patch similarity index 100% rename from patches/server/0324-Optimise-Chunk-getFluid.patch rename to patches/server/0323-Optimise-Chunk-getFluid.patch diff --git a/patches/server/0325-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0324-Set-spigots-verbose-world-setting-to-false-by-def.patch similarity index 100% rename from patches/server/0325-Set-spigots-verbose-world-setting-to-false-by-def.patch rename to patches/server/0324-Set-spigots-verbose-world-setting-to-false-by-def.patch diff --git a/patches/server/0326-Add-tick-times-API-and-mspt-command.patch b/patches/server/0325-Add-tick-times-API-and-mspt-command.patch similarity index 97% rename from patches/server/0326-Add-tick-times-API-and-mspt-command.patch rename to patches/server/0325-Add-tick-times-API-and-mspt-command.patch index e1bd6dcc6c..ab7f366958 100644 --- a/patches/server/0326-Add-tick-times-API-and-mspt-command.patch +++ b/patches/server/0325-Add-tick-times-API-and-mspt-command.patch @@ -125,7 +125,7 @@ index 72f2e81b9905a0d57ed8e2a88578f62d5235c456..7b58b2d6297800c2dcdbf7539e5ab8e7 public static void registerCommands(final MinecraftServer server) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 3ffb330a16797c04694f73b0cd9f5b38a07641b4..ff73167bfe210305491e35f18adc2755d3651a85 100644 +index ddc3da84c5a55d2cd977fcdb18121351606a6b3c..53bb62c1dcb487be915759d22e06aea80be54f36 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -258,6 +258,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index bfa914857ff36d6c2f5f96a1ddbc4ca96c3ee7ac..855edf966c36e6ee9ec524e189b18d711baeec78 100644 +index 4c32b26e29ca3db0a2f62052e14bcc3e4c1cdea5..cf18f17f181bc94a2b5f4ac6926c2388ec3178c8 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3544,10 +3544,24 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0341-Implement-Player-Client-Options-API.patch b/patches/server/0340-Implement-Player-Client-Options-API.patch similarity index 99% rename from patches/server/0341-Implement-Player-Client-Options-API.patch rename to patches/server/0340-Implement-Player-Client-Options-API.patch index e7bff21f02..d190884bb0 100644 --- a/patches/server/0341-Implement-Player-Client-Options-API.patch +++ b/patches/server/0340-Implement-Player-Client-Options-API.patch @@ -136,7 +136,7 @@ index 7daa310dd5d3eb1befb9983ce85e0354771af71d..8938f90c53de8aef71aa70522a66a69e this.adventure$locale = java.util.Objects.requireNonNullElse(net.kyori.adventure.translation.Translator.parseLocale(this.language), java.util.Locale.US); // Paper this.requestedViewDistance = clientOptions.viewDistance(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index d0af4b838bd43ef2388e918ac14e7acec71b63ef..b9487ce9391413c4c596cc5450ed5c396347ec1b 100644 +index 1959e2af13daa06293c10ea2a4f68e319fac26ad..068ff2c228308ec87fcc6d1352bd63b91bd34a93 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -653,6 +653,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0342-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0341-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch similarity index 100% rename from patches/server/0342-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch rename to patches/server/0341-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch diff --git a/patches/server/0343-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch b/patches/server/0342-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch similarity index 98% rename from patches/server/0343-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch rename to patches/server/0342-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch index 91acc7ee25..fda85df8ca 100644 --- a/patches/server/0343-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch +++ b/patches/server/0342-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch @@ -55,7 +55,7 @@ index 8938f90c53de8aef71aa70522a66a69edb467e73..e6e7dc17d1196a8211a565355f34b5dc // CraftBukkit end public boolean isRealPlayer; // Paper diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index d29885aabcead3d410329ba3056a48bb29ff75cf..9da65c0d3e8398d018da28a8668481aaf9ded472 100644 +index 2cbdcdf0349e7efa797802d0d339d158153690af..5390ce62ec8afd24d2e028ea04d2ef3029a125f9 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -297,6 +297,12 @@ public abstract class PlayerList { diff --git a/patches/server/0344-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0343-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch similarity index 98% rename from patches/server/0344-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch rename to patches/server/0343-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch index a75160c9e4..b739652ade 100644 --- a/patches/server/0344-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch +++ b/patches/server/0343-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch @@ -10,7 +10,7 @@ Co-authored-by: Wyatt Childers Co-authored-by: Jake Potrebic diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 9da65c0d3e8398d018da28a8668481aaf9ded472..9044ed6cba10314c52c44a19be1fa88771c54be6 100644 +index 5390ce62ec8afd24d2e028ea04d2ef3029a125f9..6f587c4bb4704d93552ba61335d87b1852fc169c 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -197,6 +197,7 @@ public abstract class PlayerList { diff --git a/patches/server/0345-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0344-Add-PlayerAttackEntityCooldownResetEvent.patch similarity index 95% rename from patches/server/0345-Add-PlayerAttackEntityCooldownResetEvent.patch rename to patches/server/0344-Add-PlayerAttackEntityCooldownResetEvent.patch index 6958e0c01f..3348155d85 100644 --- a/patches/server/0345-Add-PlayerAttackEntityCooldownResetEvent.patch +++ b/patches/server/0344-Add-PlayerAttackEntityCooldownResetEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerAttackEntityCooldownResetEvent diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 855edf966c36e6ee9ec524e189b18d711baeec78..926c8fd21bb610dc07658c41431a7795ba4f2870 100644 +index cf18f17f181bc94a2b5f4ac6926c2388ec3178c8..42c4adabe451cd32aa362075395a9fcc384ea788 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -2277,7 +2277,17 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0346-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0345-Don-t-fire-BlockFade-on-worldgen-threads.patch similarity index 100% rename from patches/server/0346-Don-t-fire-BlockFade-on-worldgen-threads.patch rename to patches/server/0345-Don-t-fire-BlockFade-on-worldgen-threads.patch diff --git a/patches/server/0347-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0346-Add-phantom-creative-and-insomniac-controls.patch similarity index 97% rename from patches/server/0347-Add-phantom-creative-and-insomniac-controls.patch rename to patches/server/0346-Add-phantom-creative-and-insomniac-controls.patch index 9a012509be..0eea572994 100644 --- a/patches/server/0347-Add-phantom-creative-and-insomniac-controls.patch +++ b/patches/server/0346-Add-phantom-creative-and-insomniac-controls.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add phantom creative and insomniac controls diff --git a/src/main/java/net/minecraft/world/entity/EntitySelector.java b/src/main/java/net/minecraft/world/entity/EntitySelector.java -index 3207166061bf9c4d7bf3f38e5a9f7aff23ccd5c1..ee4495b67c46cf1282cdd6ad15b224b0b7b10bfb 100644 +index f7014bf5faae03a04c31cbdaeb27188c47156c2d..eb425fac573881f3aad09ae75a32184fb0e325a6 100644 --- a/src/main/java/net/minecraft/world/entity/EntitySelector.java +++ b/src/main/java/net/minecraft/world/entity/EntitySelector.java @@ -28,6 +28,7 @@ public final class EntitySelector { diff --git a/patches/server/0348-Fix-item-duplication-and-teleport-issues.patch b/patches/server/0347-Fix-item-duplication-and-teleport-issues.patch similarity index 98% rename from patches/server/0348-Fix-item-duplication-and-teleport-issues.patch rename to patches/server/0347-Fix-item-duplication-and-teleport-issues.patch index c577f08518..86f3c094a3 100644 --- a/patches/server/0348-Fix-item-duplication-and-teleport-issues.patch +++ b/patches/server/0347-Fix-item-duplication-and-teleport-issues.patch @@ -69,7 +69,7 @@ index d80fd4e2f41583f83c9527ccf4ce80afe851276a..10015beb7a2de890fe27bffde8f55c1d public float getBlockExplosionResistance(Explosion explosion, BlockGetter world, BlockPos pos, BlockState blockState, FluidState fluidState, float max) { diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 926c8fd21bb610dc07658c41431a7795ba4f2870..c0bbeaa4a37c1ba9f5125a0c68f4511aac6a0e71 100644 +index 42c4adabe451cd32aa362075395a9fcc384ea788..8920099eb488c37b036b7bd97fbd4f7db505c77c 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1728,9 +1728,9 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -124,7 +124,7 @@ index 92bb0c63330ad3a4cb13b2dc655020714e9b1ffd..cc1189c2d7dc57ba8f29aad4ba5d2a07 } } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index e25ca301a4b9b252d3f75013e4e14df9b14aa7b9..9548ee5b43458ccc865f800d1f1b69245a821658 100644 +index 235ac5c12dab593da3a40e348a010ff626ce74a3..26f8a8cb18205bfb9fe9dc557097946987ddcb18 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -905,6 +905,11 @@ public class CraftEventFactory { diff --git a/patches/server/0349-Villager-Restocks-API.patch b/patches/server/0348-Villager-Restocks-API.patch similarity index 100% rename from patches/server/0349-Villager-Restocks-API.patch rename to patches/server/0348-Villager-Restocks-API.patch diff --git a/patches/server/0350-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0349-Validate-PickItem-Packet-and-kick-for-invalid.patch similarity index 100% rename from patches/server/0350-Validate-PickItem-Packet-and-kick-for-invalid.patch rename to patches/server/0349-Validate-PickItem-Packet-and-kick-for-invalid.patch diff --git a/patches/server/0351-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0350-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch similarity index 100% rename from patches/server/0351-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch rename to patches/server/0350-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch diff --git a/patches/server/0352-misc-debugging-dumps.patch b/patches/server/0351-misc-debugging-dumps.patch similarity index 94% rename from patches/server/0352-misc-debugging-dumps.patch rename to patches/server/0351-misc-debugging-dumps.patch index 51357a8884..ba40cf94e5 100644 --- a/patches/server/0352-misc-debugging-dumps.patch +++ b/patches/server/0351-misc-debugging-dumps.patch @@ -49,10 +49,10 @@ index e25fc35716aff1d1805884b18f67b0eb33d8c05c..8ca9ac8eff9d605baa878ca24e165ac5 StackTraceElement[] astacktraceelement = exception.getStackTrace(); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index ff73167bfe210305491e35f18adc2755d3651a85..1088a91ee131d1c303961557d8fb90101c2d8d3b 100644 +index 53bb62c1dcb487be915759d22e06aea80be54f36..8b17df3d18fe9acc1a7b10c6809886da0143f8c5 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -916,6 +916,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 94f2b0fa94ebc2572c33623fa5883dd7ed56c55a..9cf3e1e20799caf4ba469ef6d5d86bfe176641f7 100644 +index b6238c327e91a52b77135290762feb8b1085fc7e..b1c4970920ca8972f637c846106ae37822e495cf 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -484,7 +484,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/patches/server/0358-Potential-bed-API.patch b/patches/server/0357-Potential-bed-API.patch similarity index 95% rename from patches/server/0358-Potential-bed-API.patch rename to patches/server/0357-Potential-bed-API.patch index 9b500674e0..899b989746 100644 --- a/patches/server/0358-Potential-bed-API.patch +++ b/patches/server/0357-Potential-bed-API.patch @@ -8,7 +8,7 @@ Adds a new method to fetch the location of a player's bed without generating any getPotentialBedLocation - Gets the last known location of a player's bed. This does not preform any check if the bed is still valid and does not load any chunks. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index b55919a0e61a36697c95599dba17dbe2b788fd2a..084938fa2ffa7ee462766bf03f8e2b4c0fd4bf6b 100644 +index ba63c58d40cb3b8655fdb8177c423c67ac7cc3ef..c17dd4205983855615289cf0a5619056d237f325 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -12,6 +12,7 @@ import net.minecraft.nbt.CompoundTag; diff --git a/patches/server/0359-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0358-Wait-for-Async-Tasks-during-shutdown.patch similarity index 92% rename from patches/server/0359-Wait-for-Async-Tasks-during-shutdown.patch rename to patches/server/0358-Wait-for-Async-Tasks-during-shutdown.patch index 86d1266b2e..289e0129e9 100644 --- a/patches/server/0359-Wait-for-Async-Tasks-during-shutdown.patch +++ b/patches/server/0358-Wait-for-Async-Tasks-during-shutdown.patch @@ -10,10 +10,10 @@ Adds a 5 second grace period for any async tasks to finish and warns if any are still running after that delay just as reload does. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 1088a91ee131d1c303961557d8fb90101c2d8d3b..2d25ba18d3db4b3eea8bd30812656f1ade4c2a67 100644 +index 8b17df3d18fe9acc1a7b10c6809886da0143f8c5..0370d26bd1e1d2fe1d640b052aca8a9c05dcb9dc 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -943,6 +943,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop completablefuture = CompletableFuture.supplyAsync(() -> { Stream stream = dataPacks.stream(); // CraftBukkit - decompile error PackRepository resourcepackrepository = this.packRepository; -@@ -2148,6 +2154,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0; // Paper - BlockPhysicsEvent diff --git a/patches/server/0486-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0485-added-option-to-disable-pathfinding-updates-on-block.patch similarity index 100% rename from patches/server/0486-added-option-to-disable-pathfinding-updates-on-block.patch rename to patches/server/0485-added-option-to-disable-pathfinding-updates-on-block.patch diff --git a/patches/server/0487-Inline-shift-direction-fields.patch b/patches/server/0486-Inline-shift-direction-fields.patch similarity index 100% rename from patches/server/0487-Inline-shift-direction-fields.patch rename to patches/server/0486-Inline-shift-direction-fields.patch diff --git a/patches/server/0488-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0487-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/server/0488-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/server/0487-Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/server/0489-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0488-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/server/0489-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/server/0488-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/server/0490-living-entity-allow-attribute-registration.patch b/patches/server/0489-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/server/0490-living-entity-allow-attribute-registration.patch rename to patches/server/0489-living-entity-allow-attribute-registration.patch diff --git a/patches/server/0491-fix-dead-slime-setSize-invincibility.patch b/patches/server/0490-fix-dead-slime-setSize-invincibility.patch similarity index 100% rename from patches/server/0491-fix-dead-slime-setSize-invincibility.patch rename to patches/server/0490-fix-dead-slime-setSize-invincibility.patch diff --git a/patches/server/0492-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0491-Merchant-getRecipes-should-return-an-immutable-list.patch similarity index 100% rename from patches/server/0492-Merchant-getRecipes-should-return-an-immutable-list.patch rename to patches/server/0491-Merchant-getRecipes-should-return-an-immutable-list.patch diff --git a/patches/server/0493-Expose-Tracked-Players.patch b/patches/server/0492-Expose-Tracked-Players.patch similarity index 100% rename from patches/server/0493-Expose-Tracked-Players.patch rename to patches/server/0492-Expose-Tracked-Players.patch diff --git a/patches/server/0494-Improve-ServerGUI.patch b/patches/server/0493-Improve-ServerGUI.patch similarity index 100% rename from patches/server/0494-Improve-ServerGUI.patch rename to patches/server/0493-Improve-ServerGUI.patch diff --git a/patches/server/0495-fix-converting-txt-to-json-file.patch b/patches/server/0494-fix-converting-txt-to-json-file.patch similarity index 100% rename from patches/server/0495-fix-converting-txt-to-json-file.patch rename to patches/server/0494-fix-converting-txt-to-json-file.patch diff --git a/patches/server/0496-Add-worldborder-events.patch b/patches/server/0495-Add-worldborder-events.patch similarity index 100% rename from patches/server/0496-Add-worldborder-events.patch rename to patches/server/0495-Add-worldborder-events.patch diff --git a/patches/server/0497-Add-PlayerNameEntityEvent.patch b/patches/server/0496-Add-PlayerNameEntityEvent.patch similarity index 100% rename from patches/server/0497-Add-PlayerNameEntityEvent.patch rename to patches/server/0496-Add-PlayerNameEntityEvent.patch diff --git a/patches/server/0498-Add-recipe-to-cook-events.patch b/patches/server/0497-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/server/0498-Add-recipe-to-cook-events.patch rename to patches/server/0497-Add-recipe-to-cook-events.patch diff --git a/patches/server/0499-Add-Block-isValidTool.patch b/patches/server/0498-Add-Block-isValidTool.patch similarity index 100% rename from patches/server/0499-Add-Block-isValidTool.patch rename to patches/server/0498-Add-Block-isValidTool.patch diff --git a/patches/server/0500-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0499-Allow-using-signs-inside-spawn-protection.patch similarity index 100% rename from patches/server/0500-Allow-using-signs-inside-spawn-protection.patch rename to patches/server/0499-Allow-using-signs-inside-spawn-protection.patch diff --git a/patches/server/0501-Expand-world-key-API.patch b/patches/server/0500-Expand-world-key-API.patch similarity index 100% rename from patches/server/0501-Expand-world-key-API.patch rename to patches/server/0500-Expand-world-key-API.patch diff --git a/patches/server/0502-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0501-Add-fast-alternative-constructor-for-Rotations.patch similarity index 100% rename from patches/server/0502-Add-fast-alternative-constructor-for-Rotations.patch rename to patches/server/0501-Add-fast-alternative-constructor-for-Rotations.patch diff --git a/patches/server/0503-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0502-Drop-carried-item-when-player-has-disconnected.patch similarity index 100% rename from patches/server/0503-Drop-carried-item-when-player-has-disconnected.patch rename to patches/server/0502-Drop-carried-item-when-player-has-disconnected.patch diff --git a/patches/server/0504-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0503-forced-whitelist-use-configurable-kick-message.patch similarity index 87% rename from patches/server/0504-forced-whitelist-use-configurable-kick-message.patch rename to patches/server/0503-forced-whitelist-use-configurable-kick-message.patch index 4ec0ee6b72..96926fac4a 100644 --- a/patches/server/0504-forced-whitelist-use-configurable-kick-message.patch +++ b/patches/server/0503-forced-whitelist-use-configurable-kick-message.patch @@ -5,10 +5,10 @@ Subject: [PATCH] forced whitelist: use configurable kick message diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index d38cc3e642eb33759175227fbf86ed250cf0b9f3..e02e57d243bc8bccddcf3e3c40887fb774f5e460 100644 +index 43b28b56c7949f95af5b7e99b04b93ed711d8880..6651afa50cfaf53959f89108904d4bf65a0fc495 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -2288,7 +2288,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop list = ImmutableList.of(new PhantomSpawner(), new PatrolSpawner(), new CatSpawner(), new VillageSiege(), new WanderingTraderSpawner(iworlddataserver)); LevelStem worlddimension = (LevelStem) dimensions.get(dimensionKey); diff --git a/patches/server/0648-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0647-Add-config-option-for-worlds-affected-by-time-cmd.patch similarity index 100% rename from patches/server/0648-Add-config-option-for-worlds-affected-by-time-cmd.patch rename to patches/server/0647-Add-config-option-for-worlds-affected-by-time-cmd.patch diff --git a/patches/server/0649-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch b/patches/server/0648-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch similarity index 100% rename from patches/server/0649-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch rename to patches/server/0648-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch diff --git a/patches/server/0650-Multiple-Entries-with-Scoreboards.patch b/patches/server/0649-Multiple-Entries-with-Scoreboards.patch similarity index 100% rename from patches/server/0650-Multiple-Entries-with-Scoreboards.patch rename to patches/server/0649-Multiple-Entries-with-Scoreboards.patch diff --git a/patches/server/0651-Reset-placed-block-on-exception.patch b/patches/server/0650-Reset-placed-block-on-exception.patch similarity index 100% rename from patches/server/0651-Reset-placed-block-on-exception.patch rename to patches/server/0650-Reset-placed-block-on-exception.patch diff --git a/patches/server/0652-Add-configurable-height-for-slime-spawn.patch b/patches/server/0651-Add-configurable-height-for-slime-spawn.patch similarity index 100% rename from patches/server/0652-Add-configurable-height-for-slime-spawn.patch rename to patches/server/0651-Add-configurable-height-for-slime-spawn.patch diff --git a/patches/server/0653-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0652-Fix-xp-reward-for-baby-zombies.patch similarity index 100% rename from patches/server/0653-Fix-xp-reward-for-baby-zombies.patch rename to patches/server/0652-Fix-xp-reward-for-baby-zombies.patch diff --git a/patches/server/0654-Multi-Block-Change-API-Implementation.patch b/patches/server/0653-Multi-Block-Change-API-Implementation.patch similarity index 100% rename from patches/server/0654-Multi-Block-Change-API-Implementation.patch rename to patches/server/0653-Multi-Block-Change-API-Implementation.patch diff --git a/patches/server/0655-Fix-NotePlayEvent.patch b/patches/server/0654-Fix-NotePlayEvent.patch similarity index 100% rename from patches/server/0655-Fix-NotePlayEvent.patch rename to patches/server/0654-Fix-NotePlayEvent.patch diff --git a/patches/server/0656-Freeze-Tick-Lock-API.patch b/patches/server/0655-Freeze-Tick-Lock-API.patch similarity index 100% rename from patches/server/0656-Freeze-Tick-Lock-API.patch rename to patches/server/0655-Freeze-Tick-Lock-API.patch diff --git a/patches/server/0657-More-PotionEffectType-API.patch b/patches/server/0656-More-PotionEffectType-API.patch similarity index 100% rename from patches/server/0657-More-PotionEffectType-API.patch rename to patches/server/0656-More-PotionEffectType-API.patch diff --git a/patches/server/0658-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0657-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch similarity index 100% rename from patches/server/0658-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch rename to patches/server/0657-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch diff --git a/patches/server/0659-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0658-API-for-creating-command-sender-which-forwards-feedb.patch similarity index 100% rename from patches/server/0659-API-for-creating-command-sender-which-forwards-feedb.patch rename to patches/server/0658-API-for-creating-command-sender-which-forwards-feedb.patch diff --git a/patches/server/0660-Add-missing-structure-set-seed-configs.patch b/patches/server/0659-Add-missing-structure-set-seed-configs.patch similarity index 100% rename from patches/server/0660-Add-missing-structure-set-seed-configs.patch rename to patches/server/0659-Add-missing-structure-set-seed-configs.patch diff --git a/patches/server/0661-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0660-Fix-cancelled-powdered-snow-bucket-placement.patch similarity index 95% rename from patches/server/0661-Fix-cancelled-powdered-snow-bucket-placement.patch rename to patches/server/0660-Fix-cancelled-powdered-snow-bucket-placement.patch index 6a3d835ae7..08a9dbf2e4 100644 --- a/patches/server/0661-Fix-cancelled-powdered-snow-bucket-placement.patch +++ b/patches/server/0660-Fix-cancelled-powdered-snow-bucket-placement.patch @@ -8,7 +8,7 @@ snow bucket didn't revert grass that became snowy because of the placement. diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 7daecce161b4853a84520010d430600d9a7a903b..1cfd41f36724f0c54489ad7c1c41486e45467a23 100644 +index ad1cb11245108b5cb187b686ed7e6bc769193b52..ec3be7fb4eb4560fe0106ac127f17d7437612157 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -422,7 +422,7 @@ public final class ItemStack implements DataComponentHolder { diff --git a/patches/server/0662-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0661-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch similarity index 100% rename from patches/server/0662-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch rename to patches/server/0661-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch diff --git a/patches/server/0663-Add-GameEvent-tags.patch b/patches/server/0662-Add-GameEvent-tags.patch similarity index 100% rename from patches/server/0663-Add-GameEvent-tags.patch rename to patches/server/0662-Add-GameEvent-tags.patch diff --git a/patches/server/0664-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0663-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch similarity index 87% rename from patches/server/0664-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch rename to patches/server/0663-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch index b22ddd6951..f73960e08f 100644 --- a/patches/server/0664-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch +++ b/patches/server/0663-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch @@ -9,10 +9,10 @@ This might result in chunks loading far slower in the nether, for example. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 188b1844ca6ee5a97f7a588121255417a184a4df..ca6be44c6b2d0176ea41b1735106c5af7cf9f868 100644 +index 718b653a118a1c64d07efab93192f10dfcbf414e..d45f234fe389ade739bb13f824a1f650709220b8 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1371,6 +1371,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop S spin(Function serverFactory) { AtomicReference atomicreference = new AtomicReference(); -@@ -1582,7 +1583,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0; // Paper - BlockPhysicsEvent -@@ -1649,6 +1652,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop type, Level world) { super(type, world); -@@ -186,7 +187,11 @@ public class ItemEntity extends Entity implements TraceableEntity { +@@ -185,7 +186,11 @@ public class ItemEntity extends Entity implements TraceableEntity { this.move(MoverType.SELF, this.getDeltaMovement()); float f = 0.98F; @@ -79,7 +79,7 @@ index 30056568a9701fcb664682f329175d3bfee79b60..ea0d9335446b20073b9aafb9de453097 f = this.level().getBlockState(this.getBlockPosBelowThatAffectsMyMovement()).getBlock().getFriction() * 0.98F; } -@@ -395,6 +400,11 @@ public class ItemEntity extends Entity implements TraceableEntity { +@@ -393,6 +398,11 @@ public class ItemEntity extends Entity implements TraceableEntity { @Override public void addAdditionalSaveData(CompoundTag nbt) { @@ -91,7 +91,7 @@ index 30056568a9701fcb664682f329175d3bfee79b60..ea0d9335446b20073b9aafb9de453097 nbt.putShort("Health", (short) this.health); nbt.putShort("Age", (short) this.age); nbt.putShort("PickupDelay", (short) this.pickupDelay); -@@ -437,6 +447,17 @@ public class ItemEntity extends Entity implements TraceableEntity { +@@ -435,6 +445,17 @@ public class ItemEntity extends Entity implements TraceableEntity { this.setItem(ItemStack.EMPTY); } diff --git a/patches/server/0772-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0771-Ability-to-control-player-s-insomnia-and-phantoms.patch similarity index 97% rename from patches/server/0772-Ability-to-control-player-s-insomnia-and-phantoms.patch rename to patches/server/0771-Ability-to-control-player-s-insomnia-and-phantoms.patch index 5bc45a7af4..03be2495a7 100644 --- a/patches/server/0772-Ability-to-control-player-s-insomnia-and-phantoms.patch +++ b/patches/server/0771-Ability-to-control-player-s-insomnia-and-phantoms.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Ability to control player's insomnia and phantoms diff --git a/src/main/java/net/minecraft/world/entity/EntitySelector.java b/src/main/java/net/minecraft/world/entity/EntitySelector.java -index e382a29b441b656f35bc24cb90f95cb4def433d2..d8cc5614502db7025349e085381b6b32ad32296a 100644 +index 302decdccd37c5579473c8fc33adda3956be7603..dca7b99e97f21bf6cfae6ee69eeac95d0bcf6863 100644 --- a/src/main/java/net/minecraft/world/entity/EntitySelector.java +++ b/src/main/java/net/minecraft/world/entity/EntitySelector.java @@ -28,7 +28,18 @@ public final class EntitySelector { diff --git a/patches/server/0773-Fix-premature-player-kicks-on-shutdown.patch b/patches/server/0772-Fix-premature-player-kicks-on-shutdown.patch similarity index 95% rename from patches/server/0773-Fix-premature-player-kicks-on-shutdown.patch rename to patches/server/0772-Fix-premature-player-kicks-on-shutdown.patch index d3dbe3d230..034840341e 100644 --- a/patches/server/0773-Fix-premature-player-kicks-on-shutdown.patch +++ b/patches/server/0772-Fix-premature-player-kicks-on-shutdown.patch @@ -47,10 +47,10 @@ index 4d9f1fc884050993287adfa4578a87da710623fb..a8dfe7a4b3d01bf75587be078f471d1e this.disconnect((Component) Component.translatable("multiplayer.disconnect.server_shutdown")); } catch (ClassCastException classcastexception) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 3aba668f9a34cabc26063c61660ab22f83b1070e..a72b278826be1d0da79ca619ea9a9a437fa9c54b 100644 +index bef05e09c654794405832ad75c3471f63399dfee..2cc22a9a5483c62cdf64870f5ce62b33018bef06 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -2093,7 +2093,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { this.banner = CraftMetaShield.getBlockState(DyeColor.getByWoolData((byte) color.getId())); diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java -index 0b680f4d79e9d04b755309ac46969d7e43fd3c5f..213bc163daeb98d2d5cfaf02e18688c65c5d219c 100644 +index ca714e165e453d1072d083441d8b985290ada75a..302906467b12189e21633369c005736863f46dd5 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java @@ -48,8 +48,8 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta { diff --git a/patches/server/0962-General-ItemMeta-fixes.patch b/patches/server/0961-General-ItemMeta-fixes.patch similarity index 100% rename from patches/server/0962-General-ItemMeta-fixes.patch rename to patches/server/0961-General-ItemMeta-fixes.patch diff --git a/patches/server/0963-Expose-hasColor-to-leather-armor.patch b/patches/server/0962-Expose-hasColor-to-leather-armor.patch similarity index 100% rename from patches/server/0963-Expose-hasColor-to-leather-armor.patch rename to patches/server/0962-Expose-hasColor-to-leather-armor.patch diff --git a/patches/server/0964-Added-API-to-get-player-ha-proxy-address.patch b/patches/server/0963-Added-API-to-get-player-ha-proxy-address.patch similarity index 100% rename from patches/server/0964-Added-API-to-get-player-ha-proxy-address.patch rename to patches/server/0963-Added-API-to-get-player-ha-proxy-address.patch diff --git a/patches/server/0965-More-Chest-Block-API.patch b/patches/server/0964-More-Chest-Block-API.patch similarity index 100% rename from patches/server/0965-More-Chest-Block-API.patch rename to patches/server/0964-More-Chest-Block-API.patch diff --git a/patches/server/0966-Print-data-component-type-on-encoding-error.patch b/patches/server/0965-Print-data-component-type-on-encoding-error.patch similarity index 100% rename from patches/server/0966-Print-data-component-type-on-encoding-error.patch rename to patches/server/0965-Print-data-component-type-on-encoding-error.patch diff --git a/patches/server/0967-Brigadier-based-command-API.patch b/patches/server/0966-Brigadier-based-command-API.patch similarity index 99% rename from patches/server/0967-Brigadier-based-command-API.patch rename to patches/server/0966-Brigadier-based-command-API.patch index 8f0836b78a..876063208b 100644 --- a/patches/server/0967-Brigadier-based-command-API.patch +++ b/patches/server/0966-Brigadier-based-command-API.patch @@ -2242,7 +2242,7 @@ index 55484826fc5ddd04ae024e25a0251796d7fa9c28..237e4f7b24908e9ade9a483eb7ae05fa Component component = message.resolveComponent(commandSourceStack); CommandSigningContext commandSigningContext = commandSourceStack.getSigningContext(); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index e055769071841d56ec7e2a64fc519d1f8b48ff42..c97fb8eec949c693d4e822d8cf2e666a0858f20c 100644 +index 42a74f5471da882d63c194b1e212f78a94b103ec..a093f29a0b75b5a9e2db2238698d2f3f4ac14ed1 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -306,7 +306,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { @@ -2283,7 +2283,7 @@ index e055769071841d56ec7e2a64fc519d1f8b48ff42..c97fb8eec949c693d4e822d8cf2e666a this.packRepository.setSelected(dataPacks); WorldDataConfiguration worlddataconfiguration = new WorldDataConfiguration(MinecraftServer.getSelectedPacks(this.packRepository, true), this.worldData.enabledFeatures()); -@@ -2194,8 +2196,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop S spin(Function serverFactory) { AtomicReference atomicreference = new AtomicReference(); @@ -22455,7 +22455,7 @@ index c97fb8eec949c693d4e822d8cf2e666a0858f20c..4a4ce372dd105d07f58d7d93d856cb39 ((MinecraftServer) atomicreference.get()).runServer(); }, "Server thread"); -@@ -341,6 +341,77 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { return false; } : this::haveTime); @@ -22615,7 +22615,7 @@ index c97fb8eec949c693d4e822d8cf2e666a0858f20c..4a4ce372dd105d07f58d7d93d856cb39 this.profiler.popPush("nextTickWait"); this.mayHaveDelayedTasks = true; this.delayedTasksMaxNextTickTimeNanos = Math.max(Util.getNanos() + i, this.nextTickTimeNanos); -@@ -1392,6 +1464,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { @@ -22632,7 +22632,7 @@ index c97fb8eec949c693d4e822d8cf2e666a0858f20c..4a4ce372dd105d07f58d7d93d856cb39 if (entity.isRemoved()) { continue; } -@@ -2655,6 +2728,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0; // Paper - BlockPhysicsEvent worldserver.hasEntityMoveEvent = io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - Add EntityMoveEvent @@ -62,7 +62,7 @@ index 4a4ce372dd105d07f58d7d93d856cb3969969806..fb3dcce4e1888f96fdd260740d9d9559 this.profiler.push(() -> { String s = String.valueOf(worldserver); diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 66047f876aedbcc33b86b5cfe2ace588523eb810..5367ece16352523cd7d3f432a137bbed68f82638 100644 +index 96b24c1415af531feef7d8ab4724f7fed3ae8388..eec0ec43590be7e8ae5b530a7404c98b5e23cb53 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -809,10 +809,16 @@ public final class ItemStack implements DataComponentHolder { diff --git a/patches/server/1002-Entity-load-save-limit-per-chunk.patch b/patches/server/1001-Entity-load-save-limit-per-chunk.patch similarity index 100% rename from patches/server/1002-Entity-load-save-limit-per-chunk.patch rename to patches/server/1001-Entity-load-save-limit-per-chunk.patch diff --git a/patches/server/1003-Optimize-Voxel-Shape-Merging.patch b/patches/server/1002-Optimize-Voxel-Shape-Merging.patch similarity index 100% rename from patches/server/1003-Optimize-Voxel-Shape-Merging.patch rename to patches/server/1002-Optimize-Voxel-Shape-Merging.patch diff --git a/patches/server/1004-Optimize-Bit-Operations-by-inlining.patch b/patches/server/1003-Optimize-Bit-Operations-by-inlining.patch similarity index 100% rename from patches/server/1004-Optimize-Bit-Operations-by-inlining.patch rename to patches/server/1003-Optimize-Bit-Operations-by-inlining.patch diff --git a/patches/server/1005-Remove-streams-from-hot-code.patch b/patches/server/1004-Remove-streams-from-hot-code.patch similarity index 100% rename from patches/server/1005-Remove-streams-from-hot-code.patch rename to patches/server/1004-Remove-streams-from-hot-code.patch diff --git a/patches/server/1006-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/1005-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch similarity index 100% rename from patches/server/1006-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch rename to patches/server/1005-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch diff --git a/patches/server/1007-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/1006-Custom-table-implementation-for-blockstate-state-loo.patch similarity index 100% rename from patches/server/1007-Custom-table-implementation-for-blockstate-state-loo.patch rename to patches/server/1006-Custom-table-implementation-for-blockstate-state-loo.patch diff --git a/patches/server/1008-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/1007-Fix-entity-type-tags-suggestions-in-selectors.patch similarity index 100% rename from patches/server/1008-Fix-entity-type-tags-suggestions-in-selectors.patch rename to patches/server/1007-Fix-entity-type-tags-suggestions-in-selectors.patch diff --git a/patches/server/1009-Handle-Oversized-block-entities-in-chunks.patch b/patches/server/1008-Handle-Oversized-block-entities-in-chunks.patch similarity index 100% rename from patches/server/1009-Handle-Oversized-block-entities-in-chunks.patch rename to patches/server/1008-Handle-Oversized-block-entities-in-chunks.patch diff --git a/patches/server/1010-API-for-checking-sent-chunks.patch b/patches/server/1009-API-for-checking-sent-chunks.patch similarity index 100% rename from patches/server/1010-API-for-checking-sent-chunks.patch rename to patches/server/1009-API-for-checking-sent-chunks.patch diff --git a/patches/server/1011-Check-distance-in-entity-interactions.patch b/patches/server/1010-Check-distance-in-entity-interactions.patch similarity index 100% rename from patches/server/1011-Check-distance-in-entity-interactions.patch rename to patches/server/1010-Check-distance-in-entity-interactions.patch diff --git a/patches/server/1012-Configurable-Sand-Duping.patch b/patches/server/1011-Configurable-Sand-Duping.patch similarity index 100% rename from patches/server/1012-Configurable-Sand-Duping.patch rename to patches/server/1011-Configurable-Sand-Duping.patch diff --git a/patches/server/1013-Optimise-general-POI-access.patch b/patches/server/1012-Optimise-general-POI-access.patch similarity index 100% rename from patches/server/1013-Optimise-general-POI-access.patch rename to patches/server/1012-Optimise-general-POI-access.patch diff --git a/patches/server/1014-Improve-performance-of-mass-crafts.patch b/patches/server/1013-Improve-performance-of-mass-crafts.patch similarity index 100% rename from patches/server/1014-Improve-performance-of-mass-crafts.patch rename to patches/server/1013-Improve-performance-of-mass-crafts.patch diff --git a/patches/server/1015-Properly-resend-entities.patch b/patches/server/1014-Properly-resend-entities.patch similarity index 99% rename from patches/server/1015-Properly-resend-entities.patch rename to patches/server/1014-Properly-resend-entities.patch index 956f16576f..148750ed59 100644 --- a/patches/server/1015-Properly-resend-entities.patch +++ b/patches/server/1014-Properly-resend-entities.patch @@ -134,7 +134,7 @@ index 3a90dd1289d393426151d4457edaf99731cc34db..ec058eb6a10500831f173dcb47576c32 } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index e541a77381b03bd4dc648fc50aef77c304157fc0..34b67d7551c0ce354bc7bdb6a3581100c983ac47 100644 +index 52f3d0d4ce28cc6566166ae9a5a1b236ff8c027d..74231cb1c89079473d1727aa3ae2a539d4250317 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -684,13 +684,45 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/1016-Registry-Modification-API.patch b/patches/server/1015-Registry-Modification-API.patch similarity index 100% rename from patches/server/1016-Registry-Modification-API.patch rename to patches/server/1015-Registry-Modification-API.patch diff --git a/patches/server/1017-Add-registry-entry-and-builders.patch b/patches/server/1016-Add-registry-entry-and-builders.patch similarity index 100% rename from patches/server/1017-Add-registry-entry-and-builders.patch rename to patches/server/1016-Add-registry-entry-and-builders.patch diff --git a/patches/server/1018-Improved-Watchdog-Support.patch b/patches/server/1017-Improved-Watchdog-Support.patch similarity index 96% rename from patches/server/1018-Improved-Watchdog-Support.patch rename to patches/server/1017-Improved-Watchdog-Support.patch index 5d035a4ad4..4c18803565 100644 --- a/patches/server/1018-Improved-Watchdog-Support.patch +++ b/patches/server/1017-Improved-Watchdog-Support.patch @@ -115,7 +115,7 @@ index 244a19ecd0234fa1d7a6ecfea20751595688605d..581bd217304e0f9e0b2113c335694805 /* CraftBukkit start - Replace everything OptionParser optionparser = new OptionParser(); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index fb3dcce4e1888f96fdd260740d9d955962d879fc..93ebdbfad4f9f300f31a124d8d4b36c4f5ce382c 100644 +index c13b4f39c19dd6a62ae39688bde5a4739b391e59..d25d500a2206d4f7e821de3766e8a523df4370e3 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -307,7 +307,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop S spin(Function serverFactory) { AtomicReference atomicreference = new AtomicReference(); Thread thread = new ca.spottedleaf.moonrise.common.util.TickThread(() -> { // Paper - rewrite chunk system -@@ -489,6 +492,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop S spin(Function serverFactory) { AtomicReference atomicreference = new AtomicReference(); -@@ -1765,6 +1766,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0; // Paper - BlockPhysicsEvent worldserver.hasEntityMoveEvent = io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - Add EntityMoveEvent net.minecraft.world.level.block.entity.HopperBlockEntity.skipHopperEvents = worldserver.paperConfig().hopper.disableMoveEvent || org.bukkit.event.inventory.InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0; // Paper - Perf: Optimize Hoppers diff --git a/patches/server/1029-Detail-more-information-in-watchdog-dumps.patch b/patches/server/1028-Detail-more-information-in-watchdog-dumps.patch similarity index 99% rename from patches/server/1029-Detail-more-information-in-watchdog-dumps.patch rename to patches/server/1028-Detail-more-information-in-watchdog-dumps.patch index 1806b418e3..cddaca3e53 100644 --- a/patches/server/1029-Detail-more-information-in-watchdog-dumps.patch +++ b/patches/server/1028-Detail-more-information-in-watchdog-dumps.patch @@ -122,7 +122,7 @@ index 9e1af229f52a8ac09833901ad53bd154fed34a4f..c5698b05cc3ea4cb1bc6789c30f2aab7 private void tickPassenger(Entity vehicle, Entity passenger) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 34b67d7551c0ce354bc7bdb6a3581100c983ac47..e0827d8bb3fa17d4f590a5342ff41a514f623e68 100644 +index 74231cb1c89079473d1727aa3ae2a539d4250317..9f68c0fda7f5526eb97619f1a35ed3b78d1b3751 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1086,8 +1086,43 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/1030-Write-SavedData-IO-async.patch b/patches/server/1029-Write-SavedData-IO-async.patch similarity index 100% rename from patches/server/1030-Write-SavedData-IO-async.patch rename to patches/server/1029-Write-SavedData-IO-async.patch diff --git a/patches/server/1031-Add-ItemType-getItemRarity.patch b/patches/server/1030-Add-ItemType-getItemRarity.patch similarity index 100% rename from patches/server/1031-Add-ItemType-getItemRarity.patch rename to patches/server/1030-Add-ItemType-getItemRarity.patch diff --git a/patches/server/1032-Incremental-chunk-and-player-saving.patch b/patches/server/1031-Incremental-chunk-and-player-saving.patch similarity index 97% rename from patches/server/1032-Incremental-chunk-and-player-saving.patch rename to patches/server/1031-Incremental-chunk-and-player-saving.patch index 171e0f1feb..8c2a39d8fe 100644 --- a/patches/server/1032-Incremental-chunk-and-player-saving.patch +++ b/patches/server/1031-Incremental-chunk-and-player-saving.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Incremental chunk and player saving diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index a2875f7cdfb6b43ed59cff41ab4122a08c4cc57f..45695abbeb0a6d47b31b23ba6c464f17e99d7898 100644 +index b64c3e29e2b8e890073fee0b45c8b8dfc2b642fd..aa38e3b297209cc121e7dc7a6ac9588c18bf9357 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -993,7 +993,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop +Date: Mon, 16 Sep 2024 23:07:29 +0200 +Subject: [PATCH] Remove wall-time / unused skip tick protection + +Spigot still maintains some partial implementation of "tick skipping", a +practice in which the MinecraftServer.currentTick field is updated not +by an increment of one per actual tick, but instead set to +System.currentTimeMillis() / 50. This behaviour means that the tracked +tick may "skip" a tick value in case a previous tick took more than the +expected 50ms. + +To compensate for this in important paths, spigot/craftbukkit +implements "wall-time". Instead of incrementing/decrementing ticks on +block entities/entities by one for each call to their tick() method, +they instead increment/decrement important values, like +an ItemEntity's age or pickupDelay, by the difference of +`currentTick - lastTick`, where `lastTick` is the value of +`currentTick` during the last tick() call. + +These "fixes" however do not play nicely with minecraft's simulation +distance as entities/block entities implementing the above behaviour +would "catch up" their values when moving from a non-ticking chunk to a +ticking one as their `lastTick` value remains stuck on the last tick in +a ticking chunk and hence lead to a large "catch up" once ticked again. + +Paper completely removes the "tick skipping" behaviour (See patch +"Further-improve-server-tick-loop"), making the above precautions +completely unnecessary, which also rids paper of the previous described +incompatibility with non-ticking chunks. + +diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java +index 03cfa29bdb426a9fb6b1b6be6e897da48d4f2f3e..4423973d4d9a2c3879d98d1d4c8b8c117c677ac5 100644 +--- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java ++++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java +@@ -60,7 +60,7 @@ public class ItemEntity extends Entity implements TraceableEntity { + @Nullable + public UUID target; + public final float bobOffs; +- private int lastTick = MinecraftServer.currentTick - 1; // CraftBukkit ++ // private int lastTick = MinecraftServer.currentTick - 1; // CraftBukkit // Paper - remove anti tick skipping measures / wall time + public boolean canMobPickup = true; // Paper - Item#canEntityPickup + private int despawnRate = -1; // Paper - Alternative item-despawn-rate + public net.kyori.adventure.util.TriState frictionState = net.kyori.adventure.util.TriState.NOT_SET; // Paper - Friction API +@@ -153,12 +153,11 @@ public class ItemEntity extends Entity implements TraceableEntity { + this.discard(EntityRemoveEvent.Cause.DESPAWN); // CraftBukkit - add Bukkit remove cause + } else { + super.tick(); +- // CraftBukkit start - Use wall time for pickup and despawn timers +- int elapsedTicks = MinecraftServer.currentTick - this.lastTick; +- if (this.pickupDelay != 32767) this.pickupDelay -= elapsedTicks; +- if (this.age != -32768) this.age += elapsedTicks; +- this.lastTick = MinecraftServer.currentTick; +- // CraftBukkit end ++ // Paper start - remove anti tick skipping measures / wall time - revert to vanilla ++ if (this.pickupDelay > 0 && this.pickupDelay != 32767) { ++ --this.pickupDelay; ++ } ++ // Paper end - remove anti tick skipping measures / wall time - revert to vanilla + + this.xo = this.getX(); + this.yo = this.getY(); +@@ -211,7 +210,7 @@ public class ItemEntity extends Entity implements TraceableEntity { + this.mergeWithNeighbours(); + } + +- /* CraftBukkit start - moved up ++ // Paper - remove anti tick skipping measures / wall time - revert to vanilla /* CraftBukkit start - moved up + if (this.age != -32768) { + ++this.age; + } +@@ -242,12 +241,14 @@ public class ItemEntity extends Entity implements TraceableEntity { + // Spigot start - copied from above + @Override + public void inactiveTick() { +- // CraftBukkit start - Use wall time for pickup and despawn timers +- int elapsedTicks = MinecraftServer.currentTick - this.lastTick; +- if (this.pickupDelay != 32767) this.pickupDelay -= elapsedTicks; +- if (this.age != -32768) this.age += elapsedTicks; +- this.lastTick = MinecraftServer.currentTick; +- // CraftBukkit end ++ // Paper start - remove anti tick skipping measures / wall time - copied from above ++ if (this.pickupDelay > 0 && this.pickupDelay != 32767) { ++ --this.pickupDelay; ++ } ++ if (this.age != -32768) { ++ ++this.age; ++ } ++ // Paper end - remove anti tick skipping measures / wall time - copied from above + + if (!this.level().isClientSide && this.age >= this.despawnRate) { // Spigot // Paper - Alternative item-despawn-rate + // CraftBukkit start - fire ItemDespawnEvent +diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java +index 2280004638fd19ed018cb3e77d53a018b34ec516..2b43337ac63d051718a2074fcc46e128a1d65129 100644 +--- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java ++++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java +@@ -96,7 +96,7 @@ public class Zombie extends Monster { + private boolean canBreakDoors; + private int inWaterTime; + public int conversionTime; +- private int lastTick = MinecraftServer.currentTick; // CraftBukkit - add field ++ // private int lastTick = MinecraftServer.currentTick; // CraftBukkit - add field // Paper - remove anti tick skipping measures / wall time + private boolean shouldBurnInDay = true; // Paper - Add more Zombie API + + public Zombie(EntityType type, Level world) { +@@ -219,10 +219,7 @@ public class Zombie extends Monster { + public void tick() { + if (!this.level().isClientSide && this.isAlive() && !this.isNoAi()) { + if (this.isUnderWaterConverting()) { +- // CraftBukkit start - Use wall time instead of ticks for conversion +- int elapsedTicks = MinecraftServer.currentTick - this.lastTick; +- this.conversionTime -= elapsedTicks; +- // CraftBukkit end ++ --this.conversionTime; // Paper - remove anti tick skipping measures / wall time + if (this.conversionTime < 0) { + this.doUnderWaterConversion(); + } +@@ -239,7 +236,7 @@ public class Zombie extends Monster { + } + + super.tick(); +- this.lastTick = MinecraftServer.currentTick; // CraftBukkit ++ // this.lastTick = MinecraftServer.currentTick; // CraftBukkit // Paper - remove anti tick skipping measures / wall time + } + + @Override +@@ -280,7 +277,7 @@ public class Zombie extends Monster { + } + // Paper end - Add more Zombie API + public void startUnderWaterConversion(int ticksUntilWaterConversion) { +- this.lastTick = MinecraftServer.currentTick; // CraftBukkit ++ // this.lastTick = MinecraftServer.currentTick; // CraftBukkit // Paper - remove anti tick skipping measures / wall time + this.conversionTime = ticksUntilWaterConversion; + this.getEntityData().set(Zombie.DATA_DROWNED_CONVERSION_ID, true); + } +diff --git a/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java +index a2fafef89d5354e2cb02f5672810909950a57777..bf2c303a314205590a2839e0f729af3a9ff40a86 100644 +--- a/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java ++++ b/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java +@@ -54,7 +54,7 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements + public int fuel; + protected final ContainerData dataAccess; + // CraftBukkit start - add fields and methods +- private int lastTick = MinecraftServer.currentTick; ++ // private int lastTick = MinecraftServer.currentTick; // Paper - remove anti tick skipping measures / wall time + public List transaction = new java.util.ArrayList(); + private int maxStack = MAX_STACK; + +@@ -169,12 +169,10 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements + boolean flag1 = blockEntity.brewTime > 0; + ItemStack itemstack1 = (ItemStack) blockEntity.items.get(3); + +- // CraftBukkit start - Use wall time instead of ticks for brewing +- int elapsedTicks = MinecraftServer.currentTick - blockEntity.lastTick; +- blockEntity.lastTick = MinecraftServer.currentTick; ++ // Paper - remove anti tick skipping measures / wall time + + if (flag1) { +- blockEntity.brewTime -= elapsedTicks; ++ --blockEntity.brewTime; // Paper - remove anti tick skipping measures / wall time - revert to vanilla + boolean flag2 = blockEntity.brewTime <= 0; // == -> <= + // CraftBukkit end +