diff --git a/patches/removed/1.19.3/0444-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/patches/removed/1.19.3/0444-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch deleted file mode 100644 index 68a10afd43..0000000000 --- a/patches/removed/1.19.3/0444-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jake Potrebic -Date: Fri, 3 Jul 2020 15:03:33 -0700 -Subject: [PATCH] Improve EntityTargetLivingEntityEvent for 1.16 mobs - -CraftBukkit has a bug in their implementation and is incorrectly handling forget -Also adds more target reasons for why it forgot target. - -diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/StopAttackingIfTargetInvalid.java b/src/main/java/net/minecraft/world/entity/ai/behavior/StopAttackingIfTargetInvalid.java -index 44d3c9da39389b72bfc5ee39c1abb6baf9dccdb1..565691aaed71de3efe15dd751fbbbe7849ef56b7 100644 ---- a/src/main/java/net/minecraft/world/entity/ai/behavior/StopAttackingIfTargetInvalid.java -+++ b/src/main/java/net/minecraft/world/entity/ai/behavior/StopAttackingIfTargetInvalid.java -@@ -56,15 +56,15 @@ public class StopAttackingIfTargetInvalid extends Behavior { - LivingEntity entityliving = this.getAttackTarget(entity); - - if (!entity.canAttack(entityliving)) { -- this.clearAttackTarget(entity); -+ this.clearAttackTarget(entity, org.bukkit.event.entity.EntityTargetEvent.TargetReason.TARGET_INVALID); // Paper - } else if (this.canGrowTiredOfTryingToReachTarget && StopAttackingIfTargetInvalid.isTiredOfTryingToReachTarget(entity)) { -- this.clearAttackTarget(entity); -+ this.clearAttackTarget(entity, org.bukkit.event.entity.EntityTargetEvent.TargetReason.FORGOT_TARGET); // Paper - } else if (this.isCurrentTargetDeadOrRemoved(entity)) { -- this.clearAttackTarget(entity); -+ this.clearAttackTarget(entity, org.bukkit.event.entity.EntityTargetEvent.TargetReason.TARGET_DIED); // Paper - } else if (this.isCurrentTargetInDifferentLevel(entity)) { -- this.clearAttackTarget(entity); -+ this.clearAttackTarget(entity, org.bukkit.event.entity.EntityTargetEvent.TargetReason.TARGET_OTHER_LEVEL); // Paper - } else if (this.stopAttackingWhen.test(this.getAttackTarget(entity))) { -- this.clearAttackTarget(entity); -+ this.clearAttackTarget(entity, org.bukkit.event.entity.EntityTargetEvent.TargetReason.TARGET_INVALID); // Paper - } - } - -@@ -88,17 +88,20 @@ public class StopAttackingIfTargetInvalid extends Behavior { - return optional.isPresent() && !((LivingEntity) optional.get()).isAlive(); - } - -- protected void clearAttackTarget(E entity) { -+ protected void clearAttackTarget(E entity, EntityTargetEvent.TargetReason reason) { - // CraftBukkit start -- LivingEntity old = entity.getBrain().getMemory(MemoryModuleType.ATTACK_TARGET).orElse(null); -- EntityTargetEvent event = CraftEventFactory.callEntityTargetLivingEvent(entity, null, (old != null && !old.isAlive()) ? EntityTargetEvent.TargetReason.TARGET_DIED : EntityTargetEvent.TargetReason.FORGOT_TARGET); -+ // Paper start - fix this event -+ // LivingEntity old = entity.getBrain().getMemory(MemoryModuleType.ATTACK_TARGET).orElse(null); -+ EntityTargetEvent event = CraftEventFactory.callEntityTargetLivingEvent(entity, null, reason); - if (event.isCancelled()) { - return; - } -- if (event.getTarget() != null) { -+ // comment out, bad logic - bad -+ /*if (event.getTarget() != null) { - entity.getBrain().setMemory(MemoryModuleType.ATTACK_TARGET, ((CraftLivingEntity) event.getTarget()).getHandle()); - return; -- } -+ }*/ -+ // Paper end - // CraftBukkit end - this.onTargetErased.accept(entity, this.getAttackTarget(entity)); - entity.getBrain().eraseMemory(MemoryModuleType.ATTACK_TARGET); diff --git a/patches/server/0442-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/server/0442-Improve-fix-EntityTargetLivingEntityEvent.patch new file mode 100644 index 0000000000..9e7d65b4f7 --- /dev/null +++ b/patches/server/0442-Improve-fix-EntityTargetLivingEntityEvent.patch @@ -0,0 +1,48 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jake Potrebic +Date: Fri, 9 Dec 2022 03:10:23 -0800 +Subject: [PATCH] Improve/fix EntityTargetLivingEntityEvent + + +diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/StopAttackingIfTargetInvalid.java b/src/main/java/net/minecraft/world/entity/ai/behavior/StopAttackingIfTargetInvalid.java +index 7ae873f391b1c22a57f504490eabe7da558a6ec2..212e307077dfa274a4d4e4192760de23a75ef12a 100644 +--- a/src/main/java/net/minecraft/world/entity/ai/behavior/StopAttackingIfTargetInvalid.java ++++ b/src/main/java/net/minecraft/world/entity/ai/behavior/StopAttackingIfTargetInvalid.java +@@ -47,17 +47,30 @@ public class StopAttackingIfTargetInvalid { + if (entityinsentient.canAttack(entityliving) && (!shouldForgetIfTargetUnreachable || !StopAttackingIfTargetInvalid.isTiredOfTryingToReachTarget(entityinsentient, behaviorbuilder_b.tryGet(memoryaccessor1))) && entityliving.isAlive() && entityliving.level == entityinsentient.level && !alternativeCondition.test(entityliving)) { + return true; + } else { ++ // Paper start - better track target change reason ++ final EntityTargetEvent.TargetReason reason; ++ if (!entityinsentient.canAttack(entityliving)) { ++ reason = EntityTargetEvent.TargetReason.TARGET_INVALID; ++ } else if (shouldForgetIfTargetUnreachable && StopAttackingIfTargetInvalid.isTiredOfTryingToReachTarget(entityinsentient, behaviorbuilder_b.tryGet(memoryaccessor1))) { ++ reason = EntityTargetEvent.TargetReason.FORGOT_TARGET; ++ } else if (!entityliving.isAlive()) { ++ reason = EntityTargetEvent.TargetReason.TARGET_DIED; ++ } else if (entityliving.level != entityinsentient.level) { ++ reason = EntityTargetEvent.TargetReason.TARGET_OTHER_LEVEL; ++ } else { ++ reason = EntityTargetEvent.TargetReason.TARGET_INVALID; ++ } ++ // Paper end + // CraftBukkit start +- LivingEntity old = entityinsentient.getBrain().getMemory(MemoryModuleType.ATTACK_TARGET).orElse(null); +- EntityTargetEvent event = CraftEventFactory.callEntityTargetLivingEvent(entityinsentient, null, (old != null && !old.isAlive()) ? EntityTargetEvent.TargetReason.TARGET_DIED : EntityTargetEvent.TargetReason.FORGOT_TARGET); ++ EntityTargetEvent event = CraftEventFactory.callEntityTargetLivingEvent(entityinsentient, null, reason); // Paper + if (event.isCancelled()) { + return false; + } +- if (event.getTarget() == null) { +- memoryaccessor.erase(); +- return true; +- } +- entityliving = ((CraftLivingEntity) event.getTarget()).getHandle(); ++ // if (event.getTarget() == null) { // Paper - this is wrong, you are skipping the forgetCallback ++ // memoryaccessor.erase(); ++ // return true; ++ // } ++ // entityliving = ((CraftLivingEntity) event.getTarget()).getHandle(); + // CraftBukkit end + forgetCallback.accept(entityinsentient, entityliving); + memoryaccessor.erase(); diff --git a/patches/server/0442-Add-entity-liquid-API.patch b/patches/server/0443-Add-entity-liquid-API.patch similarity index 100% rename from patches/server/0442-Add-entity-liquid-API.patch rename to patches/server/0443-Add-entity-liquid-API.patch diff --git a/patches/server/0443-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0444-Update-itemstack-legacy-name-and-lore.patch similarity index 100% rename from patches/server/0443-Update-itemstack-legacy-name-and-lore.patch rename to patches/server/0444-Update-itemstack-legacy-name-and-lore.patch diff --git a/patches/server/0444-Spawn-player-in-correct-world-on-login.patch b/patches/server/0445-Spawn-player-in-correct-world-on-login.patch similarity index 100% rename from patches/server/0444-Spawn-player-in-correct-world-on-login.patch rename to patches/server/0445-Spawn-player-in-correct-world-on-login.patch diff --git a/patches/server/0445-Add-PrepareResultEvent.patch b/patches/server/0446-Add-PrepareResultEvent.patch similarity index 100% rename from patches/server/0445-Add-PrepareResultEvent.patch rename to patches/server/0446-Add-PrepareResultEvent.patch diff --git a/patches/server/0446-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0447-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch similarity index 100% rename from patches/server/0446-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch rename to patches/server/0447-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch diff --git a/patches/server/0447-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0448-Optimize-NetworkManager-Exception-Handling.patch similarity index 100% rename from patches/server/0447-Optimize-NetworkManager-Exception-Handling.patch rename to patches/server/0448-Optimize-NetworkManager-Exception-Handling.patch diff --git a/patches/server/0448-Optimize-the-advancement-data-player-iteration-to-be.patch b/patches/server/0449-Optimize-the-advancement-data-player-iteration-to-be.patch similarity index 100% rename from patches/server/0448-Optimize-the-advancement-data-player-iteration-to-be.patch rename to patches/server/0449-Optimize-the-advancement-data-player-iteration-to-be.patch diff --git a/patches/server/0449-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0450-Fix-arrows-never-despawning-MC-125757.patch similarity index 100% rename from patches/server/0449-Fix-arrows-never-despawning-MC-125757.patch rename to patches/server/0450-Fix-arrows-never-despawning-MC-125757.patch diff --git a/patches/server/0450-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0451-Thread-Safe-Vanilla-Command-permission-checking.patch similarity index 100% rename from patches/server/0450-Thread-Safe-Vanilla-Command-permission-checking.patch rename to patches/server/0451-Thread-Safe-Vanilla-Command-permission-checking.patch diff --git a/patches/server/0451-Fix-SPIGOT-5989.patch b/patches/server/0452-Fix-SPIGOT-5989.patch similarity index 100% rename from patches/server/0451-Fix-SPIGOT-5989.patch rename to patches/server/0452-Fix-SPIGOT-5989.patch diff --git a/patches/server/0452-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0453-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch similarity index 100% rename from patches/server/0452-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch rename to patches/server/0453-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch diff --git a/patches/server/0453-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0454-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch similarity index 100% rename from patches/server/0453-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch rename to patches/server/0454-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch diff --git a/patches/server/0454-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0455-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch similarity index 100% rename from patches/server/0454-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch rename to patches/server/0455-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch diff --git a/patches/server/0455-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/patches/server/0456-Add-missing-strikeLighting-call-to-World-spigot-stri.patch similarity index 90% rename from patches/server/0455-Add-missing-strikeLighting-call-to-World-spigot-stri.patch rename to patches/server/0456-Add-missing-strikeLighting-call-to-World-spigot-stri.patch index ab5db0e0f8..9eb04a5221 100644 --- a/patches/server/0455-Add-missing-strikeLighting-call-to-World-spigot-stri.patch +++ b/patches/server/0456-Add-missing-strikeLighting-call-to-World-spigot-stri.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add missing strikeLighting call to diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index f3723a8219881d55959e7231e230d28bfb521dcd..d9ac6e687ad7f4c2cfe6698cdf6e7d1d4652eb2b 100644 +index f22457cf9dd5ceb6630c1f96a2050c350c4fbbc9..cec02e3b47ccc99ba8343dafa7a760ebca64ffc1 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -2133,6 +2133,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0456-Fix-some-rails-connecting-improperly.patch b/patches/server/0457-Fix-some-rails-connecting-improperly.patch similarity index 100% rename from patches/server/0456-Fix-some-rails-connecting-improperly.patch rename to patches/server/0457-Fix-some-rails-connecting-improperly.patch diff --git a/patches/server/0457-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0458-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch similarity index 100% rename from patches/server/0457-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch rename to patches/server/0458-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch diff --git a/patches/server/0458-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0459-Do-not-let-the-server-load-chunks-from-newer-version.patch similarity index 100% rename from patches/server/0458-Do-not-let-the-server-load-chunks-from-newer-version.patch rename to patches/server/0459-Do-not-let-the-server-load-chunks-from-newer-version.patch diff --git a/patches/server/0459-Brand-support.patch b/patches/server/0460-Brand-support.patch similarity index 97% rename from patches/server/0459-Brand-support.patch rename to patches/server/0460-Brand-support.patch index 7a33a4e9f5..c88577cf57 100644 --- a/patches/server/0459-Brand-support.patch +++ b/patches/server/0460-Brand-support.patch @@ -56,7 +56,7 @@ index 508a6e062de1994f26393d33e8b41ea245e0c3d0..40423a24eac6675c8b9ddb843c910e32 return (!this.player.joining && !this.connection.isConnected()) || this.processedDisconnect; // Paper } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 5741795405d302aadbf4c10caabd40797557e102..e61402856dbf5c394724101e513438587b5583c9 100644 +index 89411cc4a774e85d79aec44cb4136679e9513329..ca12956fe9eb0ade9f78980210ec7421266ba554 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2823,6 +2823,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0460-Add-setMaxPlayers-API.patch b/patches/server/0461-Add-setMaxPlayers-API.patch similarity index 94% rename from patches/server/0460-Add-setMaxPlayers-API.patch rename to patches/server/0461-Add-setMaxPlayers-API.patch index 9b8ec67dff..b50b6e7382 100644 --- a/patches/server/0460-Add-setMaxPlayers-API.patch +++ b/patches/server/0461-Add-setMaxPlayers-API.patch @@ -18,7 +18,7 @@ index 62fe8133e10ca4e04670b504bf18db9f5e7512e0..4b2862c6c5397ebec7cc22938b76ed0d private int simulationDistance; private boolean allowCheatsForAllPlayers; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 0b6f9567aaad080ff2a21be9e17a93d2d24fd010..6e5f72f5d226b94603710d84f9054ce3aa4bd034 100644 +index a8bd9f368182395962b63b52c9107debcb6ab6b9..d296f5c970dc4c242fc18fb82e6db583eefef8d8 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -687,6 +687,13 @@ public final class CraftServer implements Server { diff --git a/patches/server/0461-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0462-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from patches/server/0461-Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/server/0462-Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/patches/server/0462-Don-t-require-FACING-data.patch b/patches/server/0463-Don-t-require-FACING-data.patch similarity index 100% rename from patches/server/0462-Don-t-require-FACING-data.patch rename to patches/server/0463-Don-t-require-FACING-data.patch diff --git a/patches/server/0463-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0464-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch similarity index 100% rename from patches/server/0463-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch rename to patches/server/0464-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch diff --git a/patches/server/0464-Add-moon-phase-API.patch b/patches/server/0465-Add-moon-phase-API.patch similarity index 100% rename from patches/server/0464-Add-moon-phase-API.patch rename to patches/server/0465-Add-moon-phase-API.patch diff --git a/patches/server/0465-Prevent-headless-pistons-from-being-created.patch b/patches/server/0466-Prevent-headless-pistons-from-being-created.patch similarity index 100% rename from patches/server/0465-Prevent-headless-pistons-from-being-created.patch rename to patches/server/0466-Prevent-headless-pistons-from-being-created.patch diff --git a/patches/server/0466-Add-BellRingEvent.patch b/patches/server/0467-Add-BellRingEvent.patch similarity index 100% rename from patches/server/0466-Add-BellRingEvent.patch rename to patches/server/0467-Add-BellRingEvent.patch diff --git a/patches/server/0467-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0468-Add-zombie-targets-turtle-egg-config.patch similarity index 100% rename from patches/server/0467-Add-zombie-targets-turtle-egg-config.patch rename to patches/server/0468-Add-zombie-targets-turtle-egg-config.patch diff --git a/patches/server/0468-Buffer-joins-to-world.patch b/patches/server/0469-Buffer-joins-to-world.patch similarity index 100% rename from patches/server/0468-Buffer-joins-to-world.patch rename to patches/server/0469-Buffer-joins-to-world.patch diff --git a/patches/server/0469-Eigencraft-redstone-implementation.patch b/patches/server/0470-Eigencraft-redstone-implementation.patch similarity index 100% rename from patches/server/0469-Eigencraft-redstone-implementation.patch rename to patches/server/0470-Eigencraft-redstone-implementation.patch diff --git a/patches/server/0470-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0471-Fix-hex-colors-not-working-in-some-kick-messages.patch similarity index 100% rename from patches/server/0470-Fix-hex-colors-not-working-in-some-kick-messages.patch rename to patches/server/0471-Fix-hex-colors-not-working-in-some-kick-messages.patch diff --git a/patches/server/0471-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0472-PortalCreateEvent-needs-to-know-its-entity.patch similarity index 100% rename from patches/server/0471-PortalCreateEvent-needs-to-know-its-entity.patch rename to patches/server/0472-PortalCreateEvent-needs-to-know-its-entity.patch diff --git a/patches/server/0472-Fix-CraftTeam-null-check.patch b/patches/server/0473-Fix-CraftTeam-null-check.patch similarity index 100% rename from patches/server/0472-Fix-CraftTeam-null-check.patch rename to patches/server/0473-Fix-CraftTeam-null-check.patch diff --git a/patches/server/0473-Add-more-Evoker-API.patch b/patches/server/0474-Add-more-Evoker-API.patch similarity index 100% rename from patches/server/0473-Add-more-Evoker-API.patch rename to patches/server/0474-Add-more-Evoker-API.patch diff --git a/patches/server/0474-Add-methods-to-get-translation-keys.patch b/patches/server/0475-Add-methods-to-get-translation-keys.patch similarity index 100% rename from patches/server/0474-Add-methods-to-get-translation-keys.patch rename to patches/server/0475-Add-methods-to-get-translation-keys.patch diff --git a/patches/server/0475-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0476-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from patches/server/0475-Create-HoverEvent-from-ItemStack-Entity.patch rename to patches/server/0476-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/patches/server/0476-Cache-block-data-strings.patch b/patches/server/0477-Cache-block-data-strings.patch similarity index 100% rename from patches/server/0476-Cache-block-data-strings.patch rename to patches/server/0477-Cache-block-data-strings.patch diff --git a/patches/server/0477-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0478-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch similarity index 96% rename from patches/server/0477-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch rename to patches/server/0478-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch index 34c83075e6..2e1404436f 100644 --- a/patches/server/0477-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch +++ b/patches/server/0478-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch @@ -9,7 +9,7 @@ as this is how Vanilla teleports entities. Cancel any pending motion when teleported. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 8eeb521b11062ecc699813c2132f7edf655d8d09..1909cc53765a38bdb31237b18f27d7e457115726 100644 +index 40423a24eac6675c8b9ddb843c910e324709ebe4..040972c62b8d6005a47ccb81a3fda1b4f98f8838 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -752,7 +752,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -57,7 +57,7 @@ index 09b2b6633b108739e8fe6d4c400d42d88b27435e..ff65d3125da3d2716cccac24317e40d0 this.setYRot(yaw); this.setXRot(pitch); diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java -index c58cd26ac15308d249f7d50fed530a6093091d36..b53fc8ca05fb44e6cb7ab6b27b8371b56795fe98 100644 +index c5a117308f051c20b81818ad91e0ca40177feb69..0e7c2e7640ff2a2cdc3088dcb56314026bfaf95f 100644 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java @@ -167,6 +167,7 @@ public abstract class BaseSpawner { diff --git a/patches/server/0478-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0479-Add-additional-open-container-api-to-HumanEntity.patch similarity index 100% rename from patches/server/0478-Add-additional-open-container-api-to-HumanEntity.patch rename to patches/server/0479-Add-additional-open-container-api-to-HumanEntity.patch diff --git a/patches/server/0479-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0480-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch similarity index 100% rename from patches/server/0479-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch rename to patches/server/0480-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch diff --git a/patches/server/0480-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0481-Extend-block-drop-capture-to-capture-all-items-added.patch similarity index 100% rename from patches/server/0480-Extend-block-drop-capture-to-capture-all-items-added.patch rename to patches/server/0481-Extend-block-drop-capture-to-capture-all-items-added.patch diff --git a/patches/server/0481-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0482-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch similarity index 100% rename from patches/server/0481-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch rename to patches/server/0482-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch diff --git a/patches/server/0482-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0483-Lazily-track-plugin-scoreboards-by-default.patch similarity index 100% rename from patches/server/0482-Lazily-track-plugin-scoreboards-by-default.patch rename to patches/server/0483-Lazily-track-plugin-scoreboards-by-default.patch diff --git a/patches/server/0483-Entity-isTicking.patch b/patches/server/0484-Entity-isTicking.patch similarity index 100% rename from patches/server/0483-Entity-isTicking.patch rename to patches/server/0484-Entity-isTicking.patch diff --git a/patches/server/0484-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0485-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch similarity index 100% rename from patches/server/0484-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch rename to patches/server/0485-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch diff --git a/patches/server/0485-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0486-Fix-Concurrency-issue-in-ShufflingList.patch similarity index 100% rename from patches/server/0485-Fix-Concurrency-issue-in-ShufflingList.patch rename to patches/server/0486-Fix-Concurrency-issue-in-ShufflingList.patch diff --git a/patches/server/0486-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0487-Reset-Ender-Crystals-on-Dragon-Spawn.patch similarity index 100% rename from patches/server/0486-Reset-Ender-Crystals-on-Dragon-Spawn.patch rename to patches/server/0487-Reset-Ender-Crystals-on-Dragon-Spawn.patch diff --git a/patches/server/0487-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0488-Fix-for-large-move-vectors-crashing-server.patch similarity index 98% rename from patches/server/0487-Fix-for-large-move-vectors-crashing-server.patch rename to patches/server/0488-Fix-for-large-move-vectors-crashing-server.patch index c59b5528ae..a2b44af249 100644 --- a/patches/server/0487-Fix-for-large-move-vectors-crashing-server.patch +++ b/patches/server/0488-Fix-for-large-move-vectors-crashing-server.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix for large move vectors crashing server Check movement distance also based on current position. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 1909cc53765a38bdb31237b18f27d7e457115726..191aa9cd6e27cbc322b8ce2aa6ad07c20660e709 100644 +index 040972c62b8d6005a47ccb81a3fda1b4f98f8838..5a17bd9435b612d2586a6bcd7fc89609f9010713 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -567,9 +567,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0488-Optimise-getType-calls.patch b/patches/server/0489-Optimise-getType-calls.patch similarity index 98% rename from patches/server/0488-Optimise-getType-calls.patch rename to patches/server/0489-Optimise-getType-calls.patch index 295d1d6ac1..62b5e4fd6c 100644 --- a/patches/server/0488-Optimise-getType-calls.patch +++ b/patches/server/0489-Optimise-getType-calls.patch @@ -67,7 +67,7 @@ index 0a755f38fae9dc84440f43113920c5b4c6d8218b..7b9e943b391c061782fccd2b8d705cee public void setFlag(int flag) { diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java -index 76efbcb951b133246bd9cbd8808f900f958d9298..14fd37f4bdb9b0b7f28abfccffe682f6fdc6339e 100644 +index 45c90505c778bfdebf0884190a422d12a0673d71..3399e8cdf2230bd71444abb43829c54d7277ce36 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java +++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java @@ -50,7 +50,7 @@ public class CraftBlockData implements BlockData { diff --git a/patches/server/0489-Villager-resetOffers.patch b/patches/server/0490-Villager-resetOffers.patch similarity index 100% rename from patches/server/0489-Villager-resetOffers.patch rename to patches/server/0490-Villager-resetOffers.patch diff --git a/patches/server/0490-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0491-Retain-block-place-order-when-capturing-blockstates.patch similarity index 100% rename from patches/server/0490-Retain-block-place-order-when-capturing-blockstates.patch rename to patches/server/0491-Retain-block-place-order-when-capturing-blockstates.patch diff --git a/patches/server/0491-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0492-Reduce-blockpos-allocation-from-pathfinding.patch similarity index 100% rename from patches/server/0491-Reduce-blockpos-allocation-from-pathfinding.patch rename to patches/server/0492-Reduce-blockpos-allocation-from-pathfinding.patch diff --git a/patches/server/0492-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0493-Fix-item-locations-dropped-from-campfires.patch similarity index 100% rename from patches/server/0492-Fix-item-locations-dropped-from-campfires.patch rename to patches/server/0493-Fix-item-locations-dropped-from-campfires.patch diff --git a/patches/server/0493-Player-elytra-boost-API.patch b/patches/server/0494-Player-elytra-boost-API.patch similarity index 94% rename from patches/server/0493-Player-elytra-boost-API.patch rename to patches/server/0494-Player-elytra-boost-API.patch index 20d00ae184..cb478778cd 100644 --- a/patches/server/0493-Player-elytra-boost-API.patch +++ b/patches/server/0494-Player-elytra-boost-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Player elytra boost API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 60e8e82a1fc255aa713808a78ae2dc73ef0b6be3..a84efd5f91141ab9b3879dbb325bc918d88a93e8 100644 +index ca12956fe9eb0ade9f78980210ec7421266ba554..025886ef9fc2d992cffb94b172a44ec123432e60 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -639,6 +639,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0494-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0495-Fixed-TileEntityBell-memory-leak.patch similarity index 100% rename from patches/server/0494-Fixed-TileEntityBell-memory-leak.patch rename to patches/server/0495-Fixed-TileEntityBell-memory-leak.patch diff --git a/patches/server/0495-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0496-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch similarity index 100% rename from patches/server/0495-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch rename to patches/server/0496-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch diff --git a/patches/server/0496-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0497-Add-getOfflinePlayerIfCached-String.patch similarity index 93% rename from patches/server/0496-Add-getOfflinePlayerIfCached-String.patch rename to patches/server/0497-Add-getOfflinePlayerIfCached-String.patch index 81f0e94d9a..c76bdd25f5 100644 --- a/patches/server/0496-Add-getOfflinePlayerIfCached-String.patch +++ b/patches/server/0497-Add-getOfflinePlayerIfCached-String.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add getOfflinePlayerIfCached(String) diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 6e5f72f5d226b94603710d84f9054ce3aa4bd034..81120251dc65290a731e25662bf484637f546ac1 100644 +index d296f5c970dc4c242fc18fb82e6db583eefef8d8..a9c9ec39610a8612ce92db1441be29ab77117ecc 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1827,6 +1827,28 @@ public final class CraftServer implements Server { diff --git a/patches/server/0497-Add-ignore-discounts-API.patch b/patches/server/0498-Add-ignore-discounts-API.patch similarity index 100% rename from patches/server/0497-Add-ignore-discounts-API.patch rename to patches/server/0498-Add-ignore-discounts-API.patch diff --git a/patches/server/0498-Toggle-for-removing-existing-dragon.patch b/patches/server/0499-Toggle-for-removing-existing-dragon.patch similarity index 100% rename from patches/server/0498-Toggle-for-removing-existing-dragon.patch rename to patches/server/0499-Toggle-for-removing-existing-dragon.patch diff --git a/patches/server/0499-Fix-client-lag-on-advancement-loading.patch b/patches/server/0500-Fix-client-lag-on-advancement-loading.patch similarity index 100% rename from patches/server/0499-Fix-client-lag-on-advancement-loading.patch rename to patches/server/0500-Fix-client-lag-on-advancement-loading.patch diff --git a/patches/server/0500-Item-no-age-no-player-pickup.patch b/patches/server/0501-Item-no-age-no-player-pickup.patch similarity index 100% rename from patches/server/0500-Item-no-age-no-player-pickup.patch rename to patches/server/0501-Item-no-age-no-player-pickup.patch diff --git a/patches/server/0501-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0502-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch similarity index 100% rename from patches/server/0501-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch rename to patches/server/0502-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch diff --git a/patches/server/0502-Beacon-API-custom-effect-ranges.patch b/patches/server/0503-Beacon-API-custom-effect-ranges.patch similarity index 100% rename from patches/server/0502-Beacon-API-custom-effect-ranges.patch rename to patches/server/0503-Beacon-API-custom-effect-ranges.patch diff --git a/patches/server/0503-Add-API-for-quit-reason.patch b/patches/server/0504-Add-API-for-quit-reason.patch similarity index 94% rename from patches/server/0503-Add-API-for-quit-reason.patch rename to patches/server/0504-Add-API-for-quit-reason.patch index 2a5696029b..e4685e3d13 100644 --- a/patches/server/0503-Add-API-for-quit-reason.patch +++ b/patches/server/0504-Add-API-for-quit-reason.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add API for quit reason diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java -index 3ae55dd6441b2dfdb67eb2f24ecf885bab89e7a6..f76ee2131c35a9dbf7ad9d086b51c9644b0a2462 100644 +index 4487b4329cf09a6538e272c44207dda492ceb099..43fd36b2ed8e58a2e6213d749a8612a98be421b2 100644 --- a/src/main/java/net/minecraft/network/Connection.java +++ b/src/main/java/net/minecraft/network/Connection.java @@ -170,12 +170,15 @@ public class Connection extends SimpleChannelInboundHandler> { @@ -25,7 +25,7 @@ index 3ae55dd6441b2dfdb67eb2f24ecf885bab89e7a6..f76ee2131c35a9dbf7ad9d086b51c964 Connection.LOGGER.debug("Failed to sent packet", throwable); ConnectionProtocol enumprotocol = this.getCurrentProtocol(); diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index eafc2651a15e1e905a6f2343760969cb5bd414c3..290e250505b229242e7b4f70469c8688cac4b548 100644 +index b291903888b33eeae7347841f12a8ca49439c736..6dc93cbcd3a5140a286d027f2ad03851b9c078f4 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -270,6 +270,7 @@ public class ServerPlayer extends Player { @@ -37,7 +37,7 @@ index eafc2651a15e1e905a6f2343760969cb5bd414c3..290e250505b229242e7b4f70469c8688 public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile) { super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 191aa9cd6e27cbc322b8ce2aa6ad07c20660e709..d71ed61acf9949974d746bd1511c30dc2a5235ec 100644 +index 5a17bd9435b612d2586a6bcd7fc89609f9010713..eeb69e4155f2b568a51529a39416248780fae886 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -507,6 +507,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0504-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0505-Add-Wandering-Trader-spawn-rate-config-options.patch similarity index 100% rename from patches/server/0504-Add-Wandering-Trader-spawn-rate-config-options.patch rename to patches/server/0505-Add-Wandering-Trader-spawn-rate-config-options.patch diff --git a/patches/server/0505-Expose-world-spawn-angle.patch b/patches/server/0506-Expose-world-spawn-angle.patch similarity index 100% rename from patches/server/0505-Expose-world-spawn-angle.patch rename to patches/server/0506-Expose-world-spawn-angle.patch diff --git a/patches/server/0506-Add-Destroy-Speed-API.patch b/patches/server/0507-Add-Destroy-Speed-API.patch similarity index 100% rename from patches/server/0506-Add-Destroy-Speed-API.patch rename to patches/server/0507-Add-Destroy-Speed-API.patch diff --git a/patches/server/0507-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0508-Fix-Player-spawnParticle-x-y-z-precision-loss.patch similarity index 93% rename from patches/server/0507-Fix-Player-spawnParticle-x-y-z-precision-loss.patch rename to patches/server/0508-Fix-Player-spawnParticle-x-y-z-precision-loss.patch index 713822953e..14ae78e0e6 100644 --- a/patches/server/0507-Fix-Player-spawnParticle-x-y-z-precision-loss.patch +++ b/patches/server/0508-Fix-Player-spawnParticle-x-y-z-precision-loss.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix Player spawnParticle x/y/z precision loss diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index a84efd5f91141ab9b3879dbb325bc918d88a93e8..56f3ce73eb018cb93e3ec2057794d31345872d8b 100644 +index 025886ef9fc2d992cffb94b172a44ec123432e60..6a342a897893355160d9f064236d775452e9b752 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2348,7 +2348,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0508-Add-LivingEntity-clearActiveItem.patch b/patches/server/0509-Add-LivingEntity-clearActiveItem.patch similarity index 100% rename from patches/server/0508-Add-LivingEntity-clearActiveItem.patch rename to patches/server/0509-Add-LivingEntity-clearActiveItem.patch diff --git a/patches/server/0509-Add-PlayerItemCooldownEvent.patch b/patches/server/0510-Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/server/0509-Add-PlayerItemCooldownEvent.patch rename to patches/server/0510-Add-PlayerItemCooldownEvent.patch diff --git a/patches/server/0510-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0511-Significantly-improve-performance-of-the-end-generat.patch similarity index 100% rename from patches/server/0510-Significantly-improve-performance-of-the-end-generat.patch rename to patches/server/0511-Significantly-improve-performance-of-the-end-generat.patch diff --git a/patches/server/0511-More-lightning-API.patch b/patches/server/0512-More-lightning-API.patch similarity index 100% rename from patches/server/0511-More-lightning-API.patch rename to patches/server/0512-More-lightning-API.patch diff --git a/patches/server/0512-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0513-Climbing-should-not-bypass-cramming-gamerule.patch similarity index 100% rename from patches/server/0512-Climbing-should-not-bypass-cramming-gamerule.patch rename to patches/server/0513-Climbing-should-not-bypass-cramming-gamerule.patch diff --git a/patches/server/0513-Added-missing-default-perms-for-commands.patch b/patches/server/0514-Added-missing-default-perms-for-commands.patch similarity index 100% rename from patches/server/0513-Added-missing-default-perms-for-commands.patch rename to patches/server/0514-Added-missing-default-perms-for-commands.patch diff --git a/patches/server/0514-Add-PlayerShearBlockEvent.patch b/patches/server/0515-Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/server/0514-Add-PlayerShearBlockEvent.patch rename to patches/server/0515-Add-PlayerShearBlockEvent.patch diff --git a/patches/server/0515-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0516-Fix-curing-zombie-villager-discount-exploit.patch similarity index 100% rename from patches/server/0515-Fix-curing-zombie-villager-discount-exploit.patch rename to patches/server/0516-Fix-curing-zombie-villager-discount-exploit.patch diff --git a/patches/server/0516-Limit-recipe-packets.patch b/patches/server/0517-Limit-recipe-packets.patch similarity index 96% rename from patches/server/0516-Limit-recipe-packets.patch rename to patches/server/0517-Limit-recipe-packets.patch index d720b48c3f..44b44ddc3b 100644 --- a/patches/server/0516-Limit-recipe-packets.patch +++ b/patches/server/0517-Limit-recipe-packets.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Limit recipe packets diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index d71ed61acf9949974d746bd1511c30dc2a5235ec..dd468a6f8185545930eae95d8f22beb25ae493b0 100644 +index eeb69e4155f2b568a51529a39416248780fae886..dbe3cab9dfd86081aab876488fda576810ce2105 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -262,6 +262,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0517-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0518-Fix-CraftSound-backwards-compatibility.patch similarity index 100% rename from patches/server/0517-Fix-CraftSound-backwards-compatibility.patch rename to patches/server/0518-Fix-CraftSound-backwards-compatibility.patch diff --git a/patches/server/0518-Player-Chunk-Load-Unload-Events.patch b/patches/server/0519-Player-Chunk-Load-Unload-Events.patch similarity index 94% rename from patches/server/0518-Player-Chunk-Load-Unload-Events.patch rename to patches/server/0519-Player-Chunk-Load-Unload-Events.patch index 2a680a14e3..0e2897de41 100644 --- a/patches/server/0518-Player-Chunk-Load-Unload-Events.patch +++ b/patches/server/0519-Player-Chunk-Load-Unload-Events.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Player Chunk Load/Unload Events diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 290e250505b229242e7b4f70469c8688cac4b548..c3ad00123198dc00bcf5a3d89f8d527b1c9c083c 100644 +index 6dc93cbcd3a5140a286d027f2ad03851b9c078f4..514b5f4762dcd11160ac3b4da1bb44911e6e62b2 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -2166,11 +2166,21 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0519-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0520-Optimize-Dynamic-get-Missing-Keys.patch similarity index 100% rename from patches/server/0519-Optimize-Dynamic-get-Missing-Keys.patch rename to patches/server/0520-Optimize-Dynamic-get-Missing-Keys.patch diff --git a/patches/server/0520-Expose-LivingEntity-hurt-direction.patch b/patches/server/0521-Expose-LivingEntity-hurt-direction.patch similarity index 100% rename from patches/server/0520-Expose-LivingEntity-hurt-direction.patch rename to patches/server/0521-Expose-LivingEntity-hurt-direction.patch diff --git a/patches/server/0521-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0522-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from patches/server/0521-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/server/0522-Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/patches/server/0522-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0523-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch similarity index 100% rename from patches/server/0522-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch rename to patches/server/0523-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch diff --git a/patches/server/0523-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0524-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch similarity index 100% rename from patches/server/0523-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch rename to patches/server/0524-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch diff --git a/patches/server/0524-Implement-TargetHitEvent.patch b/patches/server/0525-Implement-TargetHitEvent.patch similarity index 100% rename from patches/server/0524-Implement-TargetHitEvent.patch rename to patches/server/0525-Implement-TargetHitEvent.patch diff --git a/patches/server/0525-MC-4-Fix-item-position-desync.patch b/patches/server/0526-MC-4-Fix-item-position-desync.patch similarity index 100% rename from patches/server/0525-MC-4-Fix-item-position-desync.patch rename to patches/server/0526-MC-4-Fix-item-position-desync.patch diff --git a/patches/server/0526-Additional-Block-Material-API-s.patch b/patches/server/0527-Additional-Block-Material-API-s.patch similarity index 100% rename from patches/server/0526-Additional-Block-Material-API-s.patch rename to patches/server/0527-Additional-Block-Material-API-s.patch diff --git a/patches/server/0527-Fix-harming-potion-dupe.patch b/patches/server/0528-Fix-harming-potion-dupe.patch similarity index 100% rename from patches/server/0527-Fix-harming-potion-dupe.patch rename to patches/server/0528-Fix-harming-potion-dupe.patch diff --git a/patches/server/0528-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0529-Implement-API-to-get-Material-from-Boats-and-Minecar.patch similarity index 100% rename from patches/server/0528-Implement-API-to-get-Material-from-Boats-and-Minecar.patch rename to patches/server/0529-Implement-API-to-get-Material-from-Boats-and-Minecar.patch diff --git a/patches/server/0529-Cache-burn-durations.patch b/patches/server/0530-Cache-burn-durations.patch similarity index 100% rename from patches/server/0529-Cache-burn-durations.patch rename to patches/server/0530-Cache-burn-durations.patch diff --git a/patches/server/0530-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0531-Allow-disabling-mob-spawner-spawn-egg-transformation.patch similarity index 100% rename from patches/server/0530-Allow-disabling-mob-spawner-spawn-egg-transformation.patch rename to patches/server/0531-Allow-disabling-mob-spawner-spawn-egg-transformation.patch diff --git a/patches/server/0531-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0532-Fix-Not-a-string-Map-Conversion-spam.patch similarity index 100% rename from patches/server/0531-Fix-Not-a-string-Map-Conversion-spam.patch rename to patches/server/0532-Fix-Not-a-string-Map-Conversion-spam.patch diff --git a/patches/server/0532-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0533-Implement-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/server/0532-Implement-PlayerFlowerPotManipulateEvent.patch rename to patches/server/0533-Implement-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/server/0533-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0534-Fix-interact-event-not-being-called-in-adventure.patch similarity index 95% rename from patches/server/0533-Fix-interact-event-not-being-called-in-adventure.patch rename to patches/server/0534-Fix-interact-event-not-being-called-in-adventure.patch index 500d43eba6..74e8ac8471 100644 --- a/patches/server/0533-Fix-interact-event-not-being-called-in-adventure.patch +++ b/patches/server/0534-Fix-interact-event-not-being-called-in-adventure.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix interact event not being called in adventure Call PlayerInteractEvent when left-clicking on a block in adventure mode diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index dd468a6f8185545930eae95d8f22beb25ae493b0..b5b451ce6f29c69123b975a7b1943ca17388e6db 100644 +index dbe3cab9dfd86081aab876488fda576810ce2105..a21117908a8e1ccbb23fa79cfcc7a6d956ba6a51 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1847,7 +1847,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0534-Zombie-API-breaking-doors.patch b/patches/server/0535-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/server/0534-Zombie-API-breaking-doors.patch rename to patches/server/0535-Zombie-API-breaking-doors.patch diff --git a/patches/server/0535-Fix-nerfed-slime-when-splitting.patch b/patches/server/0536-Fix-nerfed-slime-when-splitting.patch similarity index 100% rename from patches/server/0535-Fix-nerfed-slime-when-splitting.patch rename to patches/server/0536-Fix-nerfed-slime-when-splitting.patch diff --git a/patches/server/0536-Add-EntityLoadCrossbowEvent.patch b/patches/server/0537-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/server/0536-Add-EntityLoadCrossbowEvent.patch rename to patches/server/0537-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/server/0537-Guardian-beam-workaround.patch b/patches/server/0538-Guardian-beam-workaround.patch similarity index 100% rename from patches/server/0537-Guardian-beam-workaround.patch rename to patches/server/0538-Guardian-beam-workaround.patch diff --git a/patches/server/0538-Added-WorldGameRuleChangeEvent.patch b/patches/server/0539-Added-WorldGameRuleChangeEvent.patch similarity index 98% rename from patches/server/0538-Added-WorldGameRuleChangeEvent.patch rename to patches/server/0539-Added-WorldGameRuleChangeEvent.patch index 47bef1ca37..e4b74bdb4c 100644 --- a/patches/server/0538-Added-WorldGameRuleChangeEvent.patch +++ b/patches/server/0539-Added-WorldGameRuleChangeEvent.patch @@ -64,7 +64,7 @@ index 694a2f685cb46a5391da012f4d7e3bd3e6e88f4c..fa8cd4438c19a262272da47985a57f7e public int get() { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 66d87216a3964c5fd39af564c3b4c40eee278c9a..2770412715a9fbd60317d356491f9f0b0bacf57d 100644 +index 51f20f0f28c3372be871873dcf58c551800797b2..9055b7821ba2a52e20bf6422cae2edfefc1872b1 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1792,8 +1792,13 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0539-Added-ServerResourcesReloadedEvent.patch b/patches/server/0540-Added-ServerResourcesReloadedEvent.patch similarity index 100% rename from patches/server/0539-Added-ServerResourcesReloadedEvent.patch rename to patches/server/0540-Added-ServerResourcesReloadedEvent.patch diff --git a/patches/server/0540-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0541-Added-world-settings-for-mobs-picking-up-loot.patch similarity index 100% rename from patches/server/0540-Added-world-settings-for-mobs-picking-up-loot.patch rename to patches/server/0541-Added-world-settings-for-mobs-picking-up-loot.patch diff --git a/patches/server/0541-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0542-Implemented-BlockFailedDispenseEvent.patch similarity index 100% rename from patches/server/0541-Implemented-BlockFailedDispenseEvent.patch rename to patches/server/0542-Implemented-BlockFailedDispenseEvent.patch diff --git a/patches/server/0542-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0543-Added-PlayerLecternPageChangeEvent.patch similarity index 100% rename from patches/server/0542-Added-PlayerLecternPageChangeEvent.patch rename to patches/server/0543-Added-PlayerLecternPageChangeEvent.patch diff --git a/patches/server/0543-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0544-Added-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from patches/server/0543-Added-PlayerLoomPatternSelectEvent.patch rename to patches/server/0544-Added-PlayerLoomPatternSelectEvent.patch diff --git a/patches/server/0544-Configurable-door-breaking-difficulty.patch b/patches/server/0545-Configurable-door-breaking-difficulty.patch similarity index 100% rename from patches/server/0544-Configurable-door-breaking-difficulty.patch rename to patches/server/0545-Configurable-door-breaking-difficulty.patch diff --git a/patches/server/0545-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0546-Empty-commands-shall-not-be-dispatched.patch similarity index 100% rename from patches/server/0545-Empty-commands-shall-not-be-dispatched.patch rename to patches/server/0546-Empty-commands-shall-not-be-dispatched.patch diff --git a/patches/server/0546-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0547-Implement-API-to-expose-exact-interaction-point.patch similarity index 100% rename from patches/server/0546-Implement-API-to-expose-exact-interaction-point.patch rename to patches/server/0547-Implement-API-to-expose-exact-interaction-point.patch diff --git a/patches/server/0547-Remove-stale-POIs.patch b/patches/server/0548-Remove-stale-POIs.patch similarity index 100% rename from patches/server/0547-Remove-stale-POIs.patch rename to patches/server/0548-Remove-stale-POIs.patch diff --git a/patches/server/0548-Fix-villager-boat-exploit.patch b/patches/server/0549-Fix-villager-boat-exploit.patch similarity index 100% rename from patches/server/0548-Fix-villager-boat-exploit.patch rename to patches/server/0549-Fix-villager-boat-exploit.patch diff --git a/patches/server/0549-Add-sendOpLevel-API.patch b/patches/server/0550-Add-sendOpLevel-API.patch similarity index 95% rename from patches/server/0549-Add-sendOpLevel-API.patch rename to patches/server/0550-Add-sendOpLevel-API.patch index 04ad234bd9..5878d6e7f1 100644 --- a/patches/server/0549-Add-sendOpLevel-API.patch +++ b/patches/server/0550-Add-sendOpLevel-API.patch @@ -32,7 +32,7 @@ index cd456e403fbeb9337c5c151b5c0333d14102cd2d..7f2e71d10006642297086806067b6e9c public boolean isWhiteListed(GameProfile profile) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 56f3ce73eb018cb93e3ec2057794d31345872d8b..fa3cb1f97c23059ac5b848008af663fca9c3be53 100644 +index 6a342a897893355160d9f064236d775452e9b752..0c25992fe12be2c1259b706ccdf9af37da149908 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -653,6 +653,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0550-Add-PaperRegistry.patch b/patches/server/0551-Add-PaperRegistry.patch similarity index 100% rename from patches/server/0550-Add-PaperRegistry.patch rename to patches/server/0551-Add-PaperRegistry.patch diff --git a/patches/server/0551-Add-StructuresLocateEvent.patch b/patches/server/0552-Add-StructuresLocateEvent.patch similarity index 100% rename from patches/server/0551-Add-StructuresLocateEvent.patch rename to patches/server/0552-Add-StructuresLocateEvent.patch diff --git a/patches/server/0552-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0553-Collision-option-for-requiring-a-player-participant.patch similarity index 100% rename from patches/server/0552-Collision-option-for-requiring-a-player-participant.patch rename to patches/server/0553-Collision-option-for-requiring-a-player-participant.patch diff --git a/patches/server/0553-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0554-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch similarity index 100% rename from patches/server/0553-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch rename to patches/server/0554-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch diff --git a/patches/server/0554-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0555-Return-chat-component-with-empty-text-instead-of-thr.patch similarity index 100% rename from patches/server/0554-Return-chat-component-with-empty-text-instead-of-thr.patch rename to patches/server/0555-Return-chat-component-with-empty-text-instead-of-thr.patch diff --git a/patches/server/0555-Make-schedule-command-per-world.patch b/patches/server/0556-Make-schedule-command-per-world.patch similarity index 100% rename from patches/server/0555-Make-schedule-command-per-world.patch rename to patches/server/0556-Make-schedule-command-per-world.patch diff --git a/patches/server/0556-Configurable-max-leash-distance.patch b/patches/server/0557-Configurable-max-leash-distance.patch similarity index 100% rename from patches/server/0556-Configurable-max-leash-distance.patch rename to patches/server/0557-Configurable-max-leash-distance.patch diff --git a/patches/server/0557-Implement-BlockPreDispenseEvent.patch b/patches/server/0558-Implement-BlockPreDispenseEvent.patch similarity index 100% rename from patches/server/0557-Implement-BlockPreDispenseEvent.patch rename to patches/server/0558-Implement-BlockPreDispenseEvent.patch diff --git a/patches/server/0558-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0559-Added-firing-of-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/server/0558-Added-firing-of-PlayerChangeBeaconEffectEvent.patch rename to patches/server/0559-Added-firing-of-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/server/0559-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0560-Add-toggle-for-always-placing-the-dragon-egg.patch similarity index 100% rename from patches/server/0559-Add-toggle-for-always-placing-the-dragon-egg.patch rename to patches/server/0560-Add-toggle-for-always-placing-the-dragon-egg.patch diff --git a/patches/server/0560-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0561-Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/server/0560-Added-PlayerStonecutterRecipeSelectEvent.patch rename to patches/server/0561-Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/server/0561-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0562-Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 100% rename from patches/server/0561-Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to patches/server/0562-Add-dropLeash-variable-to-EntityUnleashEvent.patch diff --git a/patches/server/0562-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0563-Reset-shield-blocking-on-dimension-change.patch similarity index 89% rename from patches/server/0562-Reset-shield-blocking-on-dimension-change.patch rename to patches/server/0563-Reset-shield-blocking-on-dimension-change.patch index 6d927a4872..5ecfc2dabf 100644 --- a/patches/server/0562-Reset-shield-blocking-on-dimension-change.patch +++ b/patches/server/0563-Reset-shield-blocking-on-dimension-change.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Reset shield blocking on dimension change diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index c3ad00123198dc00bcf5a3d89f8d527b1c9c083c..c288075547cea04e0a1aba66b496c8bd5c2acd42 100644 +index 514b5f4762dcd11160ac3b4da1bb44911e6e62b2..58f1ed2771fa85e755c95f981bdb23b0321a5603 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1188,6 +1188,11 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0563-add-DragonEggFormEvent.patch b/patches/server/0564-add-DragonEggFormEvent.patch similarity index 100% rename from patches/server/0563-add-DragonEggFormEvent.patch rename to patches/server/0564-add-DragonEggFormEvent.patch diff --git a/patches/server/0564-EntityMoveEvent.patch b/patches/server/0565-EntityMoveEvent.patch similarity index 97% rename from patches/server/0564-EntityMoveEvent.patch rename to patches/server/0565-EntityMoveEvent.patch index 1e52d63b52..bd74637eaa 100644 --- a/patches/server/0564-EntityMoveEvent.patch +++ b/patches/server/0565-EntityMoveEvent.patch @@ -17,7 +17,7 @@ index 9b1bde95e8303e5d4adfe92f09240df8e6323dac..c22db75f87424e9b1dd2ae017619c0e2 this.profiler.push(() -> { diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index c7a79e8208f678c5ce94f3d5bf769565d6b3ff63..c576f94ee4f562b2f871af6c241031fd765353ff 100644 +index cd791e727bf66ff32ffeeae68e5c110502fbdd37..af355382878d49c3265c372405615b73d87dd647 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -220,6 +220,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0565-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0566-added-option-to-disable-pathfinding-updates-on-block.patch similarity index 100% rename from patches/server/0565-added-option-to-disable-pathfinding-updates-on-block.patch rename to patches/server/0566-added-option-to-disable-pathfinding-updates-on-block.patch diff --git a/patches/server/0566-Inline-shift-direction-fields.patch b/patches/server/0567-Inline-shift-direction-fields.patch similarity index 100% rename from patches/server/0566-Inline-shift-direction-fields.patch rename to patches/server/0567-Inline-shift-direction-fields.patch diff --git a/patches/server/0567-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0568-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/server/0567-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/server/0568-Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/server/0568-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0569-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/server/0568-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/server/0569-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/server/0569-living-entity-allow-attribute-registration.patch b/patches/server/0570-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/server/0569-living-entity-allow-attribute-registration.patch rename to patches/server/0570-living-entity-allow-attribute-registration.patch diff --git a/patches/server/0570-fix-dead-slime-setSize-invincibility.patch b/patches/server/0571-fix-dead-slime-setSize-invincibility.patch similarity index 100% rename from patches/server/0570-fix-dead-slime-setSize-invincibility.patch rename to patches/server/0571-fix-dead-slime-setSize-invincibility.patch diff --git a/patches/server/0571-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0572-Merchant-getRecipes-should-return-an-immutable-list.patch similarity index 100% rename from patches/server/0571-Merchant-getRecipes-should-return-an-immutable-list.patch rename to patches/server/0572-Merchant-getRecipes-should-return-an-immutable-list.patch diff --git a/patches/server/0572-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0573-Add-support-for-hex-color-codes-in-console.patch similarity index 100% rename from patches/server/0572-Add-support-for-hex-color-codes-in-console.patch rename to patches/server/0573-Add-support-for-hex-color-codes-in-console.patch diff --git a/patches/server/0573-Expose-Tracked-Players.patch b/patches/server/0574-Expose-Tracked-Players.patch similarity index 100% rename from patches/server/0573-Expose-Tracked-Players.patch rename to patches/server/0574-Expose-Tracked-Players.patch diff --git a/patches/server/0574-Remove-streams-from-SensorNearest.patch b/patches/server/0575-Remove-streams-from-SensorNearest.patch similarity index 100% rename from patches/server/0574-Remove-streams-from-SensorNearest.patch rename to patches/server/0575-Remove-streams-from-SensorNearest.patch diff --git a/patches/server/0575-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0576-Throw-proper-exception-on-empty-JsonList-file.patch similarity index 100% rename from patches/server/0575-Throw-proper-exception-on-empty-JsonList-file.patch rename to patches/server/0576-Throw-proper-exception-on-empty-JsonList-file.patch diff --git a/patches/server/0576-Improve-ServerGUI.patch b/patches/server/0577-Improve-ServerGUI.patch similarity index 100% rename from patches/server/0576-Improve-ServerGUI.patch rename to patches/server/0577-Improve-ServerGUI.patch diff --git a/patches/server/0577-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/0578-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch similarity index 100% rename from patches/server/0577-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch rename to patches/server/0578-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch diff --git a/patches/server/0578-fix-converting-txt-to-json-file.patch b/patches/server/0579-fix-converting-txt-to-json-file.patch similarity index 100% rename from patches/server/0578-fix-converting-txt-to-json-file.patch rename to patches/server/0579-fix-converting-txt-to-json-file.patch diff --git a/patches/server/0579-Add-worldborder-events.patch b/patches/server/0580-Add-worldborder-events.patch similarity index 100% rename from patches/server/0579-Add-worldborder-events.patch rename to patches/server/0580-Add-worldborder-events.patch diff --git a/patches/server/0580-added-PlayerNameEntityEvent.patch b/patches/server/0581-added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/server/0580-added-PlayerNameEntityEvent.patch rename to patches/server/0581-added-PlayerNameEntityEvent.patch diff --git a/patches/server/0581-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0582-Prevent-grindstones-from-overstacking-items.patch similarity index 100% rename from patches/server/0581-Prevent-grindstones-from-overstacking-items.patch rename to patches/server/0582-Prevent-grindstones-from-overstacking-items.patch diff --git a/patches/server/0582-Add-recipe-to-cook-events.patch b/patches/server/0583-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/server/0582-Add-recipe-to-cook-events.patch rename to patches/server/0583-Add-recipe-to-cook-events.patch diff --git a/patches/server/0583-Add-Block-isValidTool.patch b/patches/server/0584-Add-Block-isValidTool.patch similarity index 100% rename from patches/server/0583-Add-Block-isValidTool.patch rename to patches/server/0584-Add-Block-isValidTool.patch diff --git a/patches/server/0584-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0585-Allow-using-signs-inside-spawn-protection.patch similarity index 94% rename from patches/server/0584-Allow-using-signs-inside-spawn-protection.patch rename to patches/server/0585-Allow-using-signs-inside-spawn-protection.patch index 57fce15e50..f0d20da672 100644 --- a/patches/server/0584-Allow-using-signs-inside-spawn-protection.patch +++ b/patches/server/0585-Allow-using-signs-inside-spawn-protection.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow using signs inside spawn protection diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index b5b451ce6f29c69123b975a7b1943ca17388e6db..5a815f4a3c9ac38994d2046fccd77b536a32a425 100644 +index a21117908a8e1ccbb23fa79cfcc7a6d956ba6a51..aacb7835387e8cb1f0c02ba6718d17f0896cd96d 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1839,7 +1839,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0585-Expand-world-key-API.patch b/patches/server/0586-Expand-world-key-API.patch similarity index 97% rename from patches/server/0585-Expand-world-key-API.patch rename to patches/server/0586-Expand-world-key-API.patch index 23e342231e..dbaa779c0c 100644 --- a/patches/server/0585-Expand-world-key-API.patch +++ b/patches/server/0586-Expand-world-key-API.patch @@ -20,7 +20,7 @@ index 3e4ac4020c9f51e634eadd43243d34267bea4b22..ce52ae980309ecddf597e14b759b77ea // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 81120251dc65290a731e25662bf484637f546ac1..56898b9302fa2c5515be88e5f8c41759149685e1 100644 +index a9c9ec39610a8612ce92db1441be29ab77117ecc..493b054977b4d3f9bd3734c3e9d3ad5002d3f9f1 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1156,9 +1156,15 @@ public final class CraftServer implements Server { diff --git a/patches/server/0586-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0587-Add-fast-alternative-constructor-for-Rotations.patch similarity index 100% rename from patches/server/0586-Add-fast-alternative-constructor-for-Rotations.patch rename to patches/server/0587-Add-fast-alternative-constructor-for-Rotations.patch diff --git a/patches/server/0587-Item-Rarity-API.patch b/patches/server/0588-Item-Rarity-API.patch similarity index 100% rename from patches/server/0587-Item-Rarity-API.patch rename to patches/server/0588-Item-Rarity-API.patch diff --git a/patches/server/0588-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0589-copy-TESign-isEditable-from-snapshots.patch similarity index 100% rename from patches/server/0588-copy-TESign-isEditable-from-snapshots.patch rename to patches/server/0589-copy-TESign-isEditable-from-snapshots.patch diff --git a/patches/server/0589-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0590-Drop-carried-item-when-player-has-disconnected.patch similarity index 100% rename from patches/server/0589-Drop-carried-item-when-player-has-disconnected.patch rename to patches/server/0590-Drop-carried-item-when-player-has-disconnected.patch diff --git a/patches/server/0590-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0591-forced-whitelist-use-configurable-kick-message.patch similarity index 100% rename from patches/server/0590-forced-whitelist-use-configurable-kick-message.patch rename to patches/server/0591-forced-whitelist-use-configurable-kick-message.patch diff --git a/patches/server/0591-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0592-Don-t-ignore-result-of-PlayerEditBookEvent.patch similarity index 91% rename from patches/server/0591-Don-t-ignore-result-of-PlayerEditBookEvent.patch rename to patches/server/0592-Don-t-ignore-result-of-PlayerEditBookEvent.patch index 6ffb061dcd..0e470e1625 100644 --- a/patches/server/0591-Don-t-ignore-result-of-PlayerEditBookEvent.patch +++ b/patches/server/0592-Don-t-ignore-result-of-PlayerEditBookEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't ignore result of PlayerEditBookEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 5a815f4a3c9ac38994d2046fccd77b536a32a425..3e9036a0d38a503d798d27bdbd33c90a46fdca52 100644 +index aacb7835387e8cb1f0c02ba6718d17f0896cd96d..ac07efd081e6e5810872dc7a9eaf0acff373f4d2 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1286,7 +1286,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0592-Entity-load-save-limit-per-chunk.patch b/patches/server/0593-Entity-load-save-limit-per-chunk.patch similarity index 100% rename from patches/server/0592-Entity-load-save-limit-per-chunk.patch rename to patches/server/0593-Entity-load-save-limit-per-chunk.patch diff --git a/patches/server/0593-Expose-protocol-version.patch b/patches/server/0594-Expose-protocol-version.patch similarity index 100% rename from patches/server/0593-Expose-protocol-version.patch rename to patches/server/0594-Expose-protocol-version.patch diff --git a/patches/server/0594-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0595-Enhance-console-tab-completions-for-brigadier-comman.patch similarity index 100% rename from patches/server/0594-Enhance-console-tab-completions-for-brigadier-comman.patch rename to patches/server/0595-Enhance-console-tab-completions-for-brigadier-comman.patch diff --git a/patches/server/0595-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0596-Fix-PlayerItemConsumeEvent-cancelling-properly.patch similarity index 100% rename from patches/server/0595-Fix-PlayerItemConsumeEvent-cancelling-properly.patch rename to patches/server/0596-Fix-PlayerItemConsumeEvent-cancelling-properly.patch diff --git a/patches/server/0596-Add-bypass-host-check.patch b/patches/server/0597-Add-bypass-host-check.patch similarity index 100% rename from patches/server/0596-Add-bypass-host-check.patch rename to patches/server/0597-Add-bypass-host-check.patch diff --git a/patches/server/0597-Set-area-affect-cloud-rotation.patch b/patches/server/0598-Set-area-affect-cloud-rotation.patch similarity index 100% rename from patches/server/0597-Set-area-affect-cloud-rotation.patch rename to patches/server/0598-Set-area-affect-cloud-rotation.patch diff --git a/patches/server/0598-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0599-add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/server/0598-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/server/0599-add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/server/0599-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0600-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/server/0599-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/server/0600-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/server/0600-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0601-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/server/0600-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/server/0601-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/server/0601-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0602-fix-PigZombieAngerEvent-cancellation.patch similarity index 100% rename from patches/server/0601-fix-PigZombieAngerEvent-cancellation.patch rename to patches/server/0602-fix-PigZombieAngerEvent-cancellation.patch diff --git a/patches/server/0602-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/server/0603-Fix-checkReach-check-for-Shulker-boxes.patch similarity index 100% rename from patches/server/0602-Fix-checkReach-check-for-Shulker-boxes.patch rename to patches/server/0603-Fix-checkReach-check-for-Shulker-boxes.patch diff --git a/patches/server/0603-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0604-fix-PlayerItemHeldEvent-firing-twice.patch similarity index 93% rename from patches/server/0603-fix-PlayerItemHeldEvent-firing-twice.patch rename to patches/server/0604-fix-PlayerItemHeldEvent-firing-twice.patch index b24d36383c..22cc05465b 100644 --- a/patches/server/0603-fix-PlayerItemHeldEvent-firing-twice.patch +++ b/patches/server/0604-fix-PlayerItemHeldEvent-firing-twice.patch @@ -5,7 +5,7 @@ Subject: [PATCH] fix PlayerItemHeldEvent firing twice diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 3e9036a0d38a503d798d27bdbd33c90a46fdca52..f91e849349dc6bf47e2c9cde17fa6aaf7d382cc5 100644 +index ac07efd081e6e5810872dc7a9eaf0acff373f4d2..27653640844eb475398ddba16ad228ee127bf324 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2051,6 +2051,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0604-Added-PlayerDeepSleepEvent.patch b/patches/server/0605-Added-PlayerDeepSleepEvent.patch similarity index 91% rename from patches/server/0604-Added-PlayerDeepSleepEvent.patch rename to patches/server/0605-Added-PlayerDeepSleepEvent.patch index df9c305204..455937d536 100644 --- a/patches/server/0604-Added-PlayerDeepSleepEvent.patch +++ b/patches/server/0605-Added-PlayerDeepSleepEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Added PlayerDeepSleepEvent diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 3563f5d893fb650892ca7231767d505b7a17c8c0..a591211e8ad46401ae91f0198bb2f06b2e2074dd 100644 +index caa0995fc4282c795783e6fa98843ce0cb594b17..bb3a4088db91f59982a9a2532ccd3001d0cba80a 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -248,6 +248,11 @@ public abstract class Player extends LivingEntity { diff --git a/patches/server/0605-More-World-API.patch b/patches/server/0606-More-World-API.patch similarity index 97% rename from patches/server/0605-More-World-API.patch rename to patches/server/0606-More-World-API.patch index ca0c42f77d..94caeb9f82 100644 --- a/patches/server/0605-More-World-API.patch +++ b/patches/server/0606-More-World-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] More World API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 8e6959826f4ff6363905eb221f6da9bb21a3733a..b61ecd22b287572edc3c6d2b1f05989221fe67cb 100644 +index 9055b7821ba2a52e20bf6422cae2edfefc1872b1..7beaea21edf0b832bc1115d90f5893c75a8da912 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -2034,6 +2034,65 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0606-Added-PlayerBedFailEnterEvent.patch b/patches/server/0607-Added-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/server/0606-Added-PlayerBedFailEnterEvent.patch rename to patches/server/0607-Added-PlayerBedFailEnterEvent.patch diff --git a/patches/server/0607-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0608-Implement-methods-to-convert-between-Component-and-B.patch similarity index 100% rename from patches/server/0607-Implement-methods-to-convert-between-Component-and-B.patch rename to patches/server/0608-Implement-methods-to-convert-between-Component-and-B.patch diff --git a/patches/server/0608-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0609-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch similarity index 100% rename from patches/server/0608-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch rename to patches/server/0609-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch diff --git a/patches/server/0609-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0610-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/server/0609-Introduce-beacon-activation-deactivation-events.patch rename to patches/server/0610-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/server/0610-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0611-add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 97% rename from patches/server/0610-add-RespawnFlags-to-PlayerRespawnEvent.patch rename to patches/server/0611-add-RespawnFlags-to-PlayerRespawnEvent.patch index 37182d6c1d..0768aef362 100644 --- a/patches/server/0610-add-RespawnFlags-to-PlayerRespawnEvent.patch +++ b/patches/server/0611-add-RespawnFlags-to-PlayerRespawnEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] add RespawnFlags to PlayerRespawnEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index f91e849349dc6bf47e2c9cde17fa6aaf7d382cc5..266a4c248ef8dc7b73c07f1cb46ad5155471a2d5 100644 +index 27653640844eb475398ddba16ad228ee127bf324..1a2a227b802830d7ef1120b6507353ca50f92b0a 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2762,7 +2762,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0611-Add-Channel-initialization-listeners.patch b/patches/server/0612-Add-Channel-initialization-listeners.patch similarity index 100% rename from patches/server/0611-Add-Channel-initialization-listeners.patch rename to patches/server/0612-Add-Channel-initialization-listeners.patch diff --git a/patches/server/0612-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0613-Send-empty-commands-if-tab-completion-is-disabled.patch similarity index 100% rename from patches/server/0612-Send-empty-commands-if-tab-completion-is-disabled.patch rename to patches/server/0613-Send-empty-commands-if-tab-completion-is-disabled.patch diff --git a/patches/server/0613-Add-more-WanderingTrader-API.patch b/patches/server/0614-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/server/0613-Add-more-WanderingTrader-API.patch rename to patches/server/0614-Add-more-WanderingTrader-API.patch diff --git a/patches/server/0614-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0615-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/server/0614-Add-EntityBlockStorage-clearEntities.patch rename to patches/server/0615-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/server/0615-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0616-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/server/0615-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/server/0616-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/server/0616-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0617-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0616-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch rename to patches/server/0617-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0617-Inventory-close.patch b/patches/server/0618-Inventory-close.patch similarity index 100% rename from patches/server/0617-Inventory-close.patch rename to patches/server/0618-Inventory-close.patch diff --git a/patches/server/0618-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0619-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/server/0618-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/server/0619-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/server/0619-Fix-CraftPotionBrewer-cache.patch b/patches/server/0620-Fix-CraftPotionBrewer-cache.patch similarity index 100% rename from patches/server/0619-Fix-CraftPotionBrewer-cache.patch rename to patches/server/0620-Fix-CraftPotionBrewer-cache.patch diff --git a/patches/server/0620-Add-basic-Datapack-API.patch b/patches/server/0621-Add-basic-Datapack-API.patch similarity index 98% rename from patches/server/0620-Add-basic-Datapack-API.patch rename to patches/server/0621-Add-basic-Datapack-API.patch index d1255596ec..dd8a5e6b37 100644 --- a/patches/server/0620-Add-basic-Datapack-API.patch +++ b/patches/server/0621-Add-basic-Datapack-API.patch @@ -92,7 +92,7 @@ index 0000000000000000000000000000000000000000..cf4374493c11057451a62a655514415c + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 56898b9302fa2c5515be88e5f8c41759149685e1..67d33a6825f8f0caa3b40cb46defa83a509bdf08 100644 +index 493b054977b4d3f9bd3734c3e9d3ad5002d3f9f1..8caeea4bb8b57501c3ad0d5cd04fe0001fd270d5 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -295,6 +295,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0621-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0622-Add-environment-variable-to-disable-server-gui.patch similarity index 100% rename from patches/server/0621-Add-environment-variable-to-disable-server-gui.patch rename to patches/server/0622-Add-environment-variable-to-disable-server-gui.patch diff --git a/patches/server/0622-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0623-additions-to-PlayerGameModeChangeEvent.patch similarity index 97% rename from patches/server/0622-additions-to-PlayerGameModeChangeEvent.patch rename to patches/server/0623-additions-to-PlayerGameModeChangeEvent.patch index 905480b311..4ee8641c89 100644 --- a/patches/server/0622-additions-to-PlayerGameModeChangeEvent.patch +++ b/patches/server/0623-additions-to-PlayerGameModeChangeEvent.patch @@ -45,7 +45,7 @@ index d47f3d255eddd652fedb4aa55286b756fe962995..27c0aaf123c3e945eb24e8a3892bd8ac } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index c288075547cea04e0a1aba66b496c8bd5c2acd42..74cbc44cf71f482c05e1efacf35dc4b68c412b4a 100644 +index 58f1ed2771fa85e755c95f981bdb23b0321a5603..dca9772075dda6f00d42adf10f19528739108bd6 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1828,8 +1828,15 @@ public class ServerPlayer extends Player { @@ -129,7 +129,7 @@ index 645a226c2e3f6dcf1c25187d006d425038b4545d..17c313b9cb45c8158cab751ffc4e0dc3 } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 266a4c248ef8dc7b73c07f1cb46ad5155471a2d5..eb149b3a054255288572fda1fb5c9106a367a647 100644 +index 1a2a227b802830d7ef1120b6507353ca50f92b0a..380f8de32119f5888676119176cda7e3def243db 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2771,7 +2771,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -142,7 +142,7 @@ index 266a4c248ef8dc7b73c07f1cb46ad5155471a2d5..eb149b3a054255288572fda1fb5c9106 } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index fa3cb1f97c23059ac5b848008af663fca9c3be53..45ad8545b5b8bf5b1ba0eb5ee2c602b34fc6a138 100644 +index 0c25992fe12be2c1259b706ccdf9af37da149908..3ae87757f4a3bf865514055d1d6fcb6fff38354d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1471,7 +1471,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0623-ItemStack-repair-check-API.patch b/patches/server/0624-ItemStack-repair-check-API.patch similarity index 100% rename from patches/server/0623-ItemStack-repair-check-API.patch rename to patches/server/0624-ItemStack-repair-check-API.patch diff --git a/patches/server/0624-More-Enchantment-API.patch b/patches/server/0625-More-Enchantment-API.patch similarity index 100% rename from patches/server/0624-More-Enchantment-API.patch rename to patches/server/0625-More-Enchantment-API.patch diff --git a/patches/server/0625-Move-range-check-for-block-placing-up.patch b/patches/server/0626-Move-range-check-for-block-placing-up.patch similarity index 92% rename from patches/server/0625-Move-range-check-for-block-placing-up.patch rename to patches/server/0626-Move-range-check-for-block-placing-up.patch index 1b55e54397..06308c5da4 100644 --- a/patches/server/0625-Move-range-check-for-block-placing-up.patch +++ b/patches/server/0626-Move-range-check-for-block-placing-up.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Move range check for block placing up diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index eb149b3a054255288572fda1fb5c9106a367a647..96f6eb2b152d1183ee45cb0b77c9c77ae8e03950 100644 +index 380f8de32119f5888676119176cda7e3def243db..6680ef4b625e539de951a7ad59d68229fe49303a 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1825,6 +1825,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0626-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0627-Fix-and-optimise-world-force-upgrading.patch similarity index 99% rename from patches/server/0626-Fix-and-optimise-world-force-upgrading.patch rename to patches/server/0627-Fix-and-optimise-world-force-upgrading.patch index c451e33f20..0ce9173162 100644 --- a/patches/server/0626-Fix-and-optimise-world-force-upgrading.patch +++ b/patches/server/0627-Fix-and-optimise-world-force-upgrading.patch @@ -359,7 +359,7 @@ index b294ef87fb93e7f4651dc04128124f297575860d..65fd57609e45ccd49ebfc1ba80d25243 return this.regionCache.getAndMoveToFirst(ChunkPos.asLong(chunkcoordintpair.getRegionX(), chunkcoordintpair.getRegionZ())); } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 67d33a6825f8f0caa3b40cb46defa83a509bdf08..02f677322ed2d9d921d7c0151a9cedb96722dc11 100644 +index 8caeea4bb8b57501c3ad0d5cd04fe0001fd270d5..613d77a51c249b5a516df7aedc8a08b9f1a14b81 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1229,12 +1229,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0627-Add-Mob-lookAt-API.patch b/patches/server/0628-Add-Mob-lookAt-API.patch similarity index 100% rename from patches/server/0627-Add-Mob-lookAt-API.patch rename to patches/server/0628-Add-Mob-lookAt-API.patch diff --git a/patches/server/0628-Add-Unix-domain-socket-support.patch b/patches/server/0629-Add-Unix-domain-socket-support.patch similarity index 100% rename from patches/server/0628-Add-Unix-domain-socket-support.patch rename to patches/server/0629-Add-Unix-domain-socket-support.patch diff --git a/patches/server/0629-Add-EntityInsideBlockEvent.patch b/patches/server/0630-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/server/0629-Add-EntityInsideBlockEvent.patch rename to patches/server/0630-Add-EntityInsideBlockEvent.patch diff --git a/patches/server/0630-Attributes-API-for-item-defaults.patch b/patches/server/0631-Attributes-API-for-item-defaults.patch similarity index 100% rename from patches/server/0630-Attributes-API-for-item-defaults.patch rename to patches/server/0631-Attributes-API-for-item-defaults.patch diff --git a/patches/server/0631-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0632-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 100% rename from patches/server/0631-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/server/0632-Add-cause-to-Weather-ThunderChangeEvents.patch diff --git a/patches/server/0632-More-Lidded-Block-API.patch b/patches/server/0633-More-Lidded-Block-API.patch similarity index 100% rename from patches/server/0632-More-Lidded-Block-API.patch rename to patches/server/0633-More-Lidded-Block-API.patch diff --git a/patches/server/0633-Limit-item-frame-cursors-on-maps.patch b/patches/server/0634-Limit-item-frame-cursors-on-maps.patch similarity index 100% rename from patches/server/0633-Limit-item-frame-cursors-on-maps.patch rename to patches/server/0634-Limit-item-frame-cursors-on-maps.patch diff --git a/patches/server/0634-Add-PlayerKickEvent-causes.patch b/patches/server/0635-Add-PlayerKickEvent-causes.patch similarity index 99% rename from patches/server/0634-Add-PlayerKickEvent-causes.patch rename to patches/server/0635-Add-PlayerKickEvent-causes.patch index 44512f85d6..a7382d5da3 100644 --- a/patches/server/0634-Add-PlayerKickEvent-causes.patch +++ b/patches/server/0635-Add-PlayerKickEvent-causes.patch @@ -491,7 +491,7 @@ index a24e7a66d52eddbdad8db71cf5e45f1a458c389f..e1c13ac7b11fb0080435fc34502208c8 } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index d404233e4982dc93fbca408003e52c6892253707..cc9db27d89c3b2a0ee7bc42f88bb68902188ba13 100644 +index 3ae87757f4a3bf865514055d1d6fcb6fff38354d..a5516f18c4bf4cfe745551d889053d7c49e81210 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -599,7 +599,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0635-Add-PufferFishStateChangeEvent.patch b/patches/server/0636-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/server/0635-Add-PufferFishStateChangeEvent.patch rename to patches/server/0636-Add-PufferFishStateChangeEvent.patch diff --git a/patches/server/0636-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0637-Fix-PlayerBucketEmptyEvent-result-itemstack.patch similarity index 100% rename from patches/server/0636-Fix-PlayerBucketEmptyEvent-result-itemstack.patch rename to patches/server/0637-Fix-PlayerBucketEmptyEvent-result-itemstack.patch diff --git a/patches/server/0637-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0638-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch similarity index 97% rename from patches/server/0637-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch rename to patches/server/0638-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch index ebe62da740..21c7ec6113 100644 --- a/patches/server/0637-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch +++ b/patches/server/0638-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch @@ -14,7 +14,7 @@ contention situations. And this is extremely a low contention situation. diff --git a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java -index 510bbdc5b79736fca2f116a980e71f85b65cf9bc..5cd4b81a9e89402c617aa3458200b95faa551c9c 100644 +index 02b7e3261f689b9d30b87661db23425f741b0fec..715830d27490572bbe963515f046205c6d7e834d 100644 --- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java +++ b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java @@ -32,14 +32,14 @@ public class PalettedContainer implements PaletteResize, PalettedContainer diff --git a/patches/server/0638-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0639-Add-option-to-fix-items-merging-through-walls.patch similarity index 100% rename from patches/server/0638-Add-option-to-fix-items-merging-through-walls.patch rename to patches/server/0639-Add-option-to-fix-items-merging-through-walls.patch diff --git a/patches/server/0639-Add-BellRevealRaiderEvent.patch b/patches/server/0640-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/server/0639-Add-BellRevealRaiderEvent.patch rename to patches/server/0640-Add-BellRevealRaiderEvent.patch diff --git a/patches/server/0640-Fix-invulnerable-end-crystals.patch b/patches/server/0641-Fix-invulnerable-end-crystals.patch similarity index 100% rename from patches/server/0640-Fix-invulnerable-end-crystals.patch rename to patches/server/0641-Fix-invulnerable-end-crystals.patch diff --git a/patches/server/0641-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0642-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/server/0641-Add-ElderGuardianAppearanceEvent.patch rename to patches/server/0642-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/server/0642-Fix-dangerous-end-portal-logic.patch b/patches/server/0643-Fix-dangerous-end-portal-logic.patch similarity index 100% rename from patches/server/0642-Fix-dangerous-end-portal-logic.patch rename to patches/server/0643-Fix-dangerous-end-portal-logic.patch diff --git a/patches/server/0643-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0644-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch similarity index 100% rename from patches/server/0643-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch rename to patches/server/0644-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch diff --git a/patches/server/0644-Make-item-validations-configurable.patch b/patches/server/0645-Make-item-validations-configurable.patch similarity index 97% rename from patches/server/0644-Make-item-validations-configurable.patch rename to patches/server/0645-Make-item-validations-configurable.patch index d079cc7ed2..6b891c6d32 100644 --- a/patches/server/0644-Make-item-validations-configurable.patch +++ b/patches/server/0645-Make-item-validations-configurable.patch @@ -32,7 +32,7 @@ index e8413ad360e9b6c4eef13edf9dd0095e7e64bce2..a5d7fae348b0b262a0a8a5e8e76f1bc7 } } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index c475ddea1c995df1dfcaf4f491f341761a5f8802..a8294bf057e03c5d866f6da31e6cdfa9edd3f146 100644 +index 71434a6778ab85e347d33a7c35cba7c0d7830d1e..f31add9c60a18bbcea9b4944b0ab183acae84cab 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -357,7 +357,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { diff --git a/patches/server/0645-Line-Of-Sight-Changes.patch b/patches/server/0646-Line-Of-Sight-Changes.patch similarity index 100% rename from patches/server/0645-Line-Of-Sight-Changes.patch rename to patches/server/0646-Line-Of-Sight-Changes.patch diff --git a/patches/server/0646-add-per-world-spawn-limits.patch b/patches/server/0647-add-per-world-spawn-limits.patch similarity index 91% rename from patches/server/0646-add-per-world-spawn-limits.patch rename to patches/server/0647-add-per-world-spawn-limits.patch index ffcda96f0e..425ecd823b 100644 --- a/patches/server/0646-add-per-world-spawn-limits.patch +++ b/patches/server/0647-add-per-world-spawn-limits.patch @@ -6,7 +6,7 @@ Subject: [PATCH] add per world spawn limits Taken from #2982. Credit to Chasewhip8 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index a31016f6b5651732c8bbcdcb239b237ccaf0a36e..e7c334dfe8f9eda2f1c8449bcae5ad983715f9db 100644 +index 0b1b0f5eaf8ac1e01d991fbf90f3656b649b878f..78427e0b3f02f01bb7c688049091469b1fd50e05 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -209,6 +209,13 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0647-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/server/0648-Fix-PotionSplashEvent-for-water-splash-potions.patch similarity index 100% rename from patches/server/0647-Fix-PotionSplashEvent-for-water-splash-potions.patch rename to patches/server/0648-Fix-PotionSplashEvent-for-water-splash-potions.patch diff --git a/patches/server/0648-Add-more-LimitedRegion-API.patch b/patches/server/0649-Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/server/0648-Add-more-LimitedRegion-API.patch rename to patches/server/0649-Add-more-LimitedRegion-API.patch diff --git a/patches/server/0649-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0650-Fix-PlayerDropItemEvent-using-wrong-item.patch similarity index 89% rename from patches/server/0649-Fix-PlayerDropItemEvent-using-wrong-item.patch rename to patches/server/0650-Fix-PlayerDropItemEvent-using-wrong-item.patch index 2b4a3cc593..abb97779ef 100644 --- a/patches/server/0649-Fix-PlayerDropItemEvent-using-wrong-item.patch +++ b/patches/server/0650-Fix-PlayerDropItemEvent-using-wrong-item.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix PlayerDropItemEvent using wrong item diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 74cbc44cf71f482c05e1efacf35dc4b68c412b4a..b21b4e4113b2dc80ba3536e7ab3d700e8db01339 100644 +index dca9772075dda6f00d42adf10f19528739108bd6..31aab0affbedf89108d5809ba25e64adde071bc7 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -2227,7 +2227,7 @@ public class ServerPlayer extends Player { @@ -18,7 +18,7 @@ index 74cbc44cf71f482c05e1efacf35dc4b68c412b4a..b21b4e4113b2dc80ba3536e7ab3d700e this.awardStat(Stats.DROP); diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index a591211e8ad46401ae91f0198bb2f06b2e2074dd..9a00e515f3e7717eaa088dab7a33c28e3aae55a0 100644 +index bb3a4088db91f59982a9a2532ccd3001d0cba80a..3d5e5d41a2d8c1de0d318eeac0652b115aa0ded8 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -718,6 +718,11 @@ public abstract class Player extends LivingEntity { diff --git a/patches/server/0650-Missing-Entity-Behavior-API.patch b/patches/server/0651-Missing-Entity-Behavior-API.patch similarity index 100% rename from patches/server/0650-Missing-Entity-Behavior-API.patch rename to patches/server/0651-Missing-Entity-Behavior-API.patch diff --git a/patches/server/0651-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0652-Ensure-disconnect-for-book-edit-is-called-on-main.patch similarity index 92% rename from patches/server/0651-Ensure-disconnect-for-book-edit-is-called-on-main.patch rename to patches/server/0652-Ensure-disconnect-for-book-edit-is-called-on-main.patch index 5de7947595..e9ae30cefd 100644 --- a/patches/server/0651-Ensure-disconnect-for-book-edit-is-called-on-main.patch +++ b/patches/server/0652-Ensure-disconnect-for-book-edit-is-called-on-main.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Ensure disconnect for book edit is called on main diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 5567689b642ca591bacd47d5d613191caee97e3d..cdbab53cff509b308ab8dfc4c70f27037bbbe948 100644 +index 297cc815a15096c1f723ed451d76fd55d9d5e629..9955f63c36a7fa4adf9176497a6767ece81c3a4f 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1205,7 +1205,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0652-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0653-Fix-return-value-of-Block-applyBoneMeal-always-being.patch similarity index 100% rename from patches/server/0652-Fix-return-value-of-Block-applyBoneMeal-always-being.patch rename to patches/server/0653-Fix-return-value-of-Block-applyBoneMeal-always-being.patch diff --git a/patches/server/0653-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0654-Use-getChunkIfLoadedImmediately-in-places.patch similarity index 94% rename from patches/server/0653-Use-getChunkIfLoadedImmediately-in-places.patch rename to patches/server/0654-Use-getChunkIfLoadedImmediately-in-places.patch index 15a23fa72f..18b12f06cf 100644 --- a/patches/server/0653-Use-getChunkIfLoadedImmediately-in-places.patch +++ b/patches/server/0654-Use-getChunkIfLoadedImmediately-in-places.patch @@ -8,7 +8,7 @@ ticket level 33 (yes getChunkIfLoaded will actually perform a chunk load in that case). diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 862314a0a73c2c6676fa4a4dc70bc719a356a93b..17aaa93e5ad6badb7a220e891328962a69a63a7b 100644 +index 307c451c7fb8e783440f805bf2623ba7fa8c300a..e14c8dfb8238b4afed2085e68beaf746463f7846 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -228,7 +228,7 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -21,7 +21,7 @@ index 862314a0a73c2c6676fa4a4dc70bc719a356a93b..17aaa93e5ad6badb7a220e891328962a @Override diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index e42cb082e4f3643fbae730d23b53ccc5c3440665..8a73f999c18bd3f8880af831f7d4bc3c97241627 100644 +index 982dc85ea66bf111a01a62df43696ca550e1294d..abaf792d77bb30d7bab6377dc1cdb6237766555d 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -198,6 +198,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0654-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0655-Fix-commands-from-signs-not-firing-command-events.patch similarity index 100% rename from patches/server/0654-Fix-commands-from-signs-not-firing-command-events.patch rename to patches/server/0655-Fix-commands-from-signs-not-firing-command-events.patch diff --git a/patches/server/0655-Adds-PlayerArmSwingEvent.patch b/patches/server/0656-Adds-PlayerArmSwingEvent.patch similarity index 93% rename from patches/server/0655-Adds-PlayerArmSwingEvent.patch rename to patches/server/0656-Adds-PlayerArmSwingEvent.patch index b9586a80b4..088d385bb9 100644 --- a/patches/server/0655-Adds-PlayerArmSwingEvent.patch +++ b/patches/server/0656-Adds-PlayerArmSwingEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Adds PlayerArmSwingEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 92198b4546ef0d90fc9bf8e493914bc1e57a7741..10e58f9bbd8e695859bc1477a863d2df36c33912 100644 +index 9955f63c36a7fa4adf9176497a6767ece81c3a4f..402df2938711b592bd8bcd114d6ec17749107748 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2494,7 +2494,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0656-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0657-Fixes-kick-event-leave-message-not-being-sent.patch similarity index 96% rename from patches/server/0656-Fixes-kick-event-leave-message-not-being-sent.patch rename to patches/server/0657-Fixes-kick-event-leave-message-not-being-sent.patch index 20eac018ce..3b80c77501 100644 --- a/patches/server/0656-Fixes-kick-event-leave-message-not-being-sent.patch +++ b/patches/server/0657-Fixes-kick-event-leave-message-not-being-sent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fixes kick event leave message not being sent diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index b21b4e4113b2dc80ba3536e7ab3d700e8db01339..4bf491ceca7291c3df727cfd55873d260078b692 100644 +index 31aab0affbedf89108d5809ba25e64adde071bc7..dda5b7f7ead6821b4212f79fcbf55636816ec4a7 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -264,7 +264,6 @@ public class ServerPlayer extends Player { @@ -17,7 +17,7 @@ index b21b4e4113b2dc80ba3536e7ab3d700e8db01339..4bf491ceca7291c3df727cfd55873d26 public boolean isRealPlayer; // Paper public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index bf11a9ad6d777c7634b5c02b0122528c9c05302a..c760a12fd857efe438a302cf02e2bfb627753fab 100644 +index 402df2938711b592bd8bcd114d6ec17749107748..96e0b661489d6a66996645e58729396077b7cf4b 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -514,7 +514,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0657-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0658-Add-config-for-mobs-immune-to-default-effects.patch similarity index 100% rename from patches/server/0657-Add-config-for-mobs-immune-to-default-effects.patch rename to patches/server/0658-Add-config-for-mobs-immune-to-default-effects.patch diff --git a/patches/server/0658-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0659-Fix-incorrect-message-for-outdated-client.patch similarity index 100% rename from patches/server/0658-Fix-incorrect-message-for-outdated-client.patch rename to patches/server/0659-Fix-incorrect-message-for-outdated-client.patch diff --git a/patches/server/0659-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0660-Don-t-apply-cramming-damage-to-players.patch similarity index 93% rename from patches/server/0659-Don-t-apply-cramming-damage-to-players.patch rename to patches/server/0660-Don-t-apply-cramming-damage-to-players.patch index 45cec72081..d46d58115d 100644 --- a/patches/server/0659-Don-t-apply-cramming-damage-to-players.patch +++ b/patches/server/0660-Don-t-apply-cramming-damage-to-players.patch @@ -11,7 +11,7 @@ It does not make a lot of sense to damage players if they get crammed, For those who really want it a config option is provided. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 4bf491ceca7291c3df727cfd55873d260078b692..c8d55095c20ab5c5b4eb1767aa4b1210d0aa5cda 100644 +index dda5b7f7ead6821b4212f79fcbf55636816ec4a7..6ddff26d6d26f0fcba9960bede9259a421cb2546 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1455,7 +1455,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0660-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0661-Rate-options-and-timings-for-sensors-and-behaviors.patch similarity index 100% rename from patches/server/0660-Rate-options-and-timings-for-sensors-and-behaviors.patch rename to patches/server/0661-Rate-options-and-timings-for-sensors-and-behaviors.patch diff --git a/patches/server/0661-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0662-Add-a-bunch-of-missing-forceDrop-toggles.patch similarity index 100% rename from patches/server/0661-Add-a-bunch-of-missing-forceDrop-toggles.patch rename to patches/server/0662-Add-a-bunch-of-missing-forceDrop-toggles.patch diff --git a/patches/server/0662-Stinger-API.patch b/patches/server/0663-Stinger-API.patch similarity index 100% rename from patches/server/0662-Stinger-API.patch rename to patches/server/0663-Stinger-API.patch diff --git a/patches/server/0663-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0664-Fix-incosistency-issue-with-empty-map-items-in-CB.patch similarity index 100% rename from patches/server/0663-Fix-incosistency-issue-with-empty-map-items-in-CB.patch rename to patches/server/0664-Fix-incosistency-issue-with-empty-map-items-in-CB.patch diff --git a/patches/server/0664-Add-System.out-err-catcher.patch b/patches/server/0665-Add-System.out-err-catcher.patch similarity index 98% rename from patches/server/0664-Add-System.out-err-catcher.patch rename to patches/server/0665-Add-System.out-err-catcher.patch index a9562b9aca..776a38a445 100644 --- a/patches/server/0664-Add-System.out-err-catcher.patch +++ b/patches/server/0665-Add-System.out-err-catcher.patch @@ -105,7 +105,7 @@ index 0000000000000000000000000000000000000000..76d0d00cd6742991e3f3ec827a75ee87 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 02f677322ed2d9d921d7c0151a9cedb96722dc11..1b4143092f709541469c037325d826f25d9e675f 100644 +index 613d77a51c249b5a516df7aedc8a08b9f1a14b81..6aec9535f73a79439c6325095c8adf140891035a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -297,6 +297,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0665-Fix-test-not-bootstrapping.patch b/patches/server/0666-Fix-test-not-bootstrapping.patch similarity index 100% rename from patches/server/0665-Fix-test-not-bootstrapping.patch rename to patches/server/0666-Fix-test-not-bootstrapping.patch diff --git a/patches/server/0666-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0667-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/server/0666-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/server/0667-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/server/0667-Improve-boat-collision-performance.patch b/patches/server/0668-Improve-boat-collision-performance.patch similarity index 100% rename from patches/server/0667-Improve-boat-collision-performance.patch rename to patches/server/0668-Improve-boat-collision-performance.patch diff --git a/patches/server/0668-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0669-Prevent-AFK-kick-while-watching-end-credits.patch similarity index 93% rename from patches/server/0668-Prevent-AFK-kick-while-watching-end-credits.patch rename to patches/server/0669-Prevent-AFK-kick-while-watching-end-credits.patch index 861295de53..d2a297dd43 100644 --- a/patches/server/0668-Prevent-AFK-kick-while-watching-end-credits.patch +++ b/patches/server/0669-Prevent-AFK-kick-while-watching-end-credits.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent AFK kick while watching end credits. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index c760a12fd857efe438a302cf02e2bfb627753fab..875cf692f747b51c16c69e40e0fd5af0161cf858 100644 +index 96e0b661489d6a66996645e58729396077b7cf4b..b43ee21186d3cf48e02b6ae71bbb2185f11f3a02 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -431,7 +431,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0669-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0670-Allow-skipping-writing-of-comments-to-server.propert.patch similarity index 100% rename from patches/server/0669-Allow-skipping-writing-of-comments-to-server.propert.patch rename to patches/server/0670-Allow-skipping-writing-of-comments-to-server.propert.patch diff --git a/patches/server/0670-Add-PlayerSetSpawnEvent.patch b/patches/server/0671-Add-PlayerSetSpawnEvent.patch similarity index 98% rename from patches/server/0670-Add-PlayerSetSpawnEvent.patch rename to patches/server/0671-Add-PlayerSetSpawnEvent.patch index 43d9e0204b..cea1ad96fc 100644 --- a/patches/server/0670-Add-PlayerSetSpawnEvent.patch +++ b/patches/server/0671-Add-PlayerSetSpawnEvent.patch @@ -32,7 +32,7 @@ index ce1c7512cc368e196ae94ee22c6a228c975b4980..1e41de9523c5fa3b9cfced798a5c35a2 String string = resourceKey.location().toString(); if (targets.size() == 1) { diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index c8d55095c20ab5c5b4eb1767aa4b1210d0aa5cda..95e268a3d50bbcea3e5a2273df6e92d8364970ce 100644 +index 6ddff26d6d26f0fcba9960bede9259a421cb2546..5f9ca49dc90b20883b52948318125e4d510b485f 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1296,7 +1296,7 @@ public class ServerPlayer extends Player { @@ -129,7 +129,7 @@ index 37e111589134d80fdfd7a04d624b8c1d58a2d664..53b35f003034e7f4c9dd8ccfaf773891 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 49501e3cb2e604655f0c6eba38d07855b7632cbf..ea2316ffa7b494f3f5f102b44fc8d3ec6d9a4131 100644 +index a5516f18c4bf4cfe745551d889053d7c49e81210..1dafacba3c5102ce4035f74ae7e103957a3085a7 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1291,9 +1291,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0671-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0672-Make-hoppers-respect-inventory-max-stack-size.patch similarity index 100% rename from patches/server/0671-Make-hoppers-respect-inventory-max-stack-size.patch rename to patches/server/0672-Make-hoppers-respect-inventory-max-stack-size.patch diff --git a/patches/server/0672-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0673-Optimize-entity-tracker-passenger-checks.patch similarity index 100% rename from patches/server/0672-Optimize-entity-tracker-passenger-checks.patch rename to patches/server/0673-Optimize-entity-tracker-passenger-checks.patch diff --git a/patches/server/0673-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0674-Config-option-for-Piglins-guarding-chests.patch similarity index 100% rename from patches/server/0673-Config-option-for-Piglins-guarding-chests.patch rename to patches/server/0674-Config-option-for-Piglins-guarding-chests.patch diff --git a/patches/server/0674-Added-EntityDamageItemEvent.patch b/patches/server/0675-Added-EntityDamageItemEvent.patch similarity index 100% rename from patches/server/0674-Added-EntityDamageItemEvent.patch rename to patches/server/0675-Added-EntityDamageItemEvent.patch diff --git a/patches/server/0675-Optimize-indirect-passenger-iteration.patch b/patches/server/0676-Optimize-indirect-passenger-iteration.patch similarity index 100% rename from patches/server/0675-Optimize-indirect-passenger-iteration.patch rename to patches/server/0676-Optimize-indirect-passenger-iteration.patch diff --git a/patches/server/0676-Fix-block-drops-position-losing-precision-millions-o.patch b/patches/server/0677-Fix-block-drops-position-losing-precision-millions-o.patch similarity index 100% rename from patches/server/0676-Fix-block-drops-position-losing-precision-millions-o.patch rename to patches/server/0677-Fix-block-drops-position-losing-precision-millions-o.patch diff --git a/patches/server/0677-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0678-Configurable-item-frame-map-cursor-update-interval.patch similarity index 100% rename from patches/server/0677-Configurable-item-frame-map-cursor-update-interval.patch rename to patches/server/0678-Configurable-item-frame-map-cursor-update-interval.patch diff --git a/patches/server/0678-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0679-Make-EntityUnleashEvent-cancellable.patch similarity index 100% rename from patches/server/0678-Make-EntityUnleashEvent-cancellable.patch rename to patches/server/0679-Make-EntityUnleashEvent-cancellable.patch diff --git a/patches/server/0679-Clear-bucket-NBT-after-dispense.patch b/patches/server/0680-Clear-bucket-NBT-after-dispense.patch similarity index 100% rename from patches/server/0679-Clear-bucket-NBT-after-dispense.patch rename to patches/server/0680-Clear-bucket-NBT-after-dispense.patch diff --git a/patches/server/0680-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0681-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/server/0680-Change-EnderEye-target-without-changing-other-things.patch rename to patches/server/0681-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/server/0681-Add-BlockBreakBlockEvent.patch b/patches/server/0682-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/server/0681-Add-BlockBreakBlockEvent.patch rename to patches/server/0682-Add-BlockBreakBlockEvent.patch diff --git a/patches/server/0682-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0683-Option-to-prevent-NBT-copy-in-smithing-recipes.patch similarity index 100% rename from patches/server/0682-Option-to-prevent-NBT-copy-in-smithing-recipes.patch rename to patches/server/0683-Option-to-prevent-NBT-copy-in-smithing-recipes.patch diff --git a/patches/server/0683-More-CommandBlock-API.patch b/patches/server/0684-More-CommandBlock-API.patch similarity index 100% rename from patches/server/0683-More-CommandBlock-API.patch rename to patches/server/0684-More-CommandBlock-API.patch diff --git a/patches/server/0684-Add-missing-team-sidebar-display-slots.patch b/patches/server/0685-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/server/0684-Add-missing-team-sidebar-display-slots.patch rename to patches/server/0685-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/server/0685-Add-back-EntityPortalExitEvent.patch b/patches/server/0686-Add-back-EntityPortalExitEvent.patch similarity index 100% rename from patches/server/0685-Add-back-EntityPortalExitEvent.patch rename to patches/server/0686-Add-back-EntityPortalExitEvent.patch diff --git a/patches/server/0686-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0687-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 100% rename from patches/server/0686-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/server/0687-Add-methods-to-find-targets-for-lightning-strikes.patch diff --git a/patches/server/0687-Get-entity-default-attributes.patch b/patches/server/0688-Get-entity-default-attributes.patch similarity index 100% rename from patches/server/0687-Get-entity-default-attributes.patch rename to patches/server/0688-Get-entity-default-attributes.patch diff --git a/patches/server/0688-Left-handed-API.patch b/patches/server/0689-Left-handed-API.patch similarity index 100% rename from patches/server/0688-Left-handed-API.patch rename to patches/server/0689-Left-handed-API.patch diff --git a/patches/server/0689-Add-more-advancement-API.patch b/patches/server/0690-Add-more-advancement-API.patch similarity index 100% rename from patches/server/0689-Add-more-advancement-API.patch rename to patches/server/0690-Add-more-advancement-API.patch diff --git a/patches/server/0690-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0691-Add-ItemFactory-getSpawnEgg-API.patch similarity index 100% rename from patches/server/0690-Add-ItemFactory-getSpawnEgg-API.patch rename to patches/server/0691-Add-ItemFactory-getSpawnEgg-API.patch diff --git a/patches/server/0691-Add-critical-damage-API.patch b/patches/server/0692-Add-critical-damage-API.patch similarity index 98% rename from patches/server/0691-Add-critical-damage-API.patch rename to patches/server/0692-Add-critical-damage-API.patch index 58ac21839e..347b9b645a 100644 --- a/patches/server/0691-Add-critical-damage-API.patch +++ b/patches/server/0692-Add-critical-damage-API.patch @@ -29,7 +29,7 @@ index ed8bad446a1845befa6d5d75c40cf281fa47a9d9..8795c94e6b6474addddbb0b337a962e8 public static DamageSource fallingBlock(Entity attacker) { return (new EntityDamageSource("fallingBlock", attacker)).damageHelmet(); diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 9a00e515f3e7717eaa088dab7a33c28e3aae55a0..983be45492dad5a1c73b591bc14b57102b273851 100644 +index 3d5e5d41a2d8c1de0d318eeac0652b115aa0ded8..95019b6ba1bc3bff42e15e5bed4ca7c5d109f1be 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -1256,7 +1256,7 @@ public abstract class Player extends LivingEntity { diff --git a/patches/server/0692-Fix-issues-with-mob-conversion.patch b/patches/server/0693-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/server/0692-Fix-issues-with-mob-conversion.patch rename to patches/server/0693-Fix-issues-with-mob-conversion.patch diff --git a/patches/server/0693-Add-isCollidable-methods-to-various-places.patch b/patches/server/0694-Add-isCollidable-methods-to-various-places.patch similarity index 100% rename from patches/server/0693-Add-isCollidable-methods-to-various-places.patch rename to patches/server/0694-Add-isCollidable-methods-to-various-places.patch diff --git a/patches/server/0694-Goat-ram-API.patch b/patches/server/0695-Goat-ram-API.patch similarity index 100% rename from patches/server/0694-Goat-ram-API.patch rename to patches/server/0695-Goat-ram-API.patch diff --git a/patches/server/0695-Add-API-for-resetting-a-single-score.patch b/patches/server/0696-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/server/0695-Add-API-for-resetting-a-single-score.patch rename to patches/server/0696-Add-API-for-resetting-a-single-score.patch diff --git a/patches/server/0696-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0697-Add-Raw-Byte-Entity-Serialization.patch similarity index 97% rename from patches/server/0696-Add-Raw-Byte-Entity-Serialization.patch rename to patches/server/0697-Add-Raw-Byte-Entity-Serialization.patch index 6defedac03..d5734e03b7 100644 --- a/patches/server/0696-Add-Raw-Byte-Entity-Serialization.patch +++ b/patches/server/0697-Add-Raw-Byte-Entity-Serialization.patch @@ -45,7 +45,7 @@ index f1ee89047e8cd916c762b91162842e3f981856b3..726a4ae7ab928eda3ae1c1e98f342157 // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 1cf2c29e4fc7073b19f62368ce4569ce54a4b13d..ca0b9b6f2b9bbbc53ab0001d5eabad341bfb3b0d 100644 +index f4807829a7a51a5aeab8277211a4d62cf7df2aca..ba9ce30003eb787fe974ae53f375ae9c0591d619 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -460,6 +460,30 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0697-Vanilla-command-permission-fixes.patch b/patches/server/0698-Vanilla-command-permission-fixes.patch similarity index 100% rename from patches/server/0697-Vanilla-command-permission-fixes.patch rename to patches/server/0698-Vanilla-command-permission-fixes.patch diff --git a/patches/server/0698-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0699-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch similarity index 100% rename from patches/server/0698-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch rename to patches/server/0699-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch diff --git a/patches/server/0699-Fix-GameProfileCache-concurrency.patch b/patches/server/0700-Fix-GameProfileCache-concurrency.patch similarity index 100% rename from patches/server/0699-Fix-GameProfileCache-concurrency.patch rename to patches/server/0700-Fix-GameProfileCache-concurrency.patch diff --git a/patches/server/0700-Log-when-the-async-catcher-is-tripped.patch b/patches/server/0701-Log-when-the-async-catcher-is-tripped.patch similarity index 100% rename from patches/server/0700-Log-when-the-async-catcher-is-tripped.patch rename to patches/server/0701-Log-when-the-async-catcher-is-tripped.patch diff --git a/patches/server/0701-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0702-Add-paper-mobcaps-and-paper-playermobcaps.patch similarity index 98% rename from patches/server/0701-Add-paper-mobcaps-and-paper-playermobcaps.patch rename to patches/server/0702-Add-paper-mobcaps-and-paper-playermobcaps.patch index 1941a0ff8d..78112c0228 100644 --- a/patches/server/0701-Add-paper-mobcaps-and-paper-playermobcaps.patch +++ b/patches/server/0702-Add-paper-mobcaps-and-paper-playermobcaps.patch @@ -286,7 +286,7 @@ index bf3fb416d36a19958033cdbf5cc313556fa0201b..0a49769bfa83d0b9c435e3ab4bba8597 // Paper start - add parameters and int ret type spawnCategoryForChunk(group, world, chunk, checker, runner, Integer.MAX_VALUE, null); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 1b4143092f709541469c037325d826f25d9e675f..3af2e5d3bdbf82c142f5ea2629456329bda7666f 100644 +index 6aec9535f73a79439c6325095c8adf140891035a..7601342f6228df2c72c5c6fabff21a9fe59d1620 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2180,6 +2180,11 @@ public final class CraftServer implements Server { @@ -302,7 +302,7 @@ index 1b4143092f709541469c037325d826f25d9e675f..3af2e5d3bdbf82c142f5ea2629456329 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 30561840201f3e560753d91f82a646bad20f1a93..7a3aaeb5191f03b8288dde7567bed686150e70a0 100644 +index 0f7c6711dc36a31da53a2389fd3c9bba4008d7d1..aaba757b605405e08da7b359bc1fc87252114252 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1700,9 +1700,14 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0702-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0703-Sanitize-ResourceLocation-error-logging.patch similarity index 100% rename from patches/server/0702-Sanitize-ResourceLocation-error-logging.patch rename to patches/server/0703-Sanitize-ResourceLocation-error-logging.patch diff --git a/patches/server/0703-Allow-controlled-flushing-for-network-manager.patch b/patches/server/0704-Allow-controlled-flushing-for-network-manager.patch similarity index 100% rename from patches/server/0703-Allow-controlled-flushing-for-network-manager.patch rename to patches/server/0704-Allow-controlled-flushing-for-network-manager.patch diff --git a/patches/server/0704-Optimise-general-POI-access.patch b/patches/server/0705-Optimise-general-POI-access.patch similarity index 100% rename from patches/server/0704-Optimise-general-POI-access.patch rename to patches/server/0705-Optimise-general-POI-access.patch diff --git a/patches/server/0705-Optimise-chunk-tick-iteration.patch b/patches/server/0706-Optimise-chunk-tick-iteration.patch similarity index 99% rename from patches/server/0705-Optimise-chunk-tick-iteration.patch rename to patches/server/0706-Optimise-chunk-tick-iteration.patch index cada80f025..8b61a62cb1 100644 --- a/patches/server/0705-Optimise-chunk-tick-iteration.patch +++ b/patches/server/0706-Optimise-chunk-tick-iteration.patch @@ -72,7 +72,7 @@ index a61f55ed1fbe5aac5289014cb95cb6950b4c77fa..e11ec87e8007979a1c6932b414bcd70c int i = 0; diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 993d04766c81990e72166f1348a01d8ef7e05d0f..109baae0c68b28720508af4a9e0b32b72b3dcb23 100644 +index 81870f23ae70db3a1290428df6a47d76baa9a722..1b8f221360f5edb4d244ec97104d85ffecef204c 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -113,6 +113,8 @@ import org.bukkit.craftbukkit.generator.CustomChunkGenerator; diff --git a/patches/server/0706-Execute-chunk-tasks-mid-tick.patch b/patches/server/0707-Execute-chunk-tasks-mid-tick.patch similarity index 100% rename from patches/server/0706-Execute-chunk-tasks-mid-tick.patch rename to patches/server/0707-Execute-chunk-tasks-mid-tick.patch diff --git a/patches/server/0707-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0708-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch similarity index 100% rename from patches/server/0707-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch rename to patches/server/0708-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch diff --git a/patches/server/0708-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0709-Custom-table-implementation-for-blockstate-state-loo.patch similarity index 100% rename from patches/server/0708-Custom-table-implementation-for-blockstate-state-loo.patch rename to patches/server/0709-Custom-table-implementation-for-blockstate-state-loo.patch diff --git a/patches/server/0709-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0710-Detail-more-information-in-watchdog-dumps.patch similarity index 100% rename from patches/server/0709-Detail-more-information-in-watchdog-dumps.patch rename to patches/server/0710-Detail-more-information-in-watchdog-dumps.patch diff --git a/patches/server/0710-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0711-Manually-inline-methods-in-BlockPosition.patch similarity index 100% rename from patches/server/0710-Manually-inline-methods-in-BlockPosition.patch rename to patches/server/0711-Manually-inline-methods-in-BlockPosition.patch diff --git a/patches/server/0711-Distance-manager-tick-timings.patch b/patches/server/0712-Distance-manager-tick-timings.patch similarity index 100% rename from patches/server/0711-Distance-manager-tick-timings.patch rename to patches/server/0712-Distance-manager-tick-timings.patch diff --git a/patches/server/0712-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0713-Name-craft-scheduler-threads-according-to-the-plugin.patch similarity index 100% rename from patches/server/0712-Name-craft-scheduler-threads-according-to-the-plugin.patch rename to patches/server/0713-Name-craft-scheduler-threads-according-to-the-plugin.patch diff --git a/patches/server/0713-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0714-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch similarity index 94% rename from patches/server/0713-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch rename to patches/server/0714-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch index f630226ffd..ae0fa46585 100644 --- a/patches/server/0713-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch +++ b/patches/server/0714-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch @@ -13,7 +13,7 @@ Paper recently reverted this optimisation, so it's been reintroduced here. diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 10f4cbf82cc4a79aacfd1f8e1e53a6c1f4963865..c56de0c388f5902d85b0810c6e105c24d721bcdd 100644 +index 5c904ca1e7963cabaaa84d81e0eab4872c4595ac..f2868adace339d923012efc9aba0d882909eecb5 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -366,6 +366,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0714-Add-packet-limiter-config.patch b/patches/server/0715-Add-packet-limiter-config.patch similarity index 98% rename from patches/server/0714-Add-packet-limiter-config.patch rename to patches/server/0715-Add-packet-limiter-config.patch index b300d4feee..5556f35187 100644 --- a/patches/server/0714-Add-packet-limiter-config.patch +++ b/patches/server/0715-Add-packet-limiter-config.patch @@ -24,7 +24,7 @@ and an action can be defined: DROP or KICK If interval or rate are less-than 0, the limit is ignored diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java -index 31dee6fbf50db4b1fe779a8ad67ac771ac7148b7..c3abb615ab3be179a53fc6de8085df7b6a854a0b 100644 +index 8ba85f8b36b06ce5047b2587018a49dc50207866..af38c38c03c93392906f752958090b3ab2dd0964 100644 --- a/src/main/java/net/minecraft/network/Connection.java +++ b/src/main/java/net/minecraft/network/Connection.java @@ -154,6 +154,22 @@ public class Connection extends SimpleChannelInboundHandler> { diff --git a/patches/server/0715-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0716-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch similarity index 100% rename from patches/server/0715-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch rename to patches/server/0716-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch diff --git a/patches/server/0716-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/server/0717-Consolidate-flush-calls-for-entity-tracker-packets.patch similarity index 100% rename from patches/server/0716-Consolidate-flush-calls-for-entity-tracker-packets.patch rename to patches/server/0717-Consolidate-flush-calls-for-entity-tracker-packets.patch diff --git a/patches/server/0717-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0718-Don-t-lookup-fluid-state-when-raytracing.patch similarity index 100% rename from patches/server/0717-Don-t-lookup-fluid-state-when-raytracing.patch rename to patches/server/0718-Don-t-lookup-fluid-state-when-raytracing.patch diff --git a/patches/server/0718-Time-scoreboard-search.patch b/patches/server/0719-Time-scoreboard-search.patch similarity index 100% rename from patches/server/0718-Time-scoreboard-search.patch rename to patches/server/0719-Time-scoreboard-search.patch diff --git a/patches/server/0719-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0720-Send-full-pos-packets-for-hard-colliding-entities.patch similarity index 100% rename from patches/server/0719-Send-full-pos-packets-for-hard-colliding-entities.patch rename to patches/server/0720-Send-full-pos-packets-for-hard-colliding-entities.patch diff --git a/patches/server/0720-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0721-Do-not-run-raytrace-logic-for-AIR.patch similarity index 100% rename from patches/server/0720-Do-not-run-raytrace-logic-for-AIR.patch rename to patches/server/0721-Do-not-run-raytrace-logic-for-AIR.patch diff --git a/patches/server/0721-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0722-Oprimise-map-impl-for-tracked-players.patch similarity index 92% rename from patches/server/0721-Oprimise-map-impl-for-tracked-players.patch rename to patches/server/0722-Oprimise-map-impl-for-tracked-players.patch index b980d8a838..f2c2dfb094 100644 --- a/patches/server/0721-Oprimise-map-impl-for-tracked-players.patch +++ b/patches/server/0722-Oprimise-map-impl-for-tracked-players.patch @@ -7,7 +7,7 @@ Reference2BooleanOpenHashMap is going to have better lookups than HashMap. diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 093bf9d33edd0e43b52a1fd14ad31881439ee8b9..1d4531b81a137bbf55d69d9116e0f23859bb0e51 100644 +index 1b8f221360f5edb4d244ec97104d85ffecef204c..57e13cb9d1460be34fe06f7c7e14330f60f0a51a 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -1395,7 +1395,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0722-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0723-Optimise-BlockSoil-nearby-water-lookup.patch similarity index 100% rename from patches/server/0722-Optimise-BlockSoil-nearby-water-lookup.patch rename to patches/server/0723-Optimise-BlockSoil-nearby-water-lookup.patch diff --git a/patches/server/0723-Optimise-random-block-ticking.patch b/patches/server/0724-Optimise-random-block-ticking.patch similarity index 100% rename from patches/server/0723-Optimise-random-block-ticking.patch rename to patches/server/0724-Optimise-random-block-ticking.patch diff --git a/patches/server/0724-Optimise-non-flush-packet-sending.patch b/patches/server/0725-Optimise-non-flush-packet-sending.patch similarity index 100% rename from patches/server/0724-Optimise-non-flush-packet-sending.patch rename to patches/server/0725-Optimise-non-flush-packet-sending.patch diff --git a/patches/server/0725-Optimise-nearby-player-lookups.patch b/patches/server/0726-Optimise-nearby-player-lookups.patch similarity index 99% rename from patches/server/0725-Optimise-nearby-player-lookups.patch rename to patches/server/0726-Optimise-nearby-player-lookups.patch index 9b36e2ed99..6c4a1edd4d 100644 --- a/patches/server/0725-Optimise-nearby-player-lookups.patch +++ b/patches/server/0726-Optimise-nearby-player-lookups.patch @@ -39,7 +39,7 @@ index e11ec87e8007979a1c6932b414bcd70c10db746c..bc46479fd0622a90fd98ac88f92b2840 // Paper end diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 61751736ce65a4004acccf36edc9e1cc057db828..d1717ea6e3aa8912caeb3a5590b08b0113b83ec0 100644 +index 57e13cb9d1460be34fe06f7c7e14330f60f0a51a..7f68b05b4d0789c308b5f90a5d626a633c80191f 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -156,6 +156,12 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0726-Remove-streams-for-villager-AI.patch b/patches/server/0727-Remove-streams-for-villager-AI.patch similarity index 100% rename from patches/server/0726-Remove-streams-for-villager-AI.patch rename to patches/server/0727-Remove-streams-for-villager-AI.patch diff --git a/patches/server/0727-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0728-Use-Velocity-compression-and-cipher-natives.patch similarity index 100% rename from patches/server/0727-Use-Velocity-compression-and-cipher-natives.patch rename to patches/server/0728-Use-Velocity-compression-and-cipher-natives.patch diff --git a/patches/server/0728-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0729-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch similarity index 100% rename from patches/server/0728-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch rename to patches/server/0729-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch diff --git a/patches/server/0729-Async-catch-modifications-to-critical-entity-state.patch b/patches/server/0730-Async-catch-modifications-to-critical-entity-state.patch similarity index 100% rename from patches/server/0729-Async-catch-modifications-to-critical-entity-state.patch rename to patches/server/0730-Async-catch-modifications-to-critical-entity-state.patch diff --git a/patches/server/0730-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0731-Fix-Bukkit-NamespacedKey-shenanigans.patch similarity index 100% rename from patches/server/0730-Fix-Bukkit-NamespacedKey-shenanigans.patch rename to patches/server/0731-Fix-Bukkit-NamespacedKey-shenanigans.patch diff --git a/patches/server/0731-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0732-Fix-merchant-inventory-not-closing-on-entity-removal.patch similarity index 100% rename from patches/server/0731-Fix-merchant-inventory-not-closing-on-entity-removal.patch rename to patches/server/0732-Fix-merchant-inventory-not-closing-on-entity-removal.patch diff --git a/patches/server/0732-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0733-Check-requirement-before-suggesting-root-nodes.patch similarity index 100% rename from patches/server/0732-Check-requirement-before-suggesting-root-nodes.patch rename to patches/server/0733-Check-requirement-before-suggesting-root-nodes.patch diff --git a/patches/server/0733-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0734-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch similarity index 92% rename from patches/server/0733-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch rename to patches/server/0734-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch index bfb98e8fb3..6d94fb5cc6 100644 --- a/patches/server/0733-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch +++ b/patches/server/0734-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Don't respond to ServerboundCommandSuggestionPacket when diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 875cf692f747b51c16c69e40e0fd5af0161cf858..045f1b81e568d9adca8e5f9374b5a3ce1267d118 100644 +index b43ee21186d3cf48e02b6ae71bbb2185f11f3a02..2877ff6f7c27ebb039dfb427911c3f4b38f0a494 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -839,6 +839,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0734-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0735-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch similarity index 100% rename from patches/server/0734-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch rename to patches/server/0735-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch diff --git a/patches/server/0735-Ensure-valid-vehicle-status.patch b/patches/server/0736-Ensure-valid-vehicle-status.patch similarity index 90% rename from patches/server/0735-Ensure-valid-vehicle-status.patch rename to patches/server/0736-Ensure-valid-vehicle-status.patch index 58fb98c68f..839f7e897b 100644 --- a/patches/server/0735-Ensure-valid-vehicle-status.patch +++ b/patches/server/0736-Ensure-valid-vehicle-status.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Ensure valid vehicle status diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index d02cab4c09e2036f6b1ac3667ef8282475daf015..cbe4bf568d5bc97b316f3a9af7a1ad9d88f7f3b5 100644 +index 0007cf65767e304e27588bf2133579c5e06cc54a..6c053e759b6758f2dc464483193213be22af623a 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -520,7 +520,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0736-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0737-Prevent-softlocked-end-exit-portal-generation.patch similarity index 100% rename from patches/server/0736-Prevent-softlocked-end-exit-portal-generation.patch rename to patches/server/0737-Prevent-softlocked-end-exit-portal-generation.patch diff --git a/patches/server/0737-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0738-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch similarity index 100% rename from patches/server/0737-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch rename to patches/server/0738-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch diff --git a/patches/server/0738-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0739-Don-t-log-debug-logging-being-disabled.patch similarity index 100% rename from patches/server/0738-Don-t-log-debug-logging-being-disabled.patch rename to patches/server/0739-Don-t-log-debug-logging-being-disabled.patch diff --git a/patches/server/0739-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0740-fix-various-menus-with-empty-level-accesses.patch similarity index 100% rename from patches/server/0739-fix-various-menus-with-empty-level-accesses.patch rename to patches/server/0740-fix-various-menus-with-empty-level-accesses.patch diff --git a/patches/server/0740-Preserve-overstacked-loot.patch b/patches/server/0741-Preserve-overstacked-loot.patch similarity index 100% rename from patches/server/0740-Preserve-overstacked-loot.patch rename to patches/server/0741-Preserve-overstacked-loot.patch diff --git a/patches/server/0741-Update-head-rotation-in-missing-places.patch b/patches/server/0742-Update-head-rotation-in-missing-places.patch similarity index 100% rename from patches/server/0741-Update-head-rotation-in-missing-places.patch rename to patches/server/0742-Update-head-rotation-in-missing-places.patch diff --git a/patches/server/0742-prevent-unintended-light-block-manipulation.patch b/patches/server/0743-prevent-unintended-light-block-manipulation.patch similarity index 100% rename from patches/server/0742-prevent-unintended-light-block-manipulation.patch rename to patches/server/0743-prevent-unintended-light-block-manipulation.patch diff --git a/patches/server/0743-Fix-CraftCriteria-defaults-map.patch b/patches/server/0744-Fix-CraftCriteria-defaults-map.patch similarity index 100% rename from patches/server/0743-Fix-CraftCriteria-defaults-map.patch rename to patches/server/0744-Fix-CraftCriteria-defaults-map.patch diff --git a/patches/server/0744-Fix-upstreams-block-state-factories.patch b/patches/server/0745-Fix-upstreams-block-state-factories.patch similarity index 100% rename from patches/server/0744-Fix-upstreams-block-state-factories.patch rename to patches/server/0745-Fix-upstreams-block-state-factories.patch diff --git a/patches/server/0745-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0746-Add-config-option-for-logging-player-ip-addresses.patch similarity index 100% rename from patches/server/0745-Add-config-option-for-logging-player-ip-addresses.patch rename to patches/server/0746-Add-config-option-for-logging-player-ip-addresses.patch diff --git a/patches/server/0746-Configurable-feature-seeds.patch b/patches/server/0747-Configurable-feature-seeds.patch similarity index 100% rename from patches/server/0746-Configurable-feature-seeds.patch rename to patches/server/0747-Configurable-feature-seeds.patch diff --git a/patches/server/0747-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/server/0748-VanillaCommandWrapper-didnt-account-for-entity-sende.patch similarity index 100% rename from patches/server/0747-VanillaCommandWrapper-didnt-account-for-entity-sende.patch rename to patches/server/0748-VanillaCommandWrapper-didnt-account-for-entity-sende.patch diff --git a/patches/server/0748-Add-root-admin-user-detection.patch b/patches/server/0749-Add-root-admin-user-detection.patch similarity index 100% rename from patches/server/0748-Add-root-admin-user-detection.patch rename to patches/server/0749-Add-root-admin-user-detection.patch diff --git a/patches/server/0749-Always-allow-item-changing-in-Fireball.patch b/patches/server/0750-Always-allow-item-changing-in-Fireball.patch similarity index 100% rename from patches/server/0749-Always-allow-item-changing-in-Fireball.patch rename to patches/server/0750-Always-allow-item-changing-in-Fireball.patch diff --git a/patches/server/0750-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0751-don-t-attempt-to-teleport-dead-entities.patch similarity index 100% rename from patches/server/0750-don-t-attempt-to-teleport-dead-entities.patch rename to patches/server/0751-don-t-attempt-to-teleport-dead-entities.patch diff --git a/patches/server/0751-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0752-Prevent-excessive-velocity-through-repeated-crits.patch similarity index 100% rename from patches/server/0751-Prevent-excessive-velocity-through-repeated-crits.patch rename to patches/server/0752-Prevent-excessive-velocity-through-repeated-crits.patch diff --git a/patches/server/0752-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0753-Remove-client-side-code-using-deprecated-for-removal.patch similarity index 100% rename from patches/server/0752-Remove-client-side-code-using-deprecated-for-removal.patch rename to patches/server/0753-Remove-client-side-code-using-deprecated-for-removal.patch diff --git a/patches/server/0753-Always-parse-protochunk-light-sources-unless-it-is-m.patch b/patches/server/0754-Always-parse-protochunk-light-sources-unless-it-is-m.patch similarity index 100% rename from patches/server/0753-Always-parse-protochunk-light-sources-unless-it-is-m.patch rename to patches/server/0754-Always-parse-protochunk-light-sources-unless-it-is-m.patch diff --git a/patches/server/0754-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0755-Fix-removing-recipes-from-RecipeIterator.patch similarity index 100% rename from patches/server/0754-Fix-removing-recipes-from-RecipeIterator.patch rename to patches/server/0755-Fix-removing-recipes-from-RecipeIterator.patch diff --git a/patches/server/0755-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0756-Prevent-sending-oversized-item-data-in-equipment-and.patch similarity index 100% rename from patches/server/0755-Prevent-sending-oversized-item-data-in-equipment-and.patch rename to patches/server/0756-Prevent-sending-oversized-item-data-in-equipment-and.patch diff --git a/patches/server/0756-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0757-Hide-unnecessary-itemmeta-from-clients.patch similarity index 98% rename from patches/server/0756-Hide-unnecessary-itemmeta-from-clients.patch rename to patches/server/0757-Hide-unnecessary-itemmeta-from-clients.patch index e1a09e241f..f07de6ce2b 100644 --- a/patches/server/0756-Hide-unnecessary-itemmeta-from-clients.patch +++ b/patches/server/0757-Hide-unnecessary-itemmeta-from-clients.patch @@ -18,7 +18,7 @@ index d2fed123ed56eaf550ac2c7a3fcc1678a127bba3..77443525e68fab0211ff48af12020ff0 } } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 88c1393d4a68c938e65852b9aaa74a7de0043f0d..1602af65ac25e9029d6628ba20aa42a069cee23a 100644 +index 2877ff6f7c27ebb039dfb427911c3f4b38f0a494..c20b72d7ff5a2d7e2d13d804947310b65fb9e49c 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2681,8 +2681,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0757-Fix-Spigot-growth-modifiers.patch b/patches/server/0758-Fix-Spigot-growth-modifiers.patch similarity index 100% rename from patches/server/0757-Fix-Spigot-growth-modifiers.patch rename to patches/server/0758-Fix-Spigot-growth-modifiers.patch diff --git a/patches/server/0758-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0759-Prevent-ContainerOpenersCounter-openCount-from-going.patch similarity index 100% rename from patches/server/0758-Prevent-ContainerOpenersCounter-openCount-from-going.patch rename to patches/server/0759-Prevent-ContainerOpenersCounter-openCount-from-going.patch diff --git a/patches/server/0759-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0760-Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/server/0759-Add-PlayerItemFrameChangeEvent.patch rename to patches/server/0760-Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/server/0760-Add-player-health-update-API.patch b/patches/server/0761-Add-player-health-update-API.patch similarity index 95% rename from patches/server/0760-Add-player-health-update-API.patch rename to patches/server/0761-Add-player-health-update-API.patch index 029f2aff54..e86812ce1d 100644 --- a/patches/server/0760-Add-player-health-update-API.patch +++ b/patches/server/0761-Add-player-health-update-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add player health update API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index ea2316ffa7b494f3f5f102b44fc8d3ec6d9a4131..10ff3f8aba814d73af931e6c91ea9a2c421592bf 100644 +index 1dafacba3c5102ce4035f74ae7e103957a3085a7..fdd9ade27e01608dcf35ee5c9c7c7d1e8428eccf 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2227,9 +2227,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0761-Optimize-HashMapPalette.patch b/patches/server/0762-Optimize-HashMapPalette.patch similarity index 100% rename from patches/server/0761-Optimize-HashMapPalette.patch rename to patches/server/0762-Optimize-HashMapPalette.patch diff --git a/patches/server/0762-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0763-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 98% rename from patches/server/0762-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/server/0763-Allow-delegation-to-vanilla-chunk-gen.patch index 6b6c1c6f35..2fd2ec6ea0 100644 --- a/patches/server/0762-Allow-delegation-to-vanilla-chunk-gen.patch +++ b/patches/server/0763-Allow-delegation-to-vanilla-chunk-gen.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow delegation to vanilla chunk gen diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 3af2e5d3bdbf82c142f5ea2629456329bda7666f..961a68252baabb0b7ccc9f7aa88dcb7516d0865f 100644 +index 7601342f6228df2c72c5c6fabff21a9fe59d1620..037cc496670c08fbee3fda1ca192758a7cad577c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2353,6 +2353,90 @@ public final class CraftServer implements Server { diff --git a/patches/server/0763-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0764-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch similarity index 99% rename from patches/server/0763-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch rename to patches/server/0764-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch index 03b178c866..3eba82a675 100644 --- a/patches/server/0763-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch +++ b/patches/server/0764-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch @@ -1180,7 +1180,7 @@ index 0000000000000000000000000000000000000000..d67a40e7be030142443680c89e1763fc + } +} diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index cbe4bf568d5bc97b316f3a9af7a1ad9d88f7f3b5..1b97987788a7180e2ab2c9edf4646925fa691fd6 100644 +index 6c053e759b6758f2dc464483193213be22af623a..6de32e9e2f626eaa60b58bdeef8c6c194cbe918c 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -413,7 +413,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0764-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0765-Optimise-collision-checking-in-player-move-packet-ha.patch similarity index 99% rename from patches/server/0764-Optimise-collision-checking-in-player-move-packet-ha.patch rename to patches/server/0765-Optimise-collision-checking-in-player-move-packet-ha.patch index 3ef4de1fc3..6f04ddaec5 100644 --- a/patches/server/0764-Optimise-collision-checking-in-player-move-packet-ha.patch +++ b/patches/server/0765-Optimise-collision-checking-in-player-move-packet-ha.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Optimise collision checking in player move packet handling Move collision logic to just the hasNewCollision call instead of getCubes + hasNewCollision diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index ff7298b9ecd11349dfe57aec4ed0ed0b458faa23..41461d9a10abe49b823b92b3817693dbec70eb9e 100644 +index c20b72d7ff5a2d7e2d13d804947310b65fb9e49c..7dff3cff9ec9c87fea7be838a6a34c02f2eeb3b1 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -647,7 +647,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0765-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0766-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch similarity index 100% rename from patches/server/0765-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch rename to patches/server/0766-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch diff --git a/patches/server/0766-Add-more-Campfire-API.patch b/patches/server/0767-Add-more-Campfire-API.patch similarity index 100% rename from patches/server/0766-Add-more-Campfire-API.patch rename to patches/server/0767-Add-more-Campfire-API.patch diff --git a/patches/server/0767-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0768-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch similarity index 100% rename from patches/server/0767-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch rename to patches/server/0768-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch diff --git a/patches/server/0768-Fix-tripwire-state-inconsistency.patch b/patches/server/0769-Fix-tripwire-state-inconsistency.patch similarity index 100% rename from patches/server/0768-Fix-tripwire-state-inconsistency.patch rename to patches/server/0769-Fix-tripwire-state-inconsistency.patch diff --git a/patches/server/0769-Fix-fluid-logging-on-Block-breakNaturally.patch b/patches/server/0770-Fix-fluid-logging-on-Block-breakNaturally.patch similarity index 100% rename from patches/server/0769-Fix-fluid-logging-on-Block-breakNaturally.patch rename to patches/server/0770-Fix-fluid-logging-on-Block-breakNaturally.patch diff --git a/patches/server/0770-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0771-Forward-CraftEntity-in-teleport-command.patch similarity index 100% rename from patches/server/0770-Forward-CraftEntity-in-teleport-command.patch rename to patches/server/0771-Forward-CraftEntity-in-teleport-command.patch diff --git a/patches/server/0771-Improve-scoreboard-entries.patch b/patches/server/0772-Improve-scoreboard-entries.patch similarity index 100% rename from patches/server/0771-Improve-scoreboard-entries.patch rename to patches/server/0772-Improve-scoreboard-entries.patch diff --git a/patches/server/0772-Entity-powdered-snow-API.patch b/patches/server/0773-Entity-powdered-snow-API.patch similarity index 100% rename from patches/server/0772-Entity-powdered-snow-API.patch rename to patches/server/0773-Entity-powdered-snow-API.patch diff --git a/patches/server/0773-Add-API-for-item-entity-health.patch b/patches/server/0774-Add-API-for-item-entity-health.patch similarity index 100% rename from patches/server/0773-Add-API-for-item-entity-health.patch rename to patches/server/0774-Add-API-for-item-entity-health.patch diff --git a/patches/server/0774-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0775-Fix-entity-type-tags-suggestions-in-selectors.patch similarity index 100% rename from patches/server/0774-Fix-entity-type-tags-suggestions-in-selectors.patch rename to patches/server/0775-Fix-entity-type-tags-suggestions-in-selectors.patch diff --git a/patches/server/0775-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0776-Configurable-max-block-light-for-monster-spawning.patch similarity index 100% rename from patches/server/0775-Configurable-max-block-light-for-monster-spawning.patch rename to patches/server/0776-Configurable-max-block-light-for-monster-spawning.patch diff --git a/patches/server/0776-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0777-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch similarity index 100% rename from patches/server/0776-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch rename to patches/server/0777-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch diff --git a/patches/server/0777-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0778-Load-effect-amplifiers-greater-than-127-correctly.patch similarity index 100% rename from patches/server/0777-Load-effect-amplifiers-greater-than-127-correctly.patch rename to patches/server/0778-Load-effect-amplifiers-greater-than-127-correctly.patch diff --git a/patches/server/0778-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0779-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/server/0778-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/server/0779-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/server/0779-Fix-bees-aging-inside-hives.patch b/patches/server/0780-Fix-bees-aging-inside-hives.patch similarity index 100% rename from patches/server/0779-Fix-bees-aging-inside-hives.patch rename to patches/server/0780-Fix-bees-aging-inside-hives.patch diff --git a/patches/server/0780-Bucketable-API.patch b/patches/server/0781-Bucketable-API.patch similarity index 100% rename from patches/server/0780-Bucketable-API.patch rename to patches/server/0781-Bucketable-API.patch diff --git a/patches/server/0781-Validate-usernames.patch b/patches/server/0782-Validate-usernames.patch similarity index 100% rename from patches/server/0781-Validate-usernames.patch rename to patches/server/0782-Validate-usernames.patch diff --git a/patches/server/0782-Make-water-animal-spawn-height-configurable.patch b/patches/server/0783-Make-water-animal-spawn-height-configurable.patch similarity index 100% rename from patches/server/0782-Make-water-animal-spawn-height-configurable.patch rename to patches/server/0783-Make-water-animal-spawn-height-configurable.patch diff --git a/patches/server/0783-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0784-Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 100% rename from patches/server/0783-Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/server/0784-Expose-vanilla-BiomeProvider-from-WorldInfo.patch diff --git a/patches/server/0784-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0785-Add-config-option-for-worlds-affected-by-time-cmd.patch similarity index 100% rename from patches/server/0784-Add-config-option-for-worlds-affected-by-time-cmd.patch rename to patches/server/0785-Add-config-option-for-worlds-affected-by-time-cmd.patch diff --git a/patches/server/0785-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0786-Add-new-overload-to-PersistentDataContainer-has.patch similarity index 100% rename from patches/server/0785-Add-new-overload-to-PersistentDataContainer-has.patch rename to patches/server/0786-Add-new-overload-to-PersistentDataContainer-has.patch diff --git a/patches/server/0786-Multiple-Entries-with-Scoreboards.patch b/patches/server/0787-Multiple-Entries-with-Scoreboards.patch similarity index 100% rename from patches/server/0786-Multiple-Entries-with-Scoreboards.patch rename to patches/server/0787-Multiple-Entries-with-Scoreboards.patch diff --git a/patches/server/0787-Reset-placed-block-on-exception.patch b/patches/server/0788-Reset-placed-block-on-exception.patch similarity index 100% rename from patches/server/0787-Reset-placed-block-on-exception.patch rename to patches/server/0788-Reset-placed-block-on-exception.patch diff --git a/patches/server/0788-Add-configurable-height-for-slime-spawn.patch b/patches/server/0789-Add-configurable-height-for-slime-spawn.patch similarity index 100% rename from patches/server/0788-Add-configurable-height-for-slime-spawn.patch rename to patches/server/0789-Add-configurable-height-for-slime-spawn.patch diff --git a/patches/server/0789-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0790-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0789-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch rename to patches/server/0790-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0790-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0791-Fix-xp-reward-for-baby-zombies.patch similarity index 100% rename from patches/server/0790-Fix-xp-reward-for-baby-zombies.patch rename to patches/server/0791-Fix-xp-reward-for-baby-zombies.patch diff --git a/patches/server/0791-Kick-on-main-for-illegal-chat.patch b/patches/server/0792-Kick-on-main-for-illegal-chat.patch similarity index 97% rename from patches/server/0791-Kick-on-main-for-illegal-chat.patch rename to patches/server/0792-Kick-on-main-for-illegal-chat.patch index 053e12f118..f35de0effd 100644 --- a/patches/server/0791-Kick-on-main-for-illegal-chat.patch +++ b/patches/server/0792-Kick-on-main-for-illegal-chat.patch @@ -7,7 +7,7 @@ Makes the PlayerKickEvent fire on the main thread for illegal characters or chat out-of-order errors. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 41461d9a10abe49b823b92b3817693dbec70eb9e..e94c307a56a0fc3040b8c1d992e078aefa3bdf85 100644 +index 7dff3cff9ec9c87fea7be838a6a34c02f2eeb3b1..25b2bdca86b62e0c76059d87da9214c0bb41fe51 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2172,7 +2172,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0792-Multi-Block-Change-API-Implementation.patch b/patches/server/0793-Multi-Block-Change-API-Implementation.patch similarity index 97% rename from patches/server/0792-Multi-Block-Change-API-Implementation.patch rename to patches/server/0793-Multi-Block-Change-API-Implementation.patch index e30611d7f4..bfb230c580 100644 --- a/patches/server/0792-Multi-Block-Change-API-Implementation.patch +++ b/patches/server/0793-Multi-Block-Change-API-Implementation.patch @@ -25,7 +25,7 @@ index 0d851e197e65ec79386ad1f981f6d1d38b65124a..24c677e80af652952263253409c05064 public void write(FriendlyByteBuf buf) { buf.writeLong(this.sectionPos.asLong()); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 10ff3f8aba814d73af931e6c91ea9a2c421592bf..9385f6727e5215f75b2a437049fb1120d18ce432 100644 +index fdd9ade27e01608dcf35ee5c9c7c7d1e8428eccf..0cda054d342972ef6ffa993786a7baa1c1e1f460 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -929,6 +929,35 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0793-Fix-NotePlayEvent.patch b/patches/server/0794-Fix-NotePlayEvent.patch similarity index 100% rename from patches/server/0793-Fix-NotePlayEvent.patch rename to patches/server/0794-Fix-NotePlayEvent.patch diff --git a/patches/server/0794-Freeze-Tick-Lock-API.patch b/patches/server/0795-Freeze-Tick-Lock-API.patch similarity index 100% rename from patches/server/0794-Freeze-Tick-Lock-API.patch rename to patches/server/0795-Freeze-Tick-Lock-API.patch diff --git a/patches/server/0795-Dolphin-API.patch b/patches/server/0796-Dolphin-API.patch similarity index 100% rename from patches/server/0795-Dolphin-API.patch rename to patches/server/0796-Dolphin-API.patch diff --git a/patches/server/0796-More-PotionEffectType-API.patch b/patches/server/0797-More-PotionEffectType-API.patch similarity index 100% rename from patches/server/0796-More-PotionEffectType-API.patch rename to patches/server/0797-More-PotionEffectType-API.patch diff --git a/patches/server/0797-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0798-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch similarity index 100% rename from patches/server/0797-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch rename to patches/server/0798-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch diff --git a/patches/server/0798-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0799-API-for-creating-command-sender-which-forwards-feedb.patch similarity index 98% rename from patches/server/0798-API-for-creating-command-sender-which-forwards-feedb.patch rename to patches/server/0799-API-for-creating-command-sender-which-forwards-feedb.patch index 56dda68156..eb0e7ef710 100644 --- a/patches/server/0798-API-for-creating-command-sender-which-forwards-feedb.patch +++ b/patches/server/0799-API-for-creating-command-sender-which-forwards-feedb.patch @@ -122,7 +122,7 @@ index 0000000000000000000000000000000000000000..e3a5f1ec376319bdfda87fa27ae217bf + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 1fa90e90b1989aa9ce72beea6c15cd8fb1e24d06..82d3869afe0f4e9fd453d2e1cb179c4aabce9f14 100644 +index ae5421fd85de55eecad2db4041c6552ed0ef04d4..3b5295b1ee2c2a7614b46ac4798efd55baff2815 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2014,6 +2014,13 @@ public final class CraftServer implements Server { diff --git a/patches/server/0799-Add-missing-structure-set-seed-configs.patch b/patches/server/0800-Add-missing-structure-set-seed-configs.patch similarity index 100% rename from patches/server/0799-Add-missing-structure-set-seed-configs.patch rename to patches/server/0800-Add-missing-structure-set-seed-configs.patch diff --git a/patches/server/0800-Implement-regenerateChunk.patch b/patches/server/0801-Implement-regenerateChunk.patch similarity index 100% rename from patches/server/0800-Implement-regenerateChunk.patch rename to patches/server/0801-Implement-regenerateChunk.patch diff --git a/patches/server/0801-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0802-Fix-cancelled-powdered-snow-bucket-placement.patch similarity index 100% rename from patches/server/0801-Fix-cancelled-powdered-snow-bucket-placement.patch rename to patches/server/0802-Fix-cancelled-powdered-snow-bucket-placement.patch diff --git a/patches/server/0802-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0803-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch similarity index 100% rename from patches/server/0802-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch rename to patches/server/0803-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch diff --git a/patches/server/0803-Add-GameEvent-tags.patch b/patches/server/0804-Add-GameEvent-tags.patch similarity index 100% rename from patches/server/0803-Add-GameEvent-tags.patch rename to patches/server/0804-Add-GameEvent-tags.patch diff --git a/patches/server/0804-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0805-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch similarity index 100% rename from patches/server/0804-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch rename to patches/server/0805-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch diff --git a/patches/server/0805-Furnace-RecipesUsed-API.patch b/patches/server/0806-Furnace-RecipesUsed-API.patch similarity index 100% rename from patches/server/0805-Furnace-RecipesUsed-API.patch rename to patches/server/0806-Furnace-RecipesUsed-API.patch diff --git a/patches/server/0806-Configurable-sculk-sensor-listener-range.patch b/patches/server/0807-Configurable-sculk-sensor-listener-range.patch similarity index 100% rename from patches/server/0806-Configurable-sculk-sensor-listener-range.patch rename to patches/server/0807-Configurable-sculk-sensor-listener-range.patch diff --git a/patches/server/0807-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0808-Add-missing-block-data-mins-and-maxes.patch similarity index 100% rename from patches/server/0807-Add-missing-block-data-mins-and-maxes.patch rename to patches/server/0808-Add-missing-block-data-mins-and-maxes.patch diff --git a/patches/server/0808-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0809-Option-to-have-default-CustomSpawners-in-custom-worl.patch similarity index 100% rename from patches/server/0808-Option-to-have-default-CustomSpawners-in-custom-worl.patch rename to patches/server/0809-Option-to-have-default-CustomSpawners-in-custom-worl.patch diff --git a/patches/server/0809-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0810-Put-world-into-worldlist-before-initing-the-world.patch similarity index 100% rename from patches/server/0809-Put-world-into-worldlist-before-initing-the-world.patch rename to patches/server/0810-Put-world-into-worldlist-before-initing-the-world.patch diff --git a/patches/server/0810-Fix-Entity-Position-Desync.patch b/patches/server/0811-Fix-Entity-Position-Desync.patch similarity index 100% rename from patches/server/0810-Fix-Entity-Position-Desync.patch rename to patches/server/0811-Fix-Entity-Position-Desync.patch diff --git a/patches/server/0811-Custom-Potion-Mixes.patch b/patches/server/0812-Custom-Potion-Mixes.patch similarity index 100% rename from patches/server/0811-Custom-Potion-Mixes.patch rename to patches/server/0812-Custom-Potion-Mixes.patch diff --git a/patches/server/0812-Fix-Fluid-tags-isTagged-method.patch b/patches/server/0813-Fix-Fluid-tags-isTagged-method.patch similarity index 100% rename from patches/server/0812-Fix-Fluid-tags-isTagged-method.patch rename to patches/server/0813-Fix-Fluid-tags-isTagged-method.patch diff --git a/patches/server/0813-Force-close-world-loading-screen.patch b/patches/server/0814-Force-close-world-loading-screen.patch similarity index 100% rename from patches/server/0813-Force-close-world-loading-screen.patch rename to patches/server/0814-Force-close-world-loading-screen.patch diff --git a/patches/server/0814-Fix-falling-block-spawn-methods.patch b/patches/server/0815-Fix-falling-block-spawn-methods.patch similarity index 100% rename from patches/server/0814-Fix-falling-block-spawn-methods.patch rename to patches/server/0815-Fix-falling-block-spawn-methods.patch diff --git a/patches/server/0815-Expose-furnace-minecart-push-values.patch b/patches/server/0816-Expose-furnace-minecart-push-values.patch similarity index 100% rename from patches/server/0815-Expose-furnace-minecart-push-values.patch rename to patches/server/0816-Expose-furnace-minecart-push-values.patch diff --git a/patches/server/0816-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0817-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch similarity index 100% rename from patches/server/0816-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch rename to patches/server/0817-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch diff --git a/patches/server/0817-More-Projectile-API.patch b/patches/server/0818-More-Projectile-API.patch similarity index 99% rename from patches/server/0817-More-Projectile-API.patch rename to patches/server/0818-More-Projectile-API.patch index a0dd05bf5f..645b5ce70a 100644 --- a/patches/server/0817-More-Projectile-API.patch +++ b/patches/server/0818-More-Projectile-API.patch @@ -18,7 +18,7 @@ public net.minecraft.world.entity.projectile.Projectile leftOwner Co-authored-by: Nassim Jahnke diff --git a/src/main/java/net/minecraft/world/entity/projectile/ThrownPotion.java b/src/main/java/net/minecraft/world/entity/projectile/ThrownPotion.java -index b1abab9396cf1dc867e9b8df8f2479f75d07fa01..f034d5f89f9a751249d0536c50d2739113bc193d 100644 +index 533aad71202f67206ff4da916b9a8574345aeba3..934b9e76d9d7d4170ac9205622bc87975de73541 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/ThrownPotion.java +++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownPotion.java @@ -100,6 +100,11 @@ public class ThrownPotion extends ThrowableItemProjectile implements ItemSupplie diff --git a/patches/server/0818-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0819-Fix-swamp-hut-cat-generation-deadlock.patch similarity index 100% rename from patches/server/0818-Fix-swamp-hut-cat-generation-deadlock.patch rename to patches/server/0819-Fix-swamp-hut-cat-generation-deadlock.patch diff --git a/patches/server/0819-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0820-Don-t-allow-vehicle-movement-from-players-while-tele.patch similarity index 100% rename from patches/server/0819-Don-t-allow-vehicle-movement-from-players-while-tele.patch rename to patches/server/0820-Don-t-allow-vehicle-movement-from-players-while-tele.patch diff --git a/patches/server/0820-Implement-getComputedBiome-API.patch b/patches/server/0821-Implement-getComputedBiome-API.patch similarity index 100% rename from patches/server/0820-Implement-getComputedBiome-API.patch rename to patches/server/0821-Implement-getComputedBiome-API.patch diff --git a/patches/server/0821-Make-some-itemstacks-nonnull.patch b/patches/server/0822-Make-some-itemstacks-nonnull.patch similarity index 100% rename from patches/server/0821-Make-some-itemstacks-nonnull.patch rename to patches/server/0822-Make-some-itemstacks-nonnull.patch diff --git a/patches/server/0822-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch b/patches/server/0823-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch similarity index 100% rename from patches/server/0822-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch rename to patches/server/0823-Add-debug-for-invalid-GameProfiles-on-skull-blocks-i.patch diff --git a/patches/server/0823-Implement-enchantWithLevels-API.patch b/patches/server/0824-Implement-enchantWithLevels-API.patch similarity index 100% rename from patches/server/0823-Implement-enchantWithLevels-API.patch rename to patches/server/0824-Implement-enchantWithLevels-API.patch diff --git a/patches/server/0824-Fix-saving-in-unloadWorld.patch b/patches/server/0825-Fix-saving-in-unloadWorld.patch similarity index 100% rename from patches/server/0824-Fix-saving-in-unloadWorld.patch rename to patches/server/0825-Fix-saving-in-unloadWorld.patch diff --git a/patches/server/0825-Buffer-OOB-setBlock-calls.patch b/patches/server/0826-Buffer-OOB-setBlock-calls.patch similarity index 100% rename from patches/server/0825-Buffer-OOB-setBlock-calls.patch rename to patches/server/0826-Buffer-OOB-setBlock-calls.patch diff --git a/patches/server/0826-Add-TameableDeathMessageEvent.patch b/patches/server/0827-Add-TameableDeathMessageEvent.patch similarity index 100% rename from patches/server/0826-Add-TameableDeathMessageEvent.patch rename to patches/server/0827-Add-TameableDeathMessageEvent.patch diff --git a/patches/server/0827-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0828-Fix-new-block-data-for-EntityChangeBlockEvent.patch similarity index 100% rename from patches/server/0827-Fix-new-block-data-for-EntityChangeBlockEvent.patch rename to patches/server/0828-Fix-new-block-data-for-EntityChangeBlockEvent.patch diff --git a/patches/server/0828-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0829-fix-player-loottables-running-when-mob-loot-gamerule.patch similarity index 100% rename from patches/server/0828-fix-player-loottables-running-when-mob-loot-gamerule.patch rename to patches/server/0829-fix-player-loottables-running-when-mob-loot-gamerule.patch diff --git a/patches/server/0829-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0830-Ensure-entity-passenger-world-matches-ridden-entity.patch similarity index 100% rename from patches/server/0829-Ensure-entity-passenger-world-matches-ridden-entity.patch rename to patches/server/0830-Ensure-entity-passenger-world-matches-ridden-entity.patch diff --git a/patches/server/0830-Guard-against-invalid-entity-positions.patch b/patches/server/0831-Guard-against-invalid-entity-positions.patch similarity index 100% rename from patches/server/0830-Guard-against-invalid-entity-positions.patch rename to patches/server/0831-Guard-against-invalid-entity-positions.patch diff --git a/patches/server/0831-cache-resource-keys.patch b/patches/server/0832-cache-resource-keys.patch similarity index 100% rename from patches/server/0831-cache-resource-keys.patch rename to patches/server/0832-cache-resource-keys.patch diff --git a/patches/server/0832-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0833-Allow-to-change-the-podium-for-the-EnderDragon.patch similarity index 100% rename from patches/server/0832-Allow-to-change-the-podium-for-the-EnderDragon.patch rename to patches/server/0833-Allow-to-change-the-podium-for-the-EnderDragon.patch diff --git a/patches/server/0833-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0834-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch similarity index 100% rename from patches/server/0833-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch rename to patches/server/0834-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch diff --git a/patches/server/0834-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0835-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch similarity index 100% rename from patches/server/0834-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch rename to patches/server/0835-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch diff --git a/patches/server/0835-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0836-Prevent-tile-entity-copies-loading-chunks.patch similarity index 100% rename from patches/server/0835-Prevent-tile-entity-copies-loading-chunks.patch rename to patches/server/0836-Prevent-tile-entity-copies-loading-chunks.patch diff --git a/patches/server/0836-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0837-Use-username-instead-of-display-name-in-PlayerList-g.patch similarity index 100% rename from patches/server/0836-Use-username-instead-of-display-name-in-PlayerList-g.patch rename to patches/server/0837-Use-username-instead-of-display-name-in-PlayerList-g.patch diff --git a/patches/server/0837-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0838-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch similarity index 100% rename from patches/server/0837-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch rename to patches/server/0838-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch diff --git a/patches/server/0838-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0839-Pass-ServerLevel-for-gamerule-callbacks.patch similarity index 100% rename from patches/server/0838-Pass-ServerLevel-for-gamerule-callbacks.patch rename to patches/server/0839-Pass-ServerLevel-for-gamerule-callbacks.patch diff --git a/patches/server/0839-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0840-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch similarity index 100% rename from patches/server/0839-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch rename to patches/server/0840-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch diff --git a/patches/server/0840-WorldCreator-keepSpawnLoaded.patch b/patches/server/0841-WorldCreator-keepSpawnLoaded.patch similarity index 100% rename from patches/server/0840-WorldCreator-keepSpawnLoaded.patch rename to patches/server/0841-WorldCreator-keepSpawnLoaded.patch diff --git a/patches/server/0841-Fix-NPE-for-BlockDataMeta-getBlockData.patch b/patches/server/0842-Fix-NPE-for-BlockDataMeta-getBlockData.patch similarity index 100% rename from patches/server/0841-Fix-NPE-for-BlockDataMeta-getBlockData.patch rename to patches/server/0842-Fix-NPE-for-BlockDataMeta-getBlockData.patch diff --git a/patches/server/0842-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0843-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch similarity index 100% rename from patches/server/0842-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch rename to patches/server/0843-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch diff --git a/patches/server/0843-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0844-Add-EntityDyeEvent-and-CollarColorable-interface.patch similarity index 100% rename from patches/server/0843-Add-EntityDyeEvent-and-CollarColorable-interface.patch rename to patches/server/0844-Add-EntityDyeEvent-and-CollarColorable-interface.patch diff --git a/patches/server/0844-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0845-Fire-CauldronLevelChange-on-initial-fill.patch similarity index 100% rename from patches/server/0844-Fire-CauldronLevelChange-on-initial-fill.patch rename to patches/server/0845-Fire-CauldronLevelChange-on-initial-fill.patch diff --git a/patches/server/0845-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0846-fix-powder-snow-cauldrons-not-turning-to-water.patch similarity index 100% rename from patches/server/0845-fix-powder-snow-cauldrons-not-turning-to-water.patch rename to patches/server/0846-fix-powder-snow-cauldrons-not-turning-to-water.patch diff --git a/patches/server/0846-Add-PlayerStopUsingItemEvent.patch b/patches/server/0847-Add-PlayerStopUsingItemEvent.patch similarity index 100% rename from patches/server/0846-Add-PlayerStopUsingItemEvent.patch rename to patches/server/0847-Add-PlayerStopUsingItemEvent.patch diff --git a/patches/server/0847-FallingBlock-auto-expire-setting.patch b/patches/server/0848-FallingBlock-auto-expire-setting.patch similarity index 100% rename from patches/server/0847-FallingBlock-auto-expire-setting.patch rename to patches/server/0848-FallingBlock-auto-expire-setting.patch diff --git a/patches/server/0848-Don-t-tick-markers.patch b/patches/server/0849-Don-t-tick-markers.patch similarity index 100% rename from patches/server/0848-Don-t-tick-markers.patch rename to patches/server/0849-Don-t-tick-markers.patch diff --git a/patches/server/0849-Do-not-accept-invalid-client-settings.patch b/patches/server/0850-Do-not-accept-invalid-client-settings.patch similarity index 100% rename from patches/server/0849-Do-not-accept-invalid-client-settings.patch rename to patches/server/0850-Do-not-accept-invalid-client-settings.patch diff --git a/patches/server/0850-Add-support-for-Proxy-Protocol.patch b/patches/server/0851-Add-support-for-Proxy-Protocol.patch similarity index 100% rename from patches/server/0850-Add-support-for-Proxy-Protocol.patch rename to patches/server/0851-Add-support-for-Proxy-Protocol.patch diff --git a/patches/server/0851-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0852-Fix-OfflinePlayer-getBedSpawnLocation.patch similarity index 100% rename from patches/server/0851-Fix-OfflinePlayer-getBedSpawnLocation.patch rename to patches/server/0852-Fix-OfflinePlayer-getBedSpawnLocation.patch diff --git a/patches/server/0852-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0853-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch similarity index 100% rename from patches/server/0852-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch rename to patches/server/0853-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch diff --git a/patches/server/0853-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0854-Sanitize-Sent-BlockEntity-NBT.patch similarity index 100% rename from patches/server/0853-Sanitize-Sent-BlockEntity-NBT.patch rename to patches/server/0854-Sanitize-Sent-BlockEntity-NBT.patch diff --git a/patches/server/0854-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0855-Prevent-entity-loading-causing-async-lookups.patch similarity index 100% rename from patches/server/0854-Prevent-entity-loading-causing-async-lookups.patch rename to patches/server/0855-Prevent-entity-loading-causing-async-lookups.patch diff --git a/patches/server/0855-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0856-Disable-component-selector-resolving-in-books-by-def.patch similarity index 100% rename from patches/server/0855-Disable-component-selector-resolving-in-books-by-def.patch rename to patches/server/0856-Disable-component-selector-resolving-in-books-by-def.patch diff --git a/patches/server/0856-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0857-Throw-exception-on-world-create-while-being-ticked.patch similarity index 100% rename from patches/server/0856-Throw-exception-on-world-create-while-being-ticked.patch rename to patches/server/0857-Throw-exception-on-world-create-while-being-ticked.patch diff --git a/patches/server/0857-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0858-Add-Alternate-Current-redstone-implementation.patch similarity index 100% rename from patches/server/0857-Add-Alternate-Current-redstone-implementation.patch rename to patches/server/0858-Add-Alternate-Current-redstone-implementation.patch diff --git a/patches/server/0858-Dont-resent-entity-on-art-update.patch b/patches/server/0859-Dont-resent-entity-on-art-update.patch similarity index 100% rename from patches/server/0858-Dont-resent-entity-on-art-update.patch rename to patches/server/0859-Dont-resent-entity-on-art-update.patch diff --git a/patches/server/0859-Add-WardenAngerChangeEvent.patch b/patches/server/0860-Add-WardenAngerChangeEvent.patch similarity index 100% rename from patches/server/0859-Add-WardenAngerChangeEvent.patch rename to patches/server/0860-Add-WardenAngerChangeEvent.patch diff --git a/patches/server/0860-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0861-Add-option-for-strict-advancement-dimension-checks.patch similarity index 100% rename from patches/server/0860-Add-option-for-strict-advancement-dimension-checks.patch rename to patches/server/0861-Add-option-for-strict-advancement-dimension-checks.patch diff --git a/patches/server/0861-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0862-Add-missing-important-BlockStateListPopulator-method.patch similarity index 100% rename from patches/server/0861-Add-missing-important-BlockStateListPopulator-method.patch rename to patches/server/0862-Add-missing-important-BlockStateListPopulator-method.patch diff --git a/patches/server/0862-Nameable-Banner-API.patch b/patches/server/0863-Nameable-Banner-API.patch similarity index 100% rename from patches/server/0862-Nameable-Banner-API.patch rename to patches/server/0863-Nameable-Banner-API.patch diff --git a/patches/server/0863-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0864-Don-t-broadcast-messages-to-command-blocks.patch similarity index 100% rename from patches/server/0863-Don-t-broadcast-messages-to-command-blocks.patch rename to patches/server/0864-Don-t-broadcast-messages-to-command-blocks.patch diff --git a/patches/server/0864-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0865-Prevent-empty-items-from-being-added-to-world.patch similarity index 100% rename from patches/server/0864-Prevent-empty-items-from-being-added-to-world.patch rename to patches/server/0865-Prevent-empty-items-from-being-added-to-world.patch diff --git a/patches/server/0865-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0866-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch similarity index 100% rename from patches/server/0865-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch rename to patches/server/0866-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch diff --git a/patches/server/0866-Don-t-print-component-in-resource-pack-rejection-mes.patch b/patches/server/0867-Don-t-print-component-in-resource-pack-rejection-mes.patch similarity index 100% rename from patches/server/0866-Don-t-print-component-in-resource-pack-rejection-mes.patch rename to patches/server/0867-Don-t-print-component-in-resource-pack-rejection-mes.patch diff --git a/patches/server/0867-Add-Player-getFishHook.patch b/patches/server/0868-Add-Player-getFishHook.patch similarity index 100% rename from patches/server/0867-Add-Player-getFishHook.patch rename to patches/server/0868-Add-Player-getFishHook.patch diff --git a/patches/server/0868-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0869-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch similarity index 100% rename from patches/server/0868-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch rename to patches/server/0869-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch diff --git a/patches/server/0869-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0870-Add-various-missing-EntityDropItemEvent-calls.patch similarity index 100% rename from patches/server/0869-Add-various-missing-EntityDropItemEvent-calls.patch rename to patches/server/0870-Add-various-missing-EntityDropItemEvent-calls.patch diff --git a/patches/server/0870-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0871-Add-some-minimal-debug-information-to-chat-packet-er.patch similarity index 100% rename from patches/server/0870-Add-some-minimal-debug-information-to-chat-packet-er.patch rename to patches/server/0871-Add-some-minimal-debug-information-to-chat-packet-er.patch diff --git a/patches/server/0871-Fix-Bee-flower-NPE.patch b/patches/server/0872-Fix-Bee-flower-NPE.patch similarity index 100% rename from patches/server/0871-Fix-Bee-flower-NPE.patch rename to patches/server/0872-Fix-Bee-flower-NPE.patch diff --git a/patches/server/0872-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0873-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch similarity index 100% rename from patches/server/0872-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch rename to patches/server/0873-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch diff --git a/patches/server/0873-More-Teleport-API.patch b/patches/server/0874-More-Teleport-API.patch similarity index 99% rename from patches/server/0873-More-Teleport-API.patch rename to patches/server/0874-More-Teleport-API.patch index a240d1d1ca..198f69e0d3 100644 --- a/patches/server/0873-More-Teleport-API.patch +++ b/patches/server/0874-More-Teleport-API.patch @@ -71,7 +71,7 @@ index 32b9816283c8c1de929d5664733553277cf6bf3c..32c724060a532e551f0ab4e7277831bb // Let the server handle cross world teleports if (location.getWorld() != null && !location.getWorld().equals(this.getWorld())) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 71b899ba2a2495dcc40f292b46a0b4b545d376ee..fc77e4bed1257cd7f3617552d591a2736168d47c 100644 +index 0cda054d342972ef6ffa993786a7baa1c1e1f460..4d3d6ecada4d8d7202498f4b3c68c35546d3f1df 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1184,13 +1184,92 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0874-Add-EntityPortalReadyEvent.patch b/patches/server/0875-Add-EntityPortalReadyEvent.patch similarity index 100% rename from patches/server/0874-Add-EntityPortalReadyEvent.patch rename to patches/server/0875-Add-EntityPortalReadyEvent.patch diff --git a/patches/server/0875-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0876-Don-t-use-level-random-in-entity-constructors.patch similarity index 100% rename from patches/server/0875-Don-t-use-level-random-in-entity-constructors.patch rename to patches/server/0876-Don-t-use-level-random-in-entity-constructors.patch diff --git a/patches/server/0876-Send-block-entities-after-destroy-prediction.patch b/patches/server/0877-Send-block-entities-after-destroy-prediction.patch similarity index 100% rename from patches/server/0876-Send-block-entities-after-destroy-prediction.patch rename to patches/server/0877-Send-block-entities-after-destroy-prediction.patch diff --git a/patches/server/0877-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0878-Warn-on-plugins-accessing-faraway-chunks.patch similarity index 100% rename from patches/server/0877-Warn-on-plugins-accessing-faraway-chunks.patch rename to patches/server/0878-Warn-on-plugins-accessing-faraway-chunks.patch diff --git a/patches/server/0878-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0879-Custom-Chat-Completion-Suggestions-API.patch similarity index 94% rename from patches/server/0878-Custom-Chat-Completion-Suggestions-API.patch rename to patches/server/0879-Custom-Chat-Completion-Suggestions-API.patch index f4600e329a..e383aeb798 100644 --- a/patches/server/0878-Custom-Chat-Completion-Suggestions-API.patch +++ b/patches/server/0879-Custom-Chat-Completion-Suggestions-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Custom Chat Completion Suggestions API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index fc77e4bed1257cd7f3617552d591a2736168d47c..d87324ccf3490fff0981336ef7d22071cd573b51 100644 +index 4d3d6ecada4d8d7202498f4b3c68c35546d3f1df..81d986eeb355087dc1ff45c2c44b9d34b04f02f1 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -665,6 +665,22 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0879-Add-missing-BlockFadeEvents.patch b/patches/server/0880-Add-missing-BlockFadeEvents.patch similarity index 100% rename from patches/server/0879-Add-missing-BlockFadeEvents.patch rename to patches/server/0880-Add-missing-BlockFadeEvents.patch diff --git a/patches/server/0880-Collision-API.patch b/patches/server/0881-Collision-API.patch similarity index 100% rename from patches/server/0880-Collision-API.patch rename to patches/server/0881-Collision-API.patch diff --git a/patches/server/0881-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0882-Fix-suggest-command-message-for-brigadier-syntax-exc.patch similarity index 100% rename from patches/server/0881-Fix-suggest-command-message-for-brigadier-syntax-exc.patch rename to patches/server/0882-Fix-suggest-command-message-for-brigadier-syntax-exc.patch diff --git a/patches/server/0882-Remove-invalid-signature-login-stacktrace.patch b/patches/server/0883-Remove-invalid-signature-login-stacktrace.patch similarity index 100% rename from patches/server/0882-Remove-invalid-signature-login-stacktrace.patch rename to patches/server/0883-Remove-invalid-signature-login-stacktrace.patch diff --git a/patches/server/0883-Add-async-catcher-to-PlayerConnection-internalTelepo.patch b/patches/server/0884-Add-async-catcher-to-PlayerConnection-internalTelepo.patch similarity index 100% rename from patches/server/0883-Add-async-catcher-to-PlayerConnection-internalTelepo.patch rename to patches/server/0884-Add-async-catcher-to-PlayerConnection-internalTelepo.patch diff --git a/patches/server/0884-Block-Ticking-API.patch b/patches/server/0885-Block-Ticking-API.patch similarity index 100% rename from patches/server/0884-Block-Ticking-API.patch rename to patches/server/0885-Block-Ticking-API.patch diff --git a/patches/server/0885-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0886-Add-Velocity-IP-Forwarding-Support.patch similarity index 100% rename from patches/server/0885-Add-Velocity-IP-Forwarding-Support.patch rename to patches/server/0886-Add-Velocity-IP-Forwarding-Support.patch diff --git a/patches/server/0886-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0887-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch similarity index 100% rename from patches/server/0886-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch rename to patches/server/0887-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch diff --git a/patches/server/0887-Add-NamespacedKey-biome-methods.patch b/patches/server/0888-Add-NamespacedKey-biome-methods.patch similarity index 100% rename from patches/server/0887-Add-NamespacedKey-biome-methods.patch rename to patches/server/0888-Add-NamespacedKey-biome-methods.patch diff --git a/patches/server/0888-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0889-Fix-plugin-loggers-on-server-shutdown.patch similarity index 100% rename from patches/server/0888-Fix-plugin-loggers-on-server-shutdown.patch rename to patches/server/0889-Fix-plugin-loggers-on-server-shutdown.patch diff --git a/patches/server/0889-Workaround-for-client-lag-spikes-MC-162253.patch b/patches/server/0890-Workaround-for-client-lag-spikes-MC-162253.patch similarity index 100% rename from patches/server/0889-Workaround-for-client-lag-spikes-MC-162253.patch rename to patches/server/0890-Workaround-for-client-lag-spikes-MC-162253.patch diff --git a/patches/server/0890-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0891-Stop-large-look-changes-from-crashing-the-server.patch similarity index 100% rename from patches/server/0890-Stop-large-look-changes-from-crashing-the-server.patch rename to patches/server/0891-Stop-large-look-changes-from-crashing-the-server.patch diff --git a/patches/server/0891-Add-custom-destroyerIdentity-to-sendBlockDamage.patch b/patches/server/0892-Add-custom-destroyerIdentity-to-sendBlockDamage.patch similarity index 94% rename from patches/server/0891-Add-custom-destroyerIdentity-to-sendBlockDamage.patch rename to patches/server/0892-Add-custom-destroyerIdentity-to-sendBlockDamage.patch index e1f0ee630c..68c8801f6b 100644 --- a/patches/server/0891-Add-custom-destroyerIdentity-to-sendBlockDamage.patch +++ b/patches/server/0892-Add-custom-destroyerIdentity-to-sendBlockDamage.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add custom destroyerIdentity to sendBlockDamage diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index d87324ccf3490fff0981336ef7d22071cd573b51..a511e41a1bba469a3d21f758f6e363bd95ecc49c 100644 +index 81d986eeb355087dc1ff45c2c44b9d34b04f02f1..275101311ea56e5947377dad1ba17f1c4b449285 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1014,13 +1014,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0892-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch b/patches/server/0893-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch similarity index 100% rename from patches/server/0892-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch rename to patches/server/0893-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch diff --git a/patches/server/0893-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0894-Fire-EntityChangeBlockEvent-in-more-places.patch similarity index 100% rename from patches/server/0893-Fire-EntityChangeBlockEvent-in-more-places.patch rename to patches/server/0894-Fire-EntityChangeBlockEvent-in-more-places.patch diff --git a/patches/server/0894-Missing-eating-regain-reason.patch b/patches/server/0895-Missing-eating-regain-reason.patch similarity index 100% rename from patches/server/0894-Missing-eating-regain-reason.patch rename to patches/server/0895-Missing-eating-regain-reason.patch diff --git a/patches/server/0895-Missing-effect-cause.patch b/patches/server/0896-Missing-effect-cause.patch similarity index 100% rename from patches/server/0895-Missing-effect-cause.patch rename to patches/server/0896-Missing-effect-cause.patch diff --git a/patches/server/0896-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0897-Added-byte-array-serialization-deserialization-for-P.patch similarity index 100% rename from patches/server/0896-Added-byte-array-serialization-deserialization-for-P.patch rename to patches/server/0897-Added-byte-array-serialization-deserialization-for-P.patch diff --git a/patches/server/0897-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0898-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch similarity index 100% rename from patches/server/0897-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch rename to patches/server/0898-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch diff --git a/patches/server/0898-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0899-Call-BlockPhysicsEvent-more-often.patch similarity index 100% rename from patches/server/0898-Call-BlockPhysicsEvent-more-often.patch rename to patches/server/0899-Call-BlockPhysicsEvent-more-often.patch diff --git a/patches/server/0899-Configurable-chat-thread-limit.patch b/patches/server/0900-Configurable-chat-thread-limit.patch similarity index 100% rename from patches/server/0899-Configurable-chat-thread-limit.patch rename to patches/server/0900-Configurable-chat-thread-limit.patch diff --git a/patches/server/0900-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0901-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch similarity index 100% rename from patches/server/0900-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch rename to patches/server/0901-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch diff --git a/patches/server/0901-Set-position-before-player-sending-on-dimension-chan.patch b/patches/server/0902-Set-position-before-player-sending-on-dimension-chan.patch similarity index 100% rename from patches/server/0901-Set-position-before-player-sending-on-dimension-chan.patch rename to patches/server/0902-Set-position-before-player-sending-on-dimension-chan.patch diff --git a/patches/server/0902-fix-Jigsaw-block-kicking-user.patch b/patches/server/0903-fix-Jigsaw-block-kicking-user.patch similarity index 100% rename from patches/server/0902-fix-Jigsaw-block-kicking-user.patch rename to patches/server/0903-fix-Jigsaw-block-kicking-user.patch diff --git a/patches/server/0903-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0904-use-BlockFormEvent-for-mud-converting-into-clay.patch similarity index 100% rename from patches/server/0903-use-BlockFormEvent-for-mud-converting-into-clay.patch rename to patches/server/0904-use-BlockFormEvent-for-mud-converting-into-clay.patch diff --git a/patches/server/0904-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch b/patches/server/0905-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch similarity index 100% rename from patches/server/0904-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch rename to patches/server/0905-Add-getDrops-to-BlockState-and-isPreferredTool-to-Bl.patch diff --git a/patches/server/0905-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0906-Fix-a-bunch-of-vanilla-bugs.patch similarity index 100% rename from patches/server/0905-Fix-a-bunch-of-vanilla-bugs.patch rename to patches/server/0906-Fix-a-bunch-of-vanilla-bugs.patch diff --git a/patches/server/0906-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0907-Remove-unnecessary-onTrackingStart-during-navigation.patch similarity index 100% rename from patches/server/0906-Remove-unnecessary-onTrackingStart-during-navigation.patch rename to patches/server/0907-Remove-unnecessary-onTrackingStart-during-navigation.patch diff --git a/patches/server/0907-Fix-custom-piglin-loved-items.patch b/patches/server/0908-Fix-custom-piglin-loved-items.patch similarity index 100% rename from patches/server/0907-Fix-custom-piglin-loved-items.patch rename to patches/server/0908-Fix-custom-piglin-loved-items.patch diff --git a/patches/server/0908-EntityPickupItemEvent-fixes.patch b/patches/server/0909-EntityPickupItemEvent-fixes.patch similarity index 100% rename from patches/server/0908-EntityPickupItemEvent-fixes.patch rename to patches/server/0909-EntityPickupItemEvent-fixes.patch diff --git a/patches/server/0909-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0910-Correctly-handle-interactions-with-items-on-cooldown.patch similarity index 100% rename from patches/server/0909-Correctly-handle-interactions-with-items-on-cooldown.patch rename to patches/server/0910-Correctly-handle-interactions-with-items-on-cooldown.patch diff --git a/patches/server/0910-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0911-Add-PlayerInventorySlotChangeEvent.patch similarity index 100% rename from patches/server/0910-Add-PlayerInventorySlotChangeEvent.patch rename to patches/server/0911-Add-PlayerInventorySlotChangeEvent.patch diff --git a/patches/server/0911-Elder-Guardian-appearance-API.patch b/patches/server/0912-Elder-Guardian-appearance-API.patch similarity index 90% rename from patches/server/0911-Elder-Guardian-appearance-API.patch rename to patches/server/0912-Elder-Guardian-appearance-API.patch index 1484e7abb6..f956532387 100644 --- a/patches/server/0911-Elder-Guardian-appearance-API.patch +++ b/patches/server/0912-Elder-Guardian-appearance-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Elder Guardian appearance API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index e3da648ce9d5e2fb2b6737b6fd217ade042a0cbc..4e76dbec9ded8b866c85bea86b2349f15db13094 100644 +index 275101311ea56e5947377dad1ba17f1c4b449285..fa6a627f61bf7d47ee426231f2beea07a5ff9be1 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2995,6 +2995,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0912-Allow-changing-bed-s-occupied-property.patch b/patches/server/0913-Allow-changing-bed-s-occupied-property.patch similarity index 100% rename from patches/server/0912-Allow-changing-bed-s-occupied-property.patch rename to patches/server/0913-Allow-changing-bed-s-occupied-property.patch diff --git a/patches/server/0913-Add-entity-knockback-API.patch b/patches/server/0914-Add-entity-knockback-API.patch similarity index 100% rename from patches/server/0913-Add-entity-knockback-API.patch rename to patches/server/0914-Add-entity-knockback-API.patch diff --git a/patches/server/0914-Detect-headless-JREs.patch b/patches/server/0915-Detect-headless-JREs.patch similarity index 100% rename from patches/server/0914-Detect-headless-JREs.patch rename to patches/server/0915-Detect-headless-JREs.patch diff --git a/patches/server/0915-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0916-fixed-entity-vehicle-collision-event-not-called.patch similarity index 100% rename from patches/server/0915-fixed-entity-vehicle-collision-event-not-called.patch rename to patches/server/0916-fixed-entity-vehicle-collision-event-not-called.patch diff --git a/patches/server/0916-optimized-dirt-and-snow-spreading.patch b/patches/server/0917-optimized-dirt-and-snow-spreading.patch similarity index 100% rename from patches/server/0916-optimized-dirt-and-snow-spreading.patch rename to patches/server/0917-optimized-dirt-and-snow-spreading.patch diff --git a/patches/server/0917-Added-EntityToggleSitEvent.patch b/patches/server/0918-Added-EntityToggleSitEvent.patch similarity index 100% rename from patches/server/0917-Added-EntityToggleSitEvent.patch rename to patches/server/0918-Added-EntityToggleSitEvent.patch diff --git a/patches/server/0918-Add-fire-tick-delay-option.patch b/patches/server/0919-Add-fire-tick-delay-option.patch similarity index 100% rename from patches/server/0918-Add-fire-tick-delay-option.patch rename to patches/server/0919-Add-fire-tick-delay-option.patch diff --git a/patches/server/0919-Add-Moving-Piston-API.patch b/patches/server/0920-Add-Moving-Piston-API.patch similarity index 100% rename from patches/server/0919-Add-Moving-Piston-API.patch rename to patches/server/0920-Add-Moving-Piston-API.patch diff --git a/patches/server/0920-Ignore-impossible-spawn-tick.patch b/patches/server/0921-Ignore-impossible-spawn-tick.patch similarity index 100% rename from patches/server/0920-Ignore-impossible-spawn-tick.patch rename to patches/server/0921-Ignore-impossible-spawn-tick.patch diff --git a/patches/server/0921-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0922-Track-projectile-source-for-fireworks-from-dispenser.patch similarity index 100% rename from patches/server/0921-Track-projectile-source-for-fireworks-from-dispenser.patch rename to patches/server/0922-Track-projectile-source-for-fireworks-from-dispenser.patch diff --git a/patches/server/0922-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0923-Fix-EntityArgument-suggestion-permissions-to-align-w.patch similarity index 100% rename from patches/server/0922-Fix-EntityArgument-suggestion-permissions-to-align-w.patch rename to patches/server/0923-Fix-EntityArgument-suggestion-permissions-to-align-w.patch diff --git a/patches/server/0923-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0924-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch similarity index 100% rename from patches/server/0923-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch rename to patches/server/0924-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch diff --git a/patches/server/0924-Prevent-compass-from-loading-chunks.patch b/patches/server/0925-Prevent-compass-from-loading-chunks.patch similarity index 100% rename from patches/server/0924-Prevent-compass-from-loading-chunks.patch rename to patches/server/0925-Prevent-compass-from-loading-chunks.patch diff --git a/patches/server/0925-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0926-Add-PrePlayerAttackEntityEvent.patch similarity index 100% rename from patches/server/0925-Add-PrePlayerAttackEntityEvent.patch rename to patches/server/0926-Add-PrePlayerAttackEntityEvent.patch diff --git a/patches/server/0926-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0927-ensure-reset-EnderDragon-boss-event-name.patch similarity index 100% rename from patches/server/0926-ensure-reset-EnderDragon-boss-event-name.patch rename to patches/server/0927-ensure-reset-EnderDragon-boss-event-name.patch diff --git a/patches/server/0927-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0928-fix-MC-252817-green-map-markers-do-not-disappear.patch similarity index 100% rename from patches/server/0927-fix-MC-252817-green-map-markers-do-not-disappear.patch rename to patches/server/0928-fix-MC-252817-green-map-markers-do-not-disappear.patch diff --git a/patches/server/0928-Reorder-bukkit-damage-source-entity-for-explosion-to.patch b/patches/server/0929-Reorder-bukkit-damage-source-entity-for-explosion-to.patch similarity index 100% rename from patches/server/0928-Reorder-bukkit-damage-source-entity-for-explosion-to.patch rename to patches/server/0929-Reorder-bukkit-damage-source-entity-for-explosion-to.patch diff --git a/patches/server/0929-Fix-MC-121048.patch b/patches/server/0930-Fix-MC-121048.patch similarity index 100% rename from patches/server/0929-Fix-MC-121048.patch rename to patches/server/0930-Fix-MC-121048.patch diff --git a/patches/server/0930-Add-Player-Warden-Warning-API.patch b/patches/server/0931-Add-Player-Warden-Warning-API.patch similarity index 95% rename from patches/server/0930-Add-Player-Warden-Warning-API.patch rename to patches/server/0931-Add-Player-Warden-Warning-API.patch index 24b08dc6a4..61e6e43c73 100644 --- a/patches/server/0930-Add-Player-Warden-Warning-API.patch +++ b/patches/server/0931-Add-Player-Warden-Warning-API.patch @@ -10,7 +10,7 @@ public net.minecraft.world.entity.monster.warden.WardenSpawnTracker cooldownTick public net.minecraft.world.entity.monster.warden.WardenSpawnTracker increaseWarningLevel()V diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 4e76dbec9ded8b866c85bea86b2349f15db13094..5c56dbb485b3e7a9c67353c0a9bc3dadfcda29be 100644 +index fa6a627f61bf7d47ee426231f2beea07a5ff9be1..c628cbff6302e4b559964824fa61a1566b83cd9f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -3000,6 +3000,41 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0931-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0932-More-vanilla-friendly-methods-to-update-trades.patch similarity index 100% rename from patches/server/0931-More-vanilla-friendly-methods-to-update-trades.patch rename to patches/server/0932-More-vanilla-friendly-methods-to-update-trades.patch diff --git a/patches/server/0932-Add-paper-dumplisteners-command.patch b/patches/server/0933-Add-paper-dumplisteners-command.patch similarity index 100% rename from patches/server/0932-Add-paper-dumplisteners-command.patch rename to patches/server/0933-Add-paper-dumplisteners-command.patch diff --git a/patches/server/0933-check-global-player-list-where-appropriate.patch b/patches/server/0934-check-global-player-list-where-appropriate.patch similarity index 100% rename from patches/server/0933-check-global-player-list-where-appropriate.patch rename to patches/server/0934-check-global-player-list-where-appropriate.patch diff --git a/patches/server/0934-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0935-Fix-async-entity-add-due-to-fungus-trees.patch similarity index 100% rename from patches/server/0934-Fix-async-entity-add-due-to-fungus-trees.patch rename to patches/server/0935-Fix-async-entity-add-due-to-fungus-trees.patch diff --git a/patches/server/0935-ItemStack-damage-API.patch b/patches/server/0936-ItemStack-damage-API.patch similarity index 100% rename from patches/server/0935-ItemStack-damage-API.patch rename to patches/server/0936-ItemStack-damage-API.patch diff --git a/patches/server/0936-Friction-API.patch b/patches/server/0937-Friction-API.patch similarity index 100% rename from patches/server/0936-Friction-API.patch rename to patches/server/0937-Friction-API.patch diff --git a/patches/server/0937-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0938-Ability-to-control-player-s-insomnia-and-phantoms.patch similarity index 100% rename from patches/server/0937-Ability-to-control-player-s-insomnia-and-phantoms.patch rename to patches/server/0938-Ability-to-control-player-s-insomnia-and-phantoms.patch diff --git a/patches/server/0938-Fix-player-kick-on-shutdown.patch b/patches/server/0939-Fix-player-kick-on-shutdown.patch similarity index 100% rename from patches/server/0938-Fix-player-kick-on-shutdown.patch rename to patches/server/0939-Fix-player-kick-on-shutdown.patch diff --git a/patches/server/0939-Sync-offhand-slot-in-menus.patch b/patches/server/0940-Sync-offhand-slot-in-menus.patch similarity index 100% rename from patches/server/0939-Sync-offhand-slot-in-menus.patch rename to patches/server/0940-Sync-offhand-slot-in-menus.patch diff --git a/patches/server/0940-Player-Entity-Tracking-Events.patch b/patches/server/0941-Player-Entity-Tracking-Events.patch similarity index 100% rename from patches/server/0940-Player-Entity-Tracking-Events.patch rename to patches/server/0941-Player-Entity-Tracking-Events.patch diff --git a/patches/server/0941-Limit-pet-look-distance.patch b/patches/server/0942-Limit-pet-look-distance.patch similarity index 100% rename from patches/server/0941-Limit-pet-look-distance.patch rename to patches/server/0942-Limit-pet-look-distance.patch diff --git a/patches/server/0942-Properly-resend-entities.patch b/patches/server/0943-Properly-resend-entities.patch similarity index 100% rename from patches/server/0942-Properly-resend-entities.patch rename to patches/server/0943-Properly-resend-entities.patch diff --git a/patches/server/0943-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0944-Fixes-and-additions-to-the-SpawnReason-API.patch similarity index 100% rename from patches/server/0943-Fixes-and-additions-to-the-SpawnReason-API.patch rename to patches/server/0944-Fixes-and-additions-to-the-SpawnReason-API.patch diff --git a/patches/server/0944-fix-Instruments.patch b/patches/server/0945-fix-Instruments.patch similarity index 100% rename from patches/server/0944-fix-Instruments.patch rename to patches/server/0945-fix-Instruments.patch