diff --git a/patches/unapplied/server/0335-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/server/0336-Guard-against-serializing-mismatching-chunk-coordina.patch similarity index 89% rename from patches/unapplied/server/0335-Guard-against-serializing-mismatching-chunk-coordina.patch rename to patches/server/0336-Guard-against-serializing-mismatching-chunk-coordina.patch index 05f3621ca5..7d824a8ef2 100644 --- a/patches/unapplied/server/0335-Guard-against-serializing-mismatching-chunk-coordina.patch +++ b/patches/server/0336-Guard-against-serializing-mismatching-chunk-coordina.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Guard against serializing mismatching chunk coordinate Should help if something dumb happens diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java -index f9dd2d9312297a727344d43150c5cab74128cbca..b1c5e5ecf2488d1a6f0a5261d4ba8958de9659ae 100644 +index a7ee469bb2880a78540b79ae691ea449dfe22ce4..0d8cfc0808a8f204d57cec40929b489099eca815 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java @@ -94,6 +94,18 @@ public class ChunkSerializer { @@ -28,9 +28,9 @@ index f9dd2d9312297a727344d43150c5cab74128cbca..b1c5e5ecf2488d1a6f0a5261d4ba8958 // Paper start public static final class InProgressChunkHolder { -@@ -119,7 +131,7 @@ public class ChunkSerializer { +@@ -115,7 +127,7 @@ public class ChunkSerializer { + public static InProgressChunkHolder loadChunk(ServerLevel world, PoiManager poiStorage, ChunkPos chunkPos, CompoundTag nbt, boolean distinguish) { - java.util.ArrayDeque tasksToExecuteOnMain = new java.util.ArrayDeque<>(); // Paper end - ChunkPos chunkcoordintpair1 = new ChunkPos(nbt.getInt("xPos"), nbt.getInt("zPos")); + ChunkPos chunkcoordintpair1 = new ChunkPos(nbt.getInt("xPos"), nbt.getInt("zPos")); // Paper - diff on change, see ChunkSerializer#getChunkCoordinate @@ -38,7 +38,7 @@ index f9dd2d9312297a727344d43150c5cab74128cbca..b1c5e5ecf2488d1a6f0a5261d4ba8958 if (!Objects.equals(chunkPos, chunkcoordintpair1)) { ChunkSerializer.LOGGER.error("Chunk file at {} is in the wrong location; relocating. (Expected {}, got {})", new Object[]{chunkPos, chunkPos, chunkcoordintpair1}); diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java -index 35115f79825035ff28bdffa26ad4127fec8d05c1..10603eebf36caca7870e9cf087e99d529550ad3e 100644 +index b4e7c9b317d532d4915932f8f79dfebf2b63ff16..e4b3a70ff9f906a10f2ba3c07642193ca3269db7 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java @@ -178,6 +178,13 @@ public class ChunkStorage implements AutoCloseable { @@ -46,7 +46,7 @@ index 35115f79825035ff28bdffa26ad4127fec8d05c1..10603eebf36caca7870e9cf087e99d52 // Paper start - async chunk io public void write(ChunkPos chunkPos, CompoundTag nbt) throws IOException { + // Paper start -+ if (!chunkPos.equals(ChunkSerializer.getChunkCoordinate(nbt))) { ++ if (nbt != null && !chunkPos.equals(ChunkSerializer.getChunkCoordinate(nbt))) { + String world = (this instanceof net.minecraft.server.level.ChunkMap) ? ((net.minecraft.server.level.ChunkMap)this).level.getWorld().getName() : null; + throw new IllegalArgumentException("Chunk coordinate and serialized data do not have matching coordinates, trying to serialize coordinate " + chunkPos.toString() + + " but compound says coordinate is " + ChunkSerializer.getChunkCoordinate(nbt).toString() + (world == null ? " for an unknown world" : (" for world: " + world))); diff --git a/patches/server/0336-Entity-Activation-Range-2.0.patch b/patches/server/0337-Entity-Activation-Range-2.0.patch similarity index 100% rename from patches/server/0336-Entity-Activation-Range-2.0.patch rename to patches/server/0337-Entity-Activation-Range-2.0.patch diff --git a/patches/server/0337-Implement-alternative-item-despawn-rate.patch b/patches/server/0338-Implement-alternative-item-despawn-rate.patch similarity index 100% rename from patches/server/0337-Implement-alternative-item-despawn-rate.patch rename to patches/server/0338-Implement-alternative-item-despawn-rate.patch diff --git a/patches/unapplied/server/0338-Lag-compensate-eating.patch b/patches/server/0339-Lag-compensate-eating.patch similarity index 79% rename from patches/unapplied/server/0338-Lag-compensate-eating.patch rename to patches/server/0339-Lag-compensate-eating.patch index bf9a765b49..2f13ddcbf8 100644 --- a/patches/unapplied/server/0338-Lag-compensate-eating.patch +++ b/patches/server/0339-Lag-compensate-eating.patch @@ -7,10 +7,10 @@ When the server is lagging, players will wait longer when eating. Change to also use a time check instead if it passes. diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 5eaedecd2e53bcdc30defbf56d6a70a0c49f03ec..38a5d219713f7d3bb3d5ea73e4e6756a03128d01 100644 +index a897ed99e7a643244fbe6f0ba1afc1bc15bb8d8d..a1c8558db314ea34ad483f7f6f70c1833b57b669 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3552,6 +3552,11 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -3601,6 +3601,11 @@ public abstract class LivingEntity extends Entity implements Attackable { return ((Byte) this.entityData.get(LivingEntity.DATA_LIVING_ENTITY_FLAGS) & 2) > 0 ? InteractionHand.OFF_HAND : InteractionHand.MAIN_HAND; } @@ -21,23 +21,22 @@ index 5eaedecd2e53bcdc30defbf56d6a70a0c49f03ec..38a5d219713f7d3bb3d5ea73e4e6756a + private void updatingUsingItem() { if (this.isUsingItem()) { - if (ItemStack.isSame(this.getItemInHand(this.getUsedItemHand()), this.useItem)) { -@@ -3569,8 +3574,12 @@ public abstract class LivingEntity extends Entity implements Attackable { - if (this.shouldTriggerItemUseEffects()) { + if (ItemStack.isSameItem(this.getItemInHand(this.getUsedItemHand()), this.useItem)) { +@@ -3619,7 +3624,12 @@ public abstract class LivingEntity extends Entity implements Attackable { this.triggerItemUseEffects(stack, 5); } -- -- if (--this.useItemRemaining == 0 && !this.level.isClientSide && !stack.useOnRelease()) { + +- if (--this.useItemRemaining == 0 && !this.level().isClientSide && !stack.useOnRelease()) { + // Paper start - lag compensate eating + // we add 1 to the expected time to avoid lag compensating when we should not + boolean shouldLagCompensate = this.useItem.getItem().isEdible() && this.eatStartTime != -1 && (System.nanoTime() - this.eatStartTime) > ((1 + this.totalEatTimeTicks) * 50 * (1000 * 1000)); -+ if ((--this.useItemRemaining == 0 || shouldLagCompensate) && !this.level.isClientSide && !this.useItem.useOnRelease()) { ++ if ((--this.useItemRemaining == 0 || shouldLagCompensate) && !this.level().isClientSide && !stack.useOnRelease()) { + this.useItemRemaining = 0; + // Paper end this.completeUsingItem(); } -@@ -3618,7 +3627,10 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -3667,7 +3677,10 @@ public abstract class LivingEntity extends Entity implements Attackable { if (!itemstack.isEmpty() && !this.isUsingItem() || forceUpdate) { // Paper use override flag this.useItem = itemstack; @@ -46,10 +45,10 @@ index 5eaedecd2e53bcdc30defbf56d6a70a0c49f03ec..38a5d219713f7d3bb3d5ea73e4e6756a + this.useItemRemaining = this.totalEatTimeTicks = itemstack.getUseDuration(); + this.eatStartTime = System.nanoTime(); + // Paper end - if (!this.level.isClientSide) { + if (!this.level().isClientSide) { this.setLivingEntityFlag(1, true); this.setLivingEntityFlag(2, hand == InteractionHand.OFF_HAND); -@@ -3643,7 +3655,10 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -3692,7 +3705,10 @@ public abstract class LivingEntity extends Entity implements Attackable { } } else if (!this.isUsingItem() && !this.useItem.isEmpty()) { this.useItem = ItemStack.EMPTY; @@ -61,7 +60,7 @@ index 5eaedecd2e53bcdc30defbf56d6a70a0c49f03ec..38a5d219713f7d3bb3d5ea73e4e6756a } } -@@ -3777,7 +3792,10 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -3825,7 +3841,10 @@ public abstract class LivingEntity extends Entity implements Attackable { } this.useItem = ItemStack.EMPTY; diff --git a/patches/server/0338-Tracking-Range-Improvements.patch b/patches/server/0340-Tracking-Range-Improvements.patch similarity index 100% rename from patches/server/0338-Tracking-Range-Improvements.patch rename to patches/server/0340-Tracking-Range-Improvements.patch diff --git a/patches/server/0339-Fix-items-vanishing-through-end-portal.patch b/patches/server/0341-Fix-items-vanishing-through-end-portal.patch similarity index 100% rename from patches/server/0339-Fix-items-vanishing-through-end-portal.patch rename to patches/server/0341-Fix-items-vanishing-through-end-portal.patch diff --git a/patches/server/0340-implement-optional-per-player-mob-spawns.patch b/patches/server/0342-implement-optional-per-player-mob-spawns.patch similarity index 100% rename from patches/server/0340-implement-optional-per-player-mob-spawns.patch rename to patches/server/0342-implement-optional-per-player-mob-spawns.patch diff --git a/patches/server/0341-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0343-Bees-get-gravity-in-void.-Fixes-MC-167279.patch similarity index 100% rename from patches/server/0341-Bees-get-gravity-in-void.-Fixes-MC-167279.patch rename to patches/server/0343-Bees-get-gravity-in-void.-Fixes-MC-167279.patch diff --git a/patches/server/0342-Improve-Block-breakNaturally-API.patch b/patches/server/0344-Improve-Block-breakNaturally-API.patch similarity index 100% rename from patches/server/0342-Improve-Block-breakNaturally-API.patch rename to patches/server/0344-Improve-Block-breakNaturally-API.patch diff --git a/patches/server/0343-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0345-Optimise-getChunkAt-calls-for-loaded-chunks.patch similarity index 100% rename from patches/server/0343-Optimise-getChunkAt-calls-for-loaded-chunks.patch rename to patches/server/0345-Optimise-getChunkAt-calls-for-loaded-chunks.patch diff --git a/patches/server/0344-Add-debug-for-sync-chunk-loads.patch b/patches/server/0346-Add-debug-for-sync-chunk-loads.patch similarity index 100% rename from patches/server/0344-Add-debug-for-sync-chunk-loads.patch rename to patches/server/0346-Add-debug-for-sync-chunk-loads.patch diff --git a/patches/server/0345-Remove-garbage-Java-version-check.patch b/patches/server/0347-Remove-garbage-Java-version-check.patch similarity index 100% rename from patches/server/0345-Remove-garbage-Java-version-check.patch rename to patches/server/0347-Remove-garbage-Java-version-check.patch diff --git a/patches/server/0346-Add-ThrownEggHatchEvent.patch b/patches/server/0348-Add-ThrownEggHatchEvent.patch similarity index 100% rename from patches/server/0346-Add-ThrownEggHatchEvent.patch rename to patches/server/0348-Add-ThrownEggHatchEvent.patch diff --git a/patches/server/0347-Entity-Jump-API.patch b/patches/server/0349-Entity-Jump-API.patch similarity index 97% rename from patches/server/0347-Entity-Jump-API.patch rename to patches/server/0349-Entity-Jump-API.patch index 6544b204f3..0e146d1a86 100644 --- a/patches/server/0347-Entity-Jump-API.patch +++ b/patches/server/0349-Entity-Jump-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Entity Jump API diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index a897ed99e7a643244fbe6f0ba1afc1bc15bb8d8d..574f8db51202c6686e7703f3193d63a1a4fefb65 100644 +index a1c8558db314ea34ad483f7f6f70c1833b57b669..55d8856e5fdeee4d38e49f5d4a252cf61212e5cb 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3262,8 +3262,10 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0348-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0350-Add-option-to-nerf-pigmen-from-nether-portals.patch similarity index 100% rename from patches/server/0348-Add-option-to-nerf-pigmen-from-nether-portals.patch rename to patches/server/0350-Add-option-to-nerf-pigmen-from-nether-portals.patch diff --git a/patches/server/0349-Make-the-GUI-graph-fancier.patch b/patches/server/0351-Make-the-GUI-graph-fancier.patch similarity index 100% rename from patches/server/0349-Make-the-GUI-graph-fancier.patch rename to patches/server/0351-Make-the-GUI-graph-fancier.patch diff --git a/patches/server/0350-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0352-add-hand-to-BlockMultiPlaceEvent.patch similarity index 100% rename from patches/server/0350-add-hand-to-BlockMultiPlaceEvent.patch rename to patches/server/0352-add-hand-to-BlockMultiPlaceEvent.patch diff --git a/patches/server/0351-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0353-Validate-tripwire-hook-placement-before-update.patch similarity index 100% rename from patches/server/0351-Validate-tripwire-hook-placement-before-update.patch rename to patches/server/0353-Validate-tripwire-hook-placement-before-update.patch diff --git a/patches/server/0352-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0354-Add-option-to-allow-iron-golems-to-spawn-in-air.patch similarity index 100% rename from patches/server/0352-Add-option-to-allow-iron-golems-to-spawn-in-air.patch rename to patches/server/0354-Add-option-to-allow-iron-golems-to-spawn-in-air.patch diff --git a/patches/server/0353-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0355-Configurable-chance-of-villager-zombie-infection.patch similarity index 100% rename from patches/server/0353-Configurable-chance-of-villager-zombie-infection.patch rename to patches/server/0355-Configurable-chance-of-villager-zombie-infection.patch diff --git a/patches/server/0354-Optimise-Chunk-getFluid.patch b/patches/server/0356-Optimise-Chunk-getFluid.patch similarity index 100% rename from patches/server/0354-Optimise-Chunk-getFluid.patch rename to patches/server/0356-Optimise-Chunk-getFluid.patch diff --git a/patches/server/0355-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0357-Set-spigots-verbose-world-setting-to-false-by-def.patch similarity index 100% rename from patches/server/0355-Set-spigots-verbose-world-setting-to-false-by-def.patch rename to patches/server/0357-Set-spigots-verbose-world-setting-to-false-by-def.patch diff --git a/patches/server/0356-Add-tick-times-API-and-mspt-command.patch b/patches/server/0358-Add-tick-times-API-and-mspt-command.patch similarity index 100% rename from patches/server/0356-Add-tick-times-API-and-mspt-command.patch rename to patches/server/0358-Add-tick-times-API-and-mspt-command.patch diff --git a/patches/server/0357-Expose-MinecraftServer-isRunning.patch b/patches/server/0359-Expose-MinecraftServer-isRunning.patch similarity index 100% rename from patches/server/0357-Expose-MinecraftServer-isRunning.patch rename to patches/server/0359-Expose-MinecraftServer-isRunning.patch diff --git a/patches/server/0358-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0360-Add-Raw-Byte-ItemStack-Serialization.patch similarity index 100% rename from patches/server/0358-Add-Raw-Byte-ItemStack-Serialization.patch rename to patches/server/0360-Add-Raw-Byte-ItemStack-Serialization.patch diff --git a/patches/server/0359-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0361-Pillager-patrol-spawn-settings-and-per-player-option.patch similarity index 100% rename from patches/server/0359-Pillager-patrol-spawn-settings-and-per-player-option.patch rename to patches/server/0361-Pillager-patrol-spawn-settings-and-per-player-option.patch diff --git a/patches/server/0360-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0362-Remote-Connections-shouldn-t-hold-up-shutdown.patch similarity index 100% rename from patches/server/0360-Remote-Connections-shouldn-t-hold-up-shutdown.patch rename to patches/server/0362-Remote-Connections-shouldn-t-hold-up-shutdown.patch diff --git a/patches/server/0361-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0363-Do-not-allow-bees-to-load-chunks-for-beehives.patch similarity index 100% rename from patches/server/0361-Do-not-allow-bees-to-load-chunks-for-beehives.patch rename to patches/server/0363-Do-not-allow-bees-to-load-chunks-for-beehives.patch diff --git a/patches/server/0362-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0364-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch similarity index 100% rename from patches/server/0362-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch rename to patches/server/0364-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch diff --git a/patches/server/0363-Don-t-tick-dead-players.patch b/patches/server/0365-Don-t-tick-dead-players.patch similarity index 100% rename from patches/server/0363-Don-t-tick-dead-players.patch rename to patches/server/0365-Don-t-tick-dead-players.patch diff --git a/patches/server/0364-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0366-Dead-Player-s-shouldn-t-be-able-to-move.patch similarity index 100% rename from patches/server/0364-Dead-Player-s-shouldn-t-be-able-to-move.patch rename to patches/server/0366-Dead-Player-s-shouldn-t-be-able-to-move.patch diff --git a/patches/server/0365-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0367-Optimize-Collision-to-not-load-chunks.patch similarity index 100% rename from patches/server/0365-Optimize-Collision-to-not-load-chunks.patch rename to patches/server/0367-Optimize-Collision-to-not-load-chunks.patch diff --git a/patches/server/0366-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0368-Don-t-move-existing-players-to-world-spawn.patch similarity index 100% rename from patches/server/0366-Don-t-move-existing-players-to-world-spawn.patch rename to patches/server/0368-Don-t-move-existing-players-to-world-spawn.patch diff --git a/patches/server/0367-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0369-Optimize-GoalSelector-Goal.Flag-Set-operations.patch similarity index 100% rename from patches/server/0367-Optimize-GoalSelector-Goal.Flag-Set-operations.patch rename to patches/server/0369-Optimize-GoalSelector-Goal.Flag-Set-operations.patch diff --git a/patches/server/0368-Improved-Watchdog-Support.patch b/patches/server/0370-Improved-Watchdog-Support.patch similarity index 100% rename from patches/server/0368-Improved-Watchdog-Support.patch rename to patches/server/0370-Improved-Watchdog-Support.patch diff --git a/patches/server/0369-Optimize-Pathfinding.patch b/patches/server/0371-Optimize-Pathfinding.patch similarity index 100% rename from patches/server/0369-Optimize-Pathfinding.patch rename to patches/server/0371-Optimize-Pathfinding.patch diff --git a/patches/server/0370-Reduce-Either-Optional-allocation.patch b/patches/server/0372-Reduce-Either-Optional-allocation.patch similarity index 100% rename from patches/server/0370-Reduce-Either-Optional-allocation.patch rename to patches/server/0372-Reduce-Either-Optional-allocation.patch diff --git a/patches/server/0371-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/server/0373-Reduce-memory-footprint-of-NBTTagCompound.patch similarity index 100% rename from patches/server/0371-Reduce-memory-footprint-of-NBTTagCompound.patch rename to patches/server/0373-Reduce-memory-footprint-of-NBTTagCompound.patch diff --git a/patches/server/0372-Prevent-opening-inventories-when-frozen.patch b/patches/server/0374-Prevent-opening-inventories-when-frozen.patch similarity index 100% rename from patches/server/0372-Prevent-opening-inventories-when-frozen.patch rename to patches/server/0374-Prevent-opening-inventories-when-frozen.patch diff --git a/patches/server/0373-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0375-Don-t-run-entity-collision-code-if-not-needed.patch similarity index 96% rename from patches/server/0373-Don-t-run-entity-collision-code-if-not-needed.patch rename to patches/server/0375-Don-t-run-entity-collision-code-if-not-needed.patch index f9d254d2eb..d33987764d 100644 --- a/patches/server/0373-Don-t-run-entity-collision-code-if-not-needed.patch +++ b/patches/server/0375-Don-t-run-entity-collision-code-if-not-needed.patch @@ -12,7 +12,7 @@ The entity's current team collision rule causes them to NEVER collide. Co-authored-by: Owen1212055 <23108066+Owen1212055@users.noreply.github.com> diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 574f8db51202c6686e7703f3193d63a1a4fefb65..6fbd1209edf59dab9cc8b0f568f2d31846264457 100644 +index 55d8856e5fdeee4d38e49f5d4a252cf61212e5cb..6bd0dcba534926716e26da6c171737ff1bc91ea7 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3377,10 +3377,24 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0374-Implement-Player-Client-Options-API.patch b/patches/server/0376-Implement-Player-Client-Options-API.patch similarity index 100% rename from patches/server/0374-Implement-Player-Client-Options-API.patch rename to patches/server/0376-Implement-Player-Client-Options-API.patch diff --git a/patches/server/0375-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0377-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch similarity index 100% rename from patches/server/0375-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch rename to patches/server/0377-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch diff --git a/patches/server/0376-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/server/0378-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch similarity index 100% rename from patches/server/0376-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch rename to patches/server/0378-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch diff --git a/patches/server/0377-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0379-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch similarity index 100% rename from patches/server/0377-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch rename to patches/server/0379-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch diff --git a/patches/server/0378-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0380-Add-PlayerAttackEntityCooldownResetEvent.patch similarity index 95% rename from patches/server/0378-Add-PlayerAttackEntityCooldownResetEvent.patch rename to patches/server/0380-Add-PlayerAttackEntityCooldownResetEvent.patch index 3caa031519..cf38110f24 100644 --- a/patches/server/0378-Add-PlayerAttackEntityCooldownResetEvent.patch +++ b/patches/server/0380-Add-PlayerAttackEntityCooldownResetEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerAttackEntityCooldownResetEvent diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 6fbd1209edf59dab9cc8b0f568f2d31846264457..934c5246f43566a7277b77d0e74b38fc94c6836f 100644 +index 6bd0dcba534926716e26da6c171737ff1bc91ea7..909ff425123228437cf3ab39c6733cd0a6dd2ef1 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -2169,7 +2169,16 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0379-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0381-Don-t-fire-BlockFade-on-worldgen-threads.patch similarity index 100% rename from patches/server/0379-Don-t-fire-BlockFade-on-worldgen-threads.patch rename to patches/server/0381-Don-t-fire-BlockFade-on-worldgen-threads.patch diff --git a/patches/server/0380-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0382-Add-phantom-creative-and-insomniac-controls.patch similarity index 100% rename from patches/server/0380-Add-phantom-creative-and-insomniac-controls.patch rename to patches/server/0382-Add-phantom-creative-and-insomniac-controls.patch diff --git a/patches/server/0381-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/server/0383-Fix-numerous-item-duplication-issues-and-teleport-is.patch similarity index 99% rename from patches/server/0381-Fix-numerous-item-duplication-issues-and-teleport-is.patch rename to patches/server/0383-Fix-numerous-item-duplication-issues-and-teleport-is.patch index b663532156..cc5a726fab 100644 --- a/patches/server/0381-Fix-numerous-item-duplication-issues-and-teleport-is.patch +++ b/patches/server/0383-Fix-numerous-item-duplication-issues-and-teleport-is.patch @@ -80,7 +80,7 @@ index 997f73e86d62b546e363382a3126bc43b4b17b7f..909d0c96840724033bd907560db46d4c public float getBlockExplosionResistance(Explosion explosion, BlockGetter world, BlockPos pos, BlockState blockState, FluidState fluidState, float max) { diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 934c5246f43566a7277b77d0e74b38fc94c6836f..d9ee22bbd654a2f39c443262b4a11f997ed1559e 100644 +index 909ff425123228437cf3ab39c6733cd0a6dd2ef1..258d055a368629154ab149813881e130fc51f698 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1688,9 +1688,9 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0382-Villager-Restocks-API.patch b/patches/server/0384-Villager-Restocks-API.patch similarity index 100% rename from patches/server/0382-Villager-Restocks-API.patch rename to patches/server/0384-Villager-Restocks-API.patch diff --git a/patches/server/0383-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0385-Validate-PickItem-Packet-and-kick-for-invalid.patch similarity index 100% rename from patches/server/0383-Validate-PickItem-Packet-and-kick-for-invalid.patch rename to patches/server/0385-Validate-PickItem-Packet-and-kick-for-invalid.patch diff --git a/patches/server/0384-Expose-game-version.patch b/patches/server/0386-Expose-game-version.patch similarity index 100% rename from patches/server/0384-Expose-game-version.patch rename to patches/server/0386-Expose-game-version.patch diff --git a/patches/server/0385-Optimize-Voxel-Shape-Merging.patch b/patches/server/0387-Optimize-Voxel-Shape-Merging.patch similarity index 100% rename from patches/server/0385-Optimize-Voxel-Shape-Merging.patch rename to patches/server/0387-Optimize-Voxel-Shape-Merging.patch diff --git a/patches/server/0386-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0388-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch similarity index 100% rename from patches/server/0386-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch rename to patches/server/0388-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch diff --git a/patches/server/0387-misc-debugging-dumps.patch b/patches/server/0389-misc-debugging-dumps.patch similarity index 100% rename from patches/server/0387-misc-debugging-dumps.patch rename to patches/server/0389-misc-debugging-dumps.patch diff --git a/patches/server/0388-Prevent-teleporting-dead-entities.patch b/patches/server/0390-Prevent-teleporting-dead-entities.patch similarity index 100% rename from patches/server/0388-Prevent-teleporting-dead-entities.patch rename to patches/server/0390-Prevent-teleporting-dead-entities.patch diff --git a/patches/server/0389-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0391-Deobfuscate-stacktraces-in-log-messages-crash-report.patch similarity index 100% rename from patches/server/0389-Deobfuscate-stacktraces-in-log-messages-crash-report.patch rename to patches/server/0391-Deobfuscate-stacktraces-in-log-messages-crash-report.patch diff --git a/patches/server/0390-Implement-Mob-Goal-API.patch b/patches/server/0392-Implement-Mob-Goal-API.patch similarity index 100% rename from patches/server/0390-Implement-Mob-Goal-API.patch rename to patches/server/0392-Implement-Mob-Goal-API.patch diff --git a/patches/server/0391-Add-villager-reputation-API.patch b/patches/server/0393-Add-villager-reputation-API.patch similarity index 100% rename from patches/server/0391-Add-villager-reputation-API.patch rename to patches/server/0393-Add-villager-reputation-API.patch diff --git a/patches/server/0392-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0394-Option-for-maximum-exp-value-when-merging-orbs.patch similarity index 100% rename from patches/server/0392-Option-for-maximum-exp-value-when-merging-orbs.patch rename to patches/server/0394-Option-for-maximum-exp-value-when-merging-orbs.patch diff --git a/patches/server/0393-ExperienceOrbMergeEvent.patch b/patches/server/0395-ExperienceOrbMergeEvent.patch similarity index 100% rename from patches/server/0393-ExperienceOrbMergeEvent.patch rename to patches/server/0395-ExperienceOrbMergeEvent.patch diff --git a/patches/server/0394-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0396-Fix-PotionEffect-ignores-icon-flag.patch similarity index 100% rename from patches/server/0394-Fix-PotionEffect-ignores-icon-flag.patch rename to patches/server/0396-Fix-PotionEffect-ignores-icon-flag.patch diff --git a/patches/server/0395-Optimize-brigadier-child-sorting-performance.patch b/patches/server/0397-Optimize-brigadier-child-sorting-performance.patch similarity index 100% rename from patches/server/0395-Optimize-brigadier-child-sorting-performance.patch rename to patches/server/0397-Optimize-brigadier-child-sorting-performance.patch diff --git a/patches/server/0396-Potential-bed-API.patch b/patches/server/0398-Potential-bed-API.patch similarity index 100% rename from patches/server/0396-Potential-bed-API.patch rename to patches/server/0398-Potential-bed-API.patch diff --git a/patches/server/0397-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0399-Wait-for-Async-Tasks-during-shutdown.patch similarity index 100% rename from patches/server/0397-Wait-for-Async-Tasks-during-shutdown.patch rename to patches/server/0399-Wait-for-Async-Tasks-during-shutdown.patch diff --git a/patches/server/0398-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0400-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch similarity index 100% rename from patches/server/0398-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch rename to patches/server/0400-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch diff --git a/patches/server/0399-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0401-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch similarity index 100% rename from patches/server/0399-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch rename to patches/server/0401-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch diff --git a/patches/server/0400-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0402-Reduce-allocation-of-Vec3D-by-entity-tracker.patch similarity index 100% rename from patches/server/0400-Reduce-allocation-of-Vec3D-by-entity-tracker.patch rename to patches/server/0402-Reduce-allocation-of-Vec3D-by-entity-tracker.patch diff --git a/patches/server/0401-Ensure-safe-gateway-teleport.patch b/patches/server/0403-Ensure-safe-gateway-teleport.patch similarity index 100% rename from patches/server/0401-Ensure-safe-gateway-teleport.patch rename to patches/server/0403-Ensure-safe-gateway-teleport.patch diff --git a/patches/server/0402-Add-option-for-console-having-all-permissions.patch b/patches/server/0404-Add-option-for-console-having-all-permissions.patch similarity index 100% rename from patches/server/0402-Add-option-for-console-having-all-permissions.patch rename to patches/server/0404-Add-option-for-console-having-all-permissions.patch diff --git a/patches/server/0403-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0405-Fix-villager-trading-demand-MC-163962.patch similarity index 100% rename from patches/server/0403-Fix-villager-trading-demand-MC-163962.patch rename to patches/server/0405-Fix-villager-trading-demand-MC-163962.patch diff --git a/patches/server/0404-Maps-shouldn-t-load-chunks.patch b/patches/server/0406-Maps-shouldn-t-load-chunks.patch similarity index 100% rename from patches/server/0404-Maps-shouldn-t-load-chunks.patch rename to patches/server/0406-Maps-shouldn-t-load-chunks.patch diff --git a/patches/server/0405-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0407-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch similarity index 100% rename from patches/server/0405-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch rename to patches/server/0407-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch diff --git a/patches/server/0406-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0408-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch similarity index 100% rename from patches/server/0406-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch rename to patches/server/0408-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch diff --git a/patches/server/0407-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0409-Fix-piston-physics-inconsistency-MC-188840.patch similarity index 100% rename from patches/server/0407-Fix-piston-physics-inconsistency-MC-188840.patch rename to patches/server/0409-Fix-piston-physics-inconsistency-MC-188840.patch diff --git a/patches/server/0408-Fix-sand-duping.patch b/patches/server/0410-Fix-sand-duping.patch similarity index 100% rename from patches/server/0408-Fix-sand-duping.patch rename to patches/server/0410-Fix-sand-duping.patch diff --git a/patches/server/0409-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0411-Fix-missing-chunks-due-to-integer-overflow.patch similarity index 100% rename from patches/server/0409-Fix-missing-chunks-due-to-integer-overflow.patch rename to patches/server/0411-Fix-missing-chunks-due-to-integer-overflow.patch diff --git a/patches/server/0410-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/server/0412-Prevent-position-desync-in-playerconnection-causing-.patch similarity index 100% rename from patches/server/0410-Prevent-position-desync-in-playerconnection-causing-.patch rename to patches/server/0412-Prevent-position-desync-in-playerconnection-causing-.patch diff --git a/patches/server/0411-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0413-Inventory-getHolder-method-without-block-snapshot.patch similarity index 100% rename from patches/server/0411-Inventory-getHolder-method-without-block-snapshot.patch rename to patches/server/0413-Inventory-getHolder-method-without-block-snapshot.patch diff --git a/patches/server/0412-Improve-Arrow-API.patch b/patches/server/0414-Improve-Arrow-API.patch similarity index 100% rename from patches/server/0412-Improve-Arrow-API.patch rename to patches/server/0414-Improve-Arrow-API.patch diff --git a/patches/server/0413-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0415-Add-and-implement-PlayerRecipeBookClickEvent.patch similarity index 100% rename from patches/server/0413-Add-and-implement-PlayerRecipeBookClickEvent.patch rename to patches/server/0415-Add-and-implement-PlayerRecipeBookClickEvent.patch diff --git a/patches/server/0414-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0416-Hide-sync-chunk-writes-behind-flag.patch similarity index 100% rename from patches/server/0414-Hide-sync-chunk-writes-behind-flag.patch rename to patches/server/0416-Hide-sync-chunk-writes-behind-flag.patch diff --git a/patches/server/0415-Add-permission-for-command-blocks.patch b/patches/server/0417-Add-permission-for-command-blocks.patch similarity index 100% rename from patches/server/0415-Add-permission-for-command-blocks.patch rename to patches/server/0417-Add-permission-for-command-blocks.patch diff --git a/patches/server/0416-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0418-Ensure-Entity-AABB-s-are-never-invalid.patch similarity index 100% rename from patches/server/0416-Ensure-Entity-AABB-s-are-never-invalid.patch rename to patches/server/0418-Ensure-Entity-AABB-s-are-never-invalid.patch diff --git a/patches/server/0417-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0419-Fix-Per-World-Difficulty-Remembering-Difficulty.patch similarity index 100% rename from patches/server/0417-Fix-Per-World-Difficulty-Remembering-Difficulty.patch rename to patches/server/0419-Fix-Per-World-Difficulty-Remembering-Difficulty.patch diff --git a/patches/server/0418-Paper-dumpitem-command.patch b/patches/server/0420-Paper-dumpitem-command.patch similarity index 100% rename from patches/server/0418-Paper-dumpitem-command.patch rename to patches/server/0420-Paper-dumpitem-command.patch diff --git a/patches/server/0419-Improve-Legacy-Component-serialization-size.patch b/patches/server/0421-Improve-Legacy-Component-serialization-size.patch similarity index 100% rename from patches/server/0419-Improve-Legacy-Component-serialization-size.patch rename to patches/server/0421-Improve-Legacy-Component-serialization-size.patch diff --git a/patches/server/0420-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0422-Optimize-Bit-Operations-by-inlining.patch similarity index 100% rename from patches/server/0420-Optimize-Bit-Operations-by-inlining.patch rename to patches/server/0422-Optimize-Bit-Operations-by-inlining.patch diff --git a/patches/server/0421-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0423-Add-Plugin-Tickets-to-API-Chunk-Methods.patch similarity index 100% rename from patches/server/0421-Add-Plugin-Tickets-to-API-Chunk-Methods.patch rename to patches/server/0423-Add-Plugin-Tickets-to-API-Chunk-Methods.patch diff --git a/patches/server/0422-incremental-chunk-and-player-saving.patch b/patches/server/0424-incremental-chunk-and-player-saving.patch similarity index 100% rename from patches/server/0422-incremental-chunk-and-player-saving.patch rename to patches/server/0424-incremental-chunk-and-player-saving.patch diff --git a/patches/server/0423-Support-old-UUID-format-for-NBT.patch b/patches/server/0425-Support-old-UUID-format-for-NBT.patch similarity index 100% rename from patches/server/0423-Support-old-UUID-format-for-NBT.patch rename to patches/server/0425-Support-old-UUID-format-for-NBT.patch diff --git a/patches/server/0424-Clean-up-duplicated-GameProfile-Properties.patch b/patches/server/0426-Clean-up-duplicated-GameProfile-Properties.patch similarity index 100% rename from patches/server/0424-Clean-up-duplicated-GameProfile-Properties.patch rename to patches/server/0426-Clean-up-duplicated-GameProfile-Properties.patch diff --git a/patches/server/0425-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0427-Convert-legacy-attributes-in-Item-Meta.patch similarity index 100% rename from patches/server/0425-Convert-legacy-attributes-in-Item-Meta.patch rename to patches/server/0427-Convert-legacy-attributes-in-Item-Meta.patch diff --git a/patches/server/0426-Remove-some-streams-from-structures.patch b/patches/server/0428-Remove-some-streams-from-structures.patch similarity index 100% rename from patches/server/0426-Remove-some-streams-from-structures.patch rename to patches/server/0428-Remove-some-streams-from-structures.patch diff --git a/patches/server/0427-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0429-Remove-streams-from-classes-related-villager-gossip.patch similarity index 100% rename from patches/server/0427-Remove-streams-from-classes-related-villager-gossip.patch rename to patches/server/0429-Remove-streams-from-classes-related-villager-gossip.patch diff --git a/patches/server/0428-Support-components-in-ItemMeta.patch b/patches/server/0430-Support-components-in-ItemMeta.patch similarity index 100% rename from patches/server/0428-Support-components-in-ItemMeta.patch rename to patches/server/0430-Support-components-in-ItemMeta.patch diff --git a/patches/server/0429-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/server/0431-Improve-fix-EntityTargetLivingEntityEvent.patch similarity index 100% rename from patches/server/0429-Improve-fix-EntityTargetLivingEntityEvent.patch rename to patches/server/0431-Improve-fix-EntityTargetLivingEntityEvent.patch diff --git a/patches/server/0430-Add-entity-liquid-API.patch b/patches/server/0432-Add-entity-liquid-API.patch similarity index 100% rename from patches/server/0430-Add-entity-liquid-API.patch rename to patches/server/0432-Add-entity-liquid-API.patch diff --git a/patches/server/0431-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0433-Update-itemstack-legacy-name-and-lore.patch similarity index 100% rename from patches/server/0431-Update-itemstack-legacy-name-and-lore.patch rename to patches/server/0433-Update-itemstack-legacy-name-and-lore.patch diff --git a/patches/server/0432-Spawn-player-in-correct-world-on-login.patch b/patches/server/0434-Spawn-player-in-correct-world-on-login.patch similarity index 100% rename from patches/server/0432-Spawn-player-in-correct-world-on-login.patch rename to patches/server/0434-Spawn-player-in-correct-world-on-login.patch diff --git a/patches/server/0433-Add-PrepareResultEvent.patch b/patches/server/0435-Add-PrepareResultEvent.patch similarity index 100% rename from patches/server/0433-Add-PrepareResultEvent.patch rename to patches/server/0435-Add-PrepareResultEvent.patch diff --git a/patches/server/0434-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0436-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch similarity index 91% rename from patches/server/0434-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch rename to patches/server/0436-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch index c84891c8c6..b08a447ef1 100644 --- a/patches/server/0434-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch +++ b/patches/server/0436-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't check chunk for portal on world gen entity add diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index d9ee22bbd654a2f39c443262b4a11f997ed1559e..84f56d1eb0075f1f3d3d52d1b893732c3804c276 100644 +index 258d055a368629154ab149813881e130fc51f698..a062c5117af949682ee9be87c860484f64a60f3e 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3484,7 +3484,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0435-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0437-Optimize-NetworkManager-Exception-Handling.patch similarity index 100% rename from patches/server/0435-Optimize-NetworkManager-Exception-Handling.patch rename to patches/server/0437-Optimize-NetworkManager-Exception-Handling.patch diff --git a/patches/server/0436-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0438-Fix-arrows-never-despawning-MC-125757.patch similarity index 100% rename from patches/server/0436-Fix-arrows-never-despawning-MC-125757.patch rename to patches/server/0438-Fix-arrows-never-despawning-MC-125757.patch diff --git a/patches/server/0437-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0439-Thread-Safe-Vanilla-Command-permission-checking.patch similarity index 100% rename from patches/server/0437-Thread-Safe-Vanilla-Command-permission-checking.patch rename to patches/server/0439-Thread-Safe-Vanilla-Command-permission-checking.patch diff --git a/patches/server/0438-Fix-SPIGOT-5989.patch b/patches/server/0440-Fix-SPIGOT-5989.patch similarity index 100% rename from patches/server/0438-Fix-SPIGOT-5989.patch rename to patches/server/0440-Fix-SPIGOT-5989.patch diff --git a/patches/server/0439-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0441-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch similarity index 100% rename from patches/server/0439-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch rename to patches/server/0441-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch diff --git a/patches/server/0440-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0442-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch similarity index 100% rename from patches/server/0440-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch rename to patches/server/0442-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch diff --git a/patches/server/0441-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0443-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch similarity index 100% rename from patches/server/0441-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch rename to patches/server/0443-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch diff --git a/patches/server/0442-Fix-some-rails-connecting-improperly.patch b/patches/server/0444-Fix-some-rails-connecting-improperly.patch similarity index 100% rename from patches/server/0442-Fix-some-rails-connecting-improperly.patch rename to patches/server/0444-Fix-some-rails-connecting-improperly.patch diff --git a/patches/server/0443-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0445-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch similarity index 100% rename from patches/server/0443-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch rename to patches/server/0445-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch diff --git a/patches/server/0444-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0446-Do-not-let-the-server-load-chunks-from-newer-version.patch similarity index 88% rename from patches/server/0444-Do-not-let-the-server-load-chunks-from-newer-version.patch rename to patches/server/0446-Do-not-let-the-server-load-chunks-from-newer-version.patch index 58df75a5c8..a8ed7c9f94 100644 --- a/patches/server/0444-Do-not-let-the-server-load-chunks-from-newer-version.patch +++ b/patches/server/0446-Do-not-let-the-server-load-chunks-from-newer-version.patch @@ -9,10 +9,10 @@ the game, immediately stop the server to prevent data corruption. You can override this functionality at your own peril. diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java -index a7ee469bb2880a78540b79ae691ea449dfe22ce4..b417b175c925049058327c7bc4ed1cc31a644018 100644 +index 0d8cfc0808a8f204d57cec40929b489099eca815..40372e47f33d2e6ff164a00d964e8d965f1fd323 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java -@@ -112,8 +112,20 @@ public class ChunkSerializer { +@@ -124,8 +124,20 @@ public class ChunkSerializer { InProgressChunkHolder holder = loadChunk(world, poiStorage, chunkPos, nbt, true); return holder.protoChunk; } @@ -31,5 +31,5 @@ index a7ee469bb2880a78540b79ae691ea449dfe22ce4..b417b175c925049058327c7bc4ed1cc3 + } + } // Paper end - ChunkPos chunkcoordintpair1 = new ChunkPos(nbt.getInt("xPos"), nbt.getInt("zPos")); + ChunkPos chunkcoordintpair1 = new ChunkPos(nbt.getInt("xPos"), nbt.getInt("zPos")); // Paper - diff on change, see ChunkSerializer#getChunkCoordinate diff --git a/patches/server/0445-Brand-support.patch b/patches/server/0447-Brand-support.patch similarity index 100% rename from patches/server/0445-Brand-support.patch rename to patches/server/0447-Brand-support.patch diff --git a/patches/server/0446-Add-setMaxPlayers-API.patch b/patches/server/0448-Add-setMaxPlayers-API.patch similarity index 100% rename from patches/server/0446-Add-setMaxPlayers-API.patch rename to patches/server/0448-Add-setMaxPlayers-API.patch diff --git a/patches/server/0447-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0449-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from patches/server/0447-Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/server/0449-Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/patches/server/0448-Don-t-require-FACING-data.patch b/patches/server/0450-Don-t-require-FACING-data.patch similarity index 100% rename from patches/server/0448-Don-t-require-FACING-data.patch rename to patches/server/0450-Don-t-require-FACING-data.patch diff --git a/patches/server/0449-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0451-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch similarity index 100% rename from patches/server/0449-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch rename to patches/server/0451-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch diff --git a/patches/server/0450-Add-moon-phase-API.patch b/patches/server/0452-Add-moon-phase-API.patch similarity index 100% rename from patches/server/0450-Add-moon-phase-API.patch rename to patches/server/0452-Add-moon-phase-API.patch diff --git a/patches/server/0451-Prevent-headless-pistons-from-being-created.patch b/patches/server/0453-Prevent-headless-pistons-from-being-created.patch similarity index 100% rename from patches/server/0451-Prevent-headless-pistons-from-being-created.patch rename to patches/server/0453-Prevent-headless-pistons-from-being-created.patch diff --git a/patches/server/0452-Add-BellRingEvent.patch b/patches/server/0454-Add-BellRingEvent.patch similarity index 100% rename from patches/server/0452-Add-BellRingEvent.patch rename to patches/server/0454-Add-BellRingEvent.patch diff --git a/patches/server/0453-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0455-Add-zombie-targets-turtle-egg-config.patch similarity index 100% rename from patches/server/0453-Add-zombie-targets-turtle-egg-config.patch rename to patches/server/0455-Add-zombie-targets-turtle-egg-config.patch diff --git a/patches/server/0454-Buffer-joins-to-world.patch b/patches/server/0456-Buffer-joins-to-world.patch similarity index 100% rename from patches/server/0454-Buffer-joins-to-world.patch rename to patches/server/0456-Buffer-joins-to-world.patch diff --git a/patches/server/0455-Eigencraft-redstone-implementation.patch b/patches/server/0457-Eigencraft-redstone-implementation.patch similarity index 100% rename from patches/server/0455-Eigencraft-redstone-implementation.patch rename to patches/server/0457-Eigencraft-redstone-implementation.patch diff --git a/patches/server/0456-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0458-Fix-hex-colors-not-working-in-some-kick-messages.patch similarity index 100% rename from patches/server/0456-Fix-hex-colors-not-working-in-some-kick-messages.patch rename to patches/server/0458-Fix-hex-colors-not-working-in-some-kick-messages.patch diff --git a/patches/server/0457-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0459-PortalCreateEvent-needs-to-know-its-entity.patch similarity index 100% rename from patches/server/0457-PortalCreateEvent-needs-to-know-its-entity.patch rename to patches/server/0459-PortalCreateEvent-needs-to-know-its-entity.patch diff --git a/patches/server/0458-Fix-CraftTeam-null-check.patch b/patches/server/0460-Fix-CraftTeam-null-check.patch similarity index 100% rename from patches/server/0458-Fix-CraftTeam-null-check.patch rename to patches/server/0460-Fix-CraftTeam-null-check.patch diff --git a/patches/server/0459-Add-more-Evoker-API.patch b/patches/server/0461-Add-more-Evoker-API.patch similarity index 100% rename from patches/server/0459-Add-more-Evoker-API.patch rename to patches/server/0461-Add-more-Evoker-API.patch diff --git a/patches/server/0460-Add-methods-to-get-translation-keys.patch b/patches/server/0462-Add-methods-to-get-translation-keys.patch similarity index 100% rename from patches/server/0460-Add-methods-to-get-translation-keys.patch rename to patches/server/0462-Add-methods-to-get-translation-keys.patch diff --git a/patches/server/0461-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0463-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from patches/server/0461-Create-HoverEvent-from-ItemStack-Entity.patch rename to patches/server/0463-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/patches/server/0462-Cache-block-data-strings.patch b/patches/server/0464-Cache-block-data-strings.patch similarity index 100% rename from patches/server/0462-Cache-block-data-strings.patch rename to patches/server/0464-Cache-block-data-strings.patch diff --git a/patches/server/0463-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0465-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch similarity index 100% rename from patches/server/0463-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch rename to patches/server/0465-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch diff --git a/patches/server/0464-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0466-Add-additional-open-container-api-to-HumanEntity.patch similarity index 100% rename from patches/server/0464-Add-additional-open-container-api-to-HumanEntity.patch rename to patches/server/0466-Add-additional-open-container-api-to-HumanEntity.patch diff --git a/patches/server/0465-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0467-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch similarity index 100% rename from patches/server/0465-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch rename to patches/server/0467-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch diff --git a/patches/server/0466-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0468-Extend-block-drop-capture-to-capture-all-items-added.patch similarity index 100% rename from patches/server/0466-Extend-block-drop-capture-to-capture-all-items-added.patch rename to patches/server/0468-Extend-block-drop-capture-to-capture-all-items-added.patch diff --git a/patches/server/0467-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0469-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch similarity index 100% rename from patches/server/0467-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch rename to patches/server/0469-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch diff --git a/patches/server/0468-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0470-Lazily-track-plugin-scoreboards-by-default.patch similarity index 100% rename from patches/server/0468-Lazily-track-plugin-scoreboards-by-default.patch rename to patches/server/0470-Lazily-track-plugin-scoreboards-by-default.patch diff --git a/patches/server/0469-Entity-isTicking.patch b/patches/server/0471-Entity-isTicking.patch similarity index 100% rename from patches/server/0469-Entity-isTicking.patch rename to patches/server/0471-Entity-isTicking.patch diff --git a/patches/server/0470-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0472-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch similarity index 100% rename from patches/server/0470-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch rename to patches/server/0472-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch diff --git a/patches/server/0471-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0473-Fix-Concurrency-issue-in-ShufflingList.patch similarity index 100% rename from patches/server/0471-Fix-Concurrency-issue-in-ShufflingList.patch rename to patches/server/0473-Fix-Concurrency-issue-in-ShufflingList.patch diff --git a/patches/server/0472-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0474-Reset-Ender-Crystals-on-Dragon-Spawn.patch similarity index 100% rename from patches/server/0472-Reset-Ender-Crystals-on-Dragon-Spawn.patch rename to patches/server/0474-Reset-Ender-Crystals-on-Dragon-Spawn.patch diff --git a/patches/server/0473-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0475-Fix-for-large-move-vectors-crashing-server.patch similarity index 100% rename from patches/server/0473-Fix-for-large-move-vectors-crashing-server.patch rename to patches/server/0475-Fix-for-large-move-vectors-crashing-server.patch diff --git a/patches/server/0474-Optimise-getType-calls.patch b/patches/server/0476-Optimise-getType-calls.patch similarity index 100% rename from patches/server/0474-Optimise-getType-calls.patch rename to patches/server/0476-Optimise-getType-calls.patch diff --git a/patches/server/0475-Villager-resetOffers.patch b/patches/server/0477-Villager-resetOffers.patch similarity index 100% rename from patches/server/0475-Villager-resetOffers.patch rename to patches/server/0477-Villager-resetOffers.patch diff --git a/patches/server/0476-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0478-Retain-block-place-order-when-capturing-blockstates.patch similarity index 100% rename from patches/server/0476-Retain-block-place-order-when-capturing-blockstates.patch rename to patches/server/0478-Retain-block-place-order-when-capturing-blockstates.patch diff --git a/patches/server/0477-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0479-Reduce-blockpos-allocation-from-pathfinding.patch similarity index 100% rename from patches/server/0477-Reduce-blockpos-allocation-from-pathfinding.patch rename to patches/server/0479-Reduce-blockpos-allocation-from-pathfinding.patch diff --git a/patches/server/0478-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0480-Fix-item-locations-dropped-from-campfires.patch similarity index 100% rename from patches/server/0478-Fix-item-locations-dropped-from-campfires.patch rename to patches/server/0480-Fix-item-locations-dropped-from-campfires.patch diff --git a/patches/server/0479-Player-elytra-boost-API.patch b/patches/server/0481-Player-elytra-boost-API.patch similarity index 100% rename from patches/server/0479-Player-elytra-boost-API.patch rename to patches/server/0481-Player-elytra-boost-API.patch diff --git a/patches/server/0480-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0482-Fixed-TileEntityBell-memory-leak.patch similarity index 100% rename from patches/server/0480-Fixed-TileEntityBell-memory-leak.patch rename to patches/server/0482-Fixed-TileEntityBell-memory-leak.patch diff --git a/patches/server/0481-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0483-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch similarity index 100% rename from patches/server/0481-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch rename to patches/server/0483-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch diff --git a/patches/server/0482-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0484-Add-getOfflinePlayerIfCached-String.patch similarity index 100% rename from patches/server/0482-Add-getOfflinePlayerIfCached-String.patch rename to patches/server/0484-Add-getOfflinePlayerIfCached-String.patch diff --git a/patches/server/0483-Add-ignore-discounts-API.patch b/patches/server/0485-Add-ignore-discounts-API.patch similarity index 100% rename from patches/server/0483-Add-ignore-discounts-API.patch rename to patches/server/0485-Add-ignore-discounts-API.patch diff --git a/patches/server/0484-Toggle-for-removing-existing-dragon.patch b/patches/server/0486-Toggle-for-removing-existing-dragon.patch similarity index 100% rename from patches/server/0484-Toggle-for-removing-existing-dragon.patch rename to patches/server/0486-Toggle-for-removing-existing-dragon.patch diff --git a/patches/server/0485-Fix-client-lag-on-advancement-loading.patch b/patches/server/0487-Fix-client-lag-on-advancement-loading.patch similarity index 100% rename from patches/server/0485-Fix-client-lag-on-advancement-loading.patch rename to patches/server/0487-Fix-client-lag-on-advancement-loading.patch diff --git a/patches/server/0486-Item-no-age-no-player-pickup.patch b/patches/server/0488-Item-no-age-no-player-pickup.patch similarity index 100% rename from patches/server/0486-Item-no-age-no-player-pickup.patch rename to patches/server/0488-Item-no-age-no-player-pickup.patch diff --git a/patches/server/0487-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0489-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch similarity index 100% rename from patches/server/0487-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch rename to patches/server/0489-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch diff --git a/patches/server/0488-Beacon-API-custom-effect-ranges.patch b/patches/server/0490-Beacon-API-custom-effect-ranges.patch similarity index 100% rename from patches/server/0488-Beacon-API-custom-effect-ranges.patch rename to patches/server/0490-Beacon-API-custom-effect-ranges.patch diff --git a/patches/server/0489-Add-API-for-quit-reason.patch b/patches/server/0491-Add-API-for-quit-reason.patch similarity index 100% rename from patches/server/0489-Add-API-for-quit-reason.patch rename to patches/server/0491-Add-API-for-quit-reason.patch diff --git a/patches/server/0490-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0492-Add-Wandering-Trader-spawn-rate-config-options.patch similarity index 100% rename from patches/server/0490-Add-Wandering-Trader-spawn-rate-config-options.patch rename to patches/server/0492-Add-Wandering-Trader-spawn-rate-config-options.patch diff --git a/patches/server/0491-Expose-world-spawn-angle.patch b/patches/server/0493-Expose-world-spawn-angle.patch similarity index 100% rename from patches/server/0491-Expose-world-spawn-angle.patch rename to patches/server/0493-Expose-world-spawn-angle.patch diff --git a/patches/server/0492-Add-Destroy-Speed-API.patch b/patches/server/0494-Add-Destroy-Speed-API.patch similarity index 100% rename from patches/server/0492-Add-Destroy-Speed-API.patch rename to patches/server/0494-Add-Destroy-Speed-API.patch diff --git a/patches/server/0493-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0495-Fix-Player-spawnParticle-x-y-z-precision-loss.patch similarity index 100% rename from patches/server/0493-Fix-Player-spawnParticle-x-y-z-precision-loss.patch rename to patches/server/0495-Fix-Player-spawnParticle-x-y-z-precision-loss.patch diff --git a/patches/server/0494-Add-LivingEntity-clearActiveItem.patch b/patches/server/0496-Add-LivingEntity-clearActiveItem.patch similarity index 100% rename from patches/server/0494-Add-LivingEntity-clearActiveItem.patch rename to patches/server/0496-Add-LivingEntity-clearActiveItem.patch diff --git a/patches/server/0495-Add-PlayerItemCooldownEvent.patch b/patches/server/0497-Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/server/0495-Add-PlayerItemCooldownEvent.patch rename to patches/server/0497-Add-PlayerItemCooldownEvent.patch diff --git a/patches/server/0496-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0498-Significantly-improve-performance-of-the-end-generat.patch similarity index 100% rename from patches/server/0496-Significantly-improve-performance-of-the-end-generat.patch rename to patches/server/0498-Significantly-improve-performance-of-the-end-generat.patch diff --git a/patches/server/0497-More-lightning-API.patch b/patches/server/0499-More-lightning-API.patch similarity index 100% rename from patches/server/0497-More-lightning-API.patch rename to patches/server/0499-More-lightning-API.patch diff --git a/patches/server/0498-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0500-Climbing-should-not-bypass-cramming-gamerule.patch similarity index 98% rename from patches/server/0498-Climbing-should-not-bypass-cramming-gamerule.patch rename to patches/server/0500-Climbing-should-not-bypass-cramming-gamerule.patch index f42c613548..aa8f094a05 100644 --- a/patches/server/0498-Climbing-should-not-bypass-cramming-gamerule.patch +++ b/patches/server/0500-Climbing-should-not-bypass-cramming-gamerule.patch @@ -45,7 +45,7 @@ index d15e62da0307728a7c2be191a27f87da1bb29f49..de06ae3e8757c923a6f3f475a34885d2 } else if (entity.level().isClientSide && (!(entity1 instanceof Player) || !((Player) entity1).isLocalPlayer())) { return false; diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 84f56d1eb0075f1f3d3d52d1b893732c3804c276..922e953234998f1322cb9fb72b02321b7975a674 100644 +index a062c5117af949682ee9be87c860484f64a60f3e..9413fc2010804c9524ad754249916432b3ff4543 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3405,7 +3405,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0499-Added-missing-default-perms-for-commands.patch b/patches/server/0501-Added-missing-default-perms-for-commands.patch similarity index 100% rename from patches/server/0499-Added-missing-default-perms-for-commands.patch rename to patches/server/0501-Added-missing-default-perms-for-commands.patch diff --git a/patches/server/0500-Add-PlayerShearBlockEvent.patch b/patches/server/0502-Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/server/0500-Add-PlayerShearBlockEvent.patch rename to patches/server/0502-Add-PlayerShearBlockEvent.patch diff --git a/patches/server/0501-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0503-Fix-curing-zombie-villager-discount-exploit.patch similarity index 100% rename from patches/server/0501-Fix-curing-zombie-villager-discount-exploit.patch rename to patches/server/0503-Fix-curing-zombie-villager-discount-exploit.patch diff --git a/patches/server/0502-Limit-recipe-packets.patch b/patches/server/0504-Limit-recipe-packets.patch similarity index 100% rename from patches/server/0502-Limit-recipe-packets.patch rename to patches/server/0504-Limit-recipe-packets.patch diff --git a/patches/server/0503-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0505-Fix-CraftSound-backwards-compatibility.patch similarity index 100% rename from patches/server/0503-Fix-CraftSound-backwards-compatibility.patch rename to patches/server/0505-Fix-CraftSound-backwards-compatibility.patch diff --git a/patches/server/0504-Player-Chunk-Load-Unload-Events.patch b/patches/server/0506-Player-Chunk-Load-Unload-Events.patch similarity index 100% rename from patches/server/0504-Player-Chunk-Load-Unload-Events.patch rename to patches/server/0506-Player-Chunk-Load-Unload-Events.patch diff --git a/patches/server/0505-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0507-Optimize-Dynamic-get-Missing-Keys.patch similarity index 100% rename from patches/server/0505-Optimize-Dynamic-get-Missing-Keys.patch rename to patches/server/0507-Optimize-Dynamic-get-Missing-Keys.patch diff --git a/patches/server/0506-Expose-LivingEntity-hurt-direction.patch b/patches/server/0508-Expose-LivingEntity-hurt-direction.patch similarity index 100% rename from patches/server/0506-Expose-LivingEntity-hurt-direction.patch rename to patches/server/0508-Expose-LivingEntity-hurt-direction.patch diff --git a/patches/server/0507-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0509-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from patches/server/0507-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/server/0509-Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/patches/server/0508-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0510-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch similarity index 100% rename from patches/server/0508-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch rename to patches/server/0510-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch diff --git a/patches/server/0509-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0511-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch similarity index 100% rename from patches/server/0509-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch rename to patches/server/0511-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch diff --git a/patches/server/0510-Implement-TargetHitEvent.patch b/patches/server/0512-Implement-TargetHitEvent.patch similarity index 100% rename from patches/server/0510-Implement-TargetHitEvent.patch rename to patches/server/0512-Implement-TargetHitEvent.patch diff --git a/patches/server/0511-MC-4-Fix-item-position-desync.patch b/patches/server/0513-MC-4-Fix-item-position-desync.patch similarity index 100% rename from patches/server/0511-MC-4-Fix-item-position-desync.patch rename to patches/server/0513-MC-4-Fix-item-position-desync.patch diff --git a/patches/server/0512-Additional-Block-Material-API-s.patch b/patches/server/0514-Additional-Block-Material-API-s.patch similarity index 100% rename from patches/server/0512-Additional-Block-Material-API-s.patch rename to patches/server/0514-Additional-Block-Material-API-s.patch diff --git a/patches/server/0513-Fix-harming-potion-dupe.patch b/patches/server/0515-Fix-harming-potion-dupe.patch similarity index 100% rename from patches/server/0513-Fix-harming-potion-dupe.patch rename to patches/server/0515-Fix-harming-potion-dupe.patch diff --git a/patches/server/0514-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0516-Implement-API-to-get-Material-from-Boats-and-Minecar.patch similarity index 100% rename from patches/server/0514-Implement-API-to-get-Material-from-Boats-and-Minecar.patch rename to patches/server/0516-Implement-API-to-get-Material-from-Boats-and-Minecar.patch diff --git a/patches/server/0515-Cache-burn-durations.patch b/patches/server/0517-Cache-burn-durations.patch similarity index 100% rename from patches/server/0515-Cache-burn-durations.patch rename to patches/server/0517-Cache-burn-durations.patch diff --git a/patches/server/0516-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0518-Allow-disabling-mob-spawner-spawn-egg-transformation.patch similarity index 100% rename from patches/server/0516-Allow-disabling-mob-spawner-spawn-egg-transformation.patch rename to patches/server/0518-Allow-disabling-mob-spawner-spawn-egg-transformation.patch diff --git a/patches/server/0517-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0519-Fix-Not-a-string-Map-Conversion-spam.patch similarity index 100% rename from patches/server/0517-Fix-Not-a-string-Map-Conversion-spam.patch rename to patches/server/0519-Fix-Not-a-string-Map-Conversion-spam.patch diff --git a/patches/server/0518-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0520-Implement-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/server/0518-Implement-PlayerFlowerPotManipulateEvent.patch rename to patches/server/0520-Implement-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/server/0519-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0521-Fix-interact-event-not-being-called-in-adventure.patch similarity index 100% rename from patches/server/0519-Fix-interact-event-not-being-called-in-adventure.patch rename to patches/server/0521-Fix-interact-event-not-being-called-in-adventure.patch diff --git a/patches/server/0520-Zombie-API-breaking-doors.patch b/patches/server/0522-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/server/0520-Zombie-API-breaking-doors.patch rename to patches/server/0522-Zombie-API-breaking-doors.patch diff --git a/patches/server/0521-Fix-nerfed-slime-when-splitting.patch b/patches/server/0523-Fix-nerfed-slime-when-splitting.patch similarity index 100% rename from patches/server/0521-Fix-nerfed-slime-when-splitting.patch rename to patches/server/0523-Fix-nerfed-slime-when-splitting.patch diff --git a/patches/server/0522-Add-EntityLoadCrossbowEvent.patch b/patches/server/0524-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/server/0522-Add-EntityLoadCrossbowEvent.patch rename to patches/server/0524-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/server/0523-Added-WorldGameRuleChangeEvent.patch b/patches/server/0525-Added-WorldGameRuleChangeEvent.patch similarity index 100% rename from patches/server/0523-Added-WorldGameRuleChangeEvent.patch rename to patches/server/0525-Added-WorldGameRuleChangeEvent.patch diff --git a/patches/server/0524-Added-ServerResourcesReloadedEvent.patch b/patches/server/0526-Added-ServerResourcesReloadedEvent.patch similarity index 100% rename from patches/server/0524-Added-ServerResourcesReloadedEvent.patch rename to patches/server/0526-Added-ServerResourcesReloadedEvent.patch diff --git a/patches/server/0525-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0527-Added-world-settings-for-mobs-picking-up-loot.patch similarity index 100% rename from patches/server/0525-Added-world-settings-for-mobs-picking-up-loot.patch rename to patches/server/0527-Added-world-settings-for-mobs-picking-up-loot.patch diff --git a/patches/server/0526-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0528-Implemented-BlockFailedDispenseEvent.patch similarity index 100% rename from patches/server/0526-Implemented-BlockFailedDispenseEvent.patch rename to patches/server/0528-Implemented-BlockFailedDispenseEvent.patch diff --git a/patches/server/0527-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0529-Added-PlayerLecternPageChangeEvent.patch similarity index 100% rename from patches/server/0527-Added-PlayerLecternPageChangeEvent.patch rename to patches/server/0529-Added-PlayerLecternPageChangeEvent.patch diff --git a/patches/server/0528-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0530-Added-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from patches/server/0528-Added-PlayerLoomPatternSelectEvent.patch rename to patches/server/0530-Added-PlayerLoomPatternSelectEvent.patch diff --git a/patches/server/0529-Configurable-door-breaking-difficulty.patch b/patches/server/0531-Configurable-door-breaking-difficulty.patch similarity index 100% rename from patches/server/0529-Configurable-door-breaking-difficulty.patch rename to patches/server/0531-Configurable-door-breaking-difficulty.patch diff --git a/patches/server/0530-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0532-Empty-commands-shall-not-be-dispatched.patch similarity index 100% rename from patches/server/0530-Empty-commands-shall-not-be-dispatched.patch rename to patches/server/0532-Empty-commands-shall-not-be-dispatched.patch diff --git a/patches/server/0531-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0533-Implement-API-to-expose-exact-interaction-point.patch similarity index 100% rename from patches/server/0531-Implement-API-to-expose-exact-interaction-point.patch rename to patches/server/0533-Implement-API-to-expose-exact-interaction-point.patch diff --git a/patches/server/0532-Remove-stale-POIs.patch b/patches/server/0534-Remove-stale-POIs.patch similarity index 100% rename from patches/server/0532-Remove-stale-POIs.patch rename to patches/server/0534-Remove-stale-POIs.patch diff --git a/patches/server/0533-Fix-villager-boat-exploit.patch b/patches/server/0535-Fix-villager-boat-exploit.patch similarity index 100% rename from patches/server/0533-Fix-villager-boat-exploit.patch rename to patches/server/0535-Fix-villager-boat-exploit.patch diff --git a/patches/server/0534-Add-sendOpLevel-API.patch b/patches/server/0536-Add-sendOpLevel-API.patch similarity index 100% rename from patches/server/0534-Add-sendOpLevel-API.patch rename to patches/server/0536-Add-sendOpLevel-API.patch diff --git a/patches/server/0535-TODO-Registry-Modification-API.patch b/patches/server/0537-TODO-Registry-Modification-API.patch similarity index 100% rename from patches/server/0535-TODO-Registry-Modification-API.patch rename to patches/server/0537-TODO-Registry-Modification-API.patch diff --git a/patches/server/0536-Add-StructuresLocateEvent.patch b/patches/server/0538-Add-StructuresLocateEvent.patch similarity index 100% rename from patches/server/0536-Add-StructuresLocateEvent.patch rename to patches/server/0538-Add-StructuresLocateEvent.patch diff --git a/patches/server/0537-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0539-Collision-option-for-requiring-a-player-participant.patch similarity index 100% rename from patches/server/0537-Collision-option-for-requiring-a-player-participant.patch rename to patches/server/0539-Collision-option-for-requiring-a-player-participant.patch diff --git a/patches/server/0538-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0540-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch similarity index 100% rename from patches/server/0538-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch rename to patches/server/0540-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch diff --git a/patches/server/0539-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0541-Return-chat-component-with-empty-text-instead-of-thr.patch similarity index 100% rename from patches/server/0539-Return-chat-component-with-empty-text-instead-of-thr.patch rename to patches/server/0541-Return-chat-component-with-empty-text-instead-of-thr.patch diff --git a/patches/server/0540-Make-schedule-command-per-world.patch b/patches/server/0542-Make-schedule-command-per-world.patch similarity index 100% rename from patches/server/0540-Make-schedule-command-per-world.patch rename to patches/server/0542-Make-schedule-command-per-world.patch diff --git a/patches/server/0541-Configurable-max-leash-distance.patch b/patches/server/0543-Configurable-max-leash-distance.patch similarity index 100% rename from patches/server/0541-Configurable-max-leash-distance.patch rename to patches/server/0543-Configurable-max-leash-distance.patch diff --git a/patches/server/0542-Implement-BlockPreDispenseEvent.patch b/patches/server/0544-Implement-BlockPreDispenseEvent.patch similarity index 100% rename from patches/server/0542-Implement-BlockPreDispenseEvent.patch rename to patches/server/0544-Implement-BlockPreDispenseEvent.patch diff --git a/patches/server/0543-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0545-Added-firing-of-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/server/0543-Added-firing-of-PlayerChangeBeaconEffectEvent.patch rename to patches/server/0545-Added-firing-of-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/server/0544-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0546-Add-toggle-for-always-placing-the-dragon-egg.patch similarity index 100% rename from patches/server/0544-Add-toggle-for-always-placing-the-dragon-egg.patch rename to patches/server/0546-Add-toggle-for-always-placing-the-dragon-egg.patch diff --git a/patches/server/0545-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0547-Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/server/0545-Added-PlayerStonecutterRecipeSelectEvent.patch rename to patches/server/0547-Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/server/0546-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0548-Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 100% rename from patches/server/0546-Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to patches/server/0548-Add-dropLeash-variable-to-EntityUnleashEvent.patch diff --git a/patches/server/0547-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0549-Reset-shield-blocking-on-dimension-change.patch similarity index 100% rename from patches/server/0547-Reset-shield-blocking-on-dimension-change.patch rename to patches/server/0549-Reset-shield-blocking-on-dimension-change.patch diff --git a/patches/server/0548-add-DragonEggFormEvent.patch b/patches/server/0550-add-DragonEggFormEvent.patch similarity index 100% rename from patches/server/0548-add-DragonEggFormEvent.patch rename to patches/server/0550-add-DragonEggFormEvent.patch diff --git a/patches/server/0549-EntityMoveEvent.patch b/patches/server/0551-EntityMoveEvent.patch similarity index 97% rename from patches/server/0549-EntityMoveEvent.patch rename to patches/server/0551-EntityMoveEvent.patch index 390bdf2537..0439d42bdd 100644 --- a/patches/server/0549-EntityMoveEvent.patch +++ b/patches/server/0551-EntityMoveEvent.patch @@ -29,7 +29,7 @@ index 7cb5dc1d0badba864705386d70b69dc3a6790284..896168b532cf42cae4911a35c0d5d6dd final Throwable thr = new Throwable(entity + " Added to world at " + new java.util.Date()); io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateThrowable(thr); diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 922e953234998f1322cb9fb72b02321b7975a674..7952ba7e7e9f36fe6dea851dbc239d39ff61a74a 100644 +index 9413fc2010804c9524ad754249916432b3ff4543..6f0dc5e3a9bd2c3e7c65fe6f93966cd579536a9c 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3340,6 +3340,20 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0550-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0552-added-option-to-disable-pathfinding-updates-on-block.patch similarity index 100% rename from patches/server/0550-added-option-to-disable-pathfinding-updates-on-block.patch rename to patches/server/0552-added-option-to-disable-pathfinding-updates-on-block.patch diff --git a/patches/server/0551-Inline-shift-direction-fields.patch b/patches/server/0553-Inline-shift-direction-fields.patch similarity index 100% rename from patches/server/0551-Inline-shift-direction-fields.patch rename to patches/server/0553-Inline-shift-direction-fields.patch diff --git a/patches/server/0552-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0554-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/server/0552-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/server/0554-Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/server/0553-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0555-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/server/0553-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/server/0555-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/server/0554-living-entity-allow-attribute-registration.patch b/patches/server/0556-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/server/0554-living-entity-allow-attribute-registration.patch rename to patches/server/0556-living-entity-allow-attribute-registration.patch diff --git a/patches/server/0555-fix-dead-slime-setSize-invincibility.patch b/patches/server/0557-fix-dead-slime-setSize-invincibility.patch similarity index 100% rename from patches/server/0555-fix-dead-slime-setSize-invincibility.patch rename to patches/server/0557-fix-dead-slime-setSize-invincibility.patch diff --git a/patches/server/0556-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0558-Merchant-getRecipes-should-return-an-immutable-list.patch similarity index 100% rename from patches/server/0556-Merchant-getRecipes-should-return-an-immutable-list.patch rename to patches/server/0558-Merchant-getRecipes-should-return-an-immutable-list.patch diff --git a/patches/server/0557-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0559-Add-support-for-hex-color-codes-in-console.patch similarity index 100% rename from patches/server/0557-Add-support-for-hex-color-codes-in-console.patch rename to patches/server/0559-Add-support-for-hex-color-codes-in-console.patch diff --git a/patches/server/0558-Expose-Tracked-Players.patch b/patches/server/0560-Expose-Tracked-Players.patch similarity index 100% rename from patches/server/0558-Expose-Tracked-Players.patch rename to patches/server/0560-Expose-Tracked-Players.patch diff --git a/patches/server/0559-Remove-streams-from-SensorNearest.patch b/patches/server/0561-Remove-streams-from-SensorNearest.patch similarity index 100% rename from patches/server/0559-Remove-streams-from-SensorNearest.patch rename to patches/server/0561-Remove-streams-from-SensorNearest.patch diff --git a/patches/server/0560-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0562-Throw-proper-exception-on-empty-JsonList-file.patch similarity index 100% rename from patches/server/0560-Throw-proper-exception-on-empty-JsonList-file.patch rename to patches/server/0562-Throw-proper-exception-on-empty-JsonList-file.patch diff --git a/patches/server/0561-Improve-ServerGUI.patch b/patches/server/0563-Improve-ServerGUI.patch similarity index 100% rename from patches/server/0561-Improve-ServerGUI.patch rename to patches/server/0563-Improve-ServerGUI.patch diff --git a/patches/server/0562-fix-converting-txt-to-json-file.patch b/patches/server/0564-fix-converting-txt-to-json-file.patch similarity index 100% rename from patches/server/0562-fix-converting-txt-to-json-file.patch rename to patches/server/0564-fix-converting-txt-to-json-file.patch diff --git a/patches/server/0563-Add-worldborder-events.patch b/patches/server/0565-Add-worldborder-events.patch similarity index 100% rename from patches/server/0563-Add-worldborder-events.patch rename to patches/server/0565-Add-worldborder-events.patch diff --git a/patches/server/0564-added-PlayerNameEntityEvent.patch b/patches/server/0566-added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/server/0564-added-PlayerNameEntityEvent.patch rename to patches/server/0566-added-PlayerNameEntityEvent.patch diff --git a/patches/server/0565-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0567-Prevent-grindstones-from-overstacking-items.patch similarity index 100% rename from patches/server/0565-Prevent-grindstones-from-overstacking-items.patch rename to patches/server/0567-Prevent-grindstones-from-overstacking-items.patch diff --git a/patches/server/0566-Add-recipe-to-cook-events.patch b/patches/server/0568-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/server/0566-Add-recipe-to-cook-events.patch rename to patches/server/0568-Add-recipe-to-cook-events.patch diff --git a/patches/server/0567-Add-Block-isValidTool.patch b/patches/server/0569-Add-Block-isValidTool.patch similarity index 100% rename from patches/server/0567-Add-Block-isValidTool.patch rename to patches/server/0569-Add-Block-isValidTool.patch diff --git a/patches/server/0568-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0570-Allow-using-signs-inside-spawn-protection.patch similarity index 100% rename from patches/server/0568-Allow-using-signs-inside-spawn-protection.patch rename to patches/server/0570-Allow-using-signs-inside-spawn-protection.patch diff --git a/patches/server/0569-Expand-world-key-API.patch b/patches/server/0571-Expand-world-key-API.patch similarity index 100% rename from patches/server/0569-Expand-world-key-API.patch rename to patches/server/0571-Expand-world-key-API.patch diff --git a/patches/server/0570-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0572-Add-fast-alternative-constructor-for-Rotations.patch similarity index 100% rename from patches/server/0570-Add-fast-alternative-constructor-for-Rotations.patch rename to patches/server/0572-Add-fast-alternative-constructor-for-Rotations.patch diff --git a/patches/server/0571-Item-Rarity-API.patch b/patches/server/0573-Item-Rarity-API.patch similarity index 100% rename from patches/server/0571-Item-Rarity-API.patch rename to patches/server/0573-Item-Rarity-API.patch diff --git a/patches/server/0572-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0574-Drop-carried-item-when-player-has-disconnected.patch similarity index 100% rename from patches/server/0572-Drop-carried-item-when-player-has-disconnected.patch rename to patches/server/0574-Drop-carried-item-when-player-has-disconnected.patch diff --git a/patches/server/0573-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0575-forced-whitelist-use-configurable-kick-message.patch similarity index 100% rename from patches/server/0573-forced-whitelist-use-configurable-kick-message.patch rename to patches/server/0575-forced-whitelist-use-configurable-kick-message.patch diff --git a/patches/server/0574-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0576-Don-t-ignore-result-of-PlayerEditBookEvent.patch similarity index 100% rename from patches/server/0574-Don-t-ignore-result-of-PlayerEditBookEvent.patch rename to patches/server/0576-Don-t-ignore-result-of-PlayerEditBookEvent.patch diff --git a/patches/server/0575-Expose-protocol-version.patch b/patches/server/0577-Expose-protocol-version.patch similarity index 100% rename from patches/server/0575-Expose-protocol-version.patch rename to patches/server/0577-Expose-protocol-version.patch diff --git a/patches/server/0576-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0578-Enhance-console-tab-completions-for-brigadier-comman.patch similarity index 100% rename from patches/server/0576-Enhance-console-tab-completions-for-brigadier-comman.patch rename to patches/server/0578-Enhance-console-tab-completions-for-brigadier-comman.patch diff --git a/patches/server/0577-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0579-Fix-PlayerItemConsumeEvent-cancelling-properly.patch similarity index 88% rename from patches/server/0577-Fix-PlayerItemConsumeEvent-cancelling-properly.patch rename to patches/server/0579-Fix-PlayerItemConsumeEvent-cancelling-properly.patch index f1fb1cecf7..be2765caed 100644 --- a/patches/server/0577-Fix-PlayerItemConsumeEvent-cancelling-properly.patch +++ b/patches/server/0579-Fix-PlayerItemConsumeEvent-cancelling-properly.patch @@ -9,10 +9,10 @@ till their item is switched. This patch clears the active item when the event is cancelled diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 7952ba7e7e9f36fe6dea851dbc239d39ff61a74a..4ad927541de2f5af9121d17b4f8b359049ee2000 100644 +index 6f0dc5e3a9bd2c3e7c65fe6f93966cd579536a9c..955402605dafa29d204b2b0fcb48d59849bcbb1a 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3808,6 +3808,7 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -3824,6 +3824,7 @@ public abstract class LivingEntity extends Entity implements Attackable { this.level().getCraftServer().getPluginManager().callEvent(event); if (event.isCancelled()) { diff --git a/patches/server/0578-Add-bypass-host-check.patch b/patches/server/0580-Add-bypass-host-check.patch similarity index 100% rename from patches/server/0578-Add-bypass-host-check.patch rename to patches/server/0580-Add-bypass-host-check.patch diff --git a/patches/server/0579-Set-area-affect-cloud-rotation.patch b/patches/server/0581-Set-area-affect-cloud-rotation.patch similarity index 100% rename from patches/server/0579-Set-area-affect-cloud-rotation.patch rename to patches/server/0581-Set-area-affect-cloud-rotation.patch diff --git a/patches/server/0580-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0582-add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/server/0580-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/server/0582-add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/server/0581-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0583-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/server/0581-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/server/0583-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/server/0582-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0584-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/server/0582-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/server/0584-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/server/0583-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0585-fix-PigZombieAngerEvent-cancellation.patch similarity index 100% rename from patches/server/0583-fix-PigZombieAngerEvent-cancellation.patch rename to patches/server/0585-fix-PigZombieAngerEvent-cancellation.patch diff --git a/patches/server/0584-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0586-fix-PlayerItemHeldEvent-firing-twice.patch similarity index 100% rename from patches/server/0584-fix-PlayerItemHeldEvent-firing-twice.patch rename to patches/server/0586-fix-PlayerItemHeldEvent-firing-twice.patch diff --git a/patches/server/0585-Added-PlayerDeepSleepEvent.patch b/patches/server/0587-Added-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/server/0585-Added-PlayerDeepSleepEvent.patch rename to patches/server/0587-Added-PlayerDeepSleepEvent.patch diff --git a/patches/server/0586-More-World-API.patch b/patches/server/0588-More-World-API.patch similarity index 100% rename from patches/server/0586-More-World-API.patch rename to patches/server/0588-More-World-API.patch diff --git a/patches/server/0587-Added-PlayerBedFailEnterEvent.patch b/patches/server/0589-Added-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/server/0587-Added-PlayerBedFailEnterEvent.patch rename to patches/server/0589-Added-PlayerBedFailEnterEvent.patch diff --git a/patches/unapplied/server/0588-Entity-load-save-limit-per-chunk.patch b/patches/server/0590-Entity-load-save-limit-per-chunk.patch similarity index 94% rename from patches/unapplied/server/0588-Entity-load-save-limit-per-chunk.patch rename to patches/server/0590-Entity-load-save-limit-per-chunk.patch index bae815e2ce..e706c5e31f 100644 --- a/patches/unapplied/server/0588-Entity-load-save-limit-per-chunk.patch +++ b/patches/server/0590-Entity-load-save-limit-per-chunk.patch @@ -9,7 +9,7 @@ defaults are only included for certain entites, this allows setting limits for any entity type. diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java -index fa54a27d224113d5565b300693bd58b460bf086d..51274302ad0d500b9291c000d457be24caf52a74 100644 +index c2aafe4e1afec2793735bf7b0bbd6af94ad393f8..c7e127e62b7616997c123c47d86ed751c12fd151 100644 --- a/src/main/java/net/minecraft/world/entity/EntityType.java +++ b/src/main/java/net/minecraft/world/entity/EntityType.java @@ -626,9 +626,20 @@ public class EntityType implements FeatureElement, EntityTypeT @@ -34,7 +34,7 @@ index fa54a27d224113d5565b300693bd58b460bf086d..51274302ad0d500b9291c000d457be24 return entity; }); diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java -index 340e2f789d3cacb5b87839e13f476149bc47583f..36deebd7d721f400cd07b2be3d1551e2d9ab7f85 100644 +index 0ec0be22f7292d57c40da6f1f4575bdebf8dbd09..060e064625969610539dbf969ce773b877a7c579 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java @@ -110,7 +110,18 @@ public class EntityStorage implements EntityPersistentStorage { diff --git a/patches/server/0588-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0591-Implement-methods-to-convert-between-Component-and-B.patch similarity index 100% rename from patches/server/0588-Implement-methods-to-convert-between-Component-and-B.patch rename to patches/server/0591-Implement-methods-to-convert-between-Component-and-B.patch diff --git a/patches/server/0589-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0592-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch similarity index 100% rename from patches/server/0589-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch rename to patches/server/0592-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch diff --git a/patches/server/0590-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0593-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/server/0590-Introduce-beacon-activation-deactivation-events.patch rename to patches/server/0593-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/server/0591-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0594-add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 100% rename from patches/server/0591-add-RespawnFlags-to-PlayerRespawnEvent.patch rename to patches/server/0594-add-RespawnFlags-to-PlayerRespawnEvent.patch diff --git a/patches/server/0592-Add-Channel-initialization-listeners.patch b/patches/server/0595-Add-Channel-initialization-listeners.patch similarity index 100% rename from patches/server/0592-Add-Channel-initialization-listeners.patch rename to patches/server/0595-Add-Channel-initialization-listeners.patch diff --git a/patches/server/0593-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0596-Send-empty-commands-if-tab-completion-is-disabled.patch similarity index 100% rename from patches/server/0593-Send-empty-commands-if-tab-completion-is-disabled.patch rename to patches/server/0596-Send-empty-commands-if-tab-completion-is-disabled.patch diff --git a/patches/server/0594-Add-more-WanderingTrader-API.patch b/patches/server/0597-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/server/0594-Add-more-WanderingTrader-API.patch rename to patches/server/0597-Add-more-WanderingTrader-API.patch diff --git a/patches/server/0595-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0598-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/server/0595-Add-EntityBlockStorage-clearEntities.patch rename to patches/server/0598-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/server/0596-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0599-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/server/0596-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/server/0599-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/server/0597-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0600-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0597-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch rename to patches/server/0600-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0598-Inventory-close.patch b/patches/server/0601-Inventory-close.patch similarity index 100% rename from patches/server/0598-Inventory-close.patch rename to patches/server/0601-Inventory-close.patch diff --git a/patches/server/0599-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0602-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/server/0599-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/server/0602-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/server/0600-Fix-CraftPotionBrewer-cache.patch b/patches/server/0603-Fix-CraftPotionBrewer-cache.patch similarity index 100% rename from patches/server/0600-Fix-CraftPotionBrewer-cache.patch rename to patches/server/0603-Fix-CraftPotionBrewer-cache.patch diff --git a/patches/server/0601-Add-basic-Datapack-API.patch b/patches/server/0604-Add-basic-Datapack-API.patch similarity index 100% rename from patches/server/0601-Add-basic-Datapack-API.patch rename to patches/server/0604-Add-basic-Datapack-API.patch diff --git a/patches/server/0602-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0605-Add-environment-variable-to-disable-server-gui.patch similarity index 100% rename from patches/server/0602-Add-environment-variable-to-disable-server-gui.patch rename to patches/server/0605-Add-environment-variable-to-disable-server-gui.patch diff --git a/patches/server/0603-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0606-additions-to-PlayerGameModeChangeEvent.patch similarity index 100% rename from patches/server/0603-additions-to-PlayerGameModeChangeEvent.patch rename to patches/server/0606-additions-to-PlayerGameModeChangeEvent.patch diff --git a/patches/server/0604-ItemStack-repair-check-API.patch b/patches/server/0607-ItemStack-repair-check-API.patch similarity index 100% rename from patches/server/0604-ItemStack-repair-check-API.patch rename to patches/server/0607-ItemStack-repair-check-API.patch diff --git a/patches/server/0605-More-Enchantment-API.patch b/patches/server/0608-More-Enchantment-API.patch similarity index 100% rename from patches/server/0605-More-Enchantment-API.patch rename to patches/server/0608-More-Enchantment-API.patch diff --git a/patches/server/0606-Move-range-check-for-block-placing-up.patch b/patches/server/0609-Move-range-check-for-block-placing-up.patch similarity index 100% rename from patches/server/0606-Move-range-check-for-block-placing-up.patch rename to patches/server/0609-Move-range-check-for-block-placing-up.patch diff --git a/patches/server/0607-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0610-Fix-and-optimise-world-force-upgrading.patch similarity index 100% rename from patches/server/0607-Fix-and-optimise-world-force-upgrading.patch rename to patches/server/0610-Fix-and-optimise-world-force-upgrading.patch diff --git a/patches/server/0608-Add-Mob-lookAt-API.patch b/patches/server/0611-Add-Mob-lookAt-API.patch similarity index 100% rename from patches/server/0608-Add-Mob-lookAt-API.patch rename to patches/server/0611-Add-Mob-lookAt-API.patch diff --git a/patches/server/0609-Add-Unix-domain-socket-support.patch b/patches/server/0612-Add-Unix-domain-socket-support.patch similarity index 100% rename from patches/server/0609-Add-Unix-domain-socket-support.patch rename to patches/server/0612-Add-Unix-domain-socket-support.patch diff --git a/patches/server/0610-Add-EntityInsideBlockEvent.patch b/patches/server/0613-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/server/0610-Add-EntityInsideBlockEvent.patch rename to patches/server/0613-Add-EntityInsideBlockEvent.patch diff --git a/patches/server/0611-Attributes-API-for-item-defaults.patch b/patches/server/0614-Attributes-API-for-item-defaults.patch similarity index 100% rename from patches/server/0611-Attributes-API-for-item-defaults.patch rename to patches/server/0614-Attributes-API-for-item-defaults.patch diff --git a/patches/server/0612-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0615-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 100% rename from patches/server/0612-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/server/0615-Add-cause-to-Weather-ThunderChangeEvents.patch diff --git a/patches/server/0613-More-Lidded-Block-API.patch b/patches/server/0616-More-Lidded-Block-API.patch similarity index 100% rename from patches/server/0613-More-Lidded-Block-API.patch rename to patches/server/0616-More-Lidded-Block-API.patch diff --git a/patches/server/0614-Limit-item-frame-cursors-on-maps.patch b/patches/server/0617-Limit-item-frame-cursors-on-maps.patch similarity index 100% rename from patches/server/0614-Limit-item-frame-cursors-on-maps.patch rename to patches/server/0617-Limit-item-frame-cursors-on-maps.patch diff --git a/patches/server/0615-Add-PlayerKickEvent-causes.patch b/patches/server/0618-Add-PlayerKickEvent-causes.patch similarity index 100% rename from patches/server/0615-Add-PlayerKickEvent-causes.patch rename to patches/server/0618-Add-PlayerKickEvent-causes.patch diff --git a/patches/server/0616-Add-PufferFishStateChangeEvent.patch b/patches/server/0619-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/server/0616-Add-PufferFishStateChangeEvent.patch rename to patches/server/0619-Add-PufferFishStateChangeEvent.patch diff --git a/patches/server/0617-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0620-Fix-PlayerBucketEmptyEvent-result-itemstack.patch similarity index 100% rename from patches/server/0617-Fix-PlayerBucketEmptyEvent-result-itemstack.patch rename to patches/server/0620-Fix-PlayerBucketEmptyEvent-result-itemstack.patch diff --git a/patches/server/0618-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0621-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch similarity index 100% rename from patches/server/0618-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch rename to patches/server/0621-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch diff --git a/patches/server/0619-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0622-Add-option-to-fix-items-merging-through-walls.patch similarity index 100% rename from patches/server/0619-Add-option-to-fix-items-merging-through-walls.patch rename to patches/server/0622-Add-option-to-fix-items-merging-through-walls.patch diff --git a/patches/server/0620-Add-BellRevealRaiderEvent.patch b/patches/server/0623-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/server/0620-Add-BellRevealRaiderEvent.patch rename to patches/server/0623-Add-BellRevealRaiderEvent.patch diff --git a/patches/server/0621-Fix-invulnerable-end-crystals.patch b/patches/server/0624-Fix-invulnerable-end-crystals.patch similarity index 100% rename from patches/server/0621-Fix-invulnerable-end-crystals.patch rename to patches/server/0624-Fix-invulnerable-end-crystals.patch diff --git a/patches/server/0622-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0625-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/server/0622-Add-ElderGuardianAppearanceEvent.patch rename to patches/server/0625-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/server/0623-Fix-dangerous-end-portal-logic.patch b/patches/server/0626-Fix-dangerous-end-portal-logic.patch similarity index 100% rename from patches/server/0623-Fix-dangerous-end-portal-logic.patch rename to patches/server/0626-Fix-dangerous-end-portal-logic.patch diff --git a/patches/server/0624-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0627-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch similarity index 100% rename from patches/server/0624-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch rename to patches/server/0627-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch diff --git a/patches/server/0625-Make-item-validations-configurable.patch b/patches/server/0628-Make-item-validations-configurable.patch similarity index 100% rename from patches/server/0625-Make-item-validations-configurable.patch rename to patches/server/0628-Make-item-validations-configurable.patch diff --git a/patches/server/0626-Line-Of-Sight-Changes.patch b/patches/server/0629-Line-Of-Sight-Changes.patch similarity index 98% rename from patches/server/0626-Line-Of-Sight-Changes.patch rename to patches/server/0629-Line-Of-Sight-Changes.patch index b78a3eb263..4f52f6477d 100644 --- a/patches/server/0626-Line-Of-Sight-Changes.patch +++ b/patches/server/0629-Line-Of-Sight-Changes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Line Of Sight Changes diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 4ad927541de2f5af9121d17b4f8b359049ee2000..3a669f8e0cd072fcbd5e5ed4b55abb0f73c009e7 100644 +index 955402605dafa29d204b2b0fcb48d59849bcbb1a..c65aa2ed46ac8cef2306eb4035c7a0742a3e8b08 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3555,7 +3555,8 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0627-add-per-world-spawn-limits.patch b/patches/server/0630-add-per-world-spawn-limits.patch similarity index 100% rename from patches/server/0627-add-per-world-spawn-limits.patch rename to patches/server/0630-add-per-world-spawn-limits.patch diff --git a/patches/server/0628-Fix-potions-splash-events.patch b/patches/server/0631-Fix-potions-splash-events.patch similarity index 100% rename from patches/server/0628-Fix-potions-splash-events.patch rename to patches/server/0631-Fix-potions-splash-events.patch diff --git a/patches/server/0629-Add-more-LimitedRegion-API.patch b/patches/server/0632-Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/server/0629-Add-more-LimitedRegion-API.patch rename to patches/server/0632-Add-more-LimitedRegion-API.patch diff --git a/patches/server/0630-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0633-Fix-PlayerDropItemEvent-using-wrong-item.patch similarity index 100% rename from patches/server/0630-Fix-PlayerDropItemEvent-using-wrong-item.patch rename to patches/server/0633-Fix-PlayerDropItemEvent-using-wrong-item.patch diff --git a/patches/server/0631-Missing-Entity-Behavior-API.patch b/patches/server/0634-Missing-Entity-Behavior-API.patch similarity index 100% rename from patches/server/0631-Missing-Entity-Behavior-API.patch rename to patches/server/0634-Missing-Entity-Behavior-API.patch diff --git a/patches/server/0632-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0635-Ensure-disconnect-for-book-edit-is-called-on-main.patch similarity index 100% rename from patches/server/0632-Ensure-disconnect-for-book-edit-is-called-on-main.patch rename to patches/server/0635-Ensure-disconnect-for-book-edit-is-called-on-main.patch diff --git a/patches/server/0633-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0636-Fix-return-value-of-Block-applyBoneMeal-always-being.patch similarity index 100% rename from patches/server/0633-Fix-return-value-of-Block-applyBoneMeal-always-being.patch rename to patches/server/0636-Fix-return-value-of-Block-applyBoneMeal-always-being.patch diff --git a/patches/server/0634-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0637-Use-getChunkIfLoadedImmediately-in-places.patch similarity index 100% rename from patches/server/0634-Use-getChunkIfLoadedImmediately-in-places.patch rename to patches/server/0637-Use-getChunkIfLoadedImmediately-in-places.patch diff --git a/patches/server/0635-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0638-Fix-commands-from-signs-not-firing-command-events.patch similarity index 100% rename from patches/server/0635-Fix-commands-from-signs-not-firing-command-events.patch rename to patches/server/0638-Fix-commands-from-signs-not-firing-command-events.patch diff --git a/patches/server/0636-Adds-PlayerArmSwingEvent.patch b/patches/server/0639-Adds-PlayerArmSwingEvent.patch similarity index 100% rename from patches/server/0636-Adds-PlayerArmSwingEvent.patch rename to patches/server/0639-Adds-PlayerArmSwingEvent.patch diff --git a/patches/server/0637-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0640-Fixes-kick-event-leave-message-not-being-sent.patch similarity index 100% rename from patches/server/0637-Fixes-kick-event-leave-message-not-being-sent.patch rename to patches/server/0640-Fixes-kick-event-leave-message-not-being-sent.patch diff --git a/patches/server/0638-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0641-Add-config-for-mobs-immune-to-default-effects.patch similarity index 97% rename from patches/server/0638-Add-config-for-mobs-immune-to-default-effects.patch rename to patches/server/0641-Add-config-for-mobs-immune-to-default-effects.patch index 13bffd8faa..acf783ec1b 100644 --- a/patches/server/0638-Add-config-for-mobs-immune-to-default-effects.patch +++ b/patches/server/0641-Add-config-for-mobs-immune-to-default-effects.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add config for mobs immune to default effects diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 3a669f8e0cd072fcbd5e5ed4b55abb0f73c009e7..212cdc23a443d019829aca5830e39ee9bd9992b1 100644 +index c65aa2ed46ac8cef2306eb4035c7a0742a3e8b08..f82323c18792882dbbadc78a382dc7ffa9a4612f 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1164,7 +1164,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0639-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0642-Fix-incorrect-message-for-outdated-client.patch similarity index 100% rename from patches/server/0639-Fix-incorrect-message-for-outdated-client.patch rename to patches/server/0642-Fix-incorrect-message-for-outdated-client.patch diff --git a/patches/server/0640-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0643-Don-t-apply-cramming-damage-to-players.patch similarity index 100% rename from patches/server/0640-Don-t-apply-cramming-damage-to-players.patch rename to patches/server/0643-Don-t-apply-cramming-damage-to-players.patch diff --git a/patches/server/0641-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0644-Rate-options-and-timings-for-sensors-and-behaviors.patch similarity index 100% rename from patches/server/0641-Rate-options-and-timings-for-sensors-and-behaviors.patch rename to patches/server/0644-Rate-options-and-timings-for-sensors-and-behaviors.patch diff --git a/patches/server/0642-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0645-Add-a-bunch-of-missing-forceDrop-toggles.patch similarity index 100% rename from patches/server/0642-Add-a-bunch-of-missing-forceDrop-toggles.patch rename to patches/server/0645-Add-a-bunch-of-missing-forceDrop-toggles.patch diff --git a/patches/server/0643-Stinger-API.patch b/patches/server/0646-Stinger-API.patch similarity index 100% rename from patches/server/0643-Stinger-API.patch rename to patches/server/0646-Stinger-API.patch diff --git a/patches/server/0644-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0647-Fix-incosistency-issue-with-empty-map-items-in-CB.patch similarity index 100% rename from patches/server/0644-Fix-incosistency-issue-with-empty-map-items-in-CB.patch rename to patches/server/0647-Fix-incosistency-issue-with-empty-map-items-in-CB.patch diff --git a/patches/server/0645-Add-System.out-err-catcher.patch b/patches/server/0648-Add-System.out-err-catcher.patch similarity index 100% rename from patches/server/0645-Add-System.out-err-catcher.patch rename to patches/server/0648-Add-System.out-err-catcher.patch diff --git a/patches/server/0646-Fix-test-not-bootstrapping.patch b/patches/server/0649-Fix-test-not-bootstrapping.patch similarity index 100% rename from patches/server/0646-Fix-test-not-bootstrapping.patch rename to patches/server/0649-Fix-test-not-bootstrapping.patch diff --git a/patches/server/0647-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0650-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/server/0647-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/server/0650-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/server/0648-Improve-boat-collision-performance.patch b/patches/server/0651-Improve-boat-collision-performance.patch similarity index 97% rename from patches/server/0648-Improve-boat-collision-performance.patch rename to patches/server/0651-Improve-boat-collision-performance.patch index bf0d4919f3..79e7f4c317 100644 --- a/patches/server/0648-Improve-boat-collision-performance.patch +++ b/patches/server/0651-Improve-boat-collision-performance.patch @@ -17,7 +17,7 @@ index 7354711e194ab58b11b68f447c1fc795fe611a65..5579dad0ba8f2e4ce43883e7d36059c2 }; diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 212cdc23a443d019829aca5830e39ee9bd9992b1..0c931f8bb093c5592f52c266be6a284492a72041 100644 +index f82323c18792882dbbadc78a382dc7ffa9a4612f..090d256dc5594edf1b053cc072b177cbf92143bb 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1383,7 +1383,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0649-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0652-Prevent-AFK-kick-while-watching-end-credits.patch similarity index 100% rename from patches/server/0649-Prevent-AFK-kick-while-watching-end-credits.patch rename to patches/server/0652-Prevent-AFK-kick-while-watching-end-credits.patch diff --git a/patches/server/0650-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0653-Allow-skipping-writing-of-comments-to-server.propert.patch similarity index 100% rename from patches/server/0650-Allow-skipping-writing-of-comments-to-server.propert.patch rename to patches/server/0653-Allow-skipping-writing-of-comments-to-server.propert.patch diff --git a/patches/server/0651-Add-PlayerSetSpawnEvent.patch b/patches/server/0654-Add-PlayerSetSpawnEvent.patch similarity index 100% rename from patches/server/0651-Add-PlayerSetSpawnEvent.patch rename to patches/server/0654-Add-PlayerSetSpawnEvent.patch diff --git a/patches/server/0652-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0655-Make-hoppers-respect-inventory-max-stack-size.patch similarity index 100% rename from patches/server/0652-Make-hoppers-respect-inventory-max-stack-size.patch rename to patches/server/0655-Make-hoppers-respect-inventory-max-stack-size.patch diff --git a/patches/server/0653-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0656-Optimize-entity-tracker-passenger-checks.patch similarity index 100% rename from patches/server/0653-Optimize-entity-tracker-passenger-checks.patch rename to patches/server/0656-Optimize-entity-tracker-passenger-checks.patch diff --git a/patches/server/0654-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0657-Config-option-for-Piglins-guarding-chests.patch similarity index 100% rename from patches/server/0654-Config-option-for-Piglins-guarding-chests.patch rename to patches/server/0657-Config-option-for-Piglins-guarding-chests.patch diff --git a/patches/server/0655-Added-EntityDamageItemEvent.patch b/patches/server/0658-Added-EntityDamageItemEvent.patch similarity index 100% rename from patches/server/0655-Added-EntityDamageItemEvent.patch rename to patches/server/0658-Added-EntityDamageItemEvent.patch diff --git a/patches/server/0656-Optimize-indirect-passenger-iteration.patch b/patches/server/0659-Optimize-indirect-passenger-iteration.patch similarity index 100% rename from patches/server/0656-Optimize-indirect-passenger-iteration.patch rename to patches/server/0659-Optimize-indirect-passenger-iteration.patch diff --git a/patches/server/0657-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0660-Configurable-item-frame-map-cursor-update-interval.patch similarity index 100% rename from patches/server/0657-Configurable-item-frame-map-cursor-update-interval.patch rename to patches/server/0660-Configurable-item-frame-map-cursor-update-interval.patch diff --git a/patches/server/0658-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0661-Make-EntityUnleashEvent-cancellable.patch similarity index 100% rename from patches/server/0658-Make-EntityUnleashEvent-cancellable.patch rename to patches/server/0661-Make-EntityUnleashEvent-cancellable.patch diff --git a/patches/server/0659-Clear-bucket-NBT-after-dispense.patch b/patches/server/0662-Clear-bucket-NBT-after-dispense.patch similarity index 100% rename from patches/server/0659-Clear-bucket-NBT-after-dispense.patch rename to patches/server/0662-Clear-bucket-NBT-after-dispense.patch diff --git a/patches/server/0660-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0663-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/server/0660-Change-EnderEye-target-without-changing-other-things.patch rename to patches/server/0663-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/server/0661-Add-BlockBreakBlockEvent.patch b/patches/server/0664-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/server/0661-Add-BlockBreakBlockEvent.patch rename to patches/server/0664-Add-BlockBreakBlockEvent.patch diff --git a/patches/server/0662-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0665-Option-to-prevent-NBT-copy-in-smithing-recipes.patch similarity index 100% rename from patches/server/0662-Option-to-prevent-NBT-copy-in-smithing-recipes.patch rename to patches/server/0665-Option-to-prevent-NBT-copy-in-smithing-recipes.patch diff --git a/patches/server/0663-More-CommandBlock-API.patch b/patches/server/0666-More-CommandBlock-API.patch similarity index 100% rename from patches/server/0663-More-CommandBlock-API.patch rename to patches/server/0666-More-CommandBlock-API.patch diff --git a/patches/server/0664-Add-missing-team-sidebar-display-slots.patch b/patches/server/0667-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/server/0664-Add-missing-team-sidebar-display-slots.patch rename to patches/server/0667-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/server/0665-Add-back-EntityPortalExitEvent.patch b/patches/server/0668-Add-back-EntityPortalExitEvent.patch similarity index 100% rename from patches/server/0665-Add-back-EntityPortalExitEvent.patch rename to patches/server/0668-Add-back-EntityPortalExitEvent.patch diff --git a/patches/server/0666-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0669-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 100% rename from patches/server/0666-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/server/0669-Add-methods-to-find-targets-for-lightning-strikes.patch diff --git a/patches/server/0667-Get-entity-default-attributes.patch b/patches/server/0670-Get-entity-default-attributes.patch similarity index 100% rename from patches/server/0667-Get-entity-default-attributes.patch rename to patches/server/0670-Get-entity-default-attributes.patch diff --git a/patches/server/0668-Left-handed-API.patch b/patches/server/0671-Left-handed-API.patch similarity index 100% rename from patches/server/0668-Left-handed-API.patch rename to patches/server/0671-Left-handed-API.patch diff --git a/patches/server/0669-Add-more-advancement-API.patch b/patches/server/0672-Add-more-advancement-API.patch similarity index 100% rename from patches/server/0669-Add-more-advancement-API.patch rename to patches/server/0672-Add-more-advancement-API.patch diff --git a/patches/server/0670-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0673-Add-ItemFactory-getSpawnEgg-API.patch similarity index 100% rename from patches/server/0670-Add-ItemFactory-getSpawnEgg-API.patch rename to patches/server/0673-Add-ItemFactory-getSpawnEgg-API.patch diff --git a/patches/server/0671-Add-critical-damage-API.patch b/patches/server/0674-Add-critical-damage-API.patch similarity index 100% rename from patches/server/0671-Add-critical-damage-API.patch rename to patches/server/0674-Add-critical-damage-API.patch diff --git a/patches/server/0672-Fix-issues-with-mob-conversion.patch b/patches/server/0675-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/server/0672-Fix-issues-with-mob-conversion.patch rename to patches/server/0675-Fix-issues-with-mob-conversion.patch diff --git a/patches/server/0673-Add-isCollidable-methods-to-various-places.patch b/patches/server/0676-Add-isCollidable-methods-to-various-places.patch similarity index 100% rename from patches/server/0673-Add-isCollidable-methods-to-various-places.patch rename to patches/server/0676-Add-isCollidable-methods-to-various-places.patch diff --git a/patches/server/0674-Goat-ram-API.patch b/patches/server/0677-Goat-ram-API.patch similarity index 100% rename from patches/server/0674-Goat-ram-API.patch rename to patches/server/0677-Goat-ram-API.patch diff --git a/patches/server/0675-Add-API-for-resetting-a-single-score.patch b/patches/server/0678-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/server/0675-Add-API-for-resetting-a-single-score.patch rename to patches/server/0678-Add-API-for-resetting-a-single-score.patch diff --git a/patches/server/0676-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0679-Add-Raw-Byte-Entity-Serialization.patch similarity index 100% rename from patches/server/0676-Add-Raw-Byte-Entity-Serialization.patch rename to patches/server/0679-Add-Raw-Byte-Entity-Serialization.patch diff --git a/patches/server/0677-Vanilla-command-permission-fixes.patch b/patches/server/0680-Vanilla-command-permission-fixes.patch similarity index 100% rename from patches/server/0677-Vanilla-command-permission-fixes.patch rename to patches/server/0680-Vanilla-command-permission-fixes.patch diff --git a/patches/server/0678-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0681-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch similarity index 100% rename from patches/server/0678-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch rename to patches/server/0681-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch diff --git a/patches/server/0679-Fix-GameProfileCache-concurrency.patch b/patches/server/0682-Fix-GameProfileCache-concurrency.patch similarity index 100% rename from patches/server/0679-Fix-GameProfileCache-concurrency.patch rename to patches/server/0682-Fix-GameProfileCache-concurrency.patch diff --git a/patches/server/0680-Improve-and-expand-AsyncCatcher.patch b/patches/server/0683-Improve-and-expand-AsyncCatcher.patch similarity index 99% rename from patches/server/0680-Improve-and-expand-AsyncCatcher.patch rename to patches/server/0683-Improve-and-expand-AsyncCatcher.patch index e90e309be0..4d3cd99acb 100644 --- a/patches/server/0680-Improve-and-expand-AsyncCatcher.patch +++ b/patches/server/0683-Improve-and-expand-AsyncCatcher.patch @@ -29,7 +29,7 @@ index ca8ceca79ee191b7366c5c84fffa47852de61ec0..ee5f58ae4c276b4529d7dd35aa5cfa51 if (player.isRemoved()) { LOGGER.info("Attempt to teleport removed player {} restricted", player.getScoreboardName()); diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 0c931f8bb093c5592f52c266be6a284492a72041..12f5e702e5b242b93b8bf13d9c8f21aa478f2237 100644 +index 090d256dc5594edf1b053cc072b177cbf92143bb..27da81c4577ea3c4efaf4e719c2b8256d4707920 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1120,7 +1120,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0681-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0684-Add-paper-mobcaps-and-paper-playermobcaps.patch similarity index 100% rename from patches/server/0681-Add-paper-mobcaps-and-paper-playermobcaps.patch rename to patches/server/0684-Add-paper-mobcaps-and-paper-playermobcaps.patch diff --git a/patches/server/0682-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0685-Sanitize-ResourceLocation-error-logging.patch similarity index 100% rename from patches/server/0682-Sanitize-ResourceLocation-error-logging.patch rename to patches/server/0685-Sanitize-ResourceLocation-error-logging.patch diff --git a/patches/server/0683-Allow-controlled-flushing-for-network-manager.patch b/patches/server/0686-Allow-controlled-flushing-for-network-manager.patch similarity index 100% rename from patches/server/0683-Allow-controlled-flushing-for-network-manager.patch rename to patches/server/0686-Allow-controlled-flushing-for-network-manager.patch diff --git a/patches/server/0684-Optimise-general-POI-access.patch b/patches/server/0687-Optimise-general-POI-access.patch similarity index 100% rename from patches/server/0684-Optimise-general-POI-access.patch rename to patches/server/0687-Optimise-general-POI-access.patch diff --git a/patches/server/0685-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch b/patches/server/0688-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch similarity index 100% rename from patches/server/0685-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch rename to patches/server/0688-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch diff --git a/patches/server/0686-Optimise-chunk-tick-iteration.patch b/patches/server/0689-Optimise-chunk-tick-iteration.patch similarity index 100% rename from patches/server/0686-Optimise-chunk-tick-iteration.patch rename to patches/server/0689-Optimise-chunk-tick-iteration.patch diff --git a/patches/server/0687-Execute-chunk-tasks-mid-tick.patch b/patches/server/0690-Execute-chunk-tasks-mid-tick.patch similarity index 100% rename from patches/server/0687-Execute-chunk-tasks-mid-tick.patch rename to patches/server/0690-Execute-chunk-tasks-mid-tick.patch diff --git a/patches/server/0688-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0691-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch similarity index 99% rename from patches/server/0688-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch rename to patches/server/0691-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch index dda57a5aaa..b6a78c51a9 100644 --- a/patches/server/0688-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch +++ b/patches/server/0691-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch @@ -10,7 +10,7 @@ hoping that at least then we don't swap chunks, and maybe recover them all. diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java -index b417b175c925049058327c7bc4ed1cc31a644018..603fcf3816d65d0a695e038d5980b1cd98659f4c 100644 +index 40372e47f33d2e6ff164a00d964e8d965f1fd323..ebcc7ece0654abd368fc759029f87a7cec9ed036 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java @@ -70,6 +70,18 @@ import net.minecraft.world.ticks.ProtoChunkTicks; @@ -32,7 +32,7 @@ index b417b175c925049058327c7bc4ed1cc31a644018..603fcf3816d65d0a695e038d5980b1cd public static final Codec> BLOCK_STATE_CODEC = PalettedContainer.codecRW(Block.BLOCK_STATE_REGISTRY, BlockState.CODEC, PalettedContainer.Strategy.SECTION_STATES, Blocks.AIR.defaultBlockState()); private static final Logger LOGGER = LogUtils.getLogger(); -@@ -434,7 +446,7 @@ public class ChunkSerializer { +@@ -446,7 +458,7 @@ public class ChunkSerializer { nbttagcompound.putInt("xPos", chunkcoordintpair.x); nbttagcompound.putInt("yPos", chunk.getMinSection()); nbttagcompound.putInt("zPos", chunkcoordintpair.z); @@ -42,7 +42,7 @@ index b417b175c925049058327c7bc4ed1cc31a644018..603fcf3816d65d0a695e038d5980b1cd nbttagcompound.putString("Status", BuiltInRegistries.CHUNK_STATUS.getKey(chunk.getStatus()).toString()); BlendingData blendingdata = chunk.getBlendingData(); diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java -index b4e7c9b317d532d4915932f8f79dfebf2b63ff16..2d93251abb1018381cf00dbbb120c8ea036710c6 100644 +index e4b3a70ff9f906a10f2ba3c07642193ca3269db7..a5da3333e87bcc9def785a8e742a30d38c0ecc27 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java @@ -41,7 +41,7 @@ public class ChunkStorage implements AutoCloseable { diff --git a/patches/server/0689-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0692-Custom-table-implementation-for-blockstate-state-loo.patch similarity index 100% rename from patches/server/0689-Custom-table-implementation-for-blockstate-state-loo.patch rename to patches/server/0692-Custom-table-implementation-for-blockstate-state-loo.patch diff --git a/patches/server/0690-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0693-Detail-more-information-in-watchdog-dumps.patch similarity index 100% rename from patches/server/0690-Detail-more-information-in-watchdog-dumps.patch rename to patches/server/0693-Detail-more-information-in-watchdog-dumps.patch diff --git a/patches/server/0691-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0694-Manually-inline-methods-in-BlockPosition.patch similarity index 100% rename from patches/server/0691-Manually-inline-methods-in-BlockPosition.patch rename to patches/server/0694-Manually-inline-methods-in-BlockPosition.patch diff --git a/patches/server/0692-Distance-manager-tick-timings.patch b/patches/server/0695-Distance-manager-tick-timings.patch similarity index 100% rename from patches/server/0692-Distance-manager-tick-timings.patch rename to patches/server/0695-Distance-manager-tick-timings.patch diff --git a/patches/server/0693-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0696-Name-craft-scheduler-threads-according-to-the-plugin.patch similarity index 100% rename from patches/server/0693-Name-craft-scheduler-threads-according-to-the-plugin.patch rename to patches/server/0696-Name-craft-scheduler-threads-according-to-the-plugin.patch diff --git a/patches/server/0694-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0697-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch similarity index 100% rename from patches/server/0694-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch rename to patches/server/0697-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch diff --git a/patches/server/0695-Add-packet-limiter-config.patch b/patches/server/0698-Add-packet-limiter-config.patch similarity index 100% rename from patches/server/0695-Add-packet-limiter-config.patch rename to patches/server/0698-Add-packet-limiter-config.patch diff --git a/patches/server/0696-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0699-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch similarity index 93% rename from patches/server/0696-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch rename to patches/server/0699-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch index 3f4832a96c..30ce1f4f3d 100644 --- a/patches/server/0696-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch +++ b/patches/server/0699-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch @@ -8,7 +8,7 @@ Lighting is purged on update anyways, so let's not add more into the conversion process diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java -index 2d93251abb1018381cf00dbbb120c8ea036710c6..6916255b55a31ddd5bc32ec47f0d5ebb417be738 100644 +index a5da3333e87bcc9def785a8e742a30d38c0ecc27..8ebecb588058da174b0e0e19e54fcddfeeca1422 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkStorage.java @@ -51,6 +51,7 @@ public class ChunkStorage implements AutoCloseable { diff --git a/patches/server/0697-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/server/0700-Consolidate-flush-calls-for-entity-tracker-packets.patch similarity index 100% rename from patches/server/0697-Consolidate-flush-calls-for-entity-tracker-packets.patch rename to patches/server/0700-Consolidate-flush-calls-for-entity-tracker-packets.patch diff --git a/patches/server/0698-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0701-Don-t-lookup-fluid-state-when-raytracing.patch similarity index 100% rename from patches/server/0698-Don-t-lookup-fluid-state-when-raytracing.patch rename to patches/server/0701-Don-t-lookup-fluid-state-when-raytracing.patch diff --git a/patches/server/0699-Time-scoreboard-search.patch b/patches/server/0702-Time-scoreboard-search.patch similarity index 100% rename from patches/server/0699-Time-scoreboard-search.patch rename to patches/server/0702-Time-scoreboard-search.patch diff --git a/patches/server/0700-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0703-Send-full-pos-packets-for-hard-colliding-entities.patch similarity index 100% rename from patches/server/0700-Send-full-pos-packets-for-hard-colliding-entities.patch rename to patches/server/0703-Send-full-pos-packets-for-hard-colliding-entities.patch diff --git a/patches/server/0701-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0704-Do-not-run-raytrace-logic-for-AIR.patch similarity index 100% rename from patches/server/0701-Do-not-run-raytrace-logic-for-AIR.patch rename to patches/server/0704-Do-not-run-raytrace-logic-for-AIR.patch diff --git a/patches/server/0702-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0705-Oprimise-map-impl-for-tracked-players.patch similarity index 100% rename from patches/server/0702-Oprimise-map-impl-for-tracked-players.patch rename to patches/server/0705-Oprimise-map-impl-for-tracked-players.patch diff --git a/patches/server/0703-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0706-Optimise-BlockSoil-nearby-water-lookup.patch similarity index 100% rename from patches/server/0703-Optimise-BlockSoil-nearby-water-lookup.patch rename to patches/server/0706-Optimise-BlockSoil-nearby-water-lookup.patch diff --git a/patches/server/0704-Optimise-random-block-ticking.patch b/patches/server/0707-Optimise-random-block-ticking.patch similarity index 100% rename from patches/server/0704-Optimise-random-block-ticking.patch rename to patches/server/0707-Optimise-random-block-ticking.patch diff --git a/patches/server/0705-Optimise-non-flush-packet-sending.patch b/patches/server/0708-Optimise-non-flush-packet-sending.patch similarity index 100% rename from patches/server/0705-Optimise-non-flush-packet-sending.patch rename to patches/server/0708-Optimise-non-flush-packet-sending.patch diff --git a/patches/server/0706-Optimise-nearby-player-lookups.patch b/patches/server/0709-Optimise-nearby-player-lookups.patch similarity index 100% rename from patches/server/0706-Optimise-nearby-player-lookups.patch rename to patches/server/0709-Optimise-nearby-player-lookups.patch diff --git a/patches/server/0707-Remove-streams-for-villager-AI.patch b/patches/server/0710-Remove-streams-for-villager-AI.patch similarity index 100% rename from patches/server/0707-Remove-streams-for-villager-AI.patch rename to patches/server/0710-Remove-streams-for-villager-AI.patch diff --git a/patches/server/0708-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0711-Use-Velocity-compression-and-cipher-natives.patch similarity index 100% rename from patches/server/0708-Use-Velocity-compression-and-cipher-natives.patch rename to patches/server/0711-Use-Velocity-compression-and-cipher-natives.patch diff --git a/patches/server/0709-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0712-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch similarity index 100% rename from patches/server/0709-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch rename to patches/server/0712-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch diff --git a/patches/server/0710-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0713-Fix-Bukkit-NamespacedKey-shenanigans.patch similarity index 100% rename from patches/server/0710-Fix-Bukkit-NamespacedKey-shenanigans.patch rename to patches/server/0713-Fix-Bukkit-NamespacedKey-shenanigans.patch diff --git a/patches/server/0711-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0714-Fix-merchant-inventory-not-closing-on-entity-removal.patch similarity index 100% rename from patches/server/0711-Fix-merchant-inventory-not-closing-on-entity-removal.patch rename to patches/server/0714-Fix-merchant-inventory-not-closing-on-entity-removal.patch diff --git a/patches/server/0712-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0715-Check-requirement-before-suggesting-root-nodes.patch similarity index 100% rename from patches/server/0712-Check-requirement-before-suggesting-root-nodes.patch rename to patches/server/0715-Check-requirement-before-suggesting-root-nodes.patch diff --git a/patches/server/0713-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0716-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch similarity index 100% rename from patches/server/0713-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch rename to patches/server/0716-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch diff --git a/patches/server/0714-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0717-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch similarity index 100% rename from patches/server/0714-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch rename to patches/server/0717-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch diff --git a/patches/server/0715-Ensure-valid-vehicle-status.patch b/patches/server/0718-Ensure-valid-vehicle-status.patch similarity index 100% rename from patches/server/0715-Ensure-valid-vehicle-status.patch rename to patches/server/0718-Ensure-valid-vehicle-status.patch diff --git a/patches/server/0716-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0719-Prevent-softlocked-end-exit-portal-generation.patch similarity index 100% rename from patches/server/0716-Prevent-softlocked-end-exit-portal-generation.patch rename to patches/server/0719-Prevent-softlocked-end-exit-portal-generation.patch diff --git a/patches/server/0717-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0720-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch similarity index 100% rename from patches/server/0717-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch rename to patches/server/0720-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch diff --git a/patches/server/0718-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0721-Don-t-log-debug-logging-being-disabled.patch similarity index 100% rename from patches/server/0718-Don-t-log-debug-logging-being-disabled.patch rename to patches/server/0721-Don-t-log-debug-logging-being-disabled.patch diff --git a/patches/server/0719-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0722-fix-various-menus-with-empty-level-accesses.patch similarity index 100% rename from patches/server/0719-fix-various-menus-with-empty-level-accesses.patch rename to patches/server/0722-fix-various-menus-with-empty-level-accesses.patch diff --git a/patches/server/0720-Preserve-overstacked-loot.patch b/patches/server/0723-Preserve-overstacked-loot.patch similarity index 100% rename from patches/server/0720-Preserve-overstacked-loot.patch rename to patches/server/0723-Preserve-overstacked-loot.patch diff --git a/patches/server/0721-Update-head-rotation-in-missing-places.patch b/patches/server/0724-Update-head-rotation-in-missing-places.patch similarity index 100% rename from patches/server/0721-Update-head-rotation-in-missing-places.patch rename to patches/server/0724-Update-head-rotation-in-missing-places.patch diff --git a/patches/server/0722-prevent-unintended-light-block-manipulation.patch b/patches/server/0725-prevent-unintended-light-block-manipulation.patch similarity index 100% rename from patches/server/0722-prevent-unintended-light-block-manipulation.patch rename to patches/server/0725-prevent-unintended-light-block-manipulation.patch diff --git a/patches/server/0723-Fix-CraftCriteria-defaults-map.patch b/patches/server/0726-Fix-CraftCriteria-defaults-map.patch similarity index 100% rename from patches/server/0723-Fix-CraftCriteria-defaults-map.patch rename to patches/server/0726-Fix-CraftCriteria-defaults-map.patch diff --git a/patches/server/0724-Fix-upstreams-block-state-factories.patch b/patches/server/0727-Fix-upstreams-block-state-factories.patch similarity index 100% rename from patches/server/0724-Fix-upstreams-block-state-factories.patch rename to patches/server/0727-Fix-upstreams-block-state-factories.patch diff --git a/patches/server/0725-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0728-Add-config-option-for-logging-player-ip-addresses.patch similarity index 100% rename from patches/server/0725-Add-config-option-for-logging-player-ip-addresses.patch rename to patches/server/0728-Add-config-option-for-logging-player-ip-addresses.patch diff --git a/patches/server/0726-Configurable-feature-seeds.patch b/patches/server/0729-Configurable-feature-seeds.patch similarity index 100% rename from patches/server/0726-Configurable-feature-seeds.patch rename to patches/server/0729-Configurable-feature-seeds.patch diff --git a/patches/server/0727-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/server/0730-VanillaCommandWrapper-didnt-account-for-entity-sende.patch similarity index 100% rename from patches/server/0727-VanillaCommandWrapper-didnt-account-for-entity-sende.patch rename to patches/server/0730-VanillaCommandWrapper-didnt-account-for-entity-sende.patch diff --git a/patches/server/0728-Add-root-admin-user-detection.patch b/patches/server/0731-Add-root-admin-user-detection.patch similarity index 100% rename from patches/server/0728-Add-root-admin-user-detection.patch rename to patches/server/0731-Add-root-admin-user-detection.patch diff --git a/patches/server/0729-Always-allow-item-changing-in-Fireball.patch b/patches/server/0732-Always-allow-item-changing-in-Fireball.patch similarity index 100% rename from patches/server/0729-Always-allow-item-changing-in-Fireball.patch rename to patches/server/0732-Always-allow-item-changing-in-Fireball.patch diff --git a/patches/server/0730-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0733-don-t-attempt-to-teleport-dead-entities.patch similarity index 100% rename from patches/server/0730-don-t-attempt-to-teleport-dead-entities.patch rename to patches/server/0733-don-t-attempt-to-teleport-dead-entities.patch diff --git a/patches/server/0731-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0734-Prevent-excessive-velocity-through-repeated-crits.patch similarity index 94% rename from patches/server/0731-Prevent-excessive-velocity-through-repeated-crits.patch rename to patches/server/0734-Prevent-excessive-velocity-through-repeated-crits.patch index 7a956bb34d..444708d8ef 100644 --- a/patches/server/0731-Prevent-excessive-velocity-through-repeated-crits.patch +++ b/patches/server/0734-Prevent-excessive-velocity-through-repeated-crits.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent excessive velocity through repeated crits diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 12f5e702e5b242b93b8bf13d9c8f21aa478f2237..ef5c3d7888426b4f88b0aadecf138935bb660dad 100644 +index 27da81c4577ea3c4efaf4e719c2b8256d4707920..6a6ec6419dbbdd6dabb6dd5697f3139924b1fd78 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -2655,13 +2655,26 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0732-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0735-Remove-client-side-code-using-deprecated-for-removal.patch similarity index 100% rename from patches/server/0732-Remove-client-side-code-using-deprecated-for-removal.patch rename to patches/server/0735-Remove-client-side-code-using-deprecated-for-removal.patch diff --git a/patches/server/0733-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0736-Fix-removing-recipes-from-RecipeIterator.patch similarity index 100% rename from patches/server/0733-Fix-removing-recipes-from-RecipeIterator.patch rename to patches/server/0736-Fix-removing-recipes-from-RecipeIterator.patch diff --git a/patches/server/0734-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0737-Prevent-sending-oversized-item-data-in-equipment-and.patch similarity index 97% rename from patches/server/0734-Prevent-sending-oversized-item-data-in-equipment-and.patch rename to patches/server/0737-Prevent-sending-oversized-item-data-in-equipment-and.patch index 2165668150..828af582ef 100644 --- a/patches/server/0734-Prevent-sending-oversized-item-data-in-equipment-and.patch +++ b/patches/server/0737-Prevent-sending-oversized-item-data-in-equipment-and.patch @@ -34,7 +34,7 @@ index 09f6948a52721b27ccd7c761a7efd09bfd7a183c..71a8812365503d840f6702a21d504a37 } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index ef5c3d7888426b4f88b0aadecf138935bb660dad..71d5b386b0e0fa1c5c1e30f1ee5bdd9cb7c290da 100644 +index 6a6ec6419dbbdd6dabb6dd5697f3139924b1fd78..fa26a234c999d4353a0287988a47440508d3783f 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3164,7 +3164,10 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0735-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0738-Hide-unnecessary-itemmeta-from-clients.patch similarity index 98% rename from patches/server/0735-Hide-unnecessary-itemmeta-from-clients.patch rename to patches/server/0738-Hide-unnecessary-itemmeta-from-clients.patch index 5e7ecdcbdb..15caf566e5 100644 --- a/patches/server/0735-Hide-unnecessary-itemmeta-from-clients.patch +++ b/patches/server/0738-Hide-unnecessary-itemmeta-from-clients.patch @@ -33,7 +33,7 @@ index 2b6e315d275cf5e303663c175745a5fe2e35969f..13e73042653909f194cfc909a9637065 } } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 71d5b386b0e0fa1c5c1e30f1ee5bdd9cb7c290da..843be459302226f7a2b6d02878aebe600e2af5ee 100644 +index fa26a234c999d4353a0287988a47440508d3783f..0ebb1e0ea091a6a0334f8c53f8ed11d5944d3670 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3166,7 +3166,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0736-Fix-Spigot-growth-modifiers.patch b/patches/server/0739-Fix-Spigot-growth-modifiers.patch similarity index 100% rename from patches/server/0736-Fix-Spigot-growth-modifiers.patch rename to patches/server/0739-Fix-Spigot-growth-modifiers.patch diff --git a/patches/server/0737-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0740-Prevent-ContainerOpenersCounter-openCount-from-going.patch similarity index 100% rename from patches/server/0737-Prevent-ContainerOpenersCounter-openCount-from-going.patch rename to patches/server/0740-Prevent-ContainerOpenersCounter-openCount-from-going.patch diff --git a/patches/server/0738-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0741-Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/server/0738-Add-PlayerItemFrameChangeEvent.patch rename to patches/server/0741-Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/server/0739-Add-player-health-update-API.patch b/patches/server/0742-Add-player-health-update-API.patch similarity index 100% rename from patches/server/0739-Add-player-health-update-API.patch rename to patches/server/0742-Add-player-health-update-API.patch diff --git a/patches/server/0740-Optimize-HashMapPalette.patch b/patches/server/0743-Optimize-HashMapPalette.patch similarity index 100% rename from patches/server/0740-Optimize-HashMapPalette.patch rename to patches/server/0743-Optimize-HashMapPalette.patch diff --git a/patches/server/0741-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0744-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 100% rename from patches/server/0741-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/server/0744-Allow-delegation-to-vanilla-chunk-gen.patch diff --git a/patches/server/0742-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0745-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch similarity index 100% rename from patches/server/0742-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch rename to patches/server/0745-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch diff --git a/patches/server/0743-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0746-Optimise-collision-checking-in-player-move-packet-ha.patch similarity index 100% rename from patches/server/0743-Optimise-collision-checking-in-player-move-packet-ha.patch rename to patches/server/0746-Optimise-collision-checking-in-player-move-packet-ha.patch diff --git a/patches/server/0744-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0747-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch similarity index 100% rename from patches/server/0744-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch rename to patches/server/0747-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch diff --git a/patches/server/0745-Add-more-Campfire-API.patch b/patches/server/0748-Add-more-Campfire-API.patch similarity index 100% rename from patches/server/0745-Add-more-Campfire-API.patch rename to patches/server/0748-Add-more-Campfire-API.patch diff --git a/patches/server/0746-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0749-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch similarity index 100% rename from patches/server/0746-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch rename to patches/server/0749-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch diff --git a/patches/server/0747-Fix-tripwire-state-inconsistency.patch b/patches/server/0750-Fix-tripwire-state-inconsistency.patch similarity index 100% rename from patches/server/0747-Fix-tripwire-state-inconsistency.patch rename to patches/server/0750-Fix-tripwire-state-inconsistency.patch diff --git a/patches/server/0748-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0751-Forward-CraftEntity-in-teleport-command.patch similarity index 100% rename from patches/server/0748-Forward-CraftEntity-in-teleport-command.patch rename to patches/server/0751-Forward-CraftEntity-in-teleport-command.patch diff --git a/patches/server/0749-Improve-scoreboard-entries.patch b/patches/server/0752-Improve-scoreboard-entries.patch similarity index 100% rename from patches/server/0749-Improve-scoreboard-entries.patch rename to patches/server/0752-Improve-scoreboard-entries.patch diff --git a/patches/server/0750-Entity-powdered-snow-API.patch b/patches/server/0753-Entity-powdered-snow-API.patch similarity index 100% rename from patches/server/0750-Entity-powdered-snow-API.patch rename to patches/server/0753-Entity-powdered-snow-API.patch diff --git a/patches/server/0751-Add-API-for-item-entity-health.patch b/patches/server/0754-Add-API-for-item-entity-health.patch similarity index 100% rename from patches/server/0751-Add-API-for-item-entity-health.patch rename to patches/server/0754-Add-API-for-item-entity-health.patch diff --git a/patches/server/0752-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0755-Fix-entity-type-tags-suggestions-in-selectors.patch similarity index 100% rename from patches/server/0752-Fix-entity-type-tags-suggestions-in-selectors.patch rename to patches/server/0755-Fix-entity-type-tags-suggestions-in-selectors.patch diff --git a/patches/server/0753-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0756-Configurable-max-block-light-for-monster-spawning.patch similarity index 100% rename from patches/server/0753-Configurable-max-block-light-for-monster-spawning.patch rename to patches/server/0756-Configurable-max-block-light-for-monster-spawning.patch diff --git a/patches/server/0754-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0757-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch similarity index 100% rename from patches/server/0754-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch rename to patches/server/0757-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch diff --git a/patches/server/0755-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0758-Load-effect-amplifiers-greater-than-127-correctly.patch similarity index 100% rename from patches/server/0755-Load-effect-amplifiers-greater-than-127-correctly.patch rename to patches/server/0758-Load-effect-amplifiers-greater-than-127-correctly.patch diff --git a/patches/server/0756-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0759-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/server/0756-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/server/0759-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/server/0757-Fix-bees-aging-inside-hives.patch b/patches/server/0760-Fix-bees-aging-inside-hives.patch similarity index 100% rename from patches/server/0757-Fix-bees-aging-inside-hives.patch rename to patches/server/0760-Fix-bees-aging-inside-hives.patch diff --git a/patches/server/0758-Bucketable-API.patch b/patches/server/0761-Bucketable-API.patch similarity index 100% rename from patches/server/0758-Bucketable-API.patch rename to patches/server/0761-Bucketable-API.patch diff --git a/patches/server/0759-Validate-usernames.patch b/patches/server/0762-Validate-usernames.patch similarity index 100% rename from patches/server/0759-Validate-usernames.patch rename to patches/server/0762-Validate-usernames.patch diff --git a/patches/server/0760-Make-water-animal-spawn-height-configurable.patch b/patches/server/0763-Make-water-animal-spawn-height-configurable.patch similarity index 100% rename from patches/server/0760-Make-water-animal-spawn-height-configurable.patch rename to patches/server/0763-Make-water-animal-spawn-height-configurable.patch diff --git a/patches/server/0761-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0764-Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 100% rename from patches/server/0761-Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/server/0764-Expose-vanilla-BiomeProvider-from-WorldInfo.patch diff --git a/patches/server/0762-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0765-Add-config-option-for-worlds-affected-by-time-cmd.patch similarity index 100% rename from patches/server/0762-Add-config-option-for-worlds-affected-by-time-cmd.patch rename to patches/server/0765-Add-config-option-for-worlds-affected-by-time-cmd.patch diff --git a/patches/server/0763-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0766-Add-new-overload-to-PersistentDataContainer-has.patch similarity index 100% rename from patches/server/0763-Add-new-overload-to-PersistentDataContainer-has.patch rename to patches/server/0766-Add-new-overload-to-PersistentDataContainer-has.patch diff --git a/patches/server/0764-Multiple-Entries-with-Scoreboards.patch b/patches/server/0767-Multiple-Entries-with-Scoreboards.patch similarity index 100% rename from patches/server/0764-Multiple-Entries-with-Scoreboards.patch rename to patches/server/0767-Multiple-Entries-with-Scoreboards.patch diff --git a/patches/server/0765-Reset-placed-block-on-exception.patch b/patches/server/0768-Reset-placed-block-on-exception.patch similarity index 100% rename from patches/server/0765-Reset-placed-block-on-exception.patch rename to patches/server/0768-Reset-placed-block-on-exception.patch diff --git a/patches/server/0766-Add-configurable-height-for-slime-spawn.patch b/patches/server/0769-Add-configurable-height-for-slime-spawn.patch similarity index 100% rename from patches/server/0766-Add-configurable-height-for-slime-spawn.patch rename to patches/server/0769-Add-configurable-height-for-slime-spawn.patch diff --git a/patches/server/0767-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0770-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0767-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch rename to patches/server/0770-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0768-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0771-Fix-xp-reward-for-baby-zombies.patch similarity index 100% rename from patches/server/0768-Fix-xp-reward-for-baby-zombies.patch rename to patches/server/0771-Fix-xp-reward-for-baby-zombies.patch diff --git a/patches/server/0769-Kick-on-main-for-illegal-chat.patch b/patches/server/0772-Kick-on-main-for-illegal-chat.patch similarity index 100% rename from patches/server/0769-Kick-on-main-for-illegal-chat.patch rename to patches/server/0772-Kick-on-main-for-illegal-chat.patch diff --git a/patches/server/0770-Multi-Block-Change-API-Implementation.patch b/patches/server/0773-Multi-Block-Change-API-Implementation.patch similarity index 100% rename from patches/server/0770-Multi-Block-Change-API-Implementation.patch rename to patches/server/0773-Multi-Block-Change-API-Implementation.patch diff --git a/patches/server/0771-Fix-NotePlayEvent.patch b/patches/server/0774-Fix-NotePlayEvent.patch similarity index 100% rename from patches/server/0771-Fix-NotePlayEvent.patch rename to patches/server/0774-Fix-NotePlayEvent.patch diff --git a/patches/server/0772-Freeze-Tick-Lock-API.patch b/patches/server/0775-Freeze-Tick-Lock-API.patch similarity index 97% rename from patches/server/0772-Freeze-Tick-Lock-API.patch rename to patches/server/0775-Freeze-Tick-Lock-API.patch index ad053db0c8..6ff27e316e 100644 --- a/patches/server/0772-Freeze-Tick-Lock-API.patch +++ b/patches/server/0775-Freeze-Tick-Lock-API.patch @@ -46,7 +46,7 @@ index 11577de26052549c58cbf9eabf0ac14fca913f80..5f016f6a33dde0f0a1cdfbdfac09b3e1 } catch (Throwable throwable) { diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 843be459302226f7a2b6d02878aebe600e2af5ee..4c49da60cbeec4272fbdbdd47f52ef830863096d 100644 +index 0ebb1e0ea091a6a0334f8c53f8ed11d5944d3670..3150f04897488c9bf60fe8921111377c72c063e5 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3424,7 +3424,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0773-Dolphin-API.patch b/patches/server/0776-Dolphin-API.patch similarity index 100% rename from patches/server/0773-Dolphin-API.patch rename to patches/server/0776-Dolphin-API.patch diff --git a/patches/server/0774-More-PotionEffectType-API.patch b/patches/server/0777-More-PotionEffectType-API.patch similarity index 100% rename from patches/server/0774-More-PotionEffectType-API.patch rename to patches/server/0777-More-PotionEffectType-API.patch diff --git a/patches/server/0775-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0778-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch similarity index 100% rename from patches/server/0775-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch rename to patches/server/0778-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch diff --git a/patches/server/0776-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0779-API-for-creating-command-sender-which-forwards-feedb.patch similarity index 100% rename from patches/server/0776-API-for-creating-command-sender-which-forwards-feedb.patch rename to patches/server/0779-API-for-creating-command-sender-which-forwards-feedb.patch diff --git a/patches/server/0777-Add-missing-structure-set-seed-configs.patch b/patches/server/0780-Add-missing-structure-set-seed-configs.patch similarity index 100% rename from patches/server/0777-Add-missing-structure-set-seed-configs.patch rename to patches/server/0780-Add-missing-structure-set-seed-configs.patch diff --git a/patches/server/0778-Implement-regenerateChunk.patch b/patches/server/0781-Implement-regenerateChunk.patch similarity index 100% rename from patches/server/0778-Implement-regenerateChunk.patch rename to patches/server/0781-Implement-regenerateChunk.patch diff --git a/patches/server/0779-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0782-Fix-cancelled-powdered-snow-bucket-placement.patch similarity index 100% rename from patches/server/0779-Fix-cancelled-powdered-snow-bucket-placement.patch rename to patches/server/0782-Fix-cancelled-powdered-snow-bucket-placement.patch diff --git a/patches/server/0780-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0783-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch similarity index 100% rename from patches/server/0780-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch rename to patches/server/0783-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch diff --git a/patches/server/0781-Add-GameEvent-tags.patch b/patches/server/0784-Add-GameEvent-tags.patch similarity index 100% rename from patches/server/0781-Add-GameEvent-tags.patch rename to patches/server/0784-Add-GameEvent-tags.patch diff --git a/patches/server/0782-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0785-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch similarity index 100% rename from patches/server/0782-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch rename to patches/server/0785-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch diff --git a/patches/server/0783-Furnace-RecipesUsed-API.patch b/patches/server/0786-Furnace-RecipesUsed-API.patch similarity index 100% rename from patches/server/0783-Furnace-RecipesUsed-API.patch rename to patches/server/0786-Furnace-RecipesUsed-API.patch diff --git a/patches/server/0784-Configurable-sculk-sensor-listener-range.patch b/patches/server/0787-Configurable-sculk-sensor-listener-range.patch similarity index 100% rename from patches/server/0784-Configurable-sculk-sensor-listener-range.patch rename to patches/server/0787-Configurable-sculk-sensor-listener-range.patch diff --git a/patches/server/0785-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0788-Add-missing-block-data-mins-and-maxes.patch similarity index 100% rename from patches/server/0785-Add-missing-block-data-mins-and-maxes.patch rename to patches/server/0788-Add-missing-block-data-mins-and-maxes.patch diff --git a/patches/server/0786-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0789-Option-to-have-default-CustomSpawners-in-custom-worl.patch similarity index 100% rename from patches/server/0786-Option-to-have-default-CustomSpawners-in-custom-worl.patch rename to patches/server/0789-Option-to-have-default-CustomSpawners-in-custom-worl.patch diff --git a/patches/server/0787-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0790-Put-world-into-worldlist-before-initing-the-world.patch similarity index 100% rename from patches/server/0787-Put-world-into-worldlist-before-initing-the-world.patch rename to patches/server/0790-Put-world-into-worldlist-before-initing-the-world.patch diff --git a/patches/server/0788-Fix-Entity-Position-Desync.patch b/patches/server/0791-Fix-Entity-Position-Desync.patch similarity index 100% rename from patches/server/0788-Fix-Entity-Position-Desync.patch rename to patches/server/0791-Fix-Entity-Position-Desync.patch diff --git a/patches/server/0789-Custom-Potion-Mixes.patch b/patches/server/0792-Custom-Potion-Mixes.patch similarity index 100% rename from patches/server/0789-Custom-Potion-Mixes.patch rename to patches/server/0792-Custom-Potion-Mixes.patch diff --git a/patches/server/0790-Force-close-world-loading-screen.patch b/patches/server/0793-Force-close-world-loading-screen.patch similarity index 100% rename from patches/server/0790-Force-close-world-loading-screen.patch rename to patches/server/0793-Force-close-world-loading-screen.patch diff --git a/patches/server/0791-Fix-falling-block-spawn-methods.patch b/patches/server/0794-Fix-falling-block-spawn-methods.patch similarity index 100% rename from patches/server/0791-Fix-falling-block-spawn-methods.patch rename to patches/server/0794-Fix-falling-block-spawn-methods.patch diff --git a/patches/server/0792-Expose-furnace-minecart-push-values.patch b/patches/server/0795-Expose-furnace-minecart-push-values.patch similarity index 100% rename from patches/server/0792-Expose-furnace-minecart-push-values.patch rename to patches/server/0795-Expose-furnace-minecart-push-values.patch diff --git a/patches/server/0793-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0796-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch similarity index 100% rename from patches/server/0793-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch rename to patches/server/0796-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch diff --git a/patches/server/0794-More-Projectile-API.patch b/patches/server/0797-More-Projectile-API.patch similarity index 100% rename from patches/server/0794-More-Projectile-API.patch rename to patches/server/0797-More-Projectile-API.patch diff --git a/patches/server/0795-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0798-Fix-swamp-hut-cat-generation-deadlock.patch similarity index 100% rename from patches/server/0795-Fix-swamp-hut-cat-generation-deadlock.patch rename to patches/server/0798-Fix-swamp-hut-cat-generation-deadlock.patch diff --git a/patches/server/0796-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0799-Don-t-allow-vehicle-movement-from-players-while-tele.patch similarity index 100% rename from patches/server/0796-Don-t-allow-vehicle-movement-from-players-while-tele.patch rename to patches/server/0799-Don-t-allow-vehicle-movement-from-players-while-tele.patch diff --git a/patches/server/0797-Implement-getComputedBiome-API.patch b/patches/server/0800-Implement-getComputedBiome-API.patch similarity index 100% rename from patches/server/0797-Implement-getComputedBiome-API.patch rename to patches/server/0800-Implement-getComputedBiome-API.patch diff --git a/patches/server/0798-Make-some-itemstacks-nonnull.patch b/patches/server/0801-Make-some-itemstacks-nonnull.patch similarity index 100% rename from patches/server/0798-Make-some-itemstacks-nonnull.patch rename to patches/server/0801-Make-some-itemstacks-nonnull.patch diff --git a/patches/server/0799-Implement-enchantWithLevels-API.patch b/patches/server/0802-Implement-enchantWithLevels-API.patch similarity index 100% rename from patches/server/0799-Implement-enchantWithLevels-API.patch rename to patches/server/0802-Implement-enchantWithLevels-API.patch diff --git a/patches/server/0800-Fix-saving-in-unloadWorld.patch b/patches/server/0803-Fix-saving-in-unloadWorld.patch similarity index 100% rename from patches/server/0800-Fix-saving-in-unloadWorld.patch rename to patches/server/0803-Fix-saving-in-unloadWorld.patch diff --git a/patches/server/0801-Buffer-OOB-setBlock-calls.patch b/patches/server/0804-Buffer-OOB-setBlock-calls.patch similarity index 100% rename from patches/server/0801-Buffer-OOB-setBlock-calls.patch rename to patches/server/0804-Buffer-OOB-setBlock-calls.patch diff --git a/patches/server/0802-Add-TameableDeathMessageEvent.patch b/patches/server/0805-Add-TameableDeathMessageEvent.patch similarity index 100% rename from patches/server/0802-Add-TameableDeathMessageEvent.patch rename to patches/server/0805-Add-TameableDeathMessageEvent.patch diff --git a/patches/server/0803-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0806-Fix-new-block-data-for-EntityChangeBlockEvent.patch similarity index 100% rename from patches/server/0803-Fix-new-block-data-for-EntityChangeBlockEvent.patch rename to patches/server/0806-Fix-new-block-data-for-EntityChangeBlockEvent.patch diff --git a/patches/server/0804-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0807-fix-player-loottables-running-when-mob-loot-gamerule.patch similarity index 100% rename from patches/server/0804-fix-player-loottables-running-when-mob-loot-gamerule.patch rename to patches/server/0807-fix-player-loottables-running-when-mob-loot-gamerule.patch diff --git a/patches/server/0805-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0808-Ensure-entity-passenger-world-matches-ridden-entity.patch similarity index 100% rename from patches/server/0805-Ensure-entity-passenger-world-matches-ridden-entity.patch rename to patches/server/0808-Ensure-entity-passenger-world-matches-ridden-entity.patch diff --git a/patches/server/0806-Guard-against-invalid-entity-positions.patch b/patches/server/0809-Guard-against-invalid-entity-positions.patch similarity index 100% rename from patches/server/0806-Guard-against-invalid-entity-positions.patch rename to patches/server/0809-Guard-against-invalid-entity-positions.patch diff --git a/patches/server/0807-cache-resource-keys.patch b/patches/server/0810-cache-resource-keys.patch similarity index 100% rename from patches/server/0807-cache-resource-keys.patch rename to patches/server/0810-cache-resource-keys.patch diff --git a/patches/server/0808-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0811-Allow-to-change-the-podium-for-the-EnderDragon.patch similarity index 100% rename from patches/server/0808-Allow-to-change-the-podium-for-the-EnderDragon.patch rename to patches/server/0811-Allow-to-change-the-podium-for-the-EnderDragon.patch diff --git a/patches/server/0809-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0812-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch similarity index 100% rename from patches/server/0809-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch rename to patches/server/0812-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch diff --git a/patches/server/0810-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0813-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch similarity index 100% rename from patches/server/0810-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch rename to patches/server/0813-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch diff --git a/patches/server/0811-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0814-Prevent-tile-entity-copies-loading-chunks.patch similarity index 100% rename from patches/server/0811-Prevent-tile-entity-copies-loading-chunks.patch rename to patches/server/0814-Prevent-tile-entity-copies-loading-chunks.patch diff --git a/patches/server/0812-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0815-Use-username-instead-of-display-name-in-PlayerList-g.patch similarity index 100% rename from patches/server/0812-Use-username-instead-of-display-name-in-PlayerList-g.patch rename to patches/server/0815-Use-username-instead-of-display-name-in-PlayerList-g.patch diff --git a/patches/server/0813-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0816-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch similarity index 100% rename from patches/server/0813-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch rename to patches/server/0816-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch diff --git a/patches/server/0814-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0817-Pass-ServerLevel-for-gamerule-callbacks.patch similarity index 100% rename from patches/server/0814-Pass-ServerLevel-for-gamerule-callbacks.patch rename to patches/server/0817-Pass-ServerLevel-for-gamerule-callbacks.patch diff --git a/patches/server/0815-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0818-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch similarity index 100% rename from patches/server/0815-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch rename to patches/server/0818-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch diff --git a/patches/server/0816-WorldCreator-keepSpawnLoaded.patch b/patches/server/0819-WorldCreator-keepSpawnLoaded.patch similarity index 100% rename from patches/server/0816-WorldCreator-keepSpawnLoaded.patch rename to patches/server/0819-WorldCreator-keepSpawnLoaded.patch diff --git a/patches/server/0817-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0820-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch similarity index 100% rename from patches/server/0817-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch rename to patches/server/0820-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch diff --git a/patches/server/0818-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0821-Add-EntityDyeEvent-and-CollarColorable-interface.patch similarity index 100% rename from patches/server/0818-Add-EntityDyeEvent-and-CollarColorable-interface.patch rename to patches/server/0821-Add-EntityDyeEvent-and-CollarColorable-interface.patch diff --git a/patches/server/0819-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0822-Fire-CauldronLevelChange-on-initial-fill.patch similarity index 100% rename from patches/server/0819-Fire-CauldronLevelChange-on-initial-fill.patch rename to patches/server/0822-Fire-CauldronLevelChange-on-initial-fill.patch diff --git a/patches/server/0820-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0823-fix-powder-snow-cauldrons-not-turning-to-water.patch similarity index 100% rename from patches/server/0820-fix-powder-snow-cauldrons-not-turning-to-water.patch rename to patches/server/0823-fix-powder-snow-cauldrons-not-turning-to-water.patch diff --git a/patches/server/0821-Add-PlayerStopUsingItemEvent.patch b/patches/server/0824-Add-PlayerStopUsingItemEvent.patch similarity index 85% rename from patches/server/0821-Add-PlayerStopUsingItemEvent.patch rename to patches/server/0824-Add-PlayerStopUsingItemEvent.patch index 569318746b..da21825101 100644 --- a/patches/server/0821-Add-PlayerStopUsingItemEvent.patch +++ b/patches/server/0824-Add-PlayerStopUsingItemEvent.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add PlayerStopUsingItemEvent diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 4c49da60cbeec4272fbdbdd47f52ef830863096d..452fdec9123d1ee591fa1639b70e9558a07d8f84 100644 +index 3150f04897488c9bf60fe8921111377c72c063e5..b6e45ba7569a07f86516b89962c6d82ec22315f8 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3967,6 +3967,7 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -3983,6 +3983,7 @@ public abstract class LivingEntity extends Entity implements Attackable { public void releaseUsingItem() { if (!this.useItem.isEmpty()) { diff --git a/patches/server/0822-FallingBlock-auto-expire-setting.patch b/patches/server/0825-FallingBlock-auto-expire-setting.patch similarity index 100% rename from patches/server/0822-FallingBlock-auto-expire-setting.patch rename to patches/server/0825-FallingBlock-auto-expire-setting.patch diff --git a/patches/server/0823-Don-t-tick-markers.patch b/patches/server/0826-Don-t-tick-markers.patch similarity index 100% rename from patches/server/0823-Don-t-tick-markers.patch rename to patches/server/0826-Don-t-tick-markers.patch diff --git a/patches/server/0824-Do-not-accept-invalid-client-settings.patch b/patches/server/0827-Do-not-accept-invalid-client-settings.patch similarity index 100% rename from patches/server/0824-Do-not-accept-invalid-client-settings.patch rename to patches/server/0827-Do-not-accept-invalid-client-settings.patch diff --git a/patches/server/0825-Add-support-for-Proxy-Protocol.patch b/patches/server/0828-Add-support-for-Proxy-Protocol.patch similarity index 100% rename from patches/server/0825-Add-support-for-Proxy-Protocol.patch rename to patches/server/0828-Add-support-for-Proxy-Protocol.patch diff --git a/patches/server/0826-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0829-Fix-OfflinePlayer-getBedSpawnLocation.patch similarity index 100% rename from patches/server/0826-Fix-OfflinePlayer-getBedSpawnLocation.patch rename to patches/server/0829-Fix-OfflinePlayer-getBedSpawnLocation.patch diff --git a/patches/server/0827-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0830-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch similarity index 100% rename from patches/server/0827-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch rename to patches/server/0830-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch diff --git a/patches/server/0828-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0831-Sanitize-Sent-BlockEntity-NBT.patch similarity index 100% rename from patches/server/0828-Sanitize-Sent-BlockEntity-NBT.patch rename to patches/server/0831-Sanitize-Sent-BlockEntity-NBT.patch diff --git a/patches/server/0829-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0832-Disable-component-selector-resolving-in-books-by-def.patch similarity index 100% rename from patches/server/0829-Disable-component-selector-resolving-in-books-by-def.patch rename to patches/server/0832-Disable-component-selector-resolving-in-books-by-def.patch diff --git a/patches/server/0830-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0833-Prevent-entity-loading-causing-async-lookups.patch similarity index 100% rename from patches/server/0830-Prevent-entity-loading-causing-async-lookups.patch rename to patches/server/0833-Prevent-entity-loading-causing-async-lookups.patch diff --git a/patches/server/0831-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0834-Throw-exception-on-world-create-while-being-ticked.patch similarity index 100% rename from patches/server/0831-Throw-exception-on-world-create-while-being-ticked.patch rename to patches/server/0834-Throw-exception-on-world-create-while-being-ticked.patch diff --git a/patches/server/0832-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0835-Add-Alternate-Current-redstone-implementation.patch similarity index 100% rename from patches/server/0832-Add-Alternate-Current-redstone-implementation.patch rename to patches/server/0835-Add-Alternate-Current-redstone-implementation.patch diff --git a/patches/server/0833-Dont-resent-entity-on-art-update.patch b/patches/server/0836-Dont-resent-entity-on-art-update.patch similarity index 100% rename from patches/server/0833-Dont-resent-entity-on-art-update.patch rename to patches/server/0836-Dont-resent-entity-on-art-update.patch diff --git a/patches/server/0834-Add-WardenAngerChangeEvent.patch b/patches/server/0837-Add-WardenAngerChangeEvent.patch similarity index 100% rename from patches/server/0834-Add-WardenAngerChangeEvent.patch rename to patches/server/0837-Add-WardenAngerChangeEvent.patch diff --git a/patches/server/0835-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0838-Add-option-for-strict-advancement-dimension-checks.patch similarity index 100% rename from patches/server/0835-Add-option-for-strict-advancement-dimension-checks.patch rename to patches/server/0838-Add-option-for-strict-advancement-dimension-checks.patch diff --git a/patches/server/0836-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0839-Add-missing-important-BlockStateListPopulator-method.patch similarity index 100% rename from patches/server/0836-Add-missing-important-BlockStateListPopulator-method.patch rename to patches/server/0839-Add-missing-important-BlockStateListPopulator-method.patch diff --git a/patches/server/0837-Nameable-Banner-API.patch b/patches/server/0840-Nameable-Banner-API.patch similarity index 100% rename from patches/server/0837-Nameable-Banner-API.patch rename to patches/server/0840-Nameable-Banner-API.patch diff --git a/patches/server/0838-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0841-Don-t-broadcast-messages-to-command-blocks.patch similarity index 100% rename from patches/server/0838-Don-t-broadcast-messages-to-command-blocks.patch rename to patches/server/0841-Don-t-broadcast-messages-to-command-blocks.patch diff --git a/patches/server/0839-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0842-Prevent-empty-items-from-being-added-to-world.patch similarity index 100% rename from patches/server/0839-Prevent-empty-items-from-being-added-to-world.patch rename to patches/server/0842-Prevent-empty-items-from-being-added-to-world.patch diff --git a/patches/server/0840-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0843-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch similarity index 100% rename from patches/server/0840-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch rename to patches/server/0843-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch diff --git a/patches/server/0841-Don-t-print-component-in-resource-pack-rejection-mes.patch b/patches/server/0844-Don-t-print-component-in-resource-pack-rejection-mes.patch similarity index 100% rename from patches/server/0841-Don-t-print-component-in-resource-pack-rejection-mes.patch rename to patches/server/0844-Don-t-print-component-in-resource-pack-rejection-mes.patch diff --git a/patches/server/0842-Add-Player-getFishHook.patch b/patches/server/0845-Add-Player-getFishHook.patch similarity index 100% rename from patches/server/0842-Add-Player-getFishHook.patch rename to patches/server/0845-Add-Player-getFishHook.patch diff --git a/patches/server/0843-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0846-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch similarity index 100% rename from patches/server/0843-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch rename to patches/server/0846-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch diff --git a/patches/server/0844-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0847-Add-various-missing-EntityDropItemEvent-calls.patch similarity index 100% rename from patches/server/0844-Add-various-missing-EntityDropItemEvent-calls.patch rename to patches/server/0847-Add-various-missing-EntityDropItemEvent-calls.patch diff --git a/patches/server/0845-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0848-Add-some-minimal-debug-information-to-chat-packet-er.patch similarity index 100% rename from patches/server/0845-Add-some-minimal-debug-information-to-chat-packet-er.patch rename to patches/server/0848-Add-some-minimal-debug-information-to-chat-packet-er.patch diff --git a/patches/server/0846-Fix-Bee-flower-NPE.patch b/patches/server/0849-Fix-Bee-flower-NPE.patch similarity index 100% rename from patches/server/0846-Fix-Bee-flower-NPE.patch rename to patches/server/0849-Fix-Bee-flower-NPE.patch diff --git a/patches/server/0847-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0850-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch similarity index 100% rename from patches/server/0847-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch rename to patches/server/0850-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch diff --git a/patches/server/0848-More-Teleport-API.patch b/patches/server/0851-More-Teleport-API.patch similarity index 100% rename from patches/server/0848-More-Teleport-API.patch rename to patches/server/0851-More-Teleport-API.patch diff --git a/patches/server/0849-Add-EntityPortalReadyEvent.patch b/patches/server/0852-Add-EntityPortalReadyEvent.patch similarity index 100% rename from patches/server/0849-Add-EntityPortalReadyEvent.patch rename to patches/server/0852-Add-EntityPortalReadyEvent.patch diff --git a/patches/server/0850-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0853-Don-t-use-level-random-in-entity-constructors.patch similarity index 100% rename from patches/server/0850-Don-t-use-level-random-in-entity-constructors.patch rename to patches/server/0853-Don-t-use-level-random-in-entity-constructors.patch diff --git a/patches/server/0851-Send-block-entities-after-destroy-prediction.patch b/patches/server/0854-Send-block-entities-after-destroy-prediction.patch similarity index 100% rename from patches/server/0851-Send-block-entities-after-destroy-prediction.patch rename to patches/server/0854-Send-block-entities-after-destroy-prediction.patch diff --git a/patches/server/0852-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0855-Warn-on-plugins-accessing-faraway-chunks.patch similarity index 100% rename from patches/server/0852-Warn-on-plugins-accessing-faraway-chunks.patch rename to patches/server/0855-Warn-on-plugins-accessing-faraway-chunks.patch diff --git a/patches/server/0853-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0856-Custom-Chat-Completion-Suggestions-API.patch similarity index 100% rename from patches/server/0853-Custom-Chat-Completion-Suggestions-API.patch rename to patches/server/0856-Custom-Chat-Completion-Suggestions-API.patch diff --git a/patches/server/0854-Add-missing-BlockFadeEvents.patch b/patches/server/0857-Add-missing-BlockFadeEvents.patch similarity index 100% rename from patches/server/0854-Add-missing-BlockFadeEvents.patch rename to patches/server/0857-Add-missing-BlockFadeEvents.patch diff --git a/patches/server/0855-Collision-API.patch b/patches/server/0858-Collision-API.patch similarity index 100% rename from patches/server/0855-Collision-API.patch rename to patches/server/0858-Collision-API.patch diff --git a/patches/server/0856-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0859-Fix-suggest-command-message-for-brigadier-syntax-exc.patch similarity index 100% rename from patches/server/0856-Fix-suggest-command-message-for-brigadier-syntax-exc.patch rename to patches/server/0859-Fix-suggest-command-message-for-brigadier-syntax-exc.patch diff --git a/patches/server/0857-Remove-invalid-signature-login-stacktrace.patch b/patches/server/0860-Remove-invalid-signature-login-stacktrace.patch similarity index 100% rename from patches/server/0857-Remove-invalid-signature-login-stacktrace.patch rename to patches/server/0860-Remove-invalid-signature-login-stacktrace.patch diff --git a/patches/server/0858-Block-Ticking-API.patch b/patches/server/0861-Block-Ticking-API.patch similarity index 100% rename from patches/server/0858-Block-Ticking-API.patch rename to patches/server/0861-Block-Ticking-API.patch diff --git a/patches/server/0859-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0862-Add-Velocity-IP-Forwarding-Support.patch similarity index 100% rename from patches/server/0859-Add-Velocity-IP-Forwarding-Support.patch rename to patches/server/0862-Add-Velocity-IP-Forwarding-Support.patch diff --git a/patches/server/0860-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0863-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch similarity index 100% rename from patches/server/0860-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch rename to patches/server/0863-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch diff --git a/patches/server/0861-Add-NamespacedKey-biome-methods.patch b/patches/server/0864-Add-NamespacedKey-biome-methods.patch similarity index 100% rename from patches/server/0861-Add-NamespacedKey-biome-methods.patch rename to patches/server/0864-Add-NamespacedKey-biome-methods.patch diff --git a/patches/server/0862-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0865-Fix-plugin-loggers-on-server-shutdown.patch similarity index 100% rename from patches/server/0862-Fix-plugin-loggers-on-server-shutdown.patch rename to patches/server/0865-Fix-plugin-loggers-on-server-shutdown.patch diff --git a/patches/server/0863-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0866-Stop-large-look-changes-from-crashing-the-server.patch similarity index 96% rename from patches/server/0863-Stop-large-look-changes-from-crashing-the-server.patch rename to patches/server/0866-Stop-large-look-changes-from-crashing-the-server.patch index def4248cf6..c13ab4bd8e 100644 --- a/patches/server/0863-Stop-large-look-changes-from-crashing-the-server.patch +++ b/patches/server/0866-Stop-large-look-changes-from-crashing-the-server.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Stop large look changes from crashing the server Co-authored-by: Jaren Knodel diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 452fdec9123d1ee591fa1639b70e9558a07d8f84..83d6f3d4981ef0ed418239e134597fa060a79c64 100644 +index b6e45ba7569a07f86516b89962c6d82ec22315f8..e489459a78ed945cfc345f4e3329bdd41e2bfb6f 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3034,37 +3034,15 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0864-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0867-Fire-EntityChangeBlockEvent-in-more-places.patch similarity index 100% rename from patches/server/0864-Fire-EntityChangeBlockEvent-in-more-places.patch rename to patches/server/0867-Fire-EntityChangeBlockEvent-in-more-places.patch diff --git a/patches/server/0865-Missing-eating-regain-reason.patch b/patches/server/0868-Missing-eating-regain-reason.patch similarity index 100% rename from patches/server/0865-Missing-eating-regain-reason.patch rename to patches/server/0868-Missing-eating-regain-reason.patch diff --git a/patches/server/0866-Missing-effect-cause.patch b/patches/server/0869-Missing-effect-cause.patch similarity index 100% rename from patches/server/0866-Missing-effect-cause.patch rename to patches/server/0869-Missing-effect-cause.patch diff --git a/patches/server/0867-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0870-Added-byte-array-serialization-deserialization-for-P.patch similarity index 100% rename from patches/server/0867-Added-byte-array-serialization-deserialization-for-P.patch rename to patches/server/0870-Added-byte-array-serialization-deserialization-for-P.patch diff --git a/patches/server/0868-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0871-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch similarity index 100% rename from patches/server/0868-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch rename to patches/server/0871-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch diff --git a/patches/server/0869-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0872-Call-BlockPhysicsEvent-more-often.patch similarity index 100% rename from patches/server/0869-Call-BlockPhysicsEvent-more-often.patch rename to patches/server/0872-Call-BlockPhysicsEvent-more-often.patch diff --git a/patches/server/0870-Configurable-chat-thread-limit.patch b/patches/server/0873-Configurable-chat-thread-limit.patch similarity index 100% rename from patches/server/0870-Configurable-chat-thread-limit.patch rename to patches/server/0873-Configurable-chat-thread-limit.patch diff --git a/patches/server/0871-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0874-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch similarity index 100% rename from patches/server/0871-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch rename to patches/server/0874-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch diff --git a/patches/server/0872-fix-Jigsaw-block-kicking-user.patch b/patches/server/0875-fix-Jigsaw-block-kicking-user.patch similarity index 100% rename from patches/server/0872-fix-Jigsaw-block-kicking-user.patch rename to patches/server/0875-fix-Jigsaw-block-kicking-user.patch diff --git a/patches/server/0873-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0876-use-BlockFormEvent-for-mud-converting-into-clay.patch similarity index 100% rename from patches/server/0873-use-BlockFormEvent-for-mud-converting-into-clay.patch rename to patches/server/0876-use-BlockFormEvent-for-mud-converting-into-clay.patch diff --git a/patches/server/0874-Add-getDrops-to-BlockState.patch b/patches/server/0877-Add-getDrops-to-BlockState.patch similarity index 100% rename from patches/server/0874-Add-getDrops-to-BlockState.patch rename to patches/server/0877-Add-getDrops-to-BlockState.patch diff --git a/patches/server/0875-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0878-Fix-a-bunch-of-vanilla-bugs.patch similarity index 100% rename from patches/server/0875-Fix-a-bunch-of-vanilla-bugs.patch rename to patches/server/0878-Fix-a-bunch-of-vanilla-bugs.patch diff --git a/patches/server/0876-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0879-Remove-unnecessary-onTrackingStart-during-navigation.patch similarity index 100% rename from patches/server/0876-Remove-unnecessary-onTrackingStart-during-navigation.patch rename to patches/server/0879-Remove-unnecessary-onTrackingStart-during-navigation.patch diff --git a/patches/server/0877-Fix-custom-piglin-loved-items.patch b/patches/server/0880-Fix-custom-piglin-loved-items.patch similarity index 100% rename from patches/server/0877-Fix-custom-piglin-loved-items.patch rename to patches/server/0880-Fix-custom-piglin-loved-items.patch diff --git a/patches/server/0878-EntityPickupItemEvent-fixes.patch b/patches/server/0881-EntityPickupItemEvent-fixes.patch similarity index 100% rename from patches/server/0878-EntityPickupItemEvent-fixes.patch rename to patches/server/0881-EntityPickupItemEvent-fixes.patch diff --git a/patches/server/0879-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0882-Correctly-handle-interactions-with-items-on-cooldown.patch similarity index 100% rename from patches/server/0879-Correctly-handle-interactions-with-items-on-cooldown.patch rename to patches/server/0882-Correctly-handle-interactions-with-items-on-cooldown.patch diff --git a/patches/server/0880-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0883-Add-PlayerInventorySlotChangeEvent.patch similarity index 100% rename from patches/server/0880-Add-PlayerInventorySlotChangeEvent.patch rename to patches/server/0883-Add-PlayerInventorySlotChangeEvent.patch diff --git a/patches/server/0881-Elder-Guardian-appearance-API.patch b/patches/server/0884-Elder-Guardian-appearance-API.patch similarity index 100% rename from patches/server/0881-Elder-Guardian-appearance-API.patch rename to patches/server/0884-Elder-Guardian-appearance-API.patch diff --git a/patches/server/0882-Allow-changing-bed-s-occupied-property.patch b/patches/server/0885-Allow-changing-bed-s-occupied-property.patch similarity index 100% rename from patches/server/0882-Allow-changing-bed-s-occupied-property.patch rename to patches/server/0885-Allow-changing-bed-s-occupied-property.patch diff --git a/patches/server/0883-Add-entity-knockback-API.patch b/patches/server/0886-Add-entity-knockback-API.patch similarity index 100% rename from patches/server/0883-Add-entity-knockback-API.patch rename to patches/server/0886-Add-entity-knockback-API.patch diff --git a/patches/server/0884-Detect-headless-JREs.patch b/patches/server/0887-Detect-headless-JREs.patch similarity index 100% rename from patches/server/0884-Detect-headless-JREs.patch rename to patches/server/0887-Detect-headless-JREs.patch diff --git a/patches/server/0885-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0888-fixed-entity-vehicle-collision-event-not-called.patch similarity index 100% rename from patches/server/0885-fixed-entity-vehicle-collision-event-not-called.patch rename to patches/server/0888-fixed-entity-vehicle-collision-event-not-called.patch diff --git a/patches/server/0886-optimized-dirt-and-snow-spreading.patch b/patches/server/0889-optimized-dirt-and-snow-spreading.patch similarity index 100% rename from patches/server/0886-optimized-dirt-and-snow-spreading.patch rename to patches/server/0889-optimized-dirt-and-snow-spreading.patch diff --git a/patches/server/0887-Added-EntityToggleSitEvent.patch b/patches/server/0890-Added-EntityToggleSitEvent.patch similarity index 100% rename from patches/server/0887-Added-EntityToggleSitEvent.patch rename to patches/server/0890-Added-EntityToggleSitEvent.patch diff --git a/patches/server/0888-Add-fire-tick-delay-option.patch b/patches/server/0891-Add-fire-tick-delay-option.patch similarity index 100% rename from patches/server/0888-Add-fire-tick-delay-option.patch rename to patches/server/0891-Add-fire-tick-delay-option.patch diff --git a/patches/server/0889-Add-Moving-Piston-API.patch b/patches/server/0892-Add-Moving-Piston-API.patch similarity index 100% rename from patches/server/0889-Add-Moving-Piston-API.patch rename to patches/server/0892-Add-Moving-Piston-API.patch diff --git a/patches/server/0890-Ignore-impossible-spawn-tick.patch b/patches/server/0893-Ignore-impossible-spawn-tick.patch similarity index 100% rename from patches/server/0890-Ignore-impossible-spawn-tick.patch rename to patches/server/0893-Ignore-impossible-spawn-tick.patch diff --git a/patches/server/0891-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0894-Track-projectile-source-for-fireworks-from-dispenser.patch similarity index 100% rename from patches/server/0891-Track-projectile-source-for-fireworks-from-dispenser.patch rename to patches/server/0894-Track-projectile-source-for-fireworks-from-dispenser.patch diff --git a/patches/server/0892-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0895-Fix-EntityArgument-suggestion-permissions-to-align-w.patch similarity index 100% rename from patches/server/0892-Fix-EntityArgument-suggestion-permissions-to-align-w.patch rename to patches/server/0895-Fix-EntityArgument-suggestion-permissions-to-align-w.patch diff --git a/patches/server/0893-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0896-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch similarity index 100% rename from patches/server/0893-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch rename to patches/server/0896-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch diff --git a/patches/server/0894-Prevent-compass-from-loading-chunks.patch b/patches/server/0897-Prevent-compass-from-loading-chunks.patch similarity index 100% rename from patches/server/0894-Prevent-compass-from-loading-chunks.patch rename to patches/server/0897-Prevent-compass-from-loading-chunks.patch diff --git a/patches/server/0895-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0898-Add-PrePlayerAttackEntityEvent.patch similarity index 100% rename from patches/server/0895-Add-PrePlayerAttackEntityEvent.patch rename to patches/server/0898-Add-PrePlayerAttackEntityEvent.patch diff --git a/patches/server/0896-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0899-ensure-reset-EnderDragon-boss-event-name.patch similarity index 100% rename from patches/server/0896-ensure-reset-EnderDragon-boss-event-name.patch rename to patches/server/0899-ensure-reset-EnderDragon-boss-event-name.patch diff --git a/patches/server/0897-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0900-fix-MC-252817-green-map-markers-do-not-disappear.patch similarity index 100% rename from patches/server/0897-fix-MC-252817-green-map-markers-do-not-disappear.patch rename to patches/server/0900-fix-MC-252817-green-map-markers-do-not-disappear.patch diff --git a/patches/server/0898-Add-Player-Warden-Warning-API.patch b/patches/server/0901-Add-Player-Warden-Warning-API.patch similarity index 100% rename from patches/server/0898-Add-Player-Warden-Warning-API.patch rename to patches/server/0901-Add-Player-Warden-Warning-API.patch diff --git a/patches/server/0899-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0902-More-vanilla-friendly-methods-to-update-trades.patch similarity index 100% rename from patches/server/0899-More-vanilla-friendly-methods-to-update-trades.patch rename to patches/server/0902-More-vanilla-friendly-methods-to-update-trades.patch diff --git a/patches/server/0900-Add-paper-dumplisteners-command.patch b/patches/server/0903-Add-paper-dumplisteners-command.patch similarity index 100% rename from patches/server/0900-Add-paper-dumplisteners-command.patch rename to patches/server/0903-Add-paper-dumplisteners-command.patch diff --git a/patches/server/0901-check-global-player-list-where-appropriate.patch b/patches/server/0904-check-global-player-list-where-appropriate.patch similarity index 97% rename from patches/server/0901-check-global-player-list-where-appropriate.patch rename to patches/server/0904-check-global-player-list-where-appropriate.patch index d9a259b62c..9e0e69b4ee 100644 --- a/patches/server/0901-check-global-player-list-where-appropriate.patch +++ b/patches/server/0904-check-global-player-list-where-appropriate.patch @@ -24,7 +24,7 @@ index d3e2005f4f1abd9ad5bda6acc8860bd74a2d2d25..5932cfd855ee08442e0f8efb52bd9f2d + // Paper end } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 83d6f3d4981ef0ed418239e134597fa060a79c64..b1565fc7458c72bb8db65ebbf7a069cb26c47ad4 100644 +index e489459a78ed945cfc345f4e3329bdd41e2bfb6f..d688308e12f44100e6296740f600ec3b064efe88 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3620,7 +3620,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0902-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0905-Fix-async-entity-add-due-to-fungus-trees.patch similarity index 100% rename from patches/server/0902-Fix-async-entity-add-due-to-fungus-trees.patch rename to patches/server/0905-Fix-async-entity-add-due-to-fungus-trees.patch diff --git a/patches/server/0903-ItemStack-damage-API.patch b/patches/server/0906-ItemStack-damage-API.patch similarity index 100% rename from patches/server/0903-ItemStack-damage-API.patch rename to patches/server/0906-ItemStack-damage-API.patch diff --git a/patches/server/0904-Friction-API.patch b/patches/server/0907-Friction-API.patch similarity index 98% rename from patches/server/0904-Friction-API.patch rename to patches/server/0907-Friction-API.patch index cccdb805be..a8d5128969 100644 --- a/patches/server/0904-Friction-API.patch +++ b/patches/server/0907-Friction-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Friction API diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index b1565fc7458c72bb8db65ebbf7a069cb26c47ad4..7afd151aa40754d96846d5bd48acfc61f2c47c87 100644 +index d688308e12f44100e6296740f600ec3b064efe88..bbb062f6a9e340492fb8535b259ddebe1e85cae9 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -263,6 +263,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0905-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0908-Ability-to-control-player-s-insomnia-and-phantoms.patch similarity index 100% rename from patches/server/0905-Ability-to-control-player-s-insomnia-and-phantoms.patch rename to patches/server/0908-Ability-to-control-player-s-insomnia-and-phantoms.patch diff --git a/patches/server/0906-Fix-player-kick-on-shutdown.patch b/patches/server/0909-Fix-player-kick-on-shutdown.patch similarity index 100% rename from patches/server/0906-Fix-player-kick-on-shutdown.patch rename to patches/server/0909-Fix-player-kick-on-shutdown.patch diff --git a/patches/server/0907-Sync-offhand-slot-in-menus.patch b/patches/server/0910-Sync-offhand-slot-in-menus.patch similarity index 100% rename from patches/server/0907-Sync-offhand-slot-in-menus.patch rename to patches/server/0910-Sync-offhand-slot-in-menus.patch diff --git a/patches/server/0908-Player-Entity-Tracking-Events.patch b/patches/server/0911-Player-Entity-Tracking-Events.patch similarity index 100% rename from patches/server/0908-Player-Entity-Tracking-Events.patch rename to patches/server/0911-Player-Entity-Tracking-Events.patch diff --git a/patches/server/0909-Limit-pet-look-distance.patch b/patches/server/0912-Limit-pet-look-distance.patch similarity index 100% rename from patches/server/0909-Limit-pet-look-distance.patch rename to patches/server/0912-Limit-pet-look-distance.patch diff --git a/patches/server/0910-Properly-resend-entities.patch b/patches/server/0913-Properly-resend-entities.patch similarity index 100% rename from patches/server/0910-Properly-resend-entities.patch rename to patches/server/0913-Properly-resend-entities.patch diff --git a/patches/server/0911-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0914-Fixes-and-additions-to-the-SpawnReason-API.patch similarity index 98% rename from patches/server/0911-Fixes-and-additions-to-the-SpawnReason-API.patch rename to patches/server/0914-Fixes-and-additions-to-the-SpawnReason-API.patch index 36555fd820..f7f6ee5b61 100644 --- a/patches/server/0911-Fixes-and-additions-to-the-SpawnReason-API.patch +++ b/patches/server/0914-Fixes-and-additions-to-the-SpawnReason-API.patch @@ -8,7 +8,7 @@ Fixes some wrong reasons, and adds missing spawn reasons for entities. Co-authored-by: Doc diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java -index c2aafe4e1afec2793735bf7b0bbd6af94ad393f8..ab20be593e25a1fd32463bf5f26534595b49a4ec 100644 +index c7e127e62b7616997c123c47d86ed751c12fd151..c11e805dc4b77f08cadb0e99d86635036405da3e 100644 --- a/src/main/java/net/minecraft/world/entity/EntityType.java +++ b/src/main/java/net/minecraft/world/entity/EntityType.java @@ -348,7 +348,7 @@ public class EntityType implements FeatureElement, EntityTypeT diff --git a/patches/server/0912-fix-Instruments.patch b/patches/server/0915-fix-Instruments.patch similarity index 100% rename from patches/server/0912-fix-Instruments.patch rename to patches/server/0915-fix-Instruments.patch diff --git a/patches/server/0913-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0916-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch similarity index 100% rename from patches/server/0913-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch rename to patches/server/0916-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch diff --git a/patches/server/0914-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0917-Fix-inconsistencies-in-dispense-events-regarding-sta.patch similarity index 100% rename from patches/server/0914-Fix-inconsistencies-in-dispense-events-regarding-sta.patch rename to patches/server/0917-Fix-inconsistencies-in-dispense-events-regarding-sta.patch diff --git a/patches/server/0915-Improve-logging-and-errors.patch b/patches/server/0918-Improve-logging-and-errors.patch similarity index 100% rename from patches/server/0915-Improve-logging-and-errors.patch rename to patches/server/0918-Improve-logging-and-errors.patch diff --git a/patches/server/0916-Add-BlockLockCheckEvent.patch b/patches/server/0919-Add-BlockLockCheckEvent.patch similarity index 100% rename from patches/server/0916-Add-BlockLockCheckEvent.patch rename to patches/server/0919-Add-BlockLockCheckEvent.patch diff --git a/patches/server/0917-Add-Sneaking-API-for-Entities.patch b/patches/server/0920-Add-Sneaking-API-for-Entities.patch similarity index 100% rename from patches/server/0917-Add-Sneaking-API-for-Entities.patch rename to patches/server/0920-Add-Sneaking-API-for-Entities.patch diff --git a/patches/server/0918-Improve-PortalEvents.patch b/patches/server/0921-Improve-PortalEvents.patch similarity index 100% rename from patches/server/0918-Improve-PortalEvents.patch rename to patches/server/0921-Improve-PortalEvents.patch diff --git a/patches/server/0919-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0922-Add-config-option-for-spider-worldborder-climbing.patch similarity index 100% rename from patches/server/0919-Add-config-option-for-spider-worldborder-climbing.patch rename to patches/server/0922-Add-config-option-for-spider-worldborder-climbing.patch diff --git a/patches/server/0920-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0923-Add-missing-SpigotConfig-logCommands-check.patch similarity index 100% rename from patches/server/0920-Add-missing-SpigotConfig-logCommands-check.patch rename to patches/server/0923-Add-missing-SpigotConfig-logCommands-check.patch diff --git a/patches/server/0921-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0924-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch similarity index 100% rename from patches/server/0921-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch rename to patches/server/0924-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch diff --git a/patches/server/0922-Flying-Fall-Damage.patch b/patches/server/0925-Flying-Fall-Damage.patch similarity index 100% rename from patches/server/0922-Flying-Fall-Damage.patch rename to patches/server/0925-Flying-Fall-Damage.patch diff --git a/patches/server/0923-Add-exploded-block-state-to-BlockExplodeEvent.patch b/patches/server/0926-Add-exploded-block-state-to-BlockExplodeEvent.patch similarity index 100% rename from patches/server/0923-Add-exploded-block-state-to-BlockExplodeEvent.patch rename to patches/server/0926-Add-exploded-block-state-to-BlockExplodeEvent.patch diff --git a/patches/server/0924-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0927-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch similarity index 100% rename from patches/server/0924-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch rename to patches/server/0927-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch diff --git a/patches/server/0925-config-for-disabling-entity-tag-tags.patch b/patches/server/0928-config-for-disabling-entity-tag-tags.patch similarity index 93% rename from patches/server/0925-config-for-disabling-entity-tag-tags.patch rename to patches/server/0928-config-for-disabling-entity-tag-tags.patch index 72aabc88bb..e7680c986a 100644 --- a/patches/server/0925-config-for-disabling-entity-tag-tags.patch +++ b/patches/server/0928-config-for-disabling-entity-tag-tags.patch @@ -5,7 +5,7 @@ Subject: [PATCH] config for disabling entity tag tags diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java -index ab20be593e25a1fd32463bf5f26534595b49a4ec..1eae10b9ddb10e6de941c03d54b57c815105feba 100644 +index c11e805dc4b77f08cadb0e99d86635036405da3e..9afc81ccb237c3655d64cdbe8a0db9a4d7791043 100644 --- a/src/main/java/net/minecraft/world/entity/EntityType.java +++ b/src/main/java/net/minecraft/world/entity/EntityType.java @@ -492,6 +492,13 @@ public class EntityType implements FeatureElement, EntityTypeT diff --git a/patches/server/0926-Use-single-player-info-update-packet-on-join.patch b/patches/server/0929-Use-single-player-info-update-packet-on-join.patch similarity index 100% rename from patches/server/0926-Use-single-player-info-update-packet-on-join.patch rename to patches/server/0929-Use-single-player-info-update-packet-on-join.patch diff --git a/patches/server/0927-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0930-Correctly-shrink-items-during-EntityResurrectEvent.patch similarity index 95% rename from patches/server/0927-Correctly-shrink-items-during-EntityResurrectEvent.patch rename to patches/server/0930-Correctly-shrink-items-during-EntityResurrectEvent.patch index a3f83b96e6..8bcfc9f077 100644 --- a/patches/server/0927-Correctly-shrink-items-during-EntityResurrectEvent.patch +++ b/patches/server/0930-Correctly-shrink-items-during-EntityResurrectEvent.patch @@ -22,7 +22,7 @@ This patch corrects this behaviour by only shrinking the item if a totem of undying was found and the event was called uncancelled. diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 7afd151aa40754d96846d5bd48acfc61f2c47c87..5e5221b4613dc04ede1f18a15ca1eb4913187cdb 100644 +index bbb062f6a9e340492fb8535b259ddebe1e85cae9..3746bcda0972c5c0f48df894248aa4398983c267 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1592,7 +1592,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0928-Win-Screen-API.patch b/patches/server/0931-Win-Screen-API.patch similarity index 100% rename from patches/server/0928-Win-Screen-API.patch rename to patches/server/0931-Win-Screen-API.patch diff --git a/patches/server/0929-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0932-Remove-CraftItemStack-setAmount-null-assignment.patch similarity index 100% rename from patches/server/0929-Remove-CraftItemStack-setAmount-null-assignment.patch rename to patches/server/0932-Remove-CraftItemStack-setAmount-null-assignment.patch diff --git a/patches/server/0930-Fix-force-opening-enchantment-tables.patch b/patches/server/0933-Fix-force-opening-enchantment-tables.patch similarity index 100% rename from patches/server/0930-Fix-force-opening-enchantment-tables.patch rename to patches/server/0933-Fix-force-opening-enchantment-tables.patch diff --git a/patches/server/0931-Add-Entity-Body-Yaw-API.patch b/patches/server/0934-Add-Entity-Body-Yaw-API.patch similarity index 100% rename from patches/server/0931-Add-Entity-Body-Yaw-API.patch rename to patches/server/0934-Add-Entity-Body-Yaw-API.patch diff --git a/patches/server/0932-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0935-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch similarity index 100% rename from patches/server/0932-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch rename to patches/server/0935-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch diff --git a/patches/server/0933-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0936-Update-the-flag-when-a-captured-block-state-is-outda.patch similarity index 100% rename from patches/server/0933-Update-the-flag-when-a-captured-block-state-is-outda.patch rename to patches/server/0936-Update-the-flag-when-a-captured-block-state-is-outda.patch diff --git a/patches/server/0934-Add-EntityFertilizeEggEvent.patch b/patches/server/0937-Add-EntityFertilizeEggEvent.patch similarity index 100% rename from patches/server/0934-Add-EntityFertilizeEggEvent.patch rename to patches/server/0937-Add-EntityFertilizeEggEvent.patch diff --git a/patches/server/0935-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0938-Fix-HumanEntity-drop-not-updating-the-client-inv.patch similarity index 100% rename from patches/server/0935-Fix-HumanEntity-drop-not-updating-the-client-inv.patch rename to patches/server/0938-Fix-HumanEntity-drop-not-updating-the-client-inv.patch diff --git a/patches/server/0936-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0939-Add-CompostItemEvent-and-EntityCompostItemEvent.patch similarity index 100% rename from patches/server/0936-Add-CompostItemEvent-and-EntityCompostItemEvent.patch rename to patches/server/0939-Add-CompostItemEvent-and-EntityCompostItemEvent.patch diff --git a/patches/server/0937-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0940-Correctly-handle-ArmorStand-invisibility.patch similarity index 100% rename from patches/server/0937-Correctly-handle-ArmorStand-invisibility.patch rename to patches/server/0940-Correctly-handle-ArmorStand-invisibility.patch diff --git a/patches/server/0938-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0941-Fix-advancement-triggers-for-entity-damage.patch similarity index 97% rename from patches/server/0938-Fix-advancement-triggers-for-entity-damage.patch rename to patches/server/0941-Fix-advancement-triggers-for-entity-damage.patch index dcd358c9be..7a83af247e 100644 --- a/patches/server/0938-Fix-advancement-triggers-for-entity-damage.patch +++ b/patches/server/0941-Fix-advancement-triggers-for-entity-damage.patch @@ -23,7 +23,7 @@ index f054d67a637b204de604fadc0d321f5c9816d808..fc5f1e1b445f0a55a35a31d58a90920a return !this.getResponse(); diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 5e5221b4613dc04ede1f18a15ca1eb4913187cdb..a6d730eaee1df1c5c61aa0f8731b8c055080a9a6 100644 +index 3746bcda0972c5c0f48df894248aa4398983c267..67627bbf84f5aab2872f636b1dcb6728c8494147 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -2280,7 +2280,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0939-Fix-text-display-error-on-spawn.patch b/patches/server/0942-Fix-text-display-error-on-spawn.patch similarity index 100% rename from patches/server/0939-Fix-text-display-error-on-spawn.patch rename to patches/server/0942-Fix-text-display-error-on-spawn.patch diff --git a/patches/server/0940-Fix-certain-inventories-returning-null-Locations.patch b/patches/server/0943-Fix-certain-inventories-returning-null-Locations.patch similarity index 100% rename from patches/server/0940-Fix-certain-inventories-returning-null-Locations.patch rename to patches/server/0943-Fix-certain-inventories-returning-null-Locations.patch diff --git a/patches/server/0941-Add-Shearable-API.patch b/patches/server/0944-Add-Shearable-API.patch similarity index 100% rename from patches/server/0941-Add-Shearable-API.patch rename to patches/server/0944-Add-Shearable-API.patch diff --git a/patches/server/0942-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0945-Fix-SpawnEggMeta-get-setSpawnedType.patch similarity index 100% rename from patches/server/0942-Fix-SpawnEggMeta-get-setSpawnedType.patch rename to patches/server/0945-Fix-SpawnEggMeta-get-setSpawnedType.patch diff --git a/patches/server/0943-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch b/patches/server/0946-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch similarity index 100% rename from patches/server/0943-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch rename to patches/server/0946-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch diff --git a/patches/server/0944-Optimize-Hoppers.patch b/patches/server/0947-Optimize-Hoppers.patch similarity index 100% rename from patches/server/0944-Optimize-Hoppers.patch rename to patches/server/0947-Optimize-Hoppers.patch diff --git a/patches/server/0945-Fix-beehives-generating-from-using-bonemeal.patch b/patches/server/0948-Fix-beehives-generating-from-using-bonemeal.patch similarity index 100% rename from patches/server/0945-Fix-beehives-generating-from-using-bonemeal.patch rename to patches/server/0948-Fix-beehives-generating-from-using-bonemeal.patch diff --git a/patches/server/0946-Fix-api-checking-banned-ips.patch b/patches/server/0949-Fix-api-checking-banned-ips.patch similarity index 100% rename from patches/server/0946-Fix-api-checking-banned-ips.patch rename to patches/server/0949-Fix-api-checking-banned-ips.patch diff --git a/patches/server/0947-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0950-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch similarity index 100% rename from patches/server/0947-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch rename to patches/server/0950-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch diff --git a/patches/server/0948-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0951-Treat-sequence-violations-like-they-should-be.patch similarity index 100% rename from patches/server/0948-Treat-sequence-violations-like-they-should-be.patch rename to patches/server/0951-Treat-sequence-violations-like-they-should-be.patch diff --git a/patches/server/0949-remove-duplicate-animate-packet-for-records.patch b/patches/server/0952-remove-duplicate-animate-packet-for-records.patch similarity index 100% rename from patches/server/0949-remove-duplicate-animate-packet-for-records.patch rename to patches/server/0952-remove-duplicate-animate-packet-for-records.patch diff --git a/patches/server/0950-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0953-Prevent-causing-expired-keys-from-impacting-new-join.patch similarity index 100% rename from patches/server/0950-Prevent-causing-expired-keys-from-impacting-new-join.patch rename to patches/server/0953-Prevent-causing-expired-keys-from-impacting-new-join.patch diff --git a/patches/server/0951-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0954-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch similarity index 100% rename from patches/server/0951-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch rename to patches/server/0954-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch diff --git a/patches/server/0952-Use-array-for-gamerule-storage.patch b/patches/server/0955-Use-array-for-gamerule-storage.patch similarity index 100% rename from patches/server/0952-Use-array-for-gamerule-storage.patch rename to patches/server/0955-Use-array-for-gamerule-storage.patch diff --git a/patches/server/0953-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0956-Fix-a-couple-of-upstream-bed-issues.patch similarity index 100% rename from patches/server/0953-Fix-a-couple-of-upstream-bed-issues.patch rename to patches/server/0956-Fix-a-couple-of-upstream-bed-issues.patch diff --git a/patches/server/0954-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0957-Fix-demo-flag-not-enabling-demo-mode.patch similarity index 100% rename from patches/server/0954-Fix-demo-flag-not-enabling-demo-mode.patch rename to patches/server/0957-Fix-demo-flag-not-enabling-demo-mode.patch diff --git a/patches/server/0955-Add-Mob-Experience-reward-API.patch b/patches/server/0958-Add-Mob-Experience-reward-API.patch similarity index 100% rename from patches/server/0955-Add-Mob-Experience-reward-API.patch rename to patches/server/0958-Add-Mob-Experience-reward-API.patch diff --git a/patches/server/0956-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0959-Break-redstone-on-top-of-trap-doors-early.patch similarity index 100% rename from patches/server/0956-Break-redstone-on-top-of-trap-doors-early.patch rename to patches/server/0959-Break-redstone-on-top-of-trap-doors-early.patch diff --git a/patches/server/0957-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0960-Fix-DamageCause-for-Falling-Blocks.patch similarity index 100% rename from patches/server/0957-Fix-DamageCause-for-Falling-Blocks.patch rename to patches/server/0960-Fix-DamageCause-for-Falling-Blocks.patch diff --git a/patches/server/0958-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0961-Avoid-Lazy-Initialization-for-Enum-Fields.patch similarity index 100% rename from patches/server/0958-Avoid-Lazy-Initialization-for-Enum-Fields.patch rename to patches/server/0961-Avoid-Lazy-Initialization-for-Enum-Fields.patch diff --git a/patches/server/0959-More-accurate-isInOpenWater-impl.patch b/patches/server/0962-More-accurate-isInOpenWater-impl.patch similarity index 100% rename from patches/server/0959-More-accurate-isInOpenWater-impl.patch rename to patches/server/0962-More-accurate-isInOpenWater-impl.patch diff --git a/patches/server/0960-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0963-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch similarity index 100% rename from patches/server/0960-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch rename to patches/server/0963-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch diff --git a/patches/server/0961-Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/server/0964-Optimise-recalcBlockCounts-for-empty-sections.patch similarity index 100% rename from patches/server/0961-Optimise-recalcBlockCounts-for-empty-sections.patch rename to patches/server/0964-Optimise-recalcBlockCounts-for-empty-sections.patch diff --git a/patches/server/0962-Fix-destroying-beehive-without-any-players-nearby-th.patch b/patches/server/0965-Fix-destroying-beehive-without-any-players-nearby-th.patch similarity index 100% rename from patches/server/0962-Fix-destroying-beehive-without-any-players-nearby-th.patch rename to patches/server/0965-Fix-destroying-beehive-without-any-players-nearby-th.patch diff --git a/patches/server/0963-Expand-PlayerItemMendEvent.patch b/patches/server/0966-Expand-PlayerItemMendEvent.patch similarity index 100% rename from patches/server/0963-Expand-PlayerItemMendEvent.patch rename to patches/server/0966-Expand-PlayerItemMendEvent.patch diff --git a/patches/server/0964-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0967-Refresh-ProjectileSource-for-projectiles.patch similarity index 100% rename from patches/server/0964-Refresh-ProjectileSource-for-projectiles.patch rename to patches/server/0967-Refresh-ProjectileSource-for-projectiles.patch diff --git a/patches/server/0965-Add-transient-modifier-API.patch b/patches/server/0968-Add-transient-modifier-API.patch similarity index 100% rename from patches/server/0965-Add-transient-modifier-API.patch rename to patches/server/0968-Add-transient-modifier-API.patch diff --git a/patches/server/0966-Fix-block-place-logic.patch b/patches/server/0969-Fix-block-place-logic.patch similarity index 100% rename from patches/server/0966-Fix-block-place-logic.patch rename to patches/server/0969-Fix-block-place-logic.patch