diff --git a/patches/server/0339-Lag-compensate-eating.patch b/patches/server/0339-Lag-compensate-eating.patch deleted file mode 100644 index 35b7a4e65d..0000000000 --- a/patches/server/0339-Lag-compensate-eating.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Spottedleaf -Date: Tue, 14 Jan 2020 15:28:28 -0800 -Subject: [PATCH] Lag compensate eating - -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 ac59a1e5ae4fe84af44220d721b60f2e157e0f1f..ca179b062fa6142da584ad1a091e63d89403a0f0 100644 ---- a/src/main/java/net/minecraft/world/entity/LivingEntity.java -+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3653,6 +3653,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; - } - -+ // Paper start - lag compensate eating -+ protected long eatStartTime; -+ protected int totalEatTimeTicks; -+ // Paper end -+ - private void updatingUsingItem() { - if (this.isUsingItem()) { - if (ItemStack.isSameItem(this.getItemInHand(this.getUsedItemHand()), this.useItem)) { -@@ -3671,7 +3676,12 @@ public abstract class LivingEntity extends Entity implements Attackable { - this.triggerItemUseEffects(stack, 5); - } - -- 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 && !stack.useOnRelease()) { -+ this.useItemRemaining = 0; -+ // Paper end - this.completeUsingItem(); - } - -@@ -3719,7 +3729,10 @@ public abstract class LivingEntity extends Entity implements Attackable { - - if (!itemstack.isEmpty() && !this.isUsingItem() || forceUpdate) { // Paper use override flag - this.useItem = itemstack; -- this.useItemRemaining = itemstack.getUseDuration(); -+ // Paper start - lag compensate eating -+ this.useItemRemaining = this.totalEatTimeTicks = itemstack.getUseDuration(); -+ this.eatStartTime = System.nanoTime(); -+ // Paper end - if (!this.level().isClientSide) { - this.setLivingEntityFlag(1, true); - this.setLivingEntityFlag(2, hand == InteractionHand.OFF_HAND); -@@ -3744,7 +3757,10 @@ public abstract class LivingEntity extends Entity implements Attackable { - } - } else if (!this.isUsingItem() && !this.useItem.isEmpty()) { - this.useItem = ItemStack.EMPTY; -- this.useItemRemaining = 0; -+ // Paper start - lag compensate eating -+ this.useItemRemaining = this.totalEatTimeTicks = 0; -+ this.eatStartTime = -1L; -+ // Paper end - } - } - -@@ -3877,7 +3893,10 @@ public abstract class LivingEntity extends Entity implements Attackable { - } - - this.useItem = ItemStack.EMPTY; -- this.useItemRemaining = 0; -+ // Paper start - lag compensate eating -+ this.useItemRemaining = this.totalEatTimeTicks = 0; -+ this.eatStartTime = -1L; -+ // Paper end - } - - public boolean isBlocking() { diff --git a/patches/server/0340-Tracking-Range-Improvements.patch b/patches/server/0339-Tracking-Range-Improvements.patch similarity index 100% rename from patches/server/0340-Tracking-Range-Improvements.patch rename to patches/server/0339-Tracking-Range-Improvements.patch diff --git a/patches/server/0341-Fix-items-vanishing-through-end-portal.patch b/patches/server/0340-Fix-items-vanishing-through-end-portal.patch similarity index 100% rename from patches/server/0341-Fix-items-vanishing-through-end-portal.patch rename to patches/server/0340-Fix-items-vanishing-through-end-portal.patch diff --git a/patches/server/0342-implement-optional-per-player-mob-spawns.patch b/patches/server/0341-implement-optional-per-player-mob-spawns.patch similarity index 100% rename from patches/server/0342-implement-optional-per-player-mob-spawns.patch rename to patches/server/0341-implement-optional-per-player-mob-spawns.patch diff --git a/patches/server/0343-Anti-Xray.patch b/patches/server/0342-Anti-Xray.patch similarity index 100% rename from patches/server/0343-Anti-Xray.patch rename to patches/server/0342-Anti-Xray.patch diff --git a/patches/server/0344-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/0344-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/0345-Improve-Block-breakNaturally-API.patch b/patches/server/0344-Improve-Block-breakNaturally-API.patch similarity index 100% rename from patches/server/0345-Improve-Block-breakNaturally-API.patch rename to patches/server/0344-Improve-Block-breakNaturally-API.patch diff --git a/patches/server/0346-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/0346-Optimise-getChunkAt-calls-for-loaded-chunks.patch rename to patches/server/0345-Optimise-getChunkAt-calls-for-loaded-chunks.patch diff --git a/patches/server/0347-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/0347-Add-debug-for-sync-chunk-loads.patch rename to patches/server/0346-Add-debug-for-sync-chunk-loads.patch diff --git a/patches/server/0348-Improve-java-version-check.patch b/patches/server/0347-Improve-java-version-check.patch similarity index 100% rename from patches/server/0348-Improve-java-version-check.patch rename to patches/server/0347-Improve-java-version-check.patch diff --git a/patches/server/0349-Add-ThrownEggHatchEvent.patch b/patches/server/0348-Add-ThrownEggHatchEvent.patch similarity index 100% rename from patches/server/0349-Add-ThrownEggHatchEvent.patch rename to patches/server/0348-Add-ThrownEggHatchEvent.patch diff --git a/patches/server/0350-Entity-Jump-API.patch b/patches/server/0349-Entity-Jump-API.patch similarity index 97% rename from patches/server/0350-Entity-Jump-API.patch rename to patches/server/0349-Entity-Jump-API.patch index 5f414603d2..966a75cfd9 100644 --- a/patches/server/0350-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 ca179b062fa6142da584ad1a091e63d89403a0f0..4008d402b01d7ea25a56d16ebbf00e182b0d60c3 100644 +index ac59a1e5ae4fe84af44220d721b60f2e157e0f1f..81a64f4fc3e06ff9b32f91fc502809e0436d6e26 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3284,8 +3284,10 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0351-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/0351-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/0352-Make-the-GUI-graph-fancier.patch b/patches/server/0351-Make-the-GUI-graph-fancier.patch similarity index 100% rename from patches/server/0352-Make-the-GUI-graph-fancier.patch rename to patches/server/0351-Make-the-GUI-graph-fancier.patch diff --git a/patches/server/0353-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0352-add-hand-to-BlockMultiPlaceEvent.patch similarity index 100% rename from patches/server/0353-add-hand-to-BlockMultiPlaceEvent.patch rename to patches/server/0352-add-hand-to-BlockMultiPlaceEvent.patch diff --git a/patches/server/0354-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/0354-Validate-tripwire-hook-placement-before-update.patch rename to patches/server/0353-Validate-tripwire-hook-placement-before-update.patch diff --git a/patches/server/0355-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/0355-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/0356-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/0356-Configurable-chance-of-villager-zombie-infection.patch rename to patches/server/0355-Configurable-chance-of-villager-zombie-infection.patch diff --git a/patches/server/0357-Optimise-Chunk-getFluid.patch b/patches/server/0356-Optimise-Chunk-getFluid.patch similarity index 100% rename from patches/server/0357-Optimise-Chunk-getFluid.patch rename to patches/server/0356-Optimise-Chunk-getFluid.patch diff --git a/patches/server/0358-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/0358-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/0359-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/0359-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/0360-Expose-MinecraftServer-isRunning.patch b/patches/server/0359-Expose-MinecraftServer-isRunning.patch similarity index 100% rename from patches/server/0360-Expose-MinecraftServer-isRunning.patch rename to patches/server/0359-Expose-MinecraftServer-isRunning.patch diff --git a/patches/server/0361-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0360-Add-Raw-Byte-ItemStack-Serialization.patch similarity index 100% rename from patches/server/0361-Add-Raw-Byte-ItemStack-Serialization.patch rename to patches/server/0360-Add-Raw-Byte-ItemStack-Serialization.patch diff --git a/patches/server/0362-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/0362-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/0363-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/0363-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/0364-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/0364-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/0365-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/0365-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch rename to patches/server/0364-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch diff --git a/patches/server/0366-Don-t-tick-dead-players.patch b/patches/server/0365-Don-t-tick-dead-players.patch similarity index 100% rename from patches/server/0366-Don-t-tick-dead-players.patch rename to patches/server/0365-Don-t-tick-dead-players.patch diff --git a/patches/server/0367-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/0367-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/0368-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/0368-Optimize-Collision-to-not-load-chunks.patch rename to patches/server/0367-Optimize-Collision-to-not-load-chunks.patch diff --git a/patches/server/0369-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/0369-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/0370-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/0370-Optimize-GoalSelector-Goal.Flag-Set-operations.patch rename to patches/server/0369-Optimize-GoalSelector-Goal.Flag-Set-operations.patch diff --git a/patches/server/0371-Improved-Watchdog-Support.patch b/patches/server/0370-Improved-Watchdog-Support.patch similarity index 100% rename from patches/server/0371-Improved-Watchdog-Support.patch rename to patches/server/0370-Improved-Watchdog-Support.patch diff --git a/patches/server/0372-Optimize-Pathfinding.patch b/patches/server/0371-Optimize-Pathfinding.patch similarity index 100% rename from patches/server/0372-Optimize-Pathfinding.patch rename to patches/server/0371-Optimize-Pathfinding.patch diff --git a/patches/server/0373-Reduce-Either-Optional-allocation.patch b/patches/server/0372-Reduce-Either-Optional-allocation.patch similarity index 100% rename from patches/server/0373-Reduce-Either-Optional-allocation.patch rename to patches/server/0372-Reduce-Either-Optional-allocation.patch diff --git a/patches/server/0374-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/server/0373-Reduce-memory-footprint-of-NBTTagCompound.patch similarity index 100% rename from patches/server/0374-Reduce-memory-footprint-of-NBTTagCompound.patch rename to patches/server/0373-Reduce-memory-footprint-of-NBTTagCompound.patch diff --git a/patches/server/0375-Prevent-opening-inventories-when-frozen.patch b/patches/server/0374-Prevent-opening-inventories-when-frozen.patch similarity index 100% rename from patches/server/0375-Prevent-opening-inventories-when-frozen.patch rename to patches/server/0374-Prevent-opening-inventories-when-frozen.patch diff --git a/patches/server/0376-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/0376-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 e7a6966d5a..dbbda78b54 100644 --- a/patches/server/0376-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 4008d402b01d7ea25a56d16ebbf00e182b0d60c3..d8c337ae968f04af8870591da6c89dc25b5db311 100644 +index 81a64f4fc3e06ff9b32f91fc502809e0436d6e26..5fe5fef2e10944edc0c43da6e9d137e418c189c9 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3399,10 +3399,24 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0377-Implement-Player-Client-Options-API.patch b/patches/server/0376-Implement-Player-Client-Options-API.patch similarity index 100% rename from patches/server/0377-Implement-Player-Client-Options-API.patch rename to patches/server/0376-Implement-Player-Client-Options-API.patch diff --git a/patches/server/0378-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/0378-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/0379-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/0379-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch rename to patches/server/0378-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch diff --git a/patches/server/0380-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/0380-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/0381-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0380-Add-PlayerAttackEntityCooldownResetEvent.patch similarity index 95% rename from patches/server/0381-Add-PlayerAttackEntityCooldownResetEvent.patch rename to patches/server/0380-Add-PlayerAttackEntityCooldownResetEvent.patch index 8f1dce9ab1..34f32a82ff 100644 --- a/patches/server/0381-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 d8c337ae968f04af8870591da6c89dc25b5db311..29c5372f48211e86fa8cfbdea9e10025a4f310d1 100644 +index 5fe5fef2e10944edc0c43da6e9d137e418c189c9..1f8c62aa221241c6532eb60e2c9b7344ef834b23 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -2196,7 +2196,16 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0382-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/0382-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/0383-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/0383-Add-phantom-creative-and-insomniac-controls.patch rename to patches/server/0382-Add-phantom-creative-and-insomniac-controls.patch diff --git a/patches/server/0384-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/0384-Fix-numerous-item-duplication-issues-and-teleport-is.patch rename to patches/server/0383-Fix-numerous-item-duplication-issues-and-teleport-is.patch index afc62f6ab7..b69a1f5ddd 100644 --- a/patches/server/0384-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 eed16b541a9c39ed4697e783612e6f7b7ff23b70..1d2dd9b8ae43f22d875cb530130118df 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 29c5372f48211e86fa8cfbdea9e10025a4f310d1..a8f51cb5be994783eca8ff13eb172fd651deb05e 100644 +index 1f8c62aa221241c6532eb60e2c9b7344ef834b23..655bd3b1ba3c2c02d70d41ae343c4aa97c3ce9a0 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1711,9 +1711,9 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0385-Villager-Restocks-API.patch b/patches/server/0384-Villager-Restocks-API.patch similarity index 100% rename from patches/server/0385-Villager-Restocks-API.patch rename to patches/server/0384-Villager-Restocks-API.patch diff --git a/patches/server/0386-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/0386-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/0387-Expose-game-version.patch b/patches/server/0386-Expose-game-version.patch similarity index 100% rename from patches/server/0387-Expose-game-version.patch rename to patches/server/0386-Expose-game-version.patch diff --git a/patches/server/0388-Optimize-Voxel-Shape-Merging.patch b/patches/server/0387-Optimize-Voxel-Shape-Merging.patch similarity index 100% rename from patches/server/0388-Optimize-Voxel-Shape-Merging.patch rename to patches/server/0387-Optimize-Voxel-Shape-Merging.patch diff --git a/patches/server/0389-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/0389-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/0390-misc-debugging-dumps.patch b/patches/server/0389-misc-debugging-dumps.patch similarity index 100% rename from patches/server/0390-misc-debugging-dumps.patch rename to patches/server/0389-misc-debugging-dumps.patch diff --git a/patches/server/0391-Prevent-teleporting-dead-entities.patch b/patches/server/0390-Prevent-teleporting-dead-entities.patch similarity index 100% rename from patches/server/0391-Prevent-teleporting-dead-entities.patch rename to patches/server/0390-Prevent-teleporting-dead-entities.patch diff --git a/patches/server/0392-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/0392-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/0393-Implement-Mob-Goal-API.patch b/patches/server/0392-Implement-Mob-Goal-API.patch similarity index 100% rename from patches/server/0393-Implement-Mob-Goal-API.patch rename to patches/server/0392-Implement-Mob-Goal-API.patch diff --git a/patches/server/0394-Add-villager-reputation-API.patch b/patches/server/0393-Add-villager-reputation-API.patch similarity index 100% rename from patches/server/0394-Add-villager-reputation-API.patch rename to patches/server/0393-Add-villager-reputation-API.patch diff --git a/patches/server/0395-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/0395-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/0396-ExperienceOrbMergeEvent.patch b/patches/server/0395-ExperienceOrbMergeEvent.patch similarity index 100% rename from patches/server/0396-ExperienceOrbMergeEvent.patch rename to patches/server/0395-ExperienceOrbMergeEvent.patch diff --git a/patches/server/0397-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0396-Fix-PotionEffect-ignores-icon-flag.patch similarity index 100% rename from patches/server/0397-Fix-PotionEffect-ignores-icon-flag.patch rename to patches/server/0396-Fix-PotionEffect-ignores-icon-flag.patch diff --git a/patches/server/0398-Optimize-brigadier-child-sorting-performance.patch b/patches/server/0397-Optimize-brigadier-child-sorting-performance.patch similarity index 100% rename from patches/server/0398-Optimize-brigadier-child-sorting-performance.patch rename to patches/server/0397-Optimize-brigadier-child-sorting-performance.patch diff --git a/patches/server/0399-Potential-bed-API.patch b/patches/server/0398-Potential-bed-API.patch similarity index 100% rename from patches/server/0399-Potential-bed-API.patch rename to patches/server/0398-Potential-bed-API.patch diff --git a/patches/server/0400-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/0400-Wait-for-Async-Tasks-during-shutdown.patch rename to patches/server/0399-Wait-for-Async-Tasks-during-shutdown.patch diff --git a/patches/server/0401-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/0401-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/0402-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/0402-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/0403-Ensure-safe-gateway-teleport.patch b/patches/server/0402-Ensure-safe-gateway-teleport.patch similarity index 100% rename from patches/server/0403-Ensure-safe-gateway-teleport.patch rename to patches/server/0402-Ensure-safe-gateway-teleport.patch diff --git a/patches/server/0404-Add-option-for-console-having-all-permissions.patch b/patches/server/0403-Add-option-for-console-having-all-permissions.patch similarity index 100% rename from patches/server/0404-Add-option-for-console-having-all-permissions.patch rename to patches/server/0403-Add-option-for-console-having-all-permissions.patch diff --git a/patches/server/0405-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0404-Fix-villager-trading-demand-MC-163962.patch similarity index 100% rename from patches/server/0405-Fix-villager-trading-demand-MC-163962.patch rename to patches/server/0404-Fix-villager-trading-demand-MC-163962.patch diff --git a/patches/server/0406-Maps-shouldn-t-load-chunks.patch b/patches/server/0405-Maps-shouldn-t-load-chunks.patch similarity index 100% rename from patches/server/0406-Maps-shouldn-t-load-chunks.patch rename to patches/server/0405-Maps-shouldn-t-load-chunks.patch diff --git a/patches/server/0407-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0406-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch similarity index 100% rename from patches/server/0407-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch rename to patches/server/0406-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch diff --git a/patches/server/0408-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0407-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch similarity index 100% rename from patches/server/0408-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch rename to patches/server/0407-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch diff --git a/patches/server/0409-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0408-Fix-piston-physics-inconsistency-MC-188840.patch similarity index 100% rename from patches/server/0409-Fix-piston-physics-inconsistency-MC-188840.patch rename to patches/server/0408-Fix-piston-physics-inconsistency-MC-188840.patch diff --git a/patches/server/0410-Fix-sand-duping.patch b/patches/server/0409-Fix-sand-duping.patch similarity index 100% rename from patches/server/0410-Fix-sand-duping.patch rename to patches/server/0409-Fix-sand-duping.patch diff --git a/patches/server/0411-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0410-Fix-missing-chunks-due-to-integer-overflow.patch similarity index 100% rename from patches/server/0411-Fix-missing-chunks-due-to-integer-overflow.patch rename to patches/server/0410-Fix-missing-chunks-due-to-integer-overflow.patch diff --git a/patches/server/0412-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/server/0411-Prevent-position-desync-in-playerconnection-causing-.patch similarity index 100% rename from patches/server/0412-Prevent-position-desync-in-playerconnection-causing-.patch rename to patches/server/0411-Prevent-position-desync-in-playerconnection-causing-.patch diff --git a/patches/server/0413-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0412-Inventory-getHolder-method-without-block-snapshot.patch similarity index 100% rename from patches/server/0413-Inventory-getHolder-method-without-block-snapshot.patch rename to patches/server/0412-Inventory-getHolder-method-without-block-snapshot.patch diff --git a/patches/server/0414-Improve-Arrow-API.patch b/patches/server/0413-Improve-Arrow-API.patch similarity index 100% rename from patches/server/0414-Improve-Arrow-API.patch rename to patches/server/0413-Improve-Arrow-API.patch diff --git a/patches/server/0415-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0414-Add-and-implement-PlayerRecipeBookClickEvent.patch similarity index 100% rename from patches/server/0415-Add-and-implement-PlayerRecipeBookClickEvent.patch rename to patches/server/0414-Add-and-implement-PlayerRecipeBookClickEvent.patch diff --git a/patches/server/0416-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0415-Hide-sync-chunk-writes-behind-flag.patch similarity index 100% rename from patches/server/0416-Hide-sync-chunk-writes-behind-flag.patch rename to patches/server/0415-Hide-sync-chunk-writes-behind-flag.patch diff --git a/patches/server/0417-Add-permission-for-command-blocks.patch b/patches/server/0416-Add-permission-for-command-blocks.patch similarity index 100% rename from patches/server/0417-Add-permission-for-command-blocks.patch rename to patches/server/0416-Add-permission-for-command-blocks.patch diff --git a/patches/server/0418-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0417-Ensure-Entity-AABB-s-are-never-invalid.patch similarity index 100% rename from patches/server/0418-Ensure-Entity-AABB-s-are-never-invalid.patch rename to patches/server/0417-Ensure-Entity-AABB-s-are-never-invalid.patch diff --git a/patches/server/0419-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0418-Fix-Per-World-Difficulty-Remembering-Difficulty.patch similarity index 100% rename from patches/server/0419-Fix-Per-World-Difficulty-Remembering-Difficulty.patch rename to patches/server/0418-Fix-Per-World-Difficulty-Remembering-Difficulty.patch diff --git a/patches/server/0420-Paper-dumpitem-command.patch b/patches/server/0419-Paper-dumpitem-command.patch similarity index 100% rename from patches/server/0420-Paper-dumpitem-command.patch rename to patches/server/0419-Paper-dumpitem-command.patch diff --git a/patches/server/0421-Improve-Legacy-Component-serialization-size.patch b/patches/server/0420-Improve-Legacy-Component-serialization-size.patch similarity index 100% rename from patches/server/0421-Improve-Legacy-Component-serialization-size.patch rename to patches/server/0420-Improve-Legacy-Component-serialization-size.patch diff --git a/patches/server/0422-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0421-Optimize-Bit-Operations-by-inlining.patch similarity index 100% rename from patches/server/0422-Optimize-Bit-Operations-by-inlining.patch rename to patches/server/0421-Optimize-Bit-Operations-by-inlining.patch diff --git a/patches/server/0423-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0422-Add-Plugin-Tickets-to-API-Chunk-Methods.patch similarity index 100% rename from patches/server/0423-Add-Plugin-Tickets-to-API-Chunk-Methods.patch rename to patches/server/0422-Add-Plugin-Tickets-to-API-Chunk-Methods.patch diff --git a/patches/server/0424-incremental-chunk-and-player-saving.patch b/patches/server/0423-incremental-chunk-and-player-saving.patch similarity index 100% rename from patches/server/0424-incremental-chunk-and-player-saving.patch rename to patches/server/0423-incremental-chunk-and-player-saving.patch diff --git a/patches/server/0425-Support-old-UUID-format-for-NBT.patch b/patches/server/0424-Support-old-UUID-format-for-NBT.patch similarity index 100% rename from patches/server/0425-Support-old-UUID-format-for-NBT.patch rename to patches/server/0424-Support-old-UUID-format-for-NBT.patch diff --git a/patches/server/0426-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0425-Convert-legacy-attributes-in-Item-Meta.patch similarity index 100% rename from patches/server/0426-Convert-legacy-attributes-in-Item-Meta.patch rename to patches/server/0425-Convert-legacy-attributes-in-Item-Meta.patch diff --git a/patches/server/0427-Remove-some-streams-from-structures.patch b/patches/server/0426-Remove-some-streams-from-structures.patch similarity index 100% rename from patches/server/0427-Remove-some-streams-from-structures.patch rename to patches/server/0426-Remove-some-streams-from-structures.patch diff --git a/patches/server/0428-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0427-Remove-streams-from-classes-related-villager-gossip.patch similarity index 100% rename from patches/server/0428-Remove-streams-from-classes-related-villager-gossip.patch rename to patches/server/0427-Remove-streams-from-classes-related-villager-gossip.patch diff --git a/patches/server/0429-Support-components-in-ItemMeta.patch b/patches/server/0428-Support-components-in-ItemMeta.patch similarity index 100% rename from patches/server/0429-Support-components-in-ItemMeta.patch rename to patches/server/0428-Support-components-in-ItemMeta.patch diff --git a/patches/server/0430-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/server/0429-Improve-fix-EntityTargetLivingEntityEvent.patch similarity index 100% rename from patches/server/0430-Improve-fix-EntityTargetLivingEntityEvent.patch rename to patches/server/0429-Improve-fix-EntityTargetLivingEntityEvent.patch diff --git a/patches/server/0431-Add-entity-liquid-API.patch b/patches/server/0430-Add-entity-liquid-API.patch similarity index 100% rename from patches/server/0431-Add-entity-liquid-API.patch rename to patches/server/0430-Add-entity-liquid-API.patch diff --git a/patches/server/0432-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0431-Update-itemstack-legacy-name-and-lore.patch similarity index 100% rename from patches/server/0432-Update-itemstack-legacy-name-and-lore.patch rename to patches/server/0431-Update-itemstack-legacy-name-and-lore.patch diff --git a/patches/server/0433-Spawn-player-in-correct-world-on-login.patch b/patches/server/0432-Spawn-player-in-correct-world-on-login.patch similarity index 100% rename from patches/server/0433-Spawn-player-in-correct-world-on-login.patch rename to patches/server/0432-Spawn-player-in-correct-world-on-login.patch diff --git a/patches/server/0434-Add-PrepareResultEvent.patch b/patches/server/0433-Add-PrepareResultEvent.patch similarity index 100% rename from patches/server/0434-Add-PrepareResultEvent.patch rename to patches/server/0433-Add-PrepareResultEvent.patch diff --git a/patches/server/0435-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0434-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch similarity index 91% rename from patches/server/0435-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch rename to patches/server/0434-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch index d03d1dfbee..f131d7c71f 100644 --- a/patches/server/0435-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch +++ b/patches/server/0434-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 a8f51cb5be994783eca8ff13eb172fd651deb05e..4d9149d3a1d5711b88ce86fb34dbdc926cbe8c31 100644 +index 655bd3b1ba3c2c02d70d41ae343c4aa97c3ce9a0..b80192d4d35cfb6ad155ac34b5296d689a154387 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3511,7 +3511,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0436-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0435-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/0435-Fix-arrows-never-despawning-MC-125757.patch diff --git a/patches/server/0437-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0436-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/0436-Thread-Safe-Vanilla-Command-permission-checking.patch diff --git a/patches/server/0438-Fix-SPIGOT-5989.patch b/patches/server/0437-Fix-SPIGOT-5989.patch similarity index 100% rename from patches/server/0438-Fix-SPIGOT-5989.patch rename to patches/server/0437-Fix-SPIGOT-5989.patch diff --git a/patches/server/0439-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0438-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/0438-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/0439-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/0439-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/0440-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/0440-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch diff --git a/patches/server/0442-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0441-Optimize-NetworkManager-Exception-Handling.patch similarity index 100% rename from patches/server/0442-Optimize-NetworkManager-Exception-Handling.patch rename to patches/server/0441-Optimize-NetworkManager-Exception-Handling.patch diff --git a/patches/server/0443-Fix-some-rails-connecting-improperly.patch b/patches/server/0442-Fix-some-rails-connecting-improperly.patch similarity index 100% rename from patches/server/0443-Fix-some-rails-connecting-improperly.patch rename to patches/server/0442-Fix-some-rails-connecting-improperly.patch diff --git a/patches/server/0444-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0443-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch similarity index 100% rename from patches/server/0444-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch rename to patches/server/0443-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch diff --git a/patches/server/0445-Brand-support.patch b/patches/server/0444-Brand-support.patch similarity index 100% rename from patches/server/0445-Brand-support.patch rename to patches/server/0444-Brand-support.patch diff --git a/patches/server/0446-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0445-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from patches/server/0446-Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/server/0445-Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/patches/server/0447-Don-t-require-FACING-data.patch b/patches/server/0446-Don-t-require-FACING-data.patch similarity index 100% rename from patches/server/0447-Don-t-require-FACING-data.patch rename to patches/server/0446-Don-t-require-FACING-data.patch diff --git a/patches/server/0448-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0447-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch similarity index 100% rename from patches/server/0448-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch rename to patches/server/0447-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch diff --git a/patches/server/0449-Add-moon-phase-API.patch b/patches/server/0448-Add-moon-phase-API.patch similarity index 100% rename from patches/server/0449-Add-moon-phase-API.patch rename to patches/server/0448-Add-moon-phase-API.patch diff --git a/patches/server/0450-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0449-Do-not-let-the-server-load-chunks-from-newer-version.patch similarity index 100% rename from patches/server/0450-Do-not-let-the-server-load-chunks-from-newer-version.patch rename to patches/server/0449-Do-not-let-the-server-load-chunks-from-newer-version.patch diff --git a/patches/server/0451-Prevent-headless-pistons-from-being-created.patch b/patches/server/0450-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/0450-Prevent-headless-pistons-from-being-created.patch diff --git a/patches/server/0452-Add-BellRingEvent.patch b/patches/server/0451-Add-BellRingEvent.patch similarity index 100% rename from patches/server/0452-Add-BellRingEvent.patch rename to patches/server/0451-Add-BellRingEvent.patch diff --git a/patches/server/0453-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0452-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/0452-Add-zombie-targets-turtle-egg-config.patch diff --git a/patches/server/0454-Buffer-joins-to-world.patch b/patches/server/0453-Buffer-joins-to-world.patch similarity index 100% rename from patches/server/0454-Buffer-joins-to-world.patch rename to patches/server/0453-Buffer-joins-to-world.patch diff --git a/patches/server/0455-Eigencraft-redstone-implementation.patch b/patches/server/0454-Eigencraft-redstone-implementation.patch similarity index 100% rename from patches/server/0455-Eigencraft-redstone-implementation.patch rename to patches/server/0454-Eigencraft-redstone-implementation.patch diff --git a/patches/server/0456-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0455-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/0455-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/0456-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/0456-PortalCreateEvent-needs-to-know-its-entity.patch diff --git a/patches/server/0458-Add-more-Evoker-API.patch b/patches/server/0457-Add-more-Evoker-API.patch similarity index 100% rename from patches/server/0458-Add-more-Evoker-API.patch rename to patches/server/0457-Add-more-Evoker-API.patch diff --git a/patches/server/0459-Add-methods-to-get-translation-keys.patch b/patches/server/0458-Add-methods-to-get-translation-keys.patch similarity index 100% rename from patches/server/0459-Add-methods-to-get-translation-keys.patch rename to patches/server/0458-Add-methods-to-get-translation-keys.patch diff --git a/patches/server/0460-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0459-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from patches/server/0460-Create-HoverEvent-from-ItemStack-Entity.patch rename to patches/server/0459-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/patches/server/0461-Cache-block-data-strings.patch b/patches/server/0460-Cache-block-data-strings.patch similarity index 100% rename from patches/server/0461-Cache-block-data-strings.patch rename to patches/server/0460-Cache-block-data-strings.patch diff --git a/patches/server/0462-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0461-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch similarity index 100% rename from patches/server/0462-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch rename to patches/server/0461-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch diff --git a/patches/server/0463-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0462-Add-additional-open-container-api-to-HumanEntity.patch similarity index 100% rename from patches/server/0463-Add-additional-open-container-api-to-HumanEntity.patch rename to patches/server/0462-Add-additional-open-container-api-to-HumanEntity.patch diff --git a/patches/server/0464-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0463-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch similarity index 100% rename from patches/server/0464-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch rename to patches/server/0463-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch diff --git a/patches/server/0465-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0464-Extend-block-drop-capture-to-capture-all-items-added.patch similarity index 100% rename from patches/server/0465-Extend-block-drop-capture-to-capture-all-items-added.patch rename to patches/server/0464-Extend-block-drop-capture-to-capture-all-items-added.patch diff --git a/patches/server/0466-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0465-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch similarity index 100% rename from patches/server/0466-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch rename to patches/server/0465-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch diff --git a/patches/server/0467-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0466-Lazily-track-plugin-scoreboards-by-default.patch similarity index 100% rename from patches/server/0467-Lazily-track-plugin-scoreboards-by-default.patch rename to patches/server/0466-Lazily-track-plugin-scoreboards-by-default.patch diff --git a/patches/server/0468-Entity-isTicking.patch b/patches/server/0467-Entity-isTicking.patch similarity index 100% rename from patches/server/0468-Entity-isTicking.patch rename to patches/server/0467-Entity-isTicking.patch diff --git a/patches/server/0469-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0468-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch similarity index 100% rename from patches/server/0469-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch rename to patches/server/0468-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch diff --git a/patches/server/0470-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0469-Fix-Concurrency-issue-in-ShufflingList.patch similarity index 100% rename from patches/server/0470-Fix-Concurrency-issue-in-ShufflingList.patch rename to patches/server/0469-Fix-Concurrency-issue-in-ShufflingList.patch diff --git a/patches/server/0471-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0470-Reset-Ender-Crystals-on-Dragon-Spawn.patch similarity index 100% rename from patches/server/0471-Reset-Ender-Crystals-on-Dragon-Spawn.patch rename to patches/server/0470-Reset-Ender-Crystals-on-Dragon-Spawn.patch diff --git a/patches/server/0472-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0471-Fix-for-large-move-vectors-crashing-server.patch similarity index 100% rename from patches/server/0472-Fix-for-large-move-vectors-crashing-server.patch rename to patches/server/0471-Fix-for-large-move-vectors-crashing-server.patch diff --git a/patches/server/0473-Optimise-getType-calls.patch b/patches/server/0472-Optimise-getType-calls.patch similarity index 100% rename from patches/server/0473-Optimise-getType-calls.patch rename to patches/server/0472-Optimise-getType-calls.patch diff --git a/patches/server/0474-Villager-resetOffers.patch b/patches/server/0473-Villager-resetOffers.patch similarity index 100% rename from patches/server/0474-Villager-resetOffers.patch rename to patches/server/0473-Villager-resetOffers.patch diff --git a/patches/server/0475-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0474-Retain-block-place-order-when-capturing-blockstates.patch similarity index 100% rename from patches/server/0475-Retain-block-place-order-when-capturing-blockstates.patch rename to patches/server/0474-Retain-block-place-order-when-capturing-blockstates.patch diff --git a/patches/server/0476-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0475-Reduce-blockpos-allocation-from-pathfinding.patch similarity index 100% rename from patches/server/0476-Reduce-blockpos-allocation-from-pathfinding.patch rename to patches/server/0475-Reduce-blockpos-allocation-from-pathfinding.patch diff --git a/patches/server/0477-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0476-Fix-item-locations-dropped-from-campfires.patch similarity index 100% rename from patches/server/0477-Fix-item-locations-dropped-from-campfires.patch rename to patches/server/0476-Fix-item-locations-dropped-from-campfires.patch diff --git a/patches/server/0478-Player-elytra-boost-API.patch b/patches/server/0477-Player-elytra-boost-API.patch similarity index 100% rename from patches/server/0478-Player-elytra-boost-API.patch rename to patches/server/0477-Player-elytra-boost-API.patch diff --git a/patches/server/0479-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0478-Fixed-TileEntityBell-memory-leak.patch similarity index 100% rename from patches/server/0479-Fixed-TileEntityBell-memory-leak.patch rename to patches/server/0478-Fixed-TileEntityBell-memory-leak.patch diff --git a/patches/server/0480-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0479-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch similarity index 100% rename from patches/server/0480-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch rename to patches/server/0479-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch diff --git a/patches/server/0481-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0480-Add-getOfflinePlayerIfCached-String.patch similarity index 100% rename from patches/server/0481-Add-getOfflinePlayerIfCached-String.patch rename to patches/server/0480-Add-getOfflinePlayerIfCached-String.patch diff --git a/patches/server/0482-Add-ignore-discounts-API.patch b/patches/server/0481-Add-ignore-discounts-API.patch similarity index 100% rename from patches/server/0482-Add-ignore-discounts-API.patch rename to patches/server/0481-Add-ignore-discounts-API.patch diff --git a/patches/server/0483-Toggle-for-removing-existing-dragon.patch b/patches/server/0482-Toggle-for-removing-existing-dragon.patch similarity index 100% rename from patches/server/0483-Toggle-for-removing-existing-dragon.patch rename to patches/server/0482-Toggle-for-removing-existing-dragon.patch diff --git a/patches/server/0484-Fix-client-lag-on-advancement-loading.patch b/patches/server/0483-Fix-client-lag-on-advancement-loading.patch similarity index 100% rename from patches/server/0484-Fix-client-lag-on-advancement-loading.patch rename to patches/server/0483-Fix-client-lag-on-advancement-loading.patch diff --git a/patches/server/0485-Item-no-age-no-player-pickup.patch b/patches/server/0484-Item-no-age-no-player-pickup.patch similarity index 100% rename from patches/server/0485-Item-no-age-no-player-pickup.patch rename to patches/server/0484-Item-no-age-no-player-pickup.patch diff --git a/patches/server/0486-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0485-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch similarity index 100% rename from patches/server/0486-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch rename to patches/server/0485-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch diff --git a/patches/server/0487-Beacon-API-custom-effect-ranges.patch b/patches/server/0486-Beacon-API-custom-effect-ranges.patch similarity index 100% rename from patches/server/0487-Beacon-API-custom-effect-ranges.patch rename to patches/server/0486-Beacon-API-custom-effect-ranges.patch diff --git a/patches/server/0488-Add-API-for-quit-reason.patch b/patches/server/0487-Add-API-for-quit-reason.patch similarity index 100% rename from patches/server/0488-Add-API-for-quit-reason.patch rename to patches/server/0487-Add-API-for-quit-reason.patch diff --git a/patches/server/0489-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0488-Add-Wandering-Trader-spawn-rate-config-options.patch similarity index 100% rename from patches/server/0489-Add-Wandering-Trader-spawn-rate-config-options.patch rename to patches/server/0488-Add-Wandering-Trader-spawn-rate-config-options.patch diff --git a/patches/server/0490-Expose-world-spawn-angle.patch b/patches/server/0489-Expose-world-spawn-angle.patch similarity index 100% rename from patches/server/0490-Expose-world-spawn-angle.patch rename to patches/server/0489-Expose-world-spawn-angle.patch diff --git a/patches/server/0491-Add-Destroy-Speed-API.patch b/patches/server/0490-Add-Destroy-Speed-API.patch similarity index 100% rename from patches/server/0491-Add-Destroy-Speed-API.patch rename to patches/server/0490-Add-Destroy-Speed-API.patch diff --git a/patches/server/0492-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0491-Fix-Player-spawnParticle-x-y-z-precision-loss.patch similarity index 100% rename from patches/server/0492-Fix-Player-spawnParticle-x-y-z-precision-loss.patch rename to patches/server/0491-Fix-Player-spawnParticle-x-y-z-precision-loss.patch diff --git a/patches/server/0493-Add-LivingEntity-clearActiveItem.patch b/patches/server/0492-Add-LivingEntity-clearActiveItem.patch similarity index 100% rename from patches/server/0493-Add-LivingEntity-clearActiveItem.patch rename to patches/server/0492-Add-LivingEntity-clearActiveItem.patch diff --git a/patches/server/0494-Add-PlayerItemCooldownEvent.patch b/patches/server/0493-Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/server/0494-Add-PlayerItemCooldownEvent.patch rename to patches/server/0493-Add-PlayerItemCooldownEvent.patch diff --git a/patches/server/0495-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0494-Significantly-improve-performance-of-the-end-generat.patch similarity index 100% rename from patches/server/0495-Significantly-improve-performance-of-the-end-generat.patch rename to patches/server/0494-Significantly-improve-performance-of-the-end-generat.patch diff --git a/patches/server/0496-More-lightning-API.patch b/patches/server/0495-More-lightning-API.patch similarity index 100% rename from patches/server/0496-More-lightning-API.patch rename to patches/server/0495-More-lightning-API.patch diff --git a/patches/server/0497-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0496-Climbing-should-not-bypass-cramming-gamerule.patch similarity index 98% rename from patches/server/0497-Climbing-should-not-bypass-cramming-gamerule.patch rename to patches/server/0496-Climbing-should-not-bypass-cramming-gamerule.patch index 976626b644..62309e7552 100644 --- a/patches/server/0497-Climbing-should-not-bypass-cramming-gamerule.patch +++ b/patches/server/0496-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 4d9149d3a1d5711b88ce86fb34dbdc926cbe8c31..6b877e084caf931f8f0908c657ed0c8b6124a165 100644 +index b80192d4d35cfb6ad155ac34b5296d689a154387..c5843bc4f2e14ff41faaaaad2e0a727fc5cc2e3b 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3427,7 +3427,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0498-Added-missing-default-perms-for-commands.patch b/patches/server/0497-Added-missing-default-perms-for-commands.patch similarity index 100% rename from patches/server/0498-Added-missing-default-perms-for-commands.patch rename to patches/server/0497-Added-missing-default-perms-for-commands.patch diff --git a/patches/server/0499-Add-PlayerShearBlockEvent.patch b/patches/server/0498-Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/server/0499-Add-PlayerShearBlockEvent.patch rename to patches/server/0498-Add-PlayerShearBlockEvent.patch diff --git a/patches/server/0500-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0499-Fix-curing-zombie-villager-discount-exploit.patch similarity index 100% rename from patches/server/0500-Fix-curing-zombie-villager-discount-exploit.patch rename to patches/server/0499-Fix-curing-zombie-villager-discount-exploit.patch diff --git a/patches/server/0501-Limit-recipe-packets.patch b/patches/server/0500-Limit-recipe-packets.patch similarity index 100% rename from patches/server/0501-Limit-recipe-packets.patch rename to patches/server/0500-Limit-recipe-packets.patch diff --git a/patches/server/0502-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0501-Fix-CraftSound-backwards-compatibility.patch similarity index 100% rename from patches/server/0502-Fix-CraftSound-backwards-compatibility.patch rename to patches/server/0501-Fix-CraftSound-backwards-compatibility.patch diff --git a/patches/server/0503-Player-Chunk-Load-Unload-Events.patch b/patches/server/0502-Player-Chunk-Load-Unload-Events.patch similarity index 100% rename from patches/server/0503-Player-Chunk-Load-Unload-Events.patch rename to patches/server/0502-Player-Chunk-Load-Unload-Events.patch diff --git a/patches/server/0504-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0503-Optimize-Dynamic-get-Missing-Keys.patch similarity index 100% rename from patches/server/0504-Optimize-Dynamic-get-Missing-Keys.patch rename to patches/server/0503-Optimize-Dynamic-get-Missing-Keys.patch diff --git a/patches/server/0505-Expose-LivingEntity-hurt-direction.patch b/patches/server/0504-Expose-LivingEntity-hurt-direction.patch similarity index 100% rename from patches/server/0505-Expose-LivingEntity-hurt-direction.patch rename to patches/server/0504-Expose-LivingEntity-hurt-direction.patch diff --git a/patches/server/0506-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0505-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from patches/server/0506-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/server/0505-Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/patches/server/0507-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0506-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch similarity index 100% rename from patches/server/0507-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch rename to patches/server/0506-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch diff --git a/patches/server/0508-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0507-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch similarity index 100% rename from patches/server/0508-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch rename to patches/server/0507-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch diff --git a/patches/server/0509-Implement-TargetHitEvent.patch b/patches/server/0508-Implement-TargetHitEvent.patch similarity index 100% rename from patches/server/0509-Implement-TargetHitEvent.patch rename to patches/server/0508-Implement-TargetHitEvent.patch diff --git a/patches/server/0510-MC-4-Fix-item-position-desync.patch b/patches/server/0509-MC-4-Fix-item-position-desync.patch similarity index 100% rename from patches/server/0510-MC-4-Fix-item-position-desync.patch rename to patches/server/0509-MC-4-Fix-item-position-desync.patch diff --git a/patches/server/0511-Additional-Block-Material-API-s.patch b/patches/server/0510-Additional-Block-Material-API-s.patch similarity index 100% rename from patches/server/0511-Additional-Block-Material-API-s.patch rename to patches/server/0510-Additional-Block-Material-API-s.patch diff --git a/patches/server/0512-Fix-harming-potion-dupe.patch b/patches/server/0511-Fix-harming-potion-dupe.patch similarity index 100% rename from patches/server/0512-Fix-harming-potion-dupe.patch rename to patches/server/0511-Fix-harming-potion-dupe.patch diff --git a/patches/server/0513-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0512-Implement-API-to-get-Material-from-Boats-and-Minecar.patch similarity index 100% rename from patches/server/0513-Implement-API-to-get-Material-from-Boats-and-Minecar.patch rename to patches/server/0512-Implement-API-to-get-Material-from-Boats-and-Minecar.patch diff --git a/patches/server/0514-Cache-burn-durations.patch b/patches/server/0513-Cache-burn-durations.patch similarity index 100% rename from patches/server/0514-Cache-burn-durations.patch rename to patches/server/0513-Cache-burn-durations.patch diff --git a/patches/server/0515-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0514-Allow-disabling-mob-spawner-spawn-egg-transformation.patch similarity index 100% rename from patches/server/0515-Allow-disabling-mob-spawner-spawn-egg-transformation.patch rename to patches/server/0514-Allow-disabling-mob-spawner-spawn-egg-transformation.patch diff --git a/patches/server/0516-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0515-Fix-Not-a-string-Map-Conversion-spam.patch similarity index 100% rename from patches/server/0516-Fix-Not-a-string-Map-Conversion-spam.patch rename to patches/server/0515-Fix-Not-a-string-Map-Conversion-spam.patch diff --git a/patches/server/0517-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0516-Implement-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/server/0517-Implement-PlayerFlowerPotManipulateEvent.patch rename to patches/server/0516-Implement-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/server/0518-Fix-interact-event-not-being-called-sometimes.patch b/patches/server/0517-Fix-interact-event-not-being-called-sometimes.patch similarity index 100% rename from patches/server/0518-Fix-interact-event-not-being-called-sometimes.patch rename to patches/server/0517-Fix-interact-event-not-being-called-sometimes.patch diff --git a/patches/server/0519-Zombie-API-breaking-doors.patch b/patches/server/0518-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/server/0519-Zombie-API-breaking-doors.patch rename to patches/server/0518-Zombie-API-breaking-doors.patch diff --git a/patches/server/0520-Fix-nerfed-slime-when-splitting.patch b/patches/server/0519-Fix-nerfed-slime-when-splitting.patch similarity index 100% rename from patches/server/0520-Fix-nerfed-slime-when-splitting.patch rename to patches/server/0519-Fix-nerfed-slime-when-splitting.patch diff --git a/patches/server/0521-Add-EntityLoadCrossbowEvent.patch b/patches/server/0520-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/server/0521-Add-EntityLoadCrossbowEvent.patch rename to patches/server/0520-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/server/0522-Added-WorldGameRuleChangeEvent.patch b/patches/server/0521-Added-WorldGameRuleChangeEvent.patch similarity index 100% rename from patches/server/0522-Added-WorldGameRuleChangeEvent.patch rename to patches/server/0521-Added-WorldGameRuleChangeEvent.patch diff --git a/patches/server/0523-Added-ServerResourcesReloadedEvent.patch b/patches/server/0522-Added-ServerResourcesReloadedEvent.patch similarity index 100% rename from patches/server/0523-Added-ServerResourcesReloadedEvent.patch rename to patches/server/0522-Added-ServerResourcesReloadedEvent.patch diff --git a/patches/server/0524-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0523-Added-world-settings-for-mobs-picking-up-loot.patch similarity index 100% rename from patches/server/0524-Added-world-settings-for-mobs-picking-up-loot.patch rename to patches/server/0523-Added-world-settings-for-mobs-picking-up-loot.patch diff --git a/patches/server/0525-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0524-Implemented-BlockFailedDispenseEvent.patch similarity index 100% rename from patches/server/0525-Implemented-BlockFailedDispenseEvent.patch rename to patches/server/0524-Implemented-BlockFailedDispenseEvent.patch diff --git a/patches/server/0526-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0525-Added-PlayerLecternPageChangeEvent.patch similarity index 100% rename from patches/server/0526-Added-PlayerLecternPageChangeEvent.patch rename to patches/server/0525-Added-PlayerLecternPageChangeEvent.patch diff --git a/patches/server/0527-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0526-Added-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from patches/server/0527-Added-PlayerLoomPatternSelectEvent.patch rename to patches/server/0526-Added-PlayerLoomPatternSelectEvent.patch diff --git a/patches/server/0528-Configurable-door-breaking-difficulty.patch b/patches/server/0527-Configurable-door-breaking-difficulty.patch similarity index 100% rename from patches/server/0528-Configurable-door-breaking-difficulty.patch rename to patches/server/0527-Configurable-door-breaking-difficulty.patch diff --git a/patches/server/0529-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0528-Empty-commands-shall-not-be-dispatched.patch similarity index 100% rename from patches/server/0529-Empty-commands-shall-not-be-dispatched.patch rename to patches/server/0528-Empty-commands-shall-not-be-dispatched.patch diff --git a/patches/server/0530-Remove-stale-POIs.patch b/patches/server/0529-Remove-stale-POIs.patch similarity index 100% rename from patches/server/0530-Remove-stale-POIs.patch rename to patches/server/0529-Remove-stale-POIs.patch diff --git a/patches/server/0531-Fix-villager-boat-exploit.patch b/patches/server/0530-Fix-villager-boat-exploit.patch similarity index 100% rename from patches/server/0531-Fix-villager-boat-exploit.patch rename to patches/server/0530-Fix-villager-boat-exploit.patch diff --git a/patches/server/0532-Add-sendOpLevel-API.patch b/patches/server/0531-Add-sendOpLevel-API.patch similarity index 100% rename from patches/server/0532-Add-sendOpLevel-API.patch rename to patches/server/0531-Add-sendOpLevel-API.patch diff --git a/patches/server/0533-TODO-Registry-Modification-API.patch b/patches/server/0532-TODO-Registry-Modification-API.patch similarity index 100% rename from patches/server/0533-TODO-Registry-Modification-API.patch rename to patches/server/0532-TODO-Registry-Modification-API.patch diff --git a/patches/server/0534-Add-StructuresLocateEvent.patch b/patches/server/0533-Add-StructuresLocateEvent.patch similarity index 100% rename from patches/server/0534-Add-StructuresLocateEvent.patch rename to patches/server/0533-Add-StructuresLocateEvent.patch diff --git a/patches/server/0535-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0534-Collision-option-for-requiring-a-player-participant.patch similarity index 100% rename from patches/server/0535-Collision-option-for-requiring-a-player-participant.patch rename to patches/server/0534-Collision-option-for-requiring-a-player-participant.patch diff --git a/patches/server/0536-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0535-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch similarity index 100% rename from patches/server/0536-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch rename to patches/server/0535-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch diff --git a/patches/server/0537-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0536-Return-chat-component-with-empty-text-instead-of-thr.patch similarity index 100% rename from patches/server/0537-Return-chat-component-with-empty-text-instead-of-thr.patch rename to patches/server/0536-Return-chat-component-with-empty-text-instead-of-thr.patch diff --git a/patches/server/0538-Make-schedule-command-per-world.patch b/patches/server/0537-Make-schedule-command-per-world.patch similarity index 100% rename from patches/server/0538-Make-schedule-command-per-world.patch rename to patches/server/0537-Make-schedule-command-per-world.patch diff --git a/patches/server/0539-Configurable-max-leash-distance.patch b/patches/server/0538-Configurable-max-leash-distance.patch similarity index 100% rename from patches/server/0539-Configurable-max-leash-distance.patch rename to patches/server/0538-Configurable-max-leash-distance.patch diff --git a/patches/server/0540-Implement-BlockPreDispenseEvent.patch b/patches/server/0539-Implement-BlockPreDispenseEvent.patch similarity index 100% rename from patches/server/0540-Implement-BlockPreDispenseEvent.patch rename to patches/server/0539-Implement-BlockPreDispenseEvent.patch diff --git a/patches/server/0541-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0540-Added-firing-of-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/server/0541-Added-firing-of-PlayerChangeBeaconEffectEvent.patch rename to patches/server/0540-Added-firing-of-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/server/0542-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0541-Add-toggle-for-always-placing-the-dragon-egg.patch similarity index 100% rename from patches/server/0542-Add-toggle-for-always-placing-the-dragon-egg.patch rename to patches/server/0541-Add-toggle-for-always-placing-the-dragon-egg.patch diff --git a/patches/server/0543-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0542-Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/server/0543-Added-PlayerStonecutterRecipeSelectEvent.patch rename to patches/server/0542-Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/server/0544-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0543-Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 100% rename from patches/server/0544-Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to patches/server/0543-Add-dropLeash-variable-to-EntityUnleashEvent.patch diff --git a/patches/server/0545-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0544-Reset-shield-blocking-on-dimension-change.patch similarity index 100% rename from patches/server/0545-Reset-shield-blocking-on-dimension-change.patch rename to patches/server/0544-Reset-shield-blocking-on-dimension-change.patch diff --git a/patches/server/0546-add-DragonEggFormEvent.patch b/patches/server/0545-add-DragonEggFormEvent.patch similarity index 100% rename from patches/server/0546-add-DragonEggFormEvent.patch rename to patches/server/0545-add-DragonEggFormEvent.patch diff --git a/patches/server/0547-EntityMoveEvent.patch b/patches/server/0546-EntityMoveEvent.patch similarity index 97% rename from patches/server/0547-EntityMoveEvent.patch rename to patches/server/0546-EntityMoveEvent.patch index 8965a0f608..a2e865ae5b 100644 --- a/patches/server/0547-EntityMoveEvent.patch +++ b/patches/server/0546-EntityMoveEvent.patch @@ -29,7 +29,7 @@ index 18a69ab85de7f23f5ff468307bf2669544eba8af..e0a94d75ddf5cc0988876e7438fbcc44 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 6b877e084caf931f8f0908c657ed0c8b6124a165..c5b9963c07ac6fb0ffeb2782b2ae22ab4cde2c08 100644 +index c5843bc4f2e14ff41faaaaad2e0a727fc5cc2e3b..5074744f1d52765a3856b7c1aa75bfe5aa35c1d4 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3362,6 +3362,20 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0548-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0547-added-option-to-disable-pathfinding-updates-on-block.patch similarity index 100% rename from patches/server/0548-added-option-to-disable-pathfinding-updates-on-block.patch rename to patches/server/0547-added-option-to-disable-pathfinding-updates-on-block.patch diff --git a/patches/server/0549-Inline-shift-direction-fields.patch b/patches/server/0548-Inline-shift-direction-fields.patch similarity index 100% rename from patches/server/0549-Inline-shift-direction-fields.patch rename to patches/server/0548-Inline-shift-direction-fields.patch diff --git a/patches/server/0550-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0549-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/server/0550-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/server/0549-Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/server/0551-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0550-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/server/0551-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/server/0550-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/server/0552-living-entity-allow-attribute-registration.patch b/patches/server/0551-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/server/0552-living-entity-allow-attribute-registration.patch rename to patches/server/0551-living-entity-allow-attribute-registration.patch diff --git a/patches/server/0553-fix-dead-slime-setSize-invincibility.patch b/patches/server/0552-fix-dead-slime-setSize-invincibility.patch similarity index 100% rename from patches/server/0553-fix-dead-slime-setSize-invincibility.patch rename to patches/server/0552-fix-dead-slime-setSize-invincibility.patch diff --git a/patches/server/0554-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0553-Merchant-getRecipes-should-return-an-immutable-list.patch similarity index 100% rename from patches/server/0554-Merchant-getRecipes-should-return-an-immutable-list.patch rename to patches/server/0553-Merchant-getRecipes-should-return-an-immutable-list.patch diff --git a/patches/server/0555-Expose-Tracked-Players.patch b/patches/server/0554-Expose-Tracked-Players.patch similarity index 100% rename from patches/server/0555-Expose-Tracked-Players.patch rename to patches/server/0554-Expose-Tracked-Players.patch diff --git a/patches/server/0556-Remove-streams-from-SensorNearest.patch b/patches/server/0555-Remove-streams-from-SensorNearest.patch similarity index 100% rename from patches/server/0556-Remove-streams-from-SensorNearest.patch rename to patches/server/0555-Remove-streams-from-SensorNearest.patch diff --git a/patches/server/0557-Improve-ServerGUI.patch b/patches/server/0556-Improve-ServerGUI.patch similarity index 100% rename from patches/server/0557-Improve-ServerGUI.patch rename to patches/server/0556-Improve-ServerGUI.patch diff --git a/patches/server/0558-fix-converting-txt-to-json-file.patch b/patches/server/0557-fix-converting-txt-to-json-file.patch similarity index 100% rename from patches/server/0558-fix-converting-txt-to-json-file.patch rename to patches/server/0557-fix-converting-txt-to-json-file.patch diff --git a/patches/server/0559-Add-worldborder-events.patch b/patches/server/0558-Add-worldborder-events.patch similarity index 100% rename from patches/server/0559-Add-worldborder-events.patch rename to patches/server/0558-Add-worldborder-events.patch diff --git a/patches/server/0560-added-PlayerNameEntityEvent.patch b/patches/server/0559-added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/server/0560-added-PlayerNameEntityEvent.patch rename to patches/server/0559-added-PlayerNameEntityEvent.patch diff --git a/patches/server/0561-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0560-Prevent-grindstones-from-overstacking-items.patch similarity index 100% rename from patches/server/0561-Prevent-grindstones-from-overstacking-items.patch rename to patches/server/0560-Prevent-grindstones-from-overstacking-items.patch diff --git a/patches/server/0562-Add-recipe-to-cook-events.patch b/patches/server/0561-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/server/0562-Add-recipe-to-cook-events.patch rename to patches/server/0561-Add-recipe-to-cook-events.patch diff --git a/patches/server/0563-Add-Block-isValidTool.patch b/patches/server/0562-Add-Block-isValidTool.patch similarity index 100% rename from patches/server/0563-Add-Block-isValidTool.patch rename to patches/server/0562-Add-Block-isValidTool.patch diff --git a/patches/server/0564-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0563-Allow-using-signs-inside-spawn-protection.patch similarity index 100% rename from patches/server/0564-Allow-using-signs-inside-spawn-protection.patch rename to patches/server/0563-Allow-using-signs-inside-spawn-protection.patch diff --git a/patches/server/0565-Expand-world-key-API.patch b/patches/server/0564-Expand-world-key-API.patch similarity index 100% rename from patches/server/0565-Expand-world-key-API.patch rename to patches/server/0564-Expand-world-key-API.patch diff --git a/patches/server/0566-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0565-Add-fast-alternative-constructor-for-Rotations.patch similarity index 100% rename from patches/server/0566-Add-fast-alternative-constructor-for-Rotations.patch rename to patches/server/0565-Add-fast-alternative-constructor-for-Rotations.patch diff --git a/patches/server/0567-Item-Rarity-API.patch b/patches/server/0566-Item-Rarity-API.patch similarity index 100% rename from patches/server/0567-Item-Rarity-API.patch rename to patches/server/0566-Item-Rarity-API.patch diff --git a/patches/server/0568-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0567-Drop-carried-item-when-player-has-disconnected.patch similarity index 100% rename from patches/server/0568-Drop-carried-item-when-player-has-disconnected.patch rename to patches/server/0567-Drop-carried-item-when-player-has-disconnected.patch diff --git a/patches/server/0569-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0568-forced-whitelist-use-configurable-kick-message.patch similarity index 100% rename from patches/server/0569-forced-whitelist-use-configurable-kick-message.patch rename to patches/server/0568-forced-whitelist-use-configurable-kick-message.patch diff --git a/patches/server/0570-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0569-Don-t-ignore-result-of-PlayerEditBookEvent.patch similarity index 100% rename from patches/server/0570-Don-t-ignore-result-of-PlayerEditBookEvent.patch rename to patches/server/0569-Don-t-ignore-result-of-PlayerEditBookEvent.patch diff --git a/patches/server/0571-Expose-protocol-version.patch b/patches/server/0570-Expose-protocol-version.patch similarity index 100% rename from patches/server/0571-Expose-protocol-version.patch rename to patches/server/0570-Expose-protocol-version.patch diff --git a/patches/server/0572-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0571-Enhance-console-tab-completions-for-brigadier-comman.patch similarity index 100% rename from patches/server/0572-Enhance-console-tab-completions-for-brigadier-comman.patch rename to patches/server/0571-Enhance-console-tab-completions-for-brigadier-comman.patch diff --git a/patches/server/0573-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0572-Fix-PlayerItemConsumeEvent-cancelling-properly.patch similarity index 88% rename from patches/server/0573-Fix-PlayerItemConsumeEvent-cancelling-properly.patch rename to patches/server/0572-Fix-PlayerItemConsumeEvent-cancelling-properly.patch index 2cb4d0c503..702fe896b1 100644 --- a/patches/server/0573-Fix-PlayerItemConsumeEvent-cancelling-properly.patch +++ b/patches/server/0572-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 c5b9963c07ac6fb0ffeb2782b2ae22ab4cde2c08..59a377a291927b843b9e4fb4a558eeb729f3d6a8 100644 +index 5074744f1d52765a3856b7c1aa75bfe5aa35c1d4..01a47bcae1ac1a7e03b5580e5e587bc54db2ce1a 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3876,6 +3876,7 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -3860,6 +3860,7 @@ public abstract class LivingEntity extends Entity implements Attackable { this.level().getCraftServer().getPluginManager().callEvent(event); if (event.isCancelled()) { diff --git a/patches/server/0574-Add-bypass-host-check.patch b/patches/server/0573-Add-bypass-host-check.patch similarity index 100% rename from patches/server/0574-Add-bypass-host-check.patch rename to patches/server/0573-Add-bypass-host-check.patch diff --git a/patches/server/0575-Set-area-affect-cloud-rotation.patch b/patches/server/0574-Set-area-affect-cloud-rotation.patch similarity index 100% rename from patches/server/0575-Set-area-affect-cloud-rotation.patch rename to patches/server/0574-Set-area-affect-cloud-rotation.patch diff --git a/patches/server/0576-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0575-add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/server/0576-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/server/0575-add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/server/0577-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0576-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/server/0577-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/server/0576-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/server/0578-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0577-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/server/0578-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/server/0577-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/server/0579-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0578-fix-PigZombieAngerEvent-cancellation.patch similarity index 100% rename from patches/server/0579-fix-PigZombieAngerEvent-cancellation.patch rename to patches/server/0578-fix-PigZombieAngerEvent-cancellation.patch diff --git a/patches/server/0580-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0579-fix-PlayerItemHeldEvent-firing-twice.patch similarity index 100% rename from patches/server/0580-fix-PlayerItemHeldEvent-firing-twice.patch rename to patches/server/0579-fix-PlayerItemHeldEvent-firing-twice.patch diff --git a/patches/server/0581-Added-PlayerDeepSleepEvent.patch b/patches/server/0580-Added-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/server/0581-Added-PlayerDeepSleepEvent.patch rename to patches/server/0580-Added-PlayerDeepSleepEvent.patch diff --git a/patches/server/0582-More-World-API.patch b/patches/server/0581-More-World-API.patch similarity index 100% rename from patches/server/0582-More-World-API.patch rename to patches/server/0581-More-World-API.patch diff --git a/patches/server/0583-Added-PlayerBedFailEnterEvent.patch b/patches/server/0582-Added-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/server/0583-Added-PlayerBedFailEnterEvent.patch rename to patches/server/0582-Added-PlayerBedFailEnterEvent.patch diff --git a/patches/server/0584-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0583-Implement-methods-to-convert-between-Component-and-B.patch similarity index 100% rename from patches/server/0584-Implement-methods-to-convert-between-Component-and-B.patch rename to patches/server/0583-Implement-methods-to-convert-between-Component-and-B.patch diff --git a/patches/server/0585-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0584-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch similarity index 100% rename from patches/server/0585-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch rename to patches/server/0584-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch diff --git a/patches/server/0586-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0585-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/server/0586-Introduce-beacon-activation-deactivation-events.patch rename to patches/server/0585-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/server/0587-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0586-add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 100% rename from patches/server/0587-add-RespawnFlags-to-PlayerRespawnEvent.patch rename to patches/server/0586-add-RespawnFlags-to-PlayerRespawnEvent.patch diff --git a/patches/server/0588-Add-Channel-initialization-listeners.patch b/patches/server/0587-Add-Channel-initialization-listeners.patch similarity index 100% rename from patches/server/0588-Add-Channel-initialization-listeners.patch rename to patches/server/0587-Add-Channel-initialization-listeners.patch diff --git a/patches/server/0589-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0588-Send-empty-commands-if-tab-completion-is-disabled.patch similarity index 100% rename from patches/server/0589-Send-empty-commands-if-tab-completion-is-disabled.patch rename to patches/server/0588-Send-empty-commands-if-tab-completion-is-disabled.patch diff --git a/patches/server/0590-Add-more-WanderingTrader-API.patch b/patches/server/0589-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/server/0590-Add-more-WanderingTrader-API.patch rename to patches/server/0589-Add-more-WanderingTrader-API.patch diff --git a/patches/server/0591-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0590-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/server/0591-Add-EntityBlockStorage-clearEntities.patch rename to patches/server/0590-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/server/0592-Entity-load-save-limit-per-chunk.patch b/patches/server/0591-Entity-load-save-limit-per-chunk.patch similarity index 100% rename from patches/server/0592-Entity-load-save-limit-per-chunk.patch rename to patches/server/0591-Entity-load-save-limit-per-chunk.patch diff --git a/patches/server/0593-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0592-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/server/0593-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/server/0592-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/server/0594-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0593-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0594-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch rename to patches/server/0593-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0595-Inventory-close.patch b/patches/server/0594-Inventory-close.patch similarity index 100% rename from patches/server/0595-Inventory-close.patch rename to patches/server/0594-Inventory-close.patch diff --git a/patches/server/0596-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0595-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/server/0596-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/server/0595-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/server/0597-Fix-CraftPotionBrewer-cache.patch b/patches/server/0596-Fix-CraftPotionBrewer-cache.patch similarity index 100% rename from patches/server/0597-Fix-CraftPotionBrewer-cache.patch rename to patches/server/0596-Fix-CraftPotionBrewer-cache.patch diff --git a/patches/server/0598-Add-basic-Datapack-API.patch b/patches/server/0597-Add-basic-Datapack-API.patch similarity index 100% rename from patches/server/0598-Add-basic-Datapack-API.patch rename to patches/server/0597-Add-basic-Datapack-API.patch diff --git a/patches/server/0599-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0598-Add-environment-variable-to-disable-server-gui.patch similarity index 100% rename from patches/server/0599-Add-environment-variable-to-disable-server-gui.patch rename to patches/server/0598-Add-environment-variable-to-disable-server-gui.patch diff --git a/patches/server/0600-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0599-additions-to-PlayerGameModeChangeEvent.patch similarity index 100% rename from patches/server/0600-additions-to-PlayerGameModeChangeEvent.patch rename to patches/server/0599-additions-to-PlayerGameModeChangeEvent.patch diff --git a/patches/server/0601-ItemStack-repair-check-API.patch b/patches/server/0600-ItemStack-repair-check-API.patch similarity index 100% rename from patches/server/0601-ItemStack-repair-check-API.patch rename to patches/server/0600-ItemStack-repair-check-API.patch diff --git a/patches/server/0602-More-Enchantment-API.patch b/patches/server/0601-More-Enchantment-API.patch similarity index 100% rename from patches/server/0602-More-Enchantment-API.patch rename to patches/server/0601-More-Enchantment-API.patch diff --git a/patches/server/0603-Move-range-check-for-block-placing-up.patch b/patches/server/0602-Move-range-check-for-block-placing-up.patch similarity index 100% rename from patches/server/0603-Move-range-check-for-block-placing-up.patch rename to patches/server/0602-Move-range-check-for-block-placing-up.patch diff --git a/patches/server/0604-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0603-Fix-and-optimise-world-force-upgrading.patch similarity index 100% rename from patches/server/0604-Fix-and-optimise-world-force-upgrading.patch rename to patches/server/0603-Fix-and-optimise-world-force-upgrading.patch diff --git a/patches/server/0605-Add-Mob-lookAt-API.patch b/patches/server/0604-Add-Mob-lookAt-API.patch similarity index 100% rename from patches/server/0605-Add-Mob-lookAt-API.patch rename to patches/server/0604-Add-Mob-lookAt-API.patch diff --git a/patches/server/0606-Add-Unix-domain-socket-support.patch b/patches/server/0605-Add-Unix-domain-socket-support.patch similarity index 100% rename from patches/server/0606-Add-Unix-domain-socket-support.patch rename to patches/server/0605-Add-Unix-domain-socket-support.patch diff --git a/patches/server/0607-Add-EntityInsideBlockEvent.patch b/patches/server/0606-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/server/0607-Add-EntityInsideBlockEvent.patch rename to patches/server/0606-Add-EntityInsideBlockEvent.patch diff --git a/patches/server/0608-Attributes-API-for-item-defaults.patch b/patches/server/0607-Attributes-API-for-item-defaults.patch similarity index 100% rename from patches/server/0608-Attributes-API-for-item-defaults.patch rename to patches/server/0607-Attributes-API-for-item-defaults.patch diff --git a/patches/server/0609-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0608-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 100% rename from patches/server/0609-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/server/0608-Add-cause-to-Weather-ThunderChangeEvents.patch diff --git a/patches/server/0610-More-Lidded-Block-API.patch b/patches/server/0609-More-Lidded-Block-API.patch similarity index 100% rename from patches/server/0610-More-Lidded-Block-API.patch rename to patches/server/0609-More-Lidded-Block-API.patch diff --git a/patches/server/0611-Limit-item-frame-cursors-on-maps.patch b/patches/server/0610-Limit-item-frame-cursors-on-maps.patch similarity index 100% rename from patches/server/0611-Limit-item-frame-cursors-on-maps.patch rename to patches/server/0610-Limit-item-frame-cursors-on-maps.patch diff --git a/patches/server/0612-Add-PlayerKickEvent-causes.patch b/patches/server/0611-Add-PlayerKickEvent-causes.patch similarity index 100% rename from patches/server/0612-Add-PlayerKickEvent-causes.patch rename to patches/server/0611-Add-PlayerKickEvent-causes.patch diff --git a/patches/server/0613-Add-PufferFishStateChangeEvent.patch b/patches/server/0612-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/server/0613-Add-PufferFishStateChangeEvent.patch rename to patches/server/0612-Add-PufferFishStateChangeEvent.patch diff --git a/patches/server/0614-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0613-Fix-PlayerBucketEmptyEvent-result-itemstack.patch similarity index 100% rename from patches/server/0614-Fix-PlayerBucketEmptyEvent-result-itemstack.patch rename to patches/server/0613-Fix-PlayerBucketEmptyEvent-result-itemstack.patch diff --git a/patches/server/0615-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0614-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch similarity index 100% rename from patches/server/0615-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch rename to patches/server/0614-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch diff --git a/patches/server/0616-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0615-Add-option-to-fix-items-merging-through-walls.patch similarity index 100% rename from patches/server/0616-Add-option-to-fix-items-merging-through-walls.patch rename to patches/server/0615-Add-option-to-fix-items-merging-through-walls.patch diff --git a/patches/server/0617-Add-BellRevealRaiderEvent.patch b/patches/server/0616-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/server/0617-Add-BellRevealRaiderEvent.patch rename to patches/server/0616-Add-BellRevealRaiderEvent.patch diff --git a/patches/server/0618-Fix-invulnerable-end-crystals.patch b/patches/server/0617-Fix-invulnerable-end-crystals.patch similarity index 100% rename from patches/server/0618-Fix-invulnerable-end-crystals.patch rename to patches/server/0617-Fix-invulnerable-end-crystals.patch diff --git a/patches/server/0619-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0618-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/server/0619-Add-ElderGuardianAppearanceEvent.patch rename to patches/server/0618-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/server/0620-Fix-dangerous-end-portal-logic.patch b/patches/server/0619-Fix-dangerous-end-portal-logic.patch similarity index 100% rename from patches/server/0620-Fix-dangerous-end-portal-logic.patch rename to patches/server/0619-Fix-dangerous-end-portal-logic.patch diff --git a/patches/server/0621-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0620-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch similarity index 100% rename from patches/server/0621-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch rename to patches/server/0620-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch diff --git a/patches/server/0622-Make-item-validations-configurable.patch b/patches/server/0621-Make-item-validations-configurable.patch similarity index 100% rename from patches/server/0622-Make-item-validations-configurable.patch rename to patches/server/0621-Make-item-validations-configurable.patch diff --git a/patches/server/0623-Line-Of-Sight-Changes.patch b/patches/server/0622-Line-Of-Sight-Changes.patch similarity index 97% rename from patches/server/0623-Line-Of-Sight-Changes.patch rename to patches/server/0622-Line-Of-Sight-Changes.patch index 0efb326f77..6cc67403a7 100644 --- a/patches/server/0623-Line-Of-Sight-Changes.patch +++ b/patches/server/0622-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 59a377a291927b843b9e4fb4a558eeb729f3d6a8..1427616a0f1c80d381831d8928a4b632107fe0f5 100644 +index 01a47bcae1ac1a7e03b5580e5e587bc54db2ce1a..256bb189d6546e3d984134f2a3d6c0058d6a7f77 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3607,7 +3607,8 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0624-add-per-world-spawn-limits.patch b/patches/server/0623-add-per-world-spawn-limits.patch similarity index 100% rename from patches/server/0624-add-per-world-spawn-limits.patch rename to patches/server/0623-add-per-world-spawn-limits.patch diff --git a/patches/server/0625-Fix-potions-splash-events.patch b/patches/server/0624-Fix-potions-splash-events.patch similarity index 100% rename from patches/server/0625-Fix-potions-splash-events.patch rename to patches/server/0624-Fix-potions-splash-events.patch diff --git a/patches/server/0626-Add-more-LimitedRegion-API.patch b/patches/server/0625-Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/server/0626-Add-more-LimitedRegion-API.patch rename to patches/server/0625-Add-more-LimitedRegion-API.patch diff --git a/patches/server/0627-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0626-Fix-PlayerDropItemEvent-using-wrong-item.patch similarity index 100% rename from patches/server/0627-Fix-PlayerDropItemEvent-using-wrong-item.patch rename to patches/server/0626-Fix-PlayerDropItemEvent-using-wrong-item.patch diff --git a/patches/server/0628-Missing-Entity-API.patch b/patches/server/0627-Missing-Entity-API.patch similarity index 100% rename from patches/server/0628-Missing-Entity-API.patch rename to patches/server/0627-Missing-Entity-API.patch diff --git a/patches/server/0629-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0628-Ensure-disconnect-for-book-edit-is-called-on-main.patch similarity index 100% rename from patches/server/0629-Ensure-disconnect-for-book-edit-is-called-on-main.patch rename to patches/server/0628-Ensure-disconnect-for-book-edit-is-called-on-main.patch diff --git a/patches/server/0630-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0629-Fix-return-value-of-Block-applyBoneMeal-always-being.patch similarity index 100% rename from patches/server/0630-Fix-return-value-of-Block-applyBoneMeal-always-being.patch rename to patches/server/0629-Fix-return-value-of-Block-applyBoneMeal-always-being.patch diff --git a/patches/server/0631-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0630-Use-getChunkIfLoadedImmediately-in-places.patch similarity index 100% rename from patches/server/0631-Use-getChunkIfLoadedImmediately-in-places.patch rename to patches/server/0630-Use-getChunkIfLoadedImmediately-in-places.patch diff --git a/patches/server/0632-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0631-Fix-commands-from-signs-not-firing-command-events.patch similarity index 100% rename from patches/server/0632-Fix-commands-from-signs-not-firing-command-events.patch rename to patches/server/0631-Fix-commands-from-signs-not-firing-command-events.patch diff --git a/patches/server/0633-Adds-PlayerArmSwingEvent.patch b/patches/server/0632-Adds-PlayerArmSwingEvent.patch similarity index 100% rename from patches/server/0633-Adds-PlayerArmSwingEvent.patch rename to patches/server/0632-Adds-PlayerArmSwingEvent.patch diff --git a/patches/server/0634-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0633-Fixes-kick-event-leave-message-not-being-sent.patch similarity index 100% rename from patches/server/0634-Fixes-kick-event-leave-message-not-being-sent.patch rename to patches/server/0633-Fixes-kick-event-leave-message-not-being-sent.patch diff --git a/patches/server/0635-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0634-Add-config-for-mobs-immune-to-default-effects.patch similarity index 97% rename from patches/server/0635-Add-config-for-mobs-immune-to-default-effects.patch rename to patches/server/0634-Add-config-for-mobs-immune-to-default-effects.patch index 0b70f326d1..e817291c81 100644 --- a/patches/server/0635-Add-config-for-mobs-immune-to-default-effects.patch +++ b/patches/server/0634-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 1427616a0f1c80d381831d8928a4b632107fe0f5..f33ac871d08672a78774a3a9642954bdcaa2e9d9 100644 +index 256bb189d6546e3d984134f2a3d6c0058d6a7f77..3457aa99084dfb8141922bf0eb0073ea41387713 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1165,7 +1165,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0636-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0635-Fix-incorrect-message-for-outdated-client.patch similarity index 100% rename from patches/server/0636-Fix-incorrect-message-for-outdated-client.patch rename to patches/server/0635-Fix-incorrect-message-for-outdated-client.patch diff --git a/patches/server/0637-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0636-Don-t-apply-cramming-damage-to-players.patch similarity index 100% rename from patches/server/0637-Don-t-apply-cramming-damage-to-players.patch rename to patches/server/0636-Don-t-apply-cramming-damage-to-players.patch diff --git a/patches/server/0638-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0637-Rate-options-and-timings-for-sensors-and-behaviors.patch similarity index 100% rename from patches/server/0638-Rate-options-and-timings-for-sensors-and-behaviors.patch rename to patches/server/0637-Rate-options-and-timings-for-sensors-and-behaviors.patch diff --git a/patches/server/0639-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0638-Add-a-bunch-of-missing-forceDrop-toggles.patch similarity index 100% rename from patches/server/0639-Add-a-bunch-of-missing-forceDrop-toggles.patch rename to patches/server/0638-Add-a-bunch-of-missing-forceDrop-toggles.patch diff --git a/patches/server/0640-Stinger-API.patch b/patches/server/0639-Stinger-API.patch similarity index 100% rename from patches/server/0640-Stinger-API.patch rename to patches/server/0639-Stinger-API.patch diff --git a/patches/server/0641-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0640-Fix-incosistency-issue-with-empty-map-items-in-CB.patch similarity index 100% rename from patches/server/0641-Fix-incosistency-issue-with-empty-map-items-in-CB.patch rename to patches/server/0640-Fix-incosistency-issue-with-empty-map-items-in-CB.patch diff --git a/patches/server/0642-Add-System.out-err-catcher.patch b/patches/server/0641-Add-System.out-err-catcher.patch similarity index 100% rename from patches/server/0642-Add-System.out-err-catcher.patch rename to patches/server/0641-Add-System.out-err-catcher.patch diff --git a/patches/server/0643-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0642-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/server/0643-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/server/0642-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/server/0644-Improve-boat-collision-performance.patch b/patches/server/0643-Improve-boat-collision-performance.patch similarity index 97% rename from patches/server/0644-Improve-boat-collision-performance.patch rename to patches/server/0643-Improve-boat-collision-performance.patch index d9f6854afd..9b03112d60 100644 --- a/patches/server/0644-Improve-boat-collision-performance.patch +++ b/patches/server/0643-Improve-boat-collision-performance.patch @@ -17,7 +17,7 @@ index 5e9401f0c2de0743aca9237ee8c4dfba586cfdb9..25b2d7016b60ee9bad0a2fb4a2c7c8ee }; diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index f33ac871d08672a78774a3a9642954bdcaa2e9d9..6b80dd7cc1dcc248f7bc1ab4c3d988f8afad1b61 100644 +index 3457aa99084dfb8141922bf0eb0073ea41387713..e7876303b545ae0b856666c88a3d20948a8d2f25 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1414,7 +1414,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0645-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0644-Prevent-AFK-kick-while-watching-end-credits.patch similarity index 100% rename from patches/server/0645-Prevent-AFK-kick-while-watching-end-credits.patch rename to patches/server/0644-Prevent-AFK-kick-while-watching-end-credits.patch diff --git a/patches/server/0646-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0645-Allow-skipping-writing-of-comments-to-server.propert.patch similarity index 100% rename from patches/server/0646-Allow-skipping-writing-of-comments-to-server.propert.patch rename to patches/server/0645-Allow-skipping-writing-of-comments-to-server.propert.patch diff --git a/patches/server/0647-Add-PlayerSetSpawnEvent.patch b/patches/server/0646-Add-PlayerSetSpawnEvent.patch similarity index 100% rename from patches/server/0647-Add-PlayerSetSpawnEvent.patch rename to patches/server/0646-Add-PlayerSetSpawnEvent.patch diff --git a/patches/server/0648-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0647-Make-hoppers-respect-inventory-max-stack-size.patch similarity index 100% rename from patches/server/0648-Make-hoppers-respect-inventory-max-stack-size.patch rename to patches/server/0647-Make-hoppers-respect-inventory-max-stack-size.patch diff --git a/patches/server/0649-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0648-Optimize-entity-tracker-passenger-checks.patch similarity index 100% rename from patches/server/0649-Optimize-entity-tracker-passenger-checks.patch rename to patches/server/0648-Optimize-entity-tracker-passenger-checks.patch diff --git a/patches/server/0650-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0649-Config-option-for-Piglins-guarding-chests.patch similarity index 100% rename from patches/server/0650-Config-option-for-Piglins-guarding-chests.patch rename to patches/server/0649-Config-option-for-Piglins-guarding-chests.patch diff --git a/patches/server/0651-Added-EntityDamageItemEvent.patch b/patches/server/0650-Added-EntityDamageItemEvent.patch similarity index 100% rename from patches/server/0651-Added-EntityDamageItemEvent.patch rename to patches/server/0650-Added-EntityDamageItemEvent.patch diff --git a/patches/server/0652-Optimize-indirect-passenger-iteration.patch b/patches/server/0651-Optimize-indirect-passenger-iteration.patch similarity index 100% rename from patches/server/0652-Optimize-indirect-passenger-iteration.patch rename to patches/server/0651-Optimize-indirect-passenger-iteration.patch diff --git a/patches/server/0653-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0652-Configurable-item-frame-map-cursor-update-interval.patch similarity index 100% rename from patches/server/0653-Configurable-item-frame-map-cursor-update-interval.patch rename to patches/server/0652-Configurable-item-frame-map-cursor-update-interval.patch diff --git a/patches/server/0654-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0653-Make-EntityUnleashEvent-cancellable.patch similarity index 100% rename from patches/server/0654-Make-EntityUnleashEvent-cancellable.patch rename to patches/server/0653-Make-EntityUnleashEvent-cancellable.patch diff --git a/patches/server/0655-Clear-bucket-NBT-after-dispense.patch b/patches/server/0654-Clear-bucket-NBT-after-dispense.patch similarity index 100% rename from patches/server/0655-Clear-bucket-NBT-after-dispense.patch rename to patches/server/0654-Clear-bucket-NBT-after-dispense.patch diff --git a/patches/server/0656-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0655-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/server/0656-Change-EnderEye-target-without-changing-other-things.patch rename to patches/server/0655-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/server/0657-Add-BlockBreakBlockEvent.patch b/patches/server/0656-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/server/0657-Add-BlockBreakBlockEvent.patch rename to patches/server/0656-Add-BlockBreakBlockEvent.patch diff --git a/patches/server/0658-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0657-Option-to-prevent-NBT-copy-in-smithing-recipes.patch similarity index 100% rename from patches/server/0658-Option-to-prevent-NBT-copy-in-smithing-recipes.patch rename to patches/server/0657-Option-to-prevent-NBT-copy-in-smithing-recipes.patch diff --git a/patches/server/0659-More-CommandBlock-API.patch b/patches/server/0658-More-CommandBlock-API.patch similarity index 100% rename from patches/server/0659-More-CommandBlock-API.patch rename to patches/server/0658-More-CommandBlock-API.patch diff --git a/patches/server/0660-Add-missing-team-sidebar-display-slots.patch b/patches/server/0659-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/server/0660-Add-missing-team-sidebar-display-slots.patch rename to patches/server/0659-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/server/0661-Add-back-EntityPortalExitEvent.patch b/patches/server/0660-Add-back-EntityPortalExitEvent.patch similarity index 100% rename from patches/server/0661-Add-back-EntityPortalExitEvent.patch rename to patches/server/0660-Add-back-EntityPortalExitEvent.patch diff --git a/patches/server/0662-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0661-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 100% rename from patches/server/0662-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/server/0661-Add-methods-to-find-targets-for-lightning-strikes.patch diff --git a/patches/server/0663-Get-entity-default-attributes.patch b/patches/server/0662-Get-entity-default-attributes.patch similarity index 100% rename from patches/server/0663-Get-entity-default-attributes.patch rename to patches/server/0662-Get-entity-default-attributes.patch diff --git a/patches/server/0664-Left-handed-API.patch b/patches/server/0663-Left-handed-API.patch similarity index 100% rename from patches/server/0664-Left-handed-API.patch rename to patches/server/0663-Left-handed-API.patch diff --git a/patches/server/0665-Add-more-advancement-API.patch b/patches/server/0664-Add-more-advancement-API.patch similarity index 100% rename from patches/server/0665-Add-more-advancement-API.patch rename to patches/server/0664-Add-more-advancement-API.patch diff --git a/patches/server/0666-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0665-Add-ItemFactory-getSpawnEgg-API.patch similarity index 100% rename from patches/server/0666-Add-ItemFactory-getSpawnEgg-API.patch rename to patches/server/0665-Add-ItemFactory-getSpawnEgg-API.patch diff --git a/patches/server/0667-Add-critical-damage-API.patch b/patches/server/0666-Add-critical-damage-API.patch similarity index 100% rename from patches/server/0667-Add-critical-damage-API.patch rename to patches/server/0666-Add-critical-damage-API.patch diff --git a/patches/server/0668-Fix-issues-with-mob-conversion.patch b/patches/server/0667-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/server/0668-Fix-issues-with-mob-conversion.patch rename to patches/server/0667-Fix-issues-with-mob-conversion.patch diff --git a/patches/server/0669-Add-isCollidable-methods-to-various-places.patch b/patches/server/0668-Add-isCollidable-methods-to-various-places.patch similarity index 100% rename from patches/server/0669-Add-isCollidable-methods-to-various-places.patch rename to patches/server/0668-Add-isCollidable-methods-to-various-places.patch diff --git a/patches/server/0670-Goat-ram-API.patch b/patches/server/0669-Goat-ram-API.patch similarity index 100% rename from patches/server/0670-Goat-ram-API.patch rename to patches/server/0669-Goat-ram-API.patch diff --git a/patches/server/0671-Add-API-for-resetting-a-single-score.patch b/patches/server/0670-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/server/0671-Add-API-for-resetting-a-single-score.patch rename to patches/server/0670-Add-API-for-resetting-a-single-score.patch diff --git a/patches/server/0672-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0671-Add-Raw-Byte-Entity-Serialization.patch similarity index 100% rename from patches/server/0672-Add-Raw-Byte-Entity-Serialization.patch rename to patches/server/0671-Add-Raw-Byte-Entity-Serialization.patch diff --git a/patches/server/0673-Vanilla-command-permission-fixes.patch b/patches/server/0672-Vanilla-command-permission-fixes.patch similarity index 100% rename from patches/server/0673-Vanilla-command-permission-fixes.patch rename to patches/server/0672-Vanilla-command-permission-fixes.patch diff --git a/patches/server/0674-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0673-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch similarity index 100% rename from patches/server/0674-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch rename to patches/server/0673-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch diff --git a/patches/server/0675-Fix-GameProfileCache-concurrency.patch b/patches/server/0674-Fix-GameProfileCache-concurrency.patch similarity index 100% rename from patches/server/0675-Fix-GameProfileCache-concurrency.patch rename to patches/server/0674-Fix-GameProfileCache-concurrency.patch diff --git a/patches/server/0676-Improve-and-expand-AsyncCatcher.patch b/patches/server/0675-Improve-and-expand-AsyncCatcher.patch similarity index 99% rename from patches/server/0676-Improve-and-expand-AsyncCatcher.patch rename to patches/server/0675-Improve-and-expand-AsyncCatcher.patch index dc14586dd1..6a6fe71235 100644 --- a/patches/server/0676-Improve-and-expand-AsyncCatcher.patch +++ b/patches/server/0675-Improve-and-expand-AsyncCatcher.patch @@ -29,7 +29,7 @@ index 3ef7882029f38329f797f77dd64b8ffeeb84dc6b..a53d67a601fc04f18f673742743a4e3b 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 6b80dd7cc1dcc248f7bc1ab4c3d988f8afad1b61..8ccdbfc7908f2b20f94e614009a2063e0a131d7b 100644 +index e7876303b545ae0b856666c88a3d20948a8d2f25..fdac3d377b9090594e7e5d5c67387652854a2068 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1119,7 +1119,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0677-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0676-Add-paper-mobcaps-and-paper-playermobcaps.patch similarity index 100% rename from patches/server/0677-Add-paper-mobcaps-and-paper-playermobcaps.patch rename to patches/server/0676-Add-paper-mobcaps-and-paper-playermobcaps.patch diff --git a/patches/server/0678-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0677-Sanitize-ResourceLocation-error-logging.patch similarity index 100% rename from patches/server/0678-Sanitize-ResourceLocation-error-logging.patch rename to patches/server/0677-Sanitize-ResourceLocation-error-logging.patch diff --git a/patches/server/0679-Optimise-general-POI-access.patch b/patches/server/0678-Optimise-general-POI-access.patch similarity index 100% rename from patches/server/0679-Optimise-general-POI-access.patch rename to patches/server/0678-Optimise-general-POI-access.patch diff --git a/patches/server/0680-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0679-Custom-table-implementation-for-blockstate-state-loo.patch similarity index 100% rename from patches/server/0680-Custom-table-implementation-for-blockstate-state-loo.patch rename to patches/server/0679-Custom-table-implementation-for-blockstate-state-loo.patch diff --git a/patches/server/0681-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0680-Manually-inline-methods-in-BlockPosition.patch similarity index 100% rename from patches/server/0681-Manually-inline-methods-in-BlockPosition.patch rename to patches/server/0680-Manually-inline-methods-in-BlockPosition.patch diff --git a/patches/server/0682-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0681-Name-craft-scheduler-threads-according-to-the-plugin.patch similarity index 100% rename from patches/server/0682-Name-craft-scheduler-threads-according-to-the-plugin.patch rename to patches/server/0681-Name-craft-scheduler-threads-according-to-the-plugin.patch diff --git a/patches/server/0683-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0682-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch similarity index 100% rename from patches/server/0683-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch rename to patches/server/0682-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch diff --git a/patches/server/0684-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0683-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch similarity index 100% rename from patches/server/0684-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch rename to patches/server/0683-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch diff --git a/patches/server/0685-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0684-Don-t-lookup-fluid-state-when-raytracing.patch similarity index 100% rename from patches/server/0685-Don-t-lookup-fluid-state-when-raytracing.patch rename to patches/server/0684-Don-t-lookup-fluid-state-when-raytracing.patch diff --git a/patches/server/0686-Time-scoreboard-search.patch b/patches/server/0685-Time-scoreboard-search.patch similarity index 100% rename from patches/server/0686-Time-scoreboard-search.patch rename to patches/server/0685-Time-scoreboard-search.patch diff --git a/patches/server/0687-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0686-Send-full-pos-packets-for-hard-colliding-entities.patch similarity index 100% rename from patches/server/0687-Send-full-pos-packets-for-hard-colliding-entities.patch rename to patches/server/0686-Send-full-pos-packets-for-hard-colliding-entities.patch diff --git a/patches/server/0688-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0687-Do-not-run-raytrace-logic-for-AIR.patch similarity index 100% rename from patches/server/0688-Do-not-run-raytrace-logic-for-AIR.patch rename to patches/server/0687-Do-not-run-raytrace-logic-for-AIR.patch diff --git a/patches/server/0689-Execute-chunk-tasks-mid-tick.patch b/patches/server/0688-Execute-chunk-tasks-mid-tick.patch similarity index 100% rename from patches/server/0689-Execute-chunk-tasks-mid-tick.patch rename to patches/server/0688-Execute-chunk-tasks-mid-tick.patch diff --git a/patches/server/0690-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0689-Oprimise-map-impl-for-tracked-players.patch similarity index 100% rename from patches/server/0690-Oprimise-map-impl-for-tracked-players.patch rename to patches/server/0689-Oprimise-map-impl-for-tracked-players.patch diff --git a/patches/server/0691-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0690-Optimise-BlockSoil-nearby-water-lookup.patch similarity index 100% rename from patches/server/0691-Optimise-BlockSoil-nearby-water-lookup.patch rename to patches/server/0690-Optimise-BlockSoil-nearby-water-lookup.patch diff --git a/patches/server/0692-Optimise-random-block-ticking.patch b/patches/server/0691-Optimise-random-block-ticking.patch similarity index 100% rename from patches/server/0692-Optimise-random-block-ticking.patch rename to patches/server/0691-Optimise-random-block-ticking.patch diff --git a/patches/server/0693-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0692-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch similarity index 100% rename from patches/server/0693-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch rename to patches/server/0692-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch diff --git a/patches/server/0694-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0693-Use-Velocity-compression-and-cipher-natives.patch similarity index 100% rename from patches/server/0694-Use-Velocity-compression-and-cipher-natives.patch rename to patches/server/0693-Use-Velocity-compression-and-cipher-natives.patch diff --git a/patches/server/0695-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0694-Detail-more-information-in-watchdog-dumps.patch similarity index 100% rename from patches/server/0695-Detail-more-information-in-watchdog-dumps.patch rename to patches/server/0694-Detail-more-information-in-watchdog-dumps.patch diff --git a/patches/server/0696-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0695-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch similarity index 100% rename from patches/server/0696-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch rename to patches/server/0695-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch diff --git a/patches/server/0697-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0696-Fix-Bukkit-NamespacedKey-shenanigans.patch similarity index 100% rename from patches/server/0697-Fix-Bukkit-NamespacedKey-shenanigans.patch rename to patches/server/0696-Fix-Bukkit-NamespacedKey-shenanigans.patch diff --git a/patches/server/0698-Distance-manager-tick-timings.patch b/patches/server/0697-Distance-manager-tick-timings.patch similarity index 100% rename from patches/server/0698-Distance-manager-tick-timings.patch rename to patches/server/0697-Distance-manager-tick-timings.patch diff --git a/patches/server/0699-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0698-Fix-merchant-inventory-not-closing-on-entity-removal.patch similarity index 100% rename from patches/server/0699-Fix-merchant-inventory-not-closing-on-entity-removal.patch rename to patches/server/0698-Fix-merchant-inventory-not-closing-on-entity-removal.patch diff --git a/patches/server/0700-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0699-Check-requirement-before-suggesting-root-nodes.patch similarity index 100% rename from patches/server/0700-Check-requirement-before-suggesting-root-nodes.patch rename to patches/server/0699-Check-requirement-before-suggesting-root-nodes.patch diff --git a/patches/server/0701-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0700-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch similarity index 100% rename from patches/server/0701-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch rename to patches/server/0700-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch diff --git a/patches/server/0702-Add-packet-limiter-config.patch b/patches/server/0701-Add-packet-limiter-config.patch similarity index 100% rename from patches/server/0702-Add-packet-limiter-config.patch rename to patches/server/0701-Add-packet-limiter-config.patch diff --git a/patches/server/0703-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0702-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch similarity index 100% rename from patches/server/0703-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch rename to patches/server/0702-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch diff --git a/patches/server/0704-Ensure-valid-vehicle-status.patch b/patches/server/0703-Ensure-valid-vehicle-status.patch similarity index 100% rename from patches/server/0704-Ensure-valid-vehicle-status.patch rename to patches/server/0703-Ensure-valid-vehicle-status.patch diff --git a/patches/server/0705-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0704-Prevent-softlocked-end-exit-portal-generation.patch similarity index 100% rename from patches/server/0705-Prevent-softlocked-end-exit-portal-generation.patch rename to patches/server/0704-Prevent-softlocked-end-exit-portal-generation.patch diff --git a/patches/server/0706-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0705-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch similarity index 100% rename from patches/server/0706-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch rename to patches/server/0705-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch diff --git a/patches/server/0707-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0706-Don-t-log-debug-logging-being-disabled.patch similarity index 100% rename from patches/server/0707-Don-t-log-debug-logging-being-disabled.patch rename to patches/server/0706-Don-t-log-debug-logging-being-disabled.patch diff --git a/patches/server/0708-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0707-fix-various-menus-with-empty-level-accesses.patch similarity index 100% rename from patches/server/0708-fix-various-menus-with-empty-level-accesses.patch rename to patches/server/0707-fix-various-menus-with-empty-level-accesses.patch diff --git a/patches/server/0709-Preserve-overstacked-loot.patch b/patches/server/0708-Preserve-overstacked-loot.patch similarity index 100% rename from patches/server/0709-Preserve-overstacked-loot.patch rename to patches/server/0708-Preserve-overstacked-loot.patch diff --git a/patches/server/0710-Update-head-rotation-in-missing-places.patch b/patches/server/0709-Update-head-rotation-in-missing-places.patch similarity index 100% rename from patches/server/0710-Update-head-rotation-in-missing-places.patch rename to patches/server/0709-Update-head-rotation-in-missing-places.patch diff --git a/patches/server/0711-prevent-unintended-light-block-manipulation.patch b/patches/server/0710-prevent-unintended-light-block-manipulation.patch similarity index 100% rename from patches/server/0711-prevent-unintended-light-block-manipulation.patch rename to patches/server/0710-prevent-unintended-light-block-manipulation.patch diff --git a/patches/server/0712-Fix-CraftCriteria-defaults-map.patch b/patches/server/0711-Fix-CraftCriteria-defaults-map.patch similarity index 100% rename from patches/server/0712-Fix-CraftCriteria-defaults-map.patch rename to patches/server/0711-Fix-CraftCriteria-defaults-map.patch diff --git a/patches/server/0713-Fix-upstreams-block-state-factories.patch b/patches/server/0712-Fix-upstreams-block-state-factories.patch similarity index 100% rename from patches/server/0713-Fix-upstreams-block-state-factories.patch rename to patches/server/0712-Fix-upstreams-block-state-factories.patch diff --git a/patches/server/0714-Configurable-feature-seeds.patch b/patches/server/0713-Configurable-feature-seeds.patch similarity index 100% rename from patches/server/0714-Configurable-feature-seeds.patch rename to patches/server/0713-Configurable-feature-seeds.patch diff --git a/patches/server/0715-Add-root-admin-user-detection.patch b/patches/server/0714-Add-root-admin-user-detection.patch similarity index 100% rename from patches/server/0715-Add-root-admin-user-detection.patch rename to patches/server/0714-Add-root-admin-user-detection.patch diff --git a/patches/server/0716-Always-allow-item-changing-in-Fireball.patch b/patches/server/0715-Always-allow-item-changing-in-Fireball.patch similarity index 100% rename from patches/server/0716-Always-allow-item-changing-in-Fireball.patch rename to patches/server/0715-Always-allow-item-changing-in-Fireball.patch diff --git a/patches/server/0717-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0716-don-t-attempt-to-teleport-dead-entities.patch similarity index 100% rename from patches/server/0717-don-t-attempt-to-teleport-dead-entities.patch rename to patches/server/0716-don-t-attempt-to-teleport-dead-entities.patch diff --git a/patches/server/0718-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0717-Prevent-excessive-velocity-through-repeated-crits.patch similarity index 94% rename from patches/server/0718-Prevent-excessive-velocity-through-repeated-crits.patch rename to patches/server/0717-Prevent-excessive-velocity-through-repeated-crits.patch index e7310fba5e..492deb23b0 100644 --- a/patches/server/0718-Prevent-excessive-velocity-through-repeated-crits.patch +++ b/patches/server/0717-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 8ccdbfc7908f2b20f94e614009a2063e0a131d7b..bc3f781be18f4a039aa58217cf4d560ab42b2d26 100644 +index fdac3d377b9090594e7e5d5c67387652854a2068..9a555f26e35441fb25d00f0623bf6d2cce1aa803 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -2683,13 +2683,26 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0719-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0718-Remove-client-side-code-using-deprecated-for-removal.patch similarity index 100% rename from patches/server/0719-Remove-client-side-code-using-deprecated-for-removal.patch rename to patches/server/0718-Remove-client-side-code-using-deprecated-for-removal.patch diff --git a/patches/server/0720-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0719-Fix-removing-recipes-from-RecipeIterator.patch similarity index 100% rename from patches/server/0720-Fix-removing-recipes-from-RecipeIterator.patch rename to patches/server/0719-Fix-removing-recipes-from-RecipeIterator.patch diff --git a/patches/server/0721-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0720-Prevent-sending-oversized-item-data-in-equipment-and.patch similarity index 97% rename from patches/server/0721-Prevent-sending-oversized-item-data-in-equipment-and.patch rename to patches/server/0720-Prevent-sending-oversized-item-data-in-equipment-and.patch index b8ea5ad3dc..67ee6fba0a 100644 --- a/patches/server/0721-Prevent-sending-oversized-item-data-in-equipment-and.patch +++ b/patches/server/0720-Prevent-sending-oversized-item-data-in-equipment-and.patch @@ -34,7 +34,7 @@ index fbcb6843492c25a03bdc2efb4efb529f9fecc221..dcf412aa557cdc7464893264b86b916e } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index bc3f781be18f4a039aa58217cf4d560ab42b2d26..52c8812c6670dbec377d0dfb985b190bf6e87da9 100644 +index 9a555f26e35441fb25d00f0623bf6d2cce1aa803..bcc155d1273786b7271850428a57480d78ca94e5 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3194,7 +3194,10 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0722-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0721-Hide-unnecessary-itemmeta-from-clients.patch similarity index 98% rename from patches/server/0722-Hide-unnecessary-itemmeta-from-clients.patch rename to patches/server/0721-Hide-unnecessary-itemmeta-from-clients.patch index 29bf6be833..a83342b88a 100644 --- a/patches/server/0722-Hide-unnecessary-itemmeta-from-clients.patch +++ b/patches/server/0721-Hide-unnecessary-itemmeta-from-clients.patch @@ -33,7 +33,7 @@ index dfe057ccd536f52bd9eed8b13899aed4fce57c1b..c571766b52f4b6b1d5dabceeb5e4a325 } } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 52c8812c6670dbec377d0dfb985b190bf6e87da9..2a23448e756199b631355cd10b567ea1d54caa37 100644 +index bcc155d1273786b7271850428a57480d78ca94e5..632961c45d4460767354a17c36dc8b18f5ff7eaa 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3196,7 +3196,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0723-Fix-Spigot-growth-modifiers.patch b/patches/server/0722-Fix-Spigot-growth-modifiers.patch similarity index 100% rename from patches/server/0723-Fix-Spigot-growth-modifiers.patch rename to patches/server/0722-Fix-Spigot-growth-modifiers.patch diff --git a/patches/server/0724-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0723-Prevent-ContainerOpenersCounter-openCount-from-going.patch similarity index 100% rename from patches/server/0724-Prevent-ContainerOpenersCounter-openCount-from-going.patch rename to patches/server/0723-Prevent-ContainerOpenersCounter-openCount-from-going.patch diff --git a/patches/server/0725-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0724-Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/server/0725-Add-PlayerItemFrameChangeEvent.patch rename to patches/server/0724-Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/server/0726-Optimize-HashMapPalette.patch b/patches/server/0725-Optimize-HashMapPalette.patch similarity index 100% rename from patches/server/0726-Optimize-HashMapPalette.patch rename to patches/server/0725-Optimize-HashMapPalette.patch diff --git a/patches/server/0727-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0726-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 100% rename from patches/server/0727-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/server/0726-Allow-delegation-to-vanilla-chunk-gen.patch diff --git a/patches/server/0728-Collision-optimisations.patch b/patches/server/0727-Collision-optimisations.patch similarity index 100% rename from patches/server/0728-Collision-optimisations.patch rename to patches/server/0727-Collision-optimisations.patch diff --git a/patches/server/0729-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0728-Optimise-collision-checking-in-player-move-packet-ha.patch similarity index 100% rename from patches/server/0729-Optimise-collision-checking-in-player-move-packet-ha.patch rename to patches/server/0728-Optimise-collision-checking-in-player-move-packet-ha.patch diff --git a/patches/server/0730-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0729-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch similarity index 100% rename from patches/server/0730-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch rename to patches/server/0729-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch diff --git a/patches/server/0731-Add-more-Campfire-API.patch b/patches/server/0730-Add-more-Campfire-API.patch similarity index 100% rename from patches/server/0731-Add-more-Campfire-API.patch rename to patches/server/0730-Add-more-Campfire-API.patch diff --git a/patches/server/0732-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0731-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch similarity index 100% rename from patches/server/0732-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch rename to patches/server/0731-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch diff --git a/patches/server/0733-Fix-tripwire-state-inconsistency.patch b/patches/server/0732-Fix-tripwire-state-inconsistency.patch similarity index 100% rename from patches/server/0733-Fix-tripwire-state-inconsistency.patch rename to patches/server/0732-Fix-tripwire-state-inconsistency.patch diff --git a/patches/server/0734-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0733-Forward-CraftEntity-in-teleport-command.patch similarity index 100% rename from patches/server/0734-Forward-CraftEntity-in-teleport-command.patch rename to patches/server/0733-Forward-CraftEntity-in-teleport-command.patch diff --git a/patches/server/0735-Improve-scoreboard-entries.patch b/patches/server/0734-Improve-scoreboard-entries.patch similarity index 100% rename from patches/server/0735-Improve-scoreboard-entries.patch rename to patches/server/0734-Improve-scoreboard-entries.patch diff --git a/patches/server/0736-Entity-powdered-snow-API.patch b/patches/server/0735-Entity-powdered-snow-API.patch similarity index 100% rename from patches/server/0736-Entity-powdered-snow-API.patch rename to patches/server/0735-Entity-powdered-snow-API.patch diff --git a/patches/server/0737-Add-API-for-item-entity-health.patch b/patches/server/0736-Add-API-for-item-entity-health.patch similarity index 100% rename from patches/server/0737-Add-API-for-item-entity-health.patch rename to patches/server/0736-Add-API-for-item-entity-health.patch diff --git a/patches/server/0738-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0737-Fix-entity-type-tags-suggestions-in-selectors.patch similarity index 100% rename from patches/server/0738-Fix-entity-type-tags-suggestions-in-selectors.patch rename to patches/server/0737-Fix-entity-type-tags-suggestions-in-selectors.patch diff --git a/patches/server/0739-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0738-Configurable-max-block-light-for-monster-spawning.patch similarity index 100% rename from patches/server/0739-Configurable-max-block-light-for-monster-spawning.patch rename to patches/server/0738-Configurable-max-block-light-for-monster-spawning.patch diff --git a/patches/server/0740-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0739-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch similarity index 100% rename from patches/server/0740-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch rename to patches/server/0739-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch diff --git a/patches/server/0741-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0740-Load-effect-amplifiers-greater-than-127-correctly.patch similarity index 100% rename from patches/server/0741-Load-effect-amplifiers-greater-than-127-correctly.patch rename to patches/server/0740-Load-effect-amplifiers-greater-than-127-correctly.patch diff --git a/patches/server/0742-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0741-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/server/0742-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/server/0741-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/server/0743-Fix-bees-aging-inside-hives.patch b/patches/server/0742-Fix-bees-aging-inside-hives.patch similarity index 100% rename from patches/server/0743-Fix-bees-aging-inside-hives.patch rename to patches/server/0742-Fix-bees-aging-inside-hives.patch diff --git a/patches/server/0744-Bucketable-API.patch b/patches/server/0743-Bucketable-API.patch similarity index 100% rename from patches/server/0744-Bucketable-API.patch rename to patches/server/0743-Bucketable-API.patch diff --git a/patches/server/0745-Validate-usernames.patch b/patches/server/0744-Validate-usernames.patch similarity index 100% rename from patches/server/0745-Validate-usernames.patch rename to patches/server/0744-Validate-usernames.patch diff --git a/patches/server/0746-Make-water-animal-spawn-height-configurable.patch b/patches/server/0745-Make-water-animal-spawn-height-configurable.patch similarity index 100% rename from patches/server/0746-Make-water-animal-spawn-height-configurable.patch rename to patches/server/0745-Make-water-animal-spawn-height-configurable.patch diff --git a/patches/server/0747-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0746-Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 100% rename from patches/server/0747-Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/server/0746-Expose-vanilla-BiomeProvider-from-WorldInfo.patch diff --git a/patches/server/0748-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0747-Add-config-option-for-worlds-affected-by-time-cmd.patch similarity index 100% rename from patches/server/0748-Add-config-option-for-worlds-affected-by-time-cmd.patch rename to patches/server/0747-Add-config-option-for-worlds-affected-by-time-cmd.patch diff --git a/patches/server/0749-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0748-Add-new-overload-to-PersistentDataContainer-has.patch similarity index 100% rename from patches/server/0749-Add-new-overload-to-PersistentDataContainer-has.patch rename to patches/server/0748-Add-new-overload-to-PersistentDataContainer-has.patch diff --git a/patches/server/0750-Multiple-Entries-with-Scoreboards.patch b/patches/server/0749-Multiple-Entries-with-Scoreboards.patch similarity index 100% rename from patches/server/0750-Multiple-Entries-with-Scoreboards.patch rename to patches/server/0749-Multiple-Entries-with-Scoreboards.patch diff --git a/patches/server/0751-Reset-placed-block-on-exception.patch b/patches/server/0750-Reset-placed-block-on-exception.patch similarity index 100% rename from patches/server/0751-Reset-placed-block-on-exception.patch rename to patches/server/0750-Reset-placed-block-on-exception.patch diff --git a/patches/server/0752-Add-configurable-height-for-slime-spawn.patch b/patches/server/0751-Add-configurable-height-for-slime-spawn.patch similarity index 100% rename from patches/server/0752-Add-configurable-height-for-slime-spawn.patch rename to patches/server/0751-Add-configurable-height-for-slime-spawn.patch diff --git a/patches/server/0753-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0752-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0753-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch rename to patches/server/0752-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0754-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0753-Fix-xp-reward-for-baby-zombies.patch similarity index 100% rename from patches/server/0754-Fix-xp-reward-for-baby-zombies.patch rename to patches/server/0753-Fix-xp-reward-for-baby-zombies.patch diff --git a/patches/server/0755-Kick-on-main-for-illegal-chat.patch b/patches/server/0754-Kick-on-main-for-illegal-chat.patch similarity index 100% rename from patches/server/0755-Kick-on-main-for-illegal-chat.patch rename to patches/server/0754-Kick-on-main-for-illegal-chat.patch diff --git a/patches/server/0756-Multi-Block-Change-API-Implementation.patch b/patches/server/0755-Multi-Block-Change-API-Implementation.patch similarity index 100% rename from patches/server/0756-Multi-Block-Change-API-Implementation.patch rename to patches/server/0755-Multi-Block-Change-API-Implementation.patch diff --git a/patches/server/0757-Fix-NotePlayEvent.patch b/patches/server/0756-Fix-NotePlayEvent.patch similarity index 100% rename from patches/server/0757-Fix-NotePlayEvent.patch rename to patches/server/0756-Fix-NotePlayEvent.patch diff --git a/patches/server/0758-Freeze-Tick-Lock-API.patch b/patches/server/0757-Freeze-Tick-Lock-API.patch similarity index 97% rename from patches/server/0758-Freeze-Tick-Lock-API.patch rename to patches/server/0757-Freeze-Tick-Lock-API.patch index 7d43ff10ef..c2c1fac22d 100644 --- a/patches/server/0758-Freeze-Tick-Lock-API.patch +++ b/patches/server/0757-Freeze-Tick-Lock-API.patch @@ -46,7 +46,7 @@ index da8bd9746a3ddef673230c12370a34c8228aa0c7..a1e795810e7e49acf4959b9c88bed1f9 } 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 2a23448e756199b631355cd10b567ea1d54caa37..7b4a04193f783a077cfec47887fc6b76b3985d8d 100644 +index 632961c45d4460767354a17c36dc8b18f5ff7eaa..57a96d44b2a37bb4feb17b872d263e1906971f18 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3446,7 +3446,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0759-Dolphin-API.patch b/patches/server/0758-Dolphin-API.patch similarity index 100% rename from patches/server/0759-Dolphin-API.patch rename to patches/server/0758-Dolphin-API.patch diff --git a/patches/server/0760-More-PotionEffectType-API.patch b/patches/server/0759-More-PotionEffectType-API.patch similarity index 100% rename from patches/server/0760-More-PotionEffectType-API.patch rename to patches/server/0759-More-PotionEffectType-API.patch diff --git a/patches/server/0761-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0760-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch similarity index 100% rename from patches/server/0761-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch rename to patches/server/0760-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch diff --git a/patches/server/0762-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0761-API-for-creating-command-sender-which-forwards-feedb.patch similarity index 100% rename from patches/server/0762-API-for-creating-command-sender-which-forwards-feedb.patch rename to patches/server/0761-API-for-creating-command-sender-which-forwards-feedb.patch diff --git a/patches/server/0763-Add-missing-structure-set-seed-configs.patch b/patches/server/0762-Add-missing-structure-set-seed-configs.patch similarity index 100% rename from patches/server/0763-Add-missing-structure-set-seed-configs.patch rename to patches/server/0762-Add-missing-structure-set-seed-configs.patch diff --git a/patches/server/0764-Implement-regenerateChunk.patch b/patches/server/0763-Implement-regenerateChunk.patch similarity index 100% rename from patches/server/0764-Implement-regenerateChunk.patch rename to patches/server/0763-Implement-regenerateChunk.patch diff --git a/patches/server/0765-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0764-Fix-cancelled-powdered-snow-bucket-placement.patch similarity index 100% rename from patches/server/0765-Fix-cancelled-powdered-snow-bucket-placement.patch rename to patches/server/0764-Fix-cancelled-powdered-snow-bucket-placement.patch diff --git a/patches/server/0766-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0765-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch similarity index 100% rename from patches/server/0766-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch rename to patches/server/0765-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch diff --git a/patches/server/0767-Add-GameEvent-tags.patch b/patches/server/0766-Add-GameEvent-tags.patch similarity index 100% rename from patches/server/0767-Add-GameEvent-tags.patch rename to patches/server/0766-Add-GameEvent-tags.patch diff --git a/patches/server/0768-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0767-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch similarity index 100% rename from patches/server/0768-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch rename to patches/server/0767-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch diff --git a/patches/server/0769-Furnace-RecipesUsed-API.patch b/patches/server/0768-Furnace-RecipesUsed-API.patch similarity index 100% rename from patches/server/0769-Furnace-RecipesUsed-API.patch rename to patches/server/0768-Furnace-RecipesUsed-API.patch diff --git a/patches/server/0770-Configurable-sculk-sensor-listener-range.patch b/patches/server/0769-Configurable-sculk-sensor-listener-range.patch similarity index 100% rename from patches/server/0770-Configurable-sculk-sensor-listener-range.patch rename to patches/server/0769-Configurable-sculk-sensor-listener-range.patch diff --git a/patches/server/0771-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0770-Add-missing-block-data-mins-and-maxes.patch similarity index 100% rename from patches/server/0771-Add-missing-block-data-mins-and-maxes.patch rename to patches/server/0770-Add-missing-block-data-mins-and-maxes.patch diff --git a/patches/server/0772-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0771-Option-to-have-default-CustomSpawners-in-custom-worl.patch similarity index 100% rename from patches/server/0772-Option-to-have-default-CustomSpawners-in-custom-worl.patch rename to patches/server/0771-Option-to-have-default-CustomSpawners-in-custom-worl.patch diff --git a/patches/server/0773-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0772-Put-world-into-worldlist-before-initing-the-world.patch similarity index 100% rename from patches/server/0773-Put-world-into-worldlist-before-initing-the-world.patch rename to patches/server/0772-Put-world-into-worldlist-before-initing-the-world.patch diff --git a/patches/server/0774-Fix-Entity-Position-Desync.patch b/patches/server/0773-Fix-Entity-Position-Desync.patch similarity index 100% rename from patches/server/0774-Fix-Entity-Position-Desync.patch rename to patches/server/0773-Fix-Entity-Position-Desync.patch diff --git a/patches/server/0775-Custom-Potion-Mixes.patch b/patches/server/0774-Custom-Potion-Mixes.patch similarity index 100% rename from patches/server/0775-Custom-Potion-Mixes.patch rename to patches/server/0774-Custom-Potion-Mixes.patch diff --git a/patches/server/0776-Force-close-world-loading-screen.patch b/patches/server/0775-Force-close-world-loading-screen.patch similarity index 100% rename from patches/server/0776-Force-close-world-loading-screen.patch rename to patches/server/0775-Force-close-world-loading-screen.patch diff --git a/patches/server/0777-Fix-falling-block-spawn-methods.patch b/patches/server/0776-Fix-falling-block-spawn-methods.patch similarity index 100% rename from patches/server/0777-Fix-falling-block-spawn-methods.patch rename to patches/server/0776-Fix-falling-block-spawn-methods.patch diff --git a/patches/server/0778-Expose-furnace-minecart-push-values.patch b/patches/server/0777-Expose-furnace-minecart-push-values.patch similarity index 100% rename from patches/server/0778-Expose-furnace-minecart-push-values.patch rename to patches/server/0777-Expose-furnace-minecart-push-values.patch diff --git a/patches/server/0779-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0778-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch similarity index 100% rename from patches/server/0779-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch rename to patches/server/0778-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch diff --git a/patches/server/0780-More-Projectile-API.patch b/patches/server/0779-More-Projectile-API.patch similarity index 100% rename from patches/server/0780-More-Projectile-API.patch rename to patches/server/0779-More-Projectile-API.patch diff --git a/patches/server/0781-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0780-Fix-swamp-hut-cat-generation-deadlock.patch similarity index 100% rename from patches/server/0781-Fix-swamp-hut-cat-generation-deadlock.patch rename to patches/server/0780-Fix-swamp-hut-cat-generation-deadlock.patch diff --git a/patches/server/0782-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0781-Don-t-allow-vehicle-movement-from-players-while-tele.patch similarity index 100% rename from patches/server/0782-Don-t-allow-vehicle-movement-from-players-while-tele.patch rename to patches/server/0781-Don-t-allow-vehicle-movement-from-players-while-tele.patch diff --git a/patches/server/0783-Implement-getComputedBiome-API.patch b/patches/server/0782-Implement-getComputedBiome-API.patch similarity index 100% rename from patches/server/0783-Implement-getComputedBiome-API.patch rename to patches/server/0782-Implement-getComputedBiome-API.patch diff --git a/patches/server/0784-Make-some-itemstacks-nonnull.patch b/patches/server/0783-Make-some-itemstacks-nonnull.patch similarity index 100% rename from patches/server/0784-Make-some-itemstacks-nonnull.patch rename to patches/server/0783-Make-some-itemstacks-nonnull.patch diff --git a/patches/server/0785-Implement-enchantWithLevels-API.patch b/patches/server/0784-Implement-enchantWithLevels-API.patch similarity index 100% rename from patches/server/0785-Implement-enchantWithLevels-API.patch rename to patches/server/0784-Implement-enchantWithLevels-API.patch diff --git a/patches/server/0786-Fix-saving-in-unloadWorld.patch b/patches/server/0785-Fix-saving-in-unloadWorld.patch similarity index 100% rename from patches/server/0786-Fix-saving-in-unloadWorld.patch rename to patches/server/0785-Fix-saving-in-unloadWorld.patch diff --git a/patches/server/0787-Buffer-OOB-setBlock-calls.patch b/patches/server/0786-Buffer-OOB-setBlock-calls.patch similarity index 100% rename from patches/server/0787-Buffer-OOB-setBlock-calls.patch rename to patches/server/0786-Buffer-OOB-setBlock-calls.patch diff --git a/patches/server/0788-Add-TameableDeathMessageEvent.patch b/patches/server/0787-Add-TameableDeathMessageEvent.patch similarity index 100% rename from patches/server/0788-Add-TameableDeathMessageEvent.patch rename to patches/server/0787-Add-TameableDeathMessageEvent.patch diff --git a/patches/server/0789-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0788-Fix-new-block-data-for-EntityChangeBlockEvent.patch similarity index 100% rename from patches/server/0789-Fix-new-block-data-for-EntityChangeBlockEvent.patch rename to patches/server/0788-Fix-new-block-data-for-EntityChangeBlockEvent.patch diff --git a/patches/server/0790-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0789-fix-player-loottables-running-when-mob-loot-gamerule.patch similarity index 100% rename from patches/server/0790-fix-player-loottables-running-when-mob-loot-gamerule.patch rename to patches/server/0789-fix-player-loottables-running-when-mob-loot-gamerule.patch diff --git a/patches/server/0791-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0790-Ensure-entity-passenger-world-matches-ridden-entity.patch similarity index 100% rename from patches/server/0791-Ensure-entity-passenger-world-matches-ridden-entity.patch rename to patches/server/0790-Ensure-entity-passenger-world-matches-ridden-entity.patch diff --git a/patches/server/0792-Guard-against-invalid-entity-positions.patch b/patches/server/0791-Guard-against-invalid-entity-positions.patch similarity index 100% rename from patches/server/0792-Guard-against-invalid-entity-positions.patch rename to patches/server/0791-Guard-against-invalid-entity-positions.patch diff --git a/patches/server/0793-cache-resource-keys.patch b/patches/server/0792-cache-resource-keys.patch similarity index 100% rename from patches/server/0793-cache-resource-keys.patch rename to patches/server/0792-cache-resource-keys.patch diff --git a/patches/server/0794-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0793-Allow-to-change-the-podium-for-the-EnderDragon.patch similarity index 100% rename from patches/server/0794-Allow-to-change-the-podium-for-the-EnderDragon.patch rename to patches/server/0793-Allow-to-change-the-podium-for-the-EnderDragon.patch diff --git a/patches/server/0795-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0794-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch similarity index 100% rename from patches/server/0795-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch rename to patches/server/0794-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch diff --git a/patches/server/0796-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0795-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch similarity index 100% rename from patches/server/0796-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch rename to patches/server/0795-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch diff --git a/patches/server/0797-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0796-Prevent-tile-entity-copies-loading-chunks.patch similarity index 100% rename from patches/server/0797-Prevent-tile-entity-copies-loading-chunks.patch rename to patches/server/0796-Prevent-tile-entity-copies-loading-chunks.patch diff --git a/patches/server/0798-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0797-Use-username-instead-of-display-name-in-PlayerList-g.patch similarity index 100% rename from patches/server/0798-Use-username-instead-of-display-name-in-PlayerList-g.patch rename to patches/server/0797-Use-username-instead-of-display-name-in-PlayerList-g.patch diff --git a/patches/server/0799-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0798-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch similarity index 100% rename from patches/server/0799-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch rename to patches/server/0798-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch diff --git a/patches/server/0800-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0799-Pass-ServerLevel-for-gamerule-callbacks.patch similarity index 100% rename from patches/server/0800-Pass-ServerLevel-for-gamerule-callbacks.patch rename to patches/server/0799-Pass-ServerLevel-for-gamerule-callbacks.patch diff --git a/patches/server/0801-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0800-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch similarity index 100% rename from patches/server/0801-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch rename to patches/server/0800-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch diff --git a/patches/server/0802-WorldCreator-keepSpawnLoaded.patch b/patches/server/0801-WorldCreator-keepSpawnLoaded.patch similarity index 100% rename from patches/server/0802-WorldCreator-keepSpawnLoaded.patch rename to patches/server/0801-WorldCreator-keepSpawnLoaded.patch diff --git a/patches/server/0803-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/server/0802-Fix-CME-in-CraftPersistentDataTypeRegistry.patch similarity index 100% rename from patches/server/0803-Fix-CME-in-CraftPersistentDataTypeRegistry.patch rename to patches/server/0802-Fix-CME-in-CraftPersistentDataTypeRegistry.patch diff --git a/patches/server/0804-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0803-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch similarity index 100% rename from patches/server/0804-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch rename to patches/server/0803-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch diff --git a/patches/server/0805-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0804-Add-EntityDyeEvent-and-CollarColorable-interface.patch similarity index 100% rename from patches/server/0805-Add-EntityDyeEvent-and-CollarColorable-interface.patch rename to patches/server/0804-Add-EntityDyeEvent-and-CollarColorable-interface.patch diff --git a/patches/server/0806-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0805-Fire-CauldronLevelChange-on-initial-fill.patch similarity index 100% rename from patches/server/0806-Fire-CauldronLevelChange-on-initial-fill.patch rename to patches/server/0805-Fire-CauldronLevelChange-on-initial-fill.patch diff --git a/patches/server/0807-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0806-fix-powder-snow-cauldrons-not-turning-to-water.patch similarity index 100% rename from patches/server/0807-fix-powder-snow-cauldrons-not-turning-to-water.patch rename to patches/server/0806-fix-powder-snow-cauldrons-not-turning-to-water.patch diff --git a/patches/server/0808-Add-PlayerStopUsingItemEvent.patch b/patches/server/0807-Add-PlayerStopUsingItemEvent.patch similarity index 85% rename from patches/server/0808-Add-PlayerStopUsingItemEvent.patch rename to patches/server/0807-Add-PlayerStopUsingItemEvent.patch index bdbcf53984..f73b524a4b 100644 --- a/patches/server/0808-Add-PlayerStopUsingItemEvent.patch +++ b/patches/server/0807-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 7b4a04193f783a077cfec47887fc6b76b3985d8d..a3fc80627627a4ad991ec8e674ac528fd69580df 100644 +index 57a96d44b2a37bb4feb17b872d263e1906971f18..93f6842555aebaaaca2b66addcd0e624cd554684 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -4035,6 +4035,7 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -4019,6 +4019,7 @@ public abstract class LivingEntity extends Entity implements Attackable { public void releaseUsingItem() { if (!this.useItem.isEmpty()) { diff --git a/patches/server/0809-FallingBlock-auto-expire-setting.patch b/patches/server/0808-FallingBlock-auto-expire-setting.patch similarity index 100% rename from patches/server/0809-FallingBlock-auto-expire-setting.patch rename to patches/server/0808-FallingBlock-auto-expire-setting.patch diff --git a/patches/server/0810-Don-t-tick-markers.patch b/patches/server/0809-Don-t-tick-markers.patch similarity index 100% rename from patches/server/0810-Don-t-tick-markers.patch rename to patches/server/0809-Don-t-tick-markers.patch diff --git a/patches/server/0811-Do-not-accept-invalid-client-settings.patch b/patches/server/0810-Do-not-accept-invalid-client-settings.patch similarity index 100% rename from patches/server/0811-Do-not-accept-invalid-client-settings.patch rename to patches/server/0810-Do-not-accept-invalid-client-settings.patch diff --git a/patches/server/0812-Add-support-for-Proxy-Protocol.patch b/patches/server/0811-Add-support-for-Proxy-Protocol.patch similarity index 100% rename from patches/server/0812-Add-support-for-Proxy-Protocol.patch rename to patches/server/0811-Add-support-for-Proxy-Protocol.patch diff --git a/patches/server/0813-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0812-Fix-OfflinePlayer-getBedSpawnLocation.patch similarity index 100% rename from patches/server/0813-Fix-OfflinePlayer-getBedSpawnLocation.patch rename to patches/server/0812-Fix-OfflinePlayer-getBedSpawnLocation.patch diff --git a/patches/server/0814-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0813-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch similarity index 100% rename from patches/server/0814-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch rename to patches/server/0813-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch diff --git a/patches/server/0815-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0814-Sanitize-Sent-BlockEntity-NBT.patch similarity index 100% rename from patches/server/0815-Sanitize-Sent-BlockEntity-NBT.patch rename to patches/server/0814-Sanitize-Sent-BlockEntity-NBT.patch diff --git a/patches/server/0816-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0815-Disable-component-selector-resolving-in-books-by-def.patch similarity index 100% rename from patches/server/0816-Disable-component-selector-resolving-in-books-by-def.patch rename to patches/server/0815-Disable-component-selector-resolving-in-books-by-def.patch diff --git a/patches/server/0817-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0816-Prevent-entity-loading-causing-async-lookups.patch similarity index 100% rename from patches/server/0817-Prevent-entity-loading-causing-async-lookups.patch rename to patches/server/0816-Prevent-entity-loading-causing-async-lookups.patch diff --git a/patches/server/0818-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0817-Throw-exception-on-world-create-while-being-ticked.patch similarity index 100% rename from patches/server/0818-Throw-exception-on-world-create-while-being-ticked.patch rename to patches/server/0817-Throw-exception-on-world-create-while-being-ticked.patch diff --git a/patches/server/0819-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0818-Add-Alternate-Current-redstone-implementation.patch similarity index 100% rename from patches/server/0819-Add-Alternate-Current-redstone-implementation.patch rename to patches/server/0818-Add-Alternate-Current-redstone-implementation.patch diff --git a/patches/server/0820-Dont-resent-entity-on-art-update.patch b/patches/server/0819-Dont-resent-entity-on-art-update.patch similarity index 100% rename from patches/server/0820-Dont-resent-entity-on-art-update.patch rename to patches/server/0819-Dont-resent-entity-on-art-update.patch diff --git a/patches/server/0821-Add-WardenAngerChangeEvent.patch b/patches/server/0820-Add-WardenAngerChangeEvent.patch similarity index 100% rename from patches/server/0821-Add-WardenAngerChangeEvent.patch rename to patches/server/0820-Add-WardenAngerChangeEvent.patch diff --git a/patches/server/0822-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0821-Add-option-for-strict-advancement-dimension-checks.patch similarity index 100% rename from patches/server/0822-Add-option-for-strict-advancement-dimension-checks.patch rename to patches/server/0821-Add-option-for-strict-advancement-dimension-checks.patch diff --git a/patches/server/0823-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0822-Add-missing-important-BlockStateListPopulator-method.patch similarity index 100% rename from patches/server/0823-Add-missing-important-BlockStateListPopulator-method.patch rename to patches/server/0822-Add-missing-important-BlockStateListPopulator-method.patch diff --git a/patches/server/0824-Nameable-Banner-API.patch b/patches/server/0823-Nameable-Banner-API.patch similarity index 100% rename from patches/server/0824-Nameable-Banner-API.patch rename to patches/server/0823-Nameable-Banner-API.patch diff --git a/patches/server/0825-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0824-Don-t-broadcast-messages-to-command-blocks.patch similarity index 100% rename from patches/server/0825-Don-t-broadcast-messages-to-command-blocks.patch rename to patches/server/0824-Don-t-broadcast-messages-to-command-blocks.patch diff --git a/patches/server/0826-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0825-Prevent-empty-items-from-being-added-to-world.patch similarity index 100% rename from patches/server/0826-Prevent-empty-items-from-being-added-to-world.patch rename to patches/server/0825-Prevent-empty-items-from-being-added-to-world.patch diff --git a/patches/server/0827-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0826-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch similarity index 100% rename from patches/server/0827-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch rename to patches/server/0826-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch diff --git a/patches/server/0828-Add-Player-getFishHook.patch b/patches/server/0827-Add-Player-getFishHook.patch similarity index 100% rename from patches/server/0828-Add-Player-getFishHook.patch rename to patches/server/0827-Add-Player-getFishHook.patch diff --git a/patches/server/0829-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0828-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch similarity index 100% rename from patches/server/0829-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch rename to patches/server/0828-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch diff --git a/patches/server/0830-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0829-Add-various-missing-EntityDropItemEvent-calls.patch similarity index 100% rename from patches/server/0830-Add-various-missing-EntityDropItemEvent-calls.patch rename to patches/server/0829-Add-various-missing-EntityDropItemEvent-calls.patch diff --git a/patches/server/0831-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0830-Add-some-minimal-debug-information-to-chat-packet-er.patch similarity index 100% rename from patches/server/0831-Add-some-minimal-debug-information-to-chat-packet-er.patch rename to patches/server/0830-Add-some-minimal-debug-information-to-chat-packet-er.patch diff --git a/patches/server/0832-Fix-Bee-flower-NPE.patch b/patches/server/0831-Fix-Bee-flower-NPE.patch similarity index 100% rename from patches/server/0832-Fix-Bee-flower-NPE.patch rename to patches/server/0831-Fix-Bee-flower-NPE.patch diff --git a/patches/server/0833-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0832-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch similarity index 100% rename from patches/server/0833-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch rename to patches/server/0832-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch diff --git a/patches/server/0834-More-Teleport-API.patch b/patches/server/0833-More-Teleport-API.patch similarity index 100% rename from patches/server/0834-More-Teleport-API.patch rename to patches/server/0833-More-Teleport-API.patch diff --git a/patches/server/0835-Add-EntityPortalReadyEvent.patch b/patches/server/0834-Add-EntityPortalReadyEvent.patch similarity index 100% rename from patches/server/0835-Add-EntityPortalReadyEvent.patch rename to patches/server/0834-Add-EntityPortalReadyEvent.patch diff --git a/patches/server/0836-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0835-Don-t-use-level-random-in-entity-constructors.patch similarity index 100% rename from patches/server/0836-Don-t-use-level-random-in-entity-constructors.patch rename to patches/server/0835-Don-t-use-level-random-in-entity-constructors.patch diff --git a/patches/server/0837-Send-block-entities-after-destroy-prediction.patch b/patches/server/0836-Send-block-entities-after-destroy-prediction.patch similarity index 100% rename from patches/server/0837-Send-block-entities-after-destroy-prediction.patch rename to patches/server/0836-Send-block-entities-after-destroy-prediction.patch diff --git a/patches/server/0838-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0837-Warn-on-plugins-accessing-faraway-chunks.patch similarity index 100% rename from patches/server/0838-Warn-on-plugins-accessing-faraway-chunks.patch rename to patches/server/0837-Warn-on-plugins-accessing-faraway-chunks.patch diff --git a/patches/server/0839-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0838-Custom-Chat-Completion-Suggestions-API.patch similarity index 100% rename from patches/server/0839-Custom-Chat-Completion-Suggestions-API.patch rename to patches/server/0838-Custom-Chat-Completion-Suggestions-API.patch diff --git a/patches/server/0840-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0839-Add-and-fix-missing-BlockFadeEvents.patch similarity index 100% rename from patches/server/0840-Add-and-fix-missing-BlockFadeEvents.patch rename to patches/server/0839-Add-and-fix-missing-BlockFadeEvents.patch diff --git a/patches/server/0841-Collision-API.patch b/patches/server/0840-Collision-API.patch similarity index 100% rename from patches/server/0841-Collision-API.patch rename to patches/server/0840-Collision-API.patch diff --git a/patches/server/0842-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0841-Fix-suggest-command-message-for-brigadier-syntax-exc.patch similarity index 100% rename from patches/server/0842-Fix-suggest-command-message-for-brigadier-syntax-exc.patch rename to patches/server/0841-Fix-suggest-command-message-for-brigadier-syntax-exc.patch diff --git a/patches/server/0843-Block-Ticking-API.patch b/patches/server/0842-Block-Ticking-API.patch similarity index 100% rename from patches/server/0843-Block-Ticking-API.patch rename to patches/server/0842-Block-Ticking-API.patch diff --git a/patches/server/0844-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0843-Add-Velocity-IP-Forwarding-Support.patch similarity index 100% rename from patches/server/0844-Add-Velocity-IP-Forwarding-Support.patch rename to patches/server/0843-Add-Velocity-IP-Forwarding-Support.patch diff --git a/patches/server/0845-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0844-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch similarity index 100% rename from patches/server/0845-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch rename to patches/server/0844-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch diff --git a/patches/server/0846-Add-NamespacedKey-biome-methods.patch b/patches/server/0845-Add-NamespacedKey-biome-methods.patch similarity index 100% rename from patches/server/0846-Add-NamespacedKey-biome-methods.patch rename to patches/server/0845-Add-NamespacedKey-biome-methods.patch diff --git a/patches/server/0847-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0846-Fix-plugin-loggers-on-server-shutdown.patch similarity index 100% rename from patches/server/0847-Fix-plugin-loggers-on-server-shutdown.patch rename to patches/server/0846-Fix-plugin-loggers-on-server-shutdown.patch diff --git a/patches/server/0848-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0847-Stop-large-look-changes-from-crashing-the-server.patch similarity index 96% rename from patches/server/0848-Stop-large-look-changes-from-crashing-the-server.patch rename to patches/server/0847-Stop-large-look-changes-from-crashing-the-server.patch index 3d6ebc55c5..631689484d 100644 --- a/patches/server/0848-Stop-large-look-changes-from-crashing-the-server.patch +++ b/patches/server/0847-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 a3fc80627627a4ad991ec8e674ac528fd69580df..c3b9d590497bf96fd0df4c00f863ab64ec91115e 100644 +index 93f6842555aebaaaca2b66addcd0e624cd554684..6e07148a0f6c2c94c12d3870e51d8ad5d53b96a7 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3062,37 +3062,15 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0849-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0848-Fire-EntityChangeBlockEvent-in-more-places.patch similarity index 100% rename from patches/server/0849-Fire-EntityChangeBlockEvent-in-more-places.patch rename to patches/server/0848-Fire-EntityChangeBlockEvent-in-more-places.patch diff --git a/patches/server/0850-Missing-eating-regain-reason.patch b/patches/server/0849-Missing-eating-regain-reason.patch similarity index 100% rename from patches/server/0850-Missing-eating-regain-reason.patch rename to patches/server/0849-Missing-eating-regain-reason.patch diff --git a/patches/server/0851-Missing-effect-cause.patch b/patches/server/0850-Missing-effect-cause.patch similarity index 100% rename from patches/server/0851-Missing-effect-cause.patch rename to patches/server/0850-Missing-effect-cause.patch diff --git a/patches/server/0852-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0851-Added-byte-array-serialization-deserialization-for-P.patch similarity index 100% rename from patches/server/0852-Added-byte-array-serialization-deserialization-for-P.patch rename to patches/server/0851-Added-byte-array-serialization-deserialization-for-P.patch diff --git a/patches/server/0853-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0852-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch similarity index 100% rename from patches/server/0853-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch rename to patches/server/0852-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch diff --git a/patches/server/0854-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0853-Call-BlockPhysicsEvent-more-often.patch similarity index 100% rename from patches/server/0854-Call-BlockPhysicsEvent-more-often.patch rename to patches/server/0853-Call-BlockPhysicsEvent-more-often.patch diff --git a/patches/server/0855-Configurable-chat-thread-limit.patch b/patches/server/0854-Configurable-chat-thread-limit.patch similarity index 100% rename from patches/server/0855-Configurable-chat-thread-limit.patch rename to patches/server/0854-Configurable-chat-thread-limit.patch diff --git a/patches/server/0856-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0855-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch similarity index 100% rename from patches/server/0856-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch rename to patches/server/0855-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch diff --git a/patches/server/0857-fix-Jigsaw-block-kicking-user.patch b/patches/server/0856-fix-Jigsaw-block-kicking-user.patch similarity index 100% rename from patches/server/0857-fix-Jigsaw-block-kicking-user.patch rename to patches/server/0856-fix-Jigsaw-block-kicking-user.patch diff --git a/patches/server/0858-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0857-use-BlockFormEvent-for-mud-converting-into-clay.patch similarity index 100% rename from patches/server/0858-use-BlockFormEvent-for-mud-converting-into-clay.patch rename to patches/server/0857-use-BlockFormEvent-for-mud-converting-into-clay.patch diff --git a/patches/server/0859-Add-getDrops-to-BlockState.patch b/patches/server/0858-Add-getDrops-to-BlockState.patch similarity index 100% rename from patches/server/0859-Add-getDrops-to-BlockState.patch rename to patches/server/0858-Add-getDrops-to-BlockState.patch diff --git a/patches/server/0860-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0859-Fix-a-bunch-of-vanilla-bugs.patch similarity index 100% rename from patches/server/0860-Fix-a-bunch-of-vanilla-bugs.patch rename to patches/server/0859-Fix-a-bunch-of-vanilla-bugs.patch diff --git a/patches/server/0861-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0860-Remove-unnecessary-onTrackingStart-during-navigation.patch similarity index 100% rename from patches/server/0861-Remove-unnecessary-onTrackingStart-during-navigation.patch rename to patches/server/0860-Remove-unnecessary-onTrackingStart-during-navigation.patch diff --git a/patches/server/0862-Fix-custom-piglin-loved-items.patch b/patches/server/0861-Fix-custom-piglin-loved-items.patch similarity index 100% rename from patches/server/0862-Fix-custom-piglin-loved-items.patch rename to patches/server/0861-Fix-custom-piglin-loved-items.patch diff --git a/patches/server/0863-EntityPickupItemEvent-fixes.patch b/patches/server/0862-EntityPickupItemEvent-fixes.patch similarity index 100% rename from patches/server/0863-EntityPickupItemEvent-fixes.patch rename to patches/server/0862-EntityPickupItemEvent-fixes.patch diff --git a/patches/server/0864-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0863-Correctly-handle-interactions-with-items-on-cooldown.patch similarity index 100% rename from patches/server/0864-Correctly-handle-interactions-with-items-on-cooldown.patch rename to patches/server/0863-Correctly-handle-interactions-with-items-on-cooldown.patch diff --git a/patches/server/0865-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0864-Add-PlayerInventorySlotChangeEvent.patch similarity index 100% rename from patches/server/0865-Add-PlayerInventorySlotChangeEvent.patch rename to patches/server/0864-Add-PlayerInventorySlotChangeEvent.patch diff --git a/patches/server/0866-Elder-Guardian-appearance-API.patch b/patches/server/0865-Elder-Guardian-appearance-API.patch similarity index 100% rename from patches/server/0866-Elder-Guardian-appearance-API.patch rename to patches/server/0865-Elder-Guardian-appearance-API.patch diff --git a/patches/server/0867-Allow-changing-bed-s-occupied-property.patch b/patches/server/0866-Allow-changing-bed-s-occupied-property.patch similarity index 100% rename from patches/server/0867-Allow-changing-bed-s-occupied-property.patch rename to patches/server/0866-Allow-changing-bed-s-occupied-property.patch diff --git a/patches/server/0868-Add-entity-knockback-API.patch b/patches/server/0867-Add-entity-knockback-API.patch similarity index 100% rename from patches/server/0868-Add-entity-knockback-API.patch rename to patches/server/0867-Add-entity-knockback-API.patch diff --git a/patches/server/0869-Detect-headless-JREs.patch b/patches/server/0868-Detect-headless-JREs.patch similarity index 100% rename from patches/server/0869-Detect-headless-JREs.patch rename to patches/server/0868-Detect-headless-JREs.patch diff --git a/patches/server/0870-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0869-fixed-entity-vehicle-collision-event-not-called.patch similarity index 100% rename from patches/server/0870-fixed-entity-vehicle-collision-event-not-called.patch rename to patches/server/0869-fixed-entity-vehicle-collision-event-not-called.patch diff --git a/patches/server/0871-optimized-dirt-and-snow-spreading.patch b/patches/server/0870-optimized-dirt-and-snow-spreading.patch similarity index 100% rename from patches/server/0871-optimized-dirt-and-snow-spreading.patch rename to patches/server/0870-optimized-dirt-and-snow-spreading.patch diff --git a/patches/server/0872-Added-EntityToggleSitEvent.patch b/patches/server/0871-Added-EntityToggleSitEvent.patch similarity index 100% rename from patches/server/0872-Added-EntityToggleSitEvent.patch rename to patches/server/0871-Added-EntityToggleSitEvent.patch diff --git a/patches/server/0873-Add-fire-tick-delay-option.patch b/patches/server/0872-Add-fire-tick-delay-option.patch similarity index 100% rename from patches/server/0873-Add-fire-tick-delay-option.patch rename to patches/server/0872-Add-fire-tick-delay-option.patch diff --git a/patches/server/0874-Add-Moving-Piston-API.patch b/patches/server/0873-Add-Moving-Piston-API.patch similarity index 100% rename from patches/server/0874-Add-Moving-Piston-API.patch rename to patches/server/0873-Add-Moving-Piston-API.patch diff --git a/patches/server/0875-Ignore-impossible-spawn-tick.patch b/patches/server/0874-Ignore-impossible-spawn-tick.patch similarity index 100% rename from patches/server/0875-Ignore-impossible-spawn-tick.patch rename to patches/server/0874-Ignore-impossible-spawn-tick.patch diff --git a/patches/server/0876-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0875-Track-projectile-source-for-fireworks-from-dispenser.patch similarity index 100% rename from patches/server/0876-Track-projectile-source-for-fireworks-from-dispenser.patch rename to patches/server/0875-Track-projectile-source-for-fireworks-from-dispenser.patch diff --git a/patches/server/0877-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0876-Fix-EntityArgument-suggestion-permissions-to-align-w.patch similarity index 100% rename from patches/server/0877-Fix-EntityArgument-suggestion-permissions-to-align-w.patch rename to patches/server/0876-Fix-EntityArgument-suggestion-permissions-to-align-w.patch diff --git a/patches/server/0878-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0877-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch similarity index 100% rename from patches/server/0878-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch rename to patches/server/0877-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch diff --git a/patches/server/0879-Prevent-compass-from-loading-chunks.patch b/patches/server/0878-Prevent-compass-from-loading-chunks.patch similarity index 100% rename from patches/server/0879-Prevent-compass-from-loading-chunks.patch rename to patches/server/0878-Prevent-compass-from-loading-chunks.patch diff --git a/patches/server/0880-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0879-Add-PrePlayerAttackEntityEvent.patch similarity index 100% rename from patches/server/0880-Add-PrePlayerAttackEntityEvent.patch rename to patches/server/0879-Add-PrePlayerAttackEntityEvent.patch diff --git a/patches/server/0881-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0880-ensure-reset-EnderDragon-boss-event-name.patch similarity index 100% rename from patches/server/0881-ensure-reset-EnderDragon-boss-event-name.patch rename to patches/server/0880-ensure-reset-EnderDragon-boss-event-name.patch diff --git a/patches/server/0882-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0881-fix-MC-252817-green-map-markers-do-not-disappear.patch similarity index 100% rename from patches/server/0882-fix-MC-252817-green-map-markers-do-not-disappear.patch rename to patches/server/0881-fix-MC-252817-green-map-markers-do-not-disappear.patch diff --git a/patches/server/0883-Add-Player-Warden-Warning-API.patch b/patches/server/0882-Add-Player-Warden-Warning-API.patch similarity index 100% rename from patches/server/0883-Add-Player-Warden-Warning-API.patch rename to patches/server/0882-Add-Player-Warden-Warning-API.patch diff --git a/patches/server/0884-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0883-More-vanilla-friendly-methods-to-update-trades.patch similarity index 100% rename from patches/server/0884-More-vanilla-friendly-methods-to-update-trades.patch rename to patches/server/0883-More-vanilla-friendly-methods-to-update-trades.patch diff --git a/patches/server/0885-Add-paper-dumplisteners-command.patch b/patches/server/0884-Add-paper-dumplisteners-command.patch similarity index 100% rename from patches/server/0885-Add-paper-dumplisteners-command.patch rename to patches/server/0884-Add-paper-dumplisteners-command.patch diff --git a/patches/server/0886-check-global-player-list-where-appropriate.patch b/patches/server/0885-check-global-player-list-where-appropriate.patch similarity index 97% rename from patches/server/0886-check-global-player-list-where-appropriate.patch rename to patches/server/0885-check-global-player-list-where-appropriate.patch index 1d14dfd3da..975758ee42 100644 --- a/patches/server/0886-check-global-player-list-where-appropriate.patch +++ b/patches/server/0885-check-global-player-list-where-appropriate.patch @@ -24,7 +24,7 @@ index 26888d5bdfe16a8c69d757b134d9e4e1978cc7ba..eae08569a3e338641740bf1ca8e92bc8 + // 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 c3b9d590497bf96fd0df4c00f863ab64ec91115e..b8174fd81aba6d47d4882fdd442fb3c011b755ac 100644 +index 6e07148a0f6c2c94c12d3870e51d8ad5d53b96a7..953a696647571f40452109857f62917cc301f5f7 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3672,7 +3672,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0887-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0886-Fix-async-entity-add-due-to-fungus-trees.patch similarity index 100% rename from patches/server/0887-Fix-async-entity-add-due-to-fungus-trees.patch rename to patches/server/0886-Fix-async-entity-add-due-to-fungus-trees.patch diff --git a/patches/server/0888-ItemStack-damage-API.patch b/patches/server/0887-ItemStack-damage-API.patch similarity index 100% rename from patches/server/0888-ItemStack-damage-API.patch rename to patches/server/0887-ItemStack-damage-API.patch diff --git a/patches/server/0889-Friction-API.patch b/patches/server/0888-Friction-API.patch similarity index 98% rename from patches/server/0889-Friction-API.patch rename to patches/server/0888-Friction-API.patch index 2ac1f34308..bb19121ddc 100644 --- a/patches/server/0889-Friction-API.patch +++ b/patches/server/0888-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 b8174fd81aba6d47d4882fdd442fb3c011b755ac..ac89d89081cde83b700dd7c13930cd14bf1e2bc4 100644 +index 953a696647571f40452109857f62917cc301f5f7..892a0cc55bc00307d0d9c3d5d4000da16c2adf90 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -262,6 +262,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0890-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0889-Ability-to-control-player-s-insomnia-and-phantoms.patch similarity index 100% rename from patches/server/0890-Ability-to-control-player-s-insomnia-and-phantoms.patch rename to patches/server/0889-Ability-to-control-player-s-insomnia-and-phantoms.patch diff --git a/patches/server/0891-Fix-player-kick-on-shutdown.patch b/patches/server/0890-Fix-player-kick-on-shutdown.patch similarity index 100% rename from patches/server/0891-Fix-player-kick-on-shutdown.patch rename to patches/server/0890-Fix-player-kick-on-shutdown.patch diff --git a/patches/server/0892-Sync-offhand-slot-in-menus.patch b/patches/server/0891-Sync-offhand-slot-in-menus.patch similarity index 100% rename from patches/server/0892-Sync-offhand-slot-in-menus.patch rename to patches/server/0891-Sync-offhand-slot-in-menus.patch diff --git a/patches/server/0893-Player-Entity-Tracking-Events.patch b/patches/server/0892-Player-Entity-Tracking-Events.patch similarity index 100% rename from patches/server/0893-Player-Entity-Tracking-Events.patch rename to patches/server/0892-Player-Entity-Tracking-Events.patch diff --git a/patches/server/0894-Limit-pet-look-distance.patch b/patches/server/0893-Limit-pet-look-distance.patch similarity index 100% rename from patches/server/0894-Limit-pet-look-distance.patch rename to patches/server/0893-Limit-pet-look-distance.patch diff --git a/patches/server/0895-Properly-resend-entities.patch b/patches/server/0894-Properly-resend-entities.patch similarity index 100% rename from patches/server/0895-Properly-resend-entities.patch rename to patches/server/0894-Properly-resend-entities.patch diff --git a/patches/server/0896-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0895-Fixes-and-additions-to-the-SpawnReason-API.patch similarity index 100% rename from patches/server/0896-Fixes-and-additions-to-the-SpawnReason-API.patch rename to patches/server/0895-Fixes-and-additions-to-the-SpawnReason-API.patch diff --git a/patches/server/0897-fix-Instruments.patch b/patches/server/0896-fix-Instruments.patch similarity index 100% rename from patches/server/0897-fix-Instruments.patch rename to patches/server/0896-fix-Instruments.patch diff --git a/patches/server/0898-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0897-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch similarity index 100% rename from patches/server/0898-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch rename to patches/server/0897-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch diff --git a/patches/server/0899-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0898-Fix-inconsistencies-in-dispense-events-regarding-sta.patch similarity index 100% rename from patches/server/0899-Fix-inconsistencies-in-dispense-events-regarding-sta.patch rename to patches/server/0898-Fix-inconsistencies-in-dispense-events-regarding-sta.patch diff --git a/patches/server/0900-Add-BlockLockCheckEvent.patch b/patches/server/0899-Add-BlockLockCheckEvent.patch similarity index 100% rename from patches/server/0900-Add-BlockLockCheckEvent.patch rename to patches/server/0899-Add-BlockLockCheckEvent.patch diff --git a/patches/server/0901-Add-Sneaking-API-for-Entities.patch b/patches/server/0900-Add-Sneaking-API-for-Entities.patch similarity index 100% rename from patches/server/0901-Add-Sneaking-API-for-Entities.patch rename to patches/server/0900-Add-Sneaking-API-for-Entities.patch diff --git a/patches/server/0902-Improve-logging-and-errors.patch b/patches/server/0901-Improve-logging-and-errors.patch similarity index 100% rename from patches/server/0902-Improve-logging-and-errors.patch rename to patches/server/0901-Improve-logging-and-errors.patch diff --git a/patches/server/0903-Improve-PortalEvents.patch b/patches/server/0902-Improve-PortalEvents.patch similarity index 100% rename from patches/server/0903-Improve-PortalEvents.patch rename to patches/server/0902-Improve-PortalEvents.patch diff --git a/patches/server/0904-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0903-Add-config-option-for-spider-worldborder-climbing.patch similarity index 100% rename from patches/server/0904-Add-config-option-for-spider-worldborder-climbing.patch rename to patches/server/0903-Add-config-option-for-spider-worldborder-climbing.patch diff --git a/patches/server/0905-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0904-Add-missing-SpigotConfig-logCommands-check.patch similarity index 100% rename from patches/server/0905-Add-missing-SpigotConfig-logCommands-check.patch rename to patches/server/0904-Add-missing-SpigotConfig-logCommands-check.patch diff --git a/patches/server/0906-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0905-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch similarity index 100% rename from patches/server/0906-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch rename to patches/server/0905-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch diff --git a/patches/server/0907-Flying-Fall-Damage.patch b/patches/server/0906-Flying-Fall-Damage.patch similarity index 100% rename from patches/server/0907-Flying-Fall-Damage.patch rename to patches/server/0906-Flying-Fall-Damage.patch diff --git a/patches/server/0908-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/server/0907-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch similarity index 100% rename from patches/server/0908-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch rename to patches/server/0907-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch diff --git a/patches/server/0909-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0908-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch similarity index 100% rename from patches/server/0909-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch rename to patches/server/0908-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch diff --git a/patches/server/0910-config-for-disabling-entity-tag-tags.patch b/patches/server/0909-config-for-disabling-entity-tag-tags.patch similarity index 100% rename from patches/server/0910-config-for-disabling-entity-tag-tags.patch rename to patches/server/0909-config-for-disabling-entity-tag-tags.patch diff --git a/patches/server/0911-Use-single-player-info-update-packet-on-join.patch b/patches/server/0910-Use-single-player-info-update-packet-on-join.patch similarity index 100% rename from patches/server/0911-Use-single-player-info-update-packet-on-join.patch rename to patches/server/0910-Use-single-player-info-update-packet-on-join.patch diff --git a/patches/server/0912-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0911-Correctly-shrink-items-during-EntityResurrectEvent.patch similarity index 95% rename from patches/server/0912-Correctly-shrink-items-during-EntityResurrectEvent.patch rename to patches/server/0911-Correctly-shrink-items-during-EntityResurrectEvent.patch index 3e5d08ea9e..2e0410c4ae 100644 --- a/patches/server/0912-Correctly-shrink-items-during-EntityResurrectEvent.patch +++ b/patches/server/0911-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 ac89d89081cde83b700dd7c13930cd14bf1e2bc4..3580c3f6d17186b591e78f62feb63213c9d34fd6 100644 +index 892a0cc55bc00307d0d9c3d5d4000da16c2adf90..5aca8ef6c70a021abc66dc3f1a0b9ceff238f3d9 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1614,7 +1614,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0913-Win-Screen-API.patch b/patches/server/0912-Win-Screen-API.patch similarity index 100% rename from patches/server/0913-Win-Screen-API.patch rename to patches/server/0912-Win-Screen-API.patch diff --git a/patches/server/0914-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0913-Remove-CraftItemStack-setAmount-null-assignment.patch similarity index 100% rename from patches/server/0914-Remove-CraftItemStack-setAmount-null-assignment.patch rename to patches/server/0913-Remove-CraftItemStack-setAmount-null-assignment.patch diff --git a/patches/server/0915-Fix-force-opening-enchantment-tables.patch b/patches/server/0914-Fix-force-opening-enchantment-tables.patch similarity index 100% rename from patches/server/0915-Fix-force-opening-enchantment-tables.patch rename to patches/server/0914-Fix-force-opening-enchantment-tables.patch diff --git a/patches/server/0916-Add-Entity-Body-Yaw-API.patch b/patches/server/0915-Add-Entity-Body-Yaw-API.patch similarity index 100% rename from patches/server/0916-Add-Entity-Body-Yaw-API.patch rename to patches/server/0915-Add-Entity-Body-Yaw-API.patch diff --git a/patches/server/0917-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0916-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch similarity index 100% rename from patches/server/0917-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch rename to patches/server/0916-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch diff --git a/patches/server/0918-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0917-Update-the-flag-when-a-captured-block-state-is-outda.patch similarity index 100% rename from patches/server/0918-Update-the-flag-when-a-captured-block-state-is-outda.patch rename to patches/server/0917-Update-the-flag-when-a-captured-block-state-is-outda.patch diff --git a/patches/server/0919-Add-EntityFertilizeEggEvent.patch b/patches/server/0918-Add-EntityFertilizeEggEvent.patch similarity index 100% rename from patches/server/0919-Add-EntityFertilizeEggEvent.patch rename to patches/server/0918-Add-EntityFertilizeEggEvent.patch diff --git a/patches/server/0920-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0919-Fix-HumanEntity-drop-not-updating-the-client-inv.patch similarity index 100% rename from patches/server/0920-Fix-HumanEntity-drop-not-updating-the-client-inv.patch rename to patches/server/0919-Fix-HumanEntity-drop-not-updating-the-client-inv.patch diff --git a/patches/server/0921-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0920-Add-CompostItemEvent-and-EntityCompostItemEvent.patch similarity index 100% rename from patches/server/0921-Add-CompostItemEvent-and-EntityCompostItemEvent.patch rename to patches/server/0920-Add-CompostItemEvent-and-EntityCompostItemEvent.patch diff --git a/patches/server/0922-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0921-Correctly-handle-ArmorStand-invisibility.patch similarity index 100% rename from patches/server/0922-Correctly-handle-ArmorStand-invisibility.patch rename to patches/server/0921-Correctly-handle-ArmorStand-invisibility.patch diff --git a/patches/server/0923-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0922-Fix-advancement-triggers-for-entity-damage.patch similarity index 97% rename from patches/server/0923-Fix-advancement-triggers-for-entity-damage.patch rename to patches/server/0922-Fix-advancement-triggers-for-entity-damage.patch index d728b5fda0..112658328d 100644 --- a/patches/server/0923-Fix-advancement-triggers-for-entity-damage.patch +++ b/patches/server/0922-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 3580c3f6d17186b591e78f62feb63213c9d34fd6..e20793aedc099857d82dac394e9ef23b14ccc33f 100644 +index 5aca8ef6c70a021abc66dc3f1a0b9ceff238f3d9..ec7886045edbca289e87898da16705a9620365a8 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -2307,7 +2307,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0924-Fix-text-display-error-on-spawn.patch b/patches/server/0923-Fix-text-display-error-on-spawn.patch similarity index 100% rename from patches/server/0924-Fix-text-display-error-on-spawn.patch rename to patches/server/0923-Fix-text-display-error-on-spawn.patch diff --git a/patches/server/0925-Fix-certain-inventories-returning-null-Locations.patch b/patches/server/0924-Fix-certain-inventories-returning-null-Locations.patch similarity index 100% rename from patches/server/0925-Fix-certain-inventories-returning-null-Locations.patch rename to patches/server/0924-Fix-certain-inventories-returning-null-Locations.patch diff --git a/patches/server/0926-Add-Shearable-API.patch b/patches/server/0925-Add-Shearable-API.patch similarity index 100% rename from patches/server/0926-Add-Shearable-API.patch rename to patches/server/0925-Add-Shearable-API.patch diff --git a/patches/server/0927-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0926-Fix-SpawnEggMeta-get-setSpawnedType.patch similarity index 100% rename from patches/server/0927-Fix-SpawnEggMeta-get-setSpawnedType.patch rename to patches/server/0926-Fix-SpawnEggMeta-get-setSpawnedType.patch diff --git a/patches/server/0958-Properly-Cancel-Usable-Items.patch b/patches/server/0958-Properly-Cancel-Usable-Items.patch index e28aa60287..08a0696c6d 100644 --- a/patches/server/0958-Properly-Cancel-Usable-Items.patch +++ b/patches/server/0958-Properly-Cancel-Usable-Items.patch @@ -46,10 +46,10 @@ index a0860af6f11214cc58db49dcce027b4e157e978b..034bfe82c1910f2c3399c11072052cbe return; } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index e20793aedc099857d82dac394e9ef23b14ccc33f..641d4bb568784087426a5e28f96e16858ccb1074 100644 +index ec7886045edbca289e87898da16705a9620365a8..8df375ea49b15145d8fc37bd1d8ccca736c2bedf 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3807,6 +3807,12 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -3807,6 +3807,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; } @@ -58,7 +58,6 @@ index e20793aedc099857d82dac394e9ef23b14ccc33f..641d4bb568784087426a5e28f96e1685 + this.getEntityData().resendPossiblyDesyncedDataValues(java.util.List.of(DATA_LIVING_ENTITY_FLAGS), serverPlayer); + } + // Paper end -+ - // Paper start - lag compensate eating - protected long eatStartTime; - protected int totalEatTimeTicks; + private void updatingUsingItem() { + if (this.isUsingItem()) { + if (ItemStack.isSameItem(this.getItemInHand(this.getUsedItemHand()), this.useItem)) { diff --git a/patches/server/1029-Optimise-chunk-tick-iteration.patch b/patches/server/1028-Optimise-chunk-tick-iteration.patch similarity index 100% rename from patches/server/1029-Optimise-chunk-tick-iteration.patch rename to patches/server/1028-Optimise-chunk-tick-iteration.patch diff --git a/patches/server/1029-Lag-compensation-ticks.patch b/patches/server/1029-Lag-compensation-ticks.patch new file mode 100644 index 0000000000..2ed88e4686 --- /dev/null +++ b/patches/server/1029-Lag-compensation-ticks.patch @@ -0,0 +1,131 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Spottedleaf +Date: Sat, 23 Sep 2023 22:05:35 -0700 +Subject: [PATCH] Lag compensation ticks + +Areas affected by lag comepnsation: + - Block breaking and destroying + - Eating food items + +diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java +index 8f0769d248c7f3cce753130147223403c7923304..97745f0bab8d82d397c6c2a5775aed92bca0a034 100644 +--- a/src/main/java/net/minecraft/server/MinecraftServer.java ++++ b/src/main/java/net/minecraft/server/MinecraftServer.java +@@ -305,6 +305,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop S spin(Function serverFactory) { + AtomicReference atomicreference = new AtomicReference(); +@@ -1522,6 +1525,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0; // Paper + net.minecraft.world.level.block.entity.HopperBlockEntity.skipHopperEvents = worldserver.paperConfig().hopper.disableMoveEvent || org.bukkit.event.inventory.InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0; // Paper + worldserver.hasEntityMoveEvent = io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper +diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java +index a35b98e92a8afaa1d61e86a614466e64ef6e948f..47e8a6b28960883da868061ed649152ea792c184 100644 +--- a/src/main/java/net/minecraft/server/level/ServerLevel.java ++++ b/src/main/java/net/minecraft/server/level/ServerLevel.java +@@ -564,6 +564,17 @@ public class ServerLevel extends Level implements WorldGenLevel { + return player != null && player.level() == this ? player : null; + } + // Paper end ++ // Paper start - lag compensation ++ private long lagCompensationTick = net.minecraft.server.MinecraftServer.SERVER_INIT; ++ ++ public long getLagCompensationTick() { ++ return this.lagCompensationTick; ++ } ++ ++ public void updateLagCompensationTick() { ++ this.lagCompensationTick = (System.nanoTime() - net.minecraft.server.MinecraftServer.SERVER_INIT) / (java.util.concurrent.TimeUnit.MILLISECONDS.toNanos(50L)); ++ } ++ // Paper end - lag compensation + + // Add env and gen to constructor, IWorldDataServer -> WorldDataServer + public ServerLevel(MinecraftServer minecraftserver, Executor executor, LevelStorageSource.LevelStorageAccess convertable_conversionsession, PrimaryLevelData iworlddataserver, ResourceKey resourcekey, LevelStem worlddimension, ChunkProgressListener worldloadlistener, boolean flag, long i, List list, boolean flag1, @Nullable RandomSequences randomsequences, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider) { +diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java +index 618ab9a2903f6d4139acd4aaa2e6db0a26e88ba9..b2c2bd5ec0afd479973f7237a5c610f21231c505 100644 +--- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java ++++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java +@@ -124,7 +124,7 @@ public class ServerPlayerGameMode { + } + + public void tick() { +- this.gameTicks = MinecraftServer.currentTick; // CraftBukkit; ++ this.gameTicks = (int)this.level.getLagCompensationTick(); // CraftBukkit; // Paper - lag compensation + BlockState iblockdata; + + if (this.hasDelayedDestroy) { +diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java +index 8df375ea49b15145d8fc37bd1d8ccca736c2bedf..c039c77d0dd6ec1d336948ca6b5351d6fae1d8bb 100644 +--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java ++++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java +@@ -3812,6 +3812,10 @@ public abstract class LivingEntity extends Entity implements Attackable { + this.getEntityData().resendPossiblyDesyncedDataValues(java.util.List.of(DATA_LIVING_ENTITY_FLAGS), serverPlayer); + } + // Paper end ++ // Paper start - lag compensate eating ++ protected long eatStartTime; ++ protected int totalEatTimeTicks; ++ // Paper end - lag compensate eating + private void updatingUsingItem() { + if (this.isUsingItem()) { + if (ItemStack.isSameItem(this.getItemInHand(this.getUsedItemHand()), this.useItem)) { +@@ -3830,7 +3834,12 @@ public abstract class LivingEntity extends Entity implements Attackable { + this.triggerItemUseEffects(stack, 5); + } + +- 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 && !stack.useOnRelease()) { ++ this.useItemRemaining = 0; ++ // Paper end + this.completeUsingItem(); + } + +@@ -3878,7 +3887,10 @@ public abstract class LivingEntity extends Entity implements Attackable { + + if (!itemstack.isEmpty() && !this.isUsingItem() || forceUpdate) { // Paper use override flag + this.useItem = itemstack; +- this.useItemRemaining = itemstack.getUseDuration(); ++ // Paper start - lag compensate eating ++ this.useItemRemaining = this.totalEatTimeTicks = itemstack.getUseDuration(); ++ this.eatStartTime = System.nanoTime(); ++ // Paper end + if (!this.level().isClientSide) { + this.setLivingEntityFlag(1, true); + this.setLivingEntityFlag(2, hand == InteractionHand.OFF_HAND); +@@ -3903,7 +3915,10 @@ public abstract class LivingEntity extends Entity implements Attackable { + } + } else if (!this.isUsingItem() && !this.useItem.isEmpty()) { + this.useItem = ItemStack.EMPTY; +- this.useItemRemaining = 0; ++ // Paper start - lag compensate eating ++ this.useItemRemaining = this.totalEatTimeTicks = 0; ++ this.eatStartTime = -1L; ++ // Paper end + } + } + +@@ -4038,7 +4053,10 @@ public abstract class LivingEntity extends Entity implements Attackable { + } + + this.useItem = ItemStack.EMPTY; +- this.useItemRemaining = 0; ++ // Paper start - lag compensate eating ++ this.useItemRemaining = this.totalEatTimeTicks = 0; ++ this.eatStartTime = -1L; ++ // Paper end + } + + public boolean isBlocking() {