diff --git a/patches/server/0533-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch b/patches/server/0533-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch deleted file mode 100644 index b789efb3c8..0000000000 --- a/patches/server/0533-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> -Date: Sun, 4 Oct 2020 19:55:25 -0700 -Subject: [PATCH] Fix CME on adding a passenger in CreatureSpawnEvent - - -diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index c9a4598f9856b82f852d79c7c1e33767bc590c21..10cc9daf2a6d29c1148b7ead70a21b29c4ae5d24 100644 ---- a/src/main/java/net/minecraft/world/entity/Entity.java -+++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -3436,7 +3436,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n - } - - private Stream getIndirectPassengersStream() { -- return this.passengers.stream().flatMap(Entity::getSelfAndPassengers); -+ return ImmutableList.copyOf(this.passengers).stream().flatMap(Entity::getSelfAndPassengers); // Paper - } - - @Override diff --git a/patches/server/0534-Fix-Concurrency-issue-in-WeightedList.patch b/patches/server/0533-Fix-Concurrency-issue-in-WeightedList.patch similarity index 100% rename from patches/server/0534-Fix-Concurrency-issue-in-WeightedList.patch rename to patches/server/0533-Fix-Concurrency-issue-in-WeightedList.patch diff --git a/patches/server/0535-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0534-Reset-Ender-Crystals-on-Dragon-Spawn.patch similarity index 100% rename from patches/server/0535-Reset-Ender-Crystals-on-Dragon-Spawn.patch rename to patches/server/0534-Reset-Ender-Crystals-on-Dragon-Spawn.patch diff --git a/patches/server/0536-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0535-Fix-for-large-move-vectors-crashing-server.patch similarity index 100% rename from patches/server/0536-Fix-for-large-move-vectors-crashing-server.patch rename to patches/server/0535-Fix-for-large-move-vectors-crashing-server.patch diff --git a/patches/server/0537-Optimise-getType-calls.patch b/patches/server/0536-Optimise-getType-calls.patch similarity index 98% rename from patches/server/0537-Optimise-getType-calls.patch rename to patches/server/0536-Optimise-getType-calls.patch index 5744b0de04..3ddb2a3609 100644 --- a/patches/server/0537-Optimise-getType-calls.patch +++ b/patches/server/0536-Optimise-getType-calls.patch @@ -41,7 +41,7 @@ index e2e6652fc227173b69580dba74855c3ed8884a3b..2c23712aadfe32439ae014c62aa16f1b @Override diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java -index 5e5465b8d9b4187a11e7952515ef040ab997d902..078c4e9e4a2ff9009242f44eeec68421b8d99ac0 100644 +index a1cac393ece249e5f18fbc0db6a7ad9f14dfb3a1..9e5dce23121b4fc3e32f2b2702c0c6959dcd18cf 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java @@ -209,7 +209,7 @@ public class CraftBlock implements Block { diff --git a/patches/server/0538-Villager-resetOffers.patch b/patches/server/0537-Villager-resetOffers.patch similarity index 100% rename from patches/server/0538-Villager-resetOffers.patch rename to patches/server/0537-Villager-resetOffers.patch diff --git a/patches/server/0539-Improve-inlinig-for-some-hot-IBlockData-methods.patch b/patches/server/0538-Improve-inlinig-for-some-hot-IBlockData-methods.patch similarity index 100% rename from patches/server/0539-Improve-inlinig-for-some-hot-IBlockData-methods.patch rename to patches/server/0538-Improve-inlinig-for-some-hot-IBlockData-methods.patch diff --git a/patches/server/0540-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0539-Retain-block-place-order-when-capturing-blockstates.patch similarity index 100% rename from patches/server/0540-Retain-block-place-order-when-capturing-blockstates.patch rename to patches/server/0539-Retain-block-place-order-when-capturing-blockstates.patch diff --git a/patches/server/0541-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0540-Reduce-blockpos-allocation-from-pathfinding.patch similarity index 100% rename from patches/server/0541-Reduce-blockpos-allocation-from-pathfinding.patch rename to patches/server/0540-Reduce-blockpos-allocation-from-pathfinding.patch diff --git a/patches/server/0542-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0541-Fix-item-locations-dropped-from-campfires.patch similarity index 100% rename from patches/server/0542-Fix-item-locations-dropped-from-campfires.patch rename to patches/server/0541-Fix-item-locations-dropped-from-campfires.patch diff --git a/patches/server/0543-Player-elytra-boost-API.patch b/patches/server/0542-Player-elytra-boost-API.patch similarity index 100% rename from patches/server/0543-Player-elytra-boost-API.patch rename to patches/server/0542-Player-elytra-boost-API.patch diff --git a/patches/server/0544-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0543-Fixed-TileEntityBell-memory-leak.patch similarity index 100% rename from patches/server/0544-Fixed-TileEntityBell-memory-leak.patch rename to patches/server/0543-Fixed-TileEntityBell-memory-leak.patch diff --git a/patches/server/0545-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0544-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch similarity index 100% rename from patches/server/0545-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch rename to patches/server/0544-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch diff --git a/patches/server/0546-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0545-Add-getOfflinePlayerIfCached-String.patch similarity index 100% rename from patches/server/0546-Add-getOfflinePlayerIfCached-String.patch rename to patches/server/0545-Add-getOfflinePlayerIfCached-String.patch diff --git a/patches/server/0547-Add-ignore-discounts-API.patch b/patches/server/0546-Add-ignore-discounts-API.patch similarity index 100% rename from patches/server/0547-Add-ignore-discounts-API.patch rename to patches/server/0546-Add-ignore-discounts-API.patch diff --git a/patches/server/0548-Toggle-for-removing-existing-dragon.patch b/patches/server/0547-Toggle-for-removing-existing-dragon.patch similarity index 100% rename from patches/server/0548-Toggle-for-removing-existing-dragon.patch rename to patches/server/0547-Toggle-for-removing-existing-dragon.patch diff --git a/patches/server/0549-Fix-client-lag-on-advancement-loading.patch b/patches/server/0548-Fix-client-lag-on-advancement-loading.patch similarity index 100% rename from patches/server/0549-Fix-client-lag-on-advancement-loading.patch rename to patches/server/0548-Fix-client-lag-on-advancement-loading.patch diff --git a/patches/server/0550-Item-no-age-no-player-pickup.patch b/patches/server/0549-Item-no-age-no-player-pickup.patch similarity index 100% rename from patches/server/0550-Item-no-age-no-player-pickup.patch rename to patches/server/0549-Item-no-age-no-player-pickup.patch diff --git a/patches/server/0551-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0550-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch similarity index 100% rename from patches/server/0551-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch rename to patches/server/0550-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch diff --git a/patches/server/0552-Beacon-API-custom-effect-ranges.patch b/patches/server/0551-Beacon-API-custom-effect-ranges.patch similarity index 100% rename from patches/server/0552-Beacon-API-custom-effect-ranges.patch rename to patches/server/0551-Beacon-API-custom-effect-ranges.patch diff --git a/patches/server/0553-Add-API-for-quit-reason.patch b/patches/server/0552-Add-API-for-quit-reason.patch similarity index 98% rename from patches/server/0553-Add-API-for-quit-reason.patch rename to patches/server/0552-Add-API-for-quit-reason.patch index 83db0febeb..b32a8fe788 100644 --- a/patches/server/0553-Add-API-for-quit-reason.patch +++ b/patches/server/0552-Add-API-for-quit-reason.patch @@ -25,7 +25,7 @@ index 7f6405ac44fef423dc8b21f3dbeaae26a1005077..bdd4f4db9849d9107b5c62d5e83b1277 Connection.LOGGER.debug("Failed to sent packet", throwable); ConnectionProtocol enumprotocol = this.getCurrentProtocol(); diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 779408573c779f86f61667f8cde8fbd2f7d2956f..2310ad5d89f9184d11c3f2d8de211425b81858df 100644 +index f3e4b9f302fbc4b615a5e735d5aab0f403e16903..84ef1c60223d421cf515c07342d2296e477dd4b7 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -262,6 +262,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0554-Seed-based-feature-search.patch b/patches/server/0553-Seed-based-feature-search.patch similarity index 100% rename from patches/server/0554-Seed-based-feature-search.patch rename to patches/server/0553-Seed-based-feature-search.patch diff --git a/patches/server/0555-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0554-Add-Wandering-Trader-spawn-rate-config-options.patch similarity index 100% rename from patches/server/0555-Add-Wandering-Trader-spawn-rate-config-options.patch rename to patches/server/0554-Add-Wandering-Trader-spawn-rate-config-options.patch diff --git a/patches/server/0556-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0555-Significantly-improve-performance-of-the-end-generat.patch similarity index 100% rename from patches/server/0556-Significantly-improve-performance-of-the-end-generat.patch rename to patches/server/0555-Significantly-improve-performance-of-the-end-generat.patch diff --git a/patches/server/0557-Expose-world-spawn-angle.patch b/patches/server/0556-Expose-world-spawn-angle.patch similarity index 95% rename from patches/server/0557-Expose-world-spawn-angle.patch rename to patches/server/0556-Expose-world-spawn-angle.patch index 7c8f397054..b592d5aa3f 100644 --- a/patches/server/0557-Expose-world-spawn-angle.patch +++ b/patches/server/0556-Expose-world-spawn-angle.patch @@ -18,7 +18,7 @@ index b9f6f8441cafeb3e64ce7943bfd1e92fe983a5c5..f8b917b2d1a1744f7a6c3b9cf60be417 Player respawnPlayer = entityplayer1.getBukkitEntity(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 6fc9b8a3daf9ecf3d4231ea872d62025d04a394e..59543c88dcde9d2056bb481383a2784be0637ae8 100644 +index 4ed31e1aae61bdcc498dc7c536f8a3353e20c7d4..ae396e3ec6c5506ed49b5e80cf236d7d2128cee1 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -378,7 +378,7 @@ public class CraftWorld implements World { diff --git a/patches/server/0558-Add-Destroy-Speed-API.patch b/patches/server/0557-Add-Destroy-Speed-API.patch similarity index 94% rename from patches/server/0558-Add-Destroy-Speed-API.patch rename to patches/server/0557-Add-Destroy-Speed-API.patch index a884675e20..be1109ffbd 100644 --- a/patches/server/0558-Add-Destroy-Speed-API.patch +++ b/patches/server/0557-Add-Destroy-Speed-API.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add Destroy Speed API Co-authored-by: Jake Potrebic diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java -index d936a86d5a95b4502944f9e76cc86d395c6dd4b8..9ec29486316012931e4547625801049eab806209 100644 +index 9e5dce23121b4fc3e32f2b2702c0c6959dcd18cf..354ed68bad64277a9566d4dfdd8808260f145458 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java @@ -782,5 +782,23 @@ public class CraftBlock implements Block { diff --git a/patches/server/0559-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0558-Fix-Player-spawnParticle-x-y-z-precision-loss.patch similarity index 100% rename from patches/server/0559-Fix-Player-spawnParticle-x-y-z-precision-loss.patch rename to patches/server/0558-Fix-Player-spawnParticle-x-y-z-precision-loss.patch diff --git a/patches/server/0560-Add-LivingEntity-clearActiveItem.patch b/patches/server/0559-Add-LivingEntity-clearActiveItem.patch similarity index 100% rename from patches/server/0560-Add-LivingEntity-clearActiveItem.patch rename to patches/server/0559-Add-LivingEntity-clearActiveItem.patch diff --git a/patches/server/0561-Add-PlayerItemCooldownEvent.patch b/patches/server/0560-Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/server/0561-Add-PlayerItemCooldownEvent.patch rename to patches/server/0560-Add-PlayerItemCooldownEvent.patch diff --git a/patches/server/0562-More-lightning-API.patch b/patches/server/0561-More-lightning-API.patch similarity index 100% rename from patches/server/0562-More-lightning-API.patch rename to patches/server/0561-More-lightning-API.patch diff --git a/patches/server/0563-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0562-Climbing-should-not-bypass-cramming-gamerule.patch similarity index 97% rename from patches/server/0563-Climbing-should-not-bypass-cramming-gamerule.patch rename to patches/server/0562-Climbing-should-not-bypass-cramming-gamerule.patch index caa874c41b..5b2fb3ff2a 100644 --- a/patches/server/0563-Climbing-should-not-bypass-cramming-gamerule.patch +++ b/patches/server/0562-Climbing-should-not-bypass-cramming-gamerule.patch @@ -21,7 +21,7 @@ index 935bb237f8ecd63ca4cec64a7c7a341c9d3358e5..208690ceca2485b54acde5123ba494d7 private void keepLoadedRange() { keepLoadedRange = (short) (getInt("keep-spawn-loaded-range", Math.min(spigotConfig.viewDistance, 10)) * 16); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 10cc9daf2a6d29c1148b7ead70a21b29c4ae5d24..184e88db63012cab509a52aee0245881791fa87d 100644 +index c9a4598f9856b82f852d79c7c1e33767bc590c21..e72477c55f6dd932bdd1b692470ddc701da9caaa 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1723,6 +1723,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n @@ -61,7 +61,7 @@ index 8fb89326395a7e70982c0d757b506565e98b12a4..a060cca08631fb42041e3a79a9abc422 } 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 8a0722455bf303f50b2955b53f9d7284a20f672e..e159d6c77860790c20ca7b531ed23ffda0380810 100644 +index 0c7ed53964675c81185644549898369cdda80377..3227ce58391b93c12dd01e2b73a3a6c5d6062827 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3277,7 +3277,7 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0564-Added-missing-default-perms-for-commands.patch b/patches/server/0563-Added-missing-default-perms-for-commands.patch similarity index 100% rename from patches/server/0564-Added-missing-default-perms-for-commands.patch rename to patches/server/0563-Added-missing-default-perms-for-commands.patch diff --git a/patches/server/0565-Add-PlayerShearBlockEvent.patch b/patches/server/0564-Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/server/0565-Add-PlayerShearBlockEvent.patch rename to patches/server/0564-Add-PlayerShearBlockEvent.patch diff --git a/patches/server/0566-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0565-Set-spigots-verbose-world-setting-to-false-by-def.patch similarity index 100% rename from patches/server/0566-Set-spigots-verbose-world-setting-to-false-by-def.patch rename to patches/server/0565-Set-spigots-verbose-world-setting-to-false-by-def.patch diff --git a/patches/server/0567-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0566-Fix-curing-zombie-villager-discount-exploit.patch similarity index 100% rename from patches/server/0567-Fix-curing-zombie-villager-discount-exploit.patch rename to patches/server/0566-Fix-curing-zombie-villager-discount-exploit.patch diff --git a/patches/server/0568-Limit-recipe-packets.patch b/patches/server/0567-Limit-recipe-packets.patch similarity index 100% rename from patches/server/0568-Limit-recipe-packets.patch rename to patches/server/0567-Limit-recipe-packets.patch diff --git a/patches/server/0569-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0568-Fix-CraftSound-backwards-compatibility.patch similarity index 100% rename from patches/server/0569-Fix-CraftSound-backwards-compatibility.patch rename to patches/server/0568-Fix-CraftSound-backwards-compatibility.patch diff --git a/patches/server/0570-MC-4-Fix-item-position-desync.patch b/patches/server/0569-MC-4-Fix-item-position-desync.patch similarity index 97% rename from patches/server/0570-MC-4-Fix-item-position-desync.patch rename to patches/server/0569-MC-4-Fix-item-position-desync.patch index 71ac3227bf..331ed8d0d2 100644 --- a/patches/server/0570-MC-4-Fix-item-position-desync.patch +++ b/patches/server/0569-MC-4-Fix-item-position-desync.patch @@ -41,7 +41,7 @@ index b30c08bfb8c55161543a4ef09f2e462e0a1fe4ae..ec93f5300cc7d423ec0d292f0f8443f9 public Vec3 updateEntityPosition(Vec3 orig) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 184e88db63012cab509a52aee0245881791fa87d..bdc6a1adccc7fa29d83799609d45e03116c6d4b9 100644 +index e72477c55f6dd932bdd1b692470ddc701da9caaa..f618490fe7eb56389e86e3c6dca1d223d38c0bb0 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3759,6 +3759,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0571-Player-Chunk-Load-Unload-Events.patch b/patches/server/0570-Player-Chunk-Load-Unload-Events.patch similarity index 100% rename from patches/server/0571-Player-Chunk-Load-Unload-Events.patch rename to patches/server/0570-Player-Chunk-Load-Unload-Events.patch diff --git a/patches/server/0572-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0571-Optimize-Dynamic-get-Missing-Keys.patch similarity index 100% rename from patches/server/0572-Optimize-Dynamic-get-Missing-Keys.patch rename to patches/server/0571-Optimize-Dynamic-get-Missing-Keys.patch diff --git a/patches/server/0573-Expose-LivingEntity-hurt-direction.patch b/patches/server/0572-Expose-LivingEntity-hurt-direction.patch similarity index 100% rename from patches/server/0573-Expose-LivingEntity-hurt-direction.patch rename to patches/server/0572-Expose-LivingEntity-hurt-direction.patch diff --git a/patches/server/0574-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0573-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 91% rename from patches/server/0574-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/server/0573-Add-OBSTRUCTED-reason-to-BedEnterResult.patch index 4014117cb7..c09ef9e474 100644 --- a/patches/server/0574-Add-OBSTRUCTED-reason-to-BedEnterResult.patch +++ b/patches/server/0573-Add-OBSTRUCTED-reason-to-BedEnterResult.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add OBSTRUCTED reason to BedEnterResult diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 69a4795266b40c3cd113b13300bb7bbdcf842496..8818a2d971615234a29710eb3cff2153f5896518 100644 +index c96953ab3f358c7c67297532cd6740ff3ff61aa3..2cab0a3eb489f1f36bb7eaae2706e3b4518668ce 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -257,6 +257,10 @@ public class CraftEventFactory { diff --git a/patches/server/0575-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0574-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch similarity index 100% rename from patches/server/0575-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch rename to patches/server/0574-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch diff --git a/patches/server/0576-added-PlayerTradeEvent.patch b/patches/server/0575-added-PlayerTradeEvent.patch similarity index 100% rename from patches/server/0576-added-PlayerTradeEvent.patch rename to patches/server/0575-added-PlayerTradeEvent.patch diff --git a/patches/server/0577-Implement-TargetHitEvent.patch b/patches/server/0576-Implement-TargetHitEvent.patch similarity index 100% rename from patches/server/0577-Implement-TargetHitEvent.patch rename to patches/server/0576-Implement-TargetHitEvent.patch diff --git a/patches/server/0578-Additional-Block-Material-API-s.patch b/patches/server/0577-Additional-Block-Material-API-s.patch similarity index 93% rename from patches/server/0578-Additional-Block-Material-API-s.patch rename to patches/server/0577-Additional-Block-Material-API-s.patch index 7eda1002ac..f64f7682d7 100644 --- a/patches/server/0578-Additional-Block-Material-API-s.patch +++ b/patches/server/0577-Additional-Block-Material-API-s.patch @@ -9,7 +9,7 @@ process to do this in the Bukkit API Adds API for buildable, replaceable, burnable too. diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java -index 24f2eba1c39abce074740d928640dd0dd30f27db..3386fa8eaa890a7353ee152f27a313ee358ecb52 100644 +index 354ed68bad64277a9566d4dfdd8808260f145458..ef3d93ba8b4149aa479abc6e9787a8746f60ce1d 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java @@ -618,6 +618,25 @@ public class CraftBlock implements Block { diff --git a/patches/server/0579-Fix-harming-potion-dupe.patch b/patches/server/0578-Fix-harming-potion-dupe.patch similarity index 100% rename from patches/server/0579-Fix-harming-potion-dupe.patch rename to patches/server/0578-Fix-harming-potion-dupe.patch diff --git a/patches/server/0580-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0579-Implement-API-to-get-Material-from-Boats-and-Minecar.patch similarity index 100% rename from patches/server/0580-Implement-API-to-get-Material-from-Boats-and-Minecar.patch rename to patches/server/0579-Implement-API-to-get-Material-from-Boats-and-Minecar.patch diff --git a/patches/server/0581-Cache-burn-durations.patch b/patches/server/0580-Cache-burn-durations.patch similarity index 100% rename from patches/server/0581-Cache-burn-durations.patch rename to patches/server/0580-Cache-burn-durations.patch diff --git a/patches/server/0582-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0581-Allow-disabling-mob-spawner-spawn-egg-transformation.patch similarity index 100% rename from patches/server/0582-Allow-disabling-mob-spawner-spawn-egg-transformation.patch rename to patches/server/0581-Allow-disabling-mob-spawner-spawn-egg-transformation.patch diff --git a/patches/server/0583-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0582-Fix-Not-a-string-Map-Conversion-spam.patch similarity index 100% rename from patches/server/0583-Fix-Not-a-string-Map-Conversion-spam.patch rename to patches/server/0582-Fix-Not-a-string-Map-Conversion-spam.patch diff --git a/patches/server/0584-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0583-Implement-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/server/0584-Implement-PlayerFlowerPotManipulateEvent.patch rename to patches/server/0583-Implement-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/server/0585-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0584-Fix-interact-event-not-being-called-in-adventure.patch similarity index 100% rename from patches/server/0585-Fix-interact-event-not-being-called-in-adventure.patch rename to patches/server/0584-Fix-interact-event-not-being-called-in-adventure.patch diff --git a/patches/server/0586-Zombie-API-breaking-doors.patch b/patches/server/0585-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/server/0586-Zombie-API-breaking-doors.patch rename to patches/server/0585-Zombie-API-breaking-doors.patch diff --git a/patches/server/0587-Fix-nerfed-slime-when-splitting.patch b/patches/server/0586-Fix-nerfed-slime-when-splitting.patch similarity index 100% rename from patches/server/0587-Fix-nerfed-slime-when-splitting.patch rename to patches/server/0586-Fix-nerfed-slime-when-splitting.patch diff --git a/patches/server/0588-Add-EntityLoadCrossbowEvent.patch b/patches/server/0587-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/server/0588-Add-EntityLoadCrossbowEvent.patch rename to patches/server/0587-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/server/0589-Guardian-beam-workaround.patch b/patches/server/0588-Guardian-beam-workaround.patch similarity index 100% rename from patches/server/0589-Guardian-beam-workaround.patch rename to patches/server/0588-Guardian-beam-workaround.patch diff --git a/patches/server/0590-Added-WorldGameRuleChangeEvent.patch b/patches/server/0589-Added-WorldGameRuleChangeEvent.patch similarity index 100% rename from patches/server/0590-Added-WorldGameRuleChangeEvent.patch rename to patches/server/0589-Added-WorldGameRuleChangeEvent.patch diff --git a/patches/server/0591-Added-ServerResourcesReloadedEvent.patch b/patches/server/0590-Added-ServerResourcesReloadedEvent.patch similarity index 100% rename from patches/server/0591-Added-ServerResourcesReloadedEvent.patch rename to patches/server/0590-Added-ServerResourcesReloadedEvent.patch diff --git a/patches/server/0592-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0591-Added-world-settings-for-mobs-picking-up-loot.patch similarity index 100% rename from patches/server/0592-Added-world-settings-for-mobs-picking-up-loot.patch rename to patches/server/0591-Added-world-settings-for-mobs-picking-up-loot.patch diff --git a/patches/server/0593-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0592-Implemented-BlockFailedDispenseEvent.patch similarity index 100% rename from patches/server/0593-Implemented-BlockFailedDispenseEvent.patch rename to patches/server/0592-Implemented-BlockFailedDispenseEvent.patch diff --git a/patches/server/0594-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0593-Added-PlayerLecternPageChangeEvent.patch similarity index 100% rename from patches/server/0594-Added-PlayerLecternPageChangeEvent.patch rename to patches/server/0593-Added-PlayerLecternPageChangeEvent.patch diff --git a/patches/server/0595-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0594-Added-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from patches/server/0595-Added-PlayerLoomPatternSelectEvent.patch rename to patches/server/0594-Added-PlayerLoomPatternSelectEvent.patch diff --git a/patches/server/0596-Configurable-door-breaking-difficulty.patch b/patches/server/0595-Configurable-door-breaking-difficulty.patch similarity index 100% rename from patches/server/0596-Configurable-door-breaking-difficulty.patch rename to patches/server/0595-Configurable-door-breaking-difficulty.patch diff --git a/patches/server/0597-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0596-Empty-commands-shall-not-be-dispatched.patch similarity index 100% rename from patches/server/0597-Empty-commands-shall-not-be-dispatched.patch rename to patches/server/0596-Empty-commands-shall-not-be-dispatched.patch diff --git a/patches/server/0598-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0597-Implement-API-to-expose-exact-interaction-point.patch similarity index 97% rename from patches/server/0598-Implement-API-to-expose-exact-interaction-point.patch rename to patches/server/0597-Implement-API-to-expose-exact-interaction-point.patch index 143f983b71..b3fa24d300 100644 --- a/patches/server/0598-Implement-API-to-expose-exact-interaction-point.patch +++ b/patches/server/0597-Implement-API-to-expose-exact-interaction-point.patch @@ -18,7 +18,7 @@ index 2fb45e48cc5845c71cca21c43bb012f3eb6a0b53..5ef649dec31ba6d6b74a7bd757727ffd this.interactResult = event.useItemInHand() == Event.Result.DENY; this.interactPosition = blockposition.immutable(); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index f5e83d82940602ef7733fbc61077c42c72da74bd..67c3405264fda2f7ce2b9822f8e0a8da71998677 100644 +index f960ee7644ed792c4136cbcb75cc12e8dbed65c4..00426ffa3da994aed445f0767a99b83154773e10 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -55,7 +55,9 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParams; diff --git a/patches/server/0599-Remove-stale-POIs.patch b/patches/server/0598-Remove-stale-POIs.patch similarity index 100% rename from patches/server/0599-Remove-stale-POIs.patch rename to patches/server/0598-Remove-stale-POIs.patch diff --git a/patches/server/0600-Fix-villager-boat-exploit.patch b/patches/server/0599-Fix-villager-boat-exploit.patch similarity index 100% rename from patches/server/0600-Fix-villager-boat-exploit.patch rename to patches/server/0599-Fix-villager-boat-exploit.patch diff --git a/patches/server/0601-Add-sendOpLevel-API.patch b/patches/server/0600-Add-sendOpLevel-API.patch similarity index 100% rename from patches/server/0601-Add-sendOpLevel-API.patch rename to patches/server/0600-Add-sendOpLevel-API.patch diff --git a/patches/server/0602-Add-StructureLocateEvent.patch b/patches/server/0601-Add-StructureLocateEvent.patch similarity index 100% rename from patches/server/0602-Add-StructureLocateEvent.patch rename to patches/server/0601-Add-StructureLocateEvent.patch diff --git a/patches/server/0603-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0602-Collision-option-for-requiring-a-player-participant.patch similarity index 98% rename from patches/server/0603-Collision-option-for-requiring-a-player-participant.patch rename to patches/server/0602-Collision-option-for-requiring-a-player-participant.patch index 4f507c6733..703aee524f 100644 --- a/patches/server/0603-Collision-option-for-requiring-a-player-participant.patch +++ b/patches/server/0602-Collision-option-for-requiring-a-player-participant.patch @@ -28,7 +28,7 @@ index 4227e7fc46e22265316b42bbdb166d60e5aed94e..3d16e4a6bf842a209c760fd89f8edf99 public int wanderingTraderSpawnDayTicks = 24000; public int wanderingTraderSpawnChanceFailureIncrement = 25; diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index bdc6a1adccc7fa29d83799609d45e03116c6d4b9..08428a1aa9e9f007415d29c653b8885b09ab3b19 100644 +index f618490fe7eb56389e86e3c6dca1d223d38c0bb0..8e530b22413764470dcf5862c1a3ef8e504a124f 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1606,6 +1606,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0604-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0603-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch similarity index 100% rename from patches/server/0604-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch rename to patches/server/0603-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch diff --git a/patches/server/0605-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0604-Return-chat-component-with-empty-text-instead-of-thr.patch similarity index 100% rename from patches/server/0605-Return-chat-component-with-empty-text-instead-of-thr.patch rename to patches/server/0604-Return-chat-component-with-empty-text-instead-of-thr.patch diff --git a/patches/server/0606-Make-schedule-command-per-world.patch b/patches/server/0605-Make-schedule-command-per-world.patch similarity index 100% rename from patches/server/0606-Make-schedule-command-per-world.patch rename to patches/server/0605-Make-schedule-command-per-world.patch diff --git a/patches/server/0607-Configurable-max-leash-distance.patch b/patches/server/0606-Configurable-max-leash-distance.patch similarity index 100% rename from patches/server/0607-Configurable-max-leash-distance.patch rename to patches/server/0606-Configurable-max-leash-distance.patch diff --git a/patches/server/0608-Implement-BlockPreDispenseEvent.patch b/patches/server/0607-Implement-BlockPreDispenseEvent.patch similarity index 100% rename from patches/server/0608-Implement-BlockPreDispenseEvent.patch rename to patches/server/0607-Implement-BlockPreDispenseEvent.patch diff --git a/patches/server/0609-Added-Vanilla-Entity-Tags.patch b/patches/server/0608-Added-Vanilla-Entity-Tags.patch similarity index 100% rename from patches/server/0609-Added-Vanilla-Entity-Tags.patch rename to patches/server/0608-Added-Vanilla-Entity-Tags.patch diff --git a/patches/server/0610-added-Wither-API.patch b/patches/server/0609-added-Wither-API.patch similarity index 100% rename from patches/server/0610-added-Wither-API.patch rename to patches/server/0609-added-Wither-API.patch diff --git a/patches/server/0611-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0610-Added-firing-of-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/server/0611-Added-firing-of-PlayerChangeBeaconEffectEvent.patch rename to patches/server/0610-Added-firing-of-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/server/0612-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0611-Add-toggle-for-always-placing-the-dragon-egg.patch similarity index 100% rename from patches/server/0612-Add-toggle-for-always-placing-the-dragon-egg.patch rename to patches/server/0611-Add-toggle-for-always-placing-the-dragon-egg.patch diff --git a/patches/server/0613-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0612-Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/server/0613-Added-PlayerStonecutterRecipeSelectEvent.patch rename to patches/server/0612-Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/server/0614-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0613-Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 100% rename from patches/server/0614-Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to patches/server/0613-Add-dropLeash-variable-to-EntityUnleashEvent.patch diff --git a/patches/server/0615-Skip-distance-map-update-when-spawning-disabled.patch b/patches/server/0614-Skip-distance-map-update-when-spawning-disabled.patch similarity index 100% rename from patches/server/0615-Skip-distance-map-update-when-spawning-disabled.patch rename to patches/server/0614-Skip-distance-map-update-when-spawning-disabled.patch diff --git a/patches/server/0616-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0615-Reset-shield-blocking-on-dimension-change.patch similarity index 100% rename from patches/server/0616-Reset-shield-blocking-on-dimension-change.patch rename to patches/server/0615-Reset-shield-blocking-on-dimension-change.patch diff --git a/patches/server/0617-add-DragonEggFormEvent.patch b/patches/server/0616-add-DragonEggFormEvent.patch similarity index 100% rename from patches/server/0617-add-DragonEggFormEvent.patch rename to patches/server/0616-add-DragonEggFormEvent.patch diff --git a/patches/server/0618-EntityMoveEvent.patch b/patches/server/0617-EntityMoveEvent.patch similarity index 97% rename from patches/server/0618-EntityMoveEvent.patch rename to patches/server/0617-EntityMoveEvent.patch index d556b3807f..99dd3e38f4 100644 --- a/patches/server/0618-EntityMoveEvent.patch +++ b/patches/server/0617-EntityMoveEvent.patch @@ -29,7 +29,7 @@ index 4223d4610b4fec588980dba2ea5ec4f04c45d945..fd2b301bda95438bc7e48173bbe74aec return new Throwable(entity + " Added to world at " + new java.util.Date()); } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index e159d6c77860790c20ca7b531ed23ffda0380810..fdf0c39111059d7030cfc1eddfdcdda375bd2640 100644 +index 3227ce58391b93c12dd01e2b73a3a6c5d6062827..f0a2e27c21b0fd9df236a0a145c7cbf37661fa7d 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3223,6 +3223,20 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0619-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0618-added-option-to-disable-pathfinding-updates-on-block.patch similarity index 100% rename from patches/server/0619-added-option-to-disable-pathfinding-updates-on-block.patch rename to patches/server/0618-added-option-to-disable-pathfinding-updates-on-block.patch diff --git a/patches/server/0620-Inline-shift-direction-fields.patch b/patches/server/0619-Inline-shift-direction-fields.patch similarity index 100% rename from patches/server/0620-Inline-shift-direction-fields.patch rename to patches/server/0619-Inline-shift-direction-fields.patch diff --git a/patches/server/0621-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0620-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 95% rename from patches/server/0621-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/server/0620-Allow-adding-items-to-BlockDropItemEvent.patch index 7a94aaf369..316f8a68bb 100644 --- a/patches/server/0621-Allow-adding-items-to-BlockDropItemEvent.patch +++ b/patches/server/0620-Allow-adding-items-to-BlockDropItemEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow adding items to BlockDropItemEvent diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index b2ef3b767957f961b3c47db73fba3ee9dab226be..d01d4ca873f8225d3503ecb102ce2eb7bfced421 100644 +index 7c68b15c432084adf069797cfccb0526055796cb..db6c0917824b9127abd9f9250dc195a9f1d56f4f 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -390,13 +390,30 @@ public class CraftEventFactory { diff --git a/patches/server/0622-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0621-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/server/0622-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/server/0621-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/server/0623-living-entity-allow-attribute-registration.patch b/patches/server/0622-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/server/0623-living-entity-allow-attribute-registration.patch rename to patches/server/0622-living-entity-allow-attribute-registration.patch diff --git a/patches/server/0624-fix-dead-slime-setSize-invincibility.patch b/patches/server/0623-fix-dead-slime-setSize-invincibility.patch similarity index 100% rename from patches/server/0624-fix-dead-slime-setSize-invincibility.patch rename to patches/server/0623-fix-dead-slime-setSize-invincibility.patch diff --git a/patches/server/0625-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0624-Merchant-getRecipes-should-return-an-immutable-list.patch similarity index 100% rename from patches/server/0625-Merchant-getRecipes-should-return-an-immutable-list.patch rename to patches/server/0624-Merchant-getRecipes-should-return-an-immutable-list.patch diff --git a/patches/server/0626-misc-debugging-dumps.patch b/patches/server/0625-misc-debugging-dumps.patch similarity index 100% rename from patches/server/0626-misc-debugging-dumps.patch rename to patches/server/0625-misc-debugging-dumps.patch diff --git a/patches/server/0627-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0626-Add-support-for-hex-color-codes-in-console.patch similarity index 99% rename from patches/server/0627-Add-support-for-hex-color-codes-in-console.patch rename to patches/server/0626-Add-support-for-hex-color-codes-in-console.patch index b0cf631cab..420ce8e5e6 100644 --- a/patches/server/0627-Add-support-for-hex-color-codes-in-console.patch +++ b/patches/server/0626-Add-support-for-hex-color-codes-in-console.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add support for hex color codes in console Converts upstream's hex color code legacy format into actual hex color codes in the console. diff --git a/build.gradle.kts b/build.gradle.kts -index 10b1689ef6b724df07074e7069f2620fede3cacc..f57faf4c4587f7a10c05038d6b358871a905039c 100644 +index 31a6e07981f20fc0cedbca24cf65807e50ab8142..c95e5f2fee54be09b16c26daffdfcfda877ec203 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -28,6 +28,7 @@ dependencies { diff --git a/patches/server/0628-Expose-Tracked-Players.patch b/patches/server/0627-Expose-Tracked-Players.patch similarity index 100% rename from patches/server/0628-Expose-Tracked-Players.patch rename to patches/server/0627-Expose-Tracked-Players.patch diff --git a/patches/server/0629-Remove-streams-from-SensorNearest.patch b/patches/server/0628-Remove-streams-from-SensorNearest.patch similarity index 100% rename from patches/server/0629-Remove-streams-from-SensorNearest.patch rename to patches/server/0628-Remove-streams-from-SensorNearest.patch diff --git a/patches/server/0630-MC-29274-Fix-Wither-hostility-towards-players.patch b/patches/server/0629-MC-29274-Fix-Wither-hostility-towards-players.patch similarity index 100% rename from patches/server/0630-MC-29274-Fix-Wither-hostility-towards-players.patch rename to patches/server/0629-MC-29274-Fix-Wither-hostility-towards-players.patch diff --git a/patches/server/0631-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0630-Throw-proper-exception-on-empty-JsonList-file.patch similarity index 100% rename from patches/server/0631-Throw-proper-exception-on-empty-JsonList-file.patch rename to patches/server/0630-Throw-proper-exception-on-empty-JsonList-file.patch diff --git a/patches/server/0632-Improve-ServerGUI.patch b/patches/server/0631-Improve-ServerGUI.patch similarity index 100% rename from patches/server/0632-Improve-ServerGUI.patch rename to patches/server/0631-Improve-ServerGUI.patch diff --git a/patches/server/0633-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/0632-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch similarity index 100% rename from patches/server/0633-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch rename to patches/server/0632-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch diff --git a/patches/server/0634-fix-converting-txt-to-json-file.patch b/patches/server/0633-fix-converting-txt-to-json-file.patch similarity index 100% rename from patches/server/0634-fix-converting-txt-to-json-file.patch rename to patches/server/0633-fix-converting-txt-to-json-file.patch diff --git a/patches/server/0635-Add-worldborder-events.patch b/patches/server/0634-Add-worldborder-events.patch similarity index 100% rename from patches/server/0635-Add-worldborder-events.patch rename to patches/server/0634-Add-worldborder-events.patch diff --git a/patches/server/0636-added-PlayerNameEntityEvent.patch b/patches/server/0635-added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/server/0636-added-PlayerNameEntityEvent.patch rename to patches/server/0635-added-PlayerNameEntityEvent.patch diff --git a/patches/server/0637-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0636-Prevent-grindstones-from-overstacking-items.patch similarity index 100% rename from patches/server/0637-Prevent-grindstones-from-overstacking-items.patch rename to patches/server/0636-Prevent-grindstones-from-overstacking-items.patch diff --git a/patches/server/0638-Add-recipe-to-cook-events.patch b/patches/server/0637-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/server/0638-Add-recipe-to-cook-events.patch rename to patches/server/0637-Add-recipe-to-cook-events.patch diff --git a/patches/server/0639-Add-Block-isValidTool.patch b/patches/server/0638-Add-Block-isValidTool.patch similarity index 87% rename from patches/server/0639-Add-Block-isValidTool.patch rename to patches/server/0638-Add-Block-isValidTool.patch index 473b688fa9..24c164bed5 100644 --- a/patches/server/0639-Add-Block-isValidTool.patch +++ b/patches/server/0638-Add-Block-isValidTool.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add Block#isValidTool diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java -index 64589df0a05ddf023f66cdf2cf995a8a5ade2ca8..88bfa152681282b7bbd2e6f2d147920ce23abaf1 100644 +index ef3d93ba8b4149aa479abc6e9787a8746f60ce1d..0b909c0e2137250895b17a0fb5da0c188c402fe1 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java @@ -819,5 +819,9 @@ public class CraftBlock implements Block { diff --git a/patches/server/0640-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0639-Allow-using-signs-inside-spawn-protection.patch similarity index 100% rename from patches/server/0640-Allow-using-signs-inside-spawn-protection.patch rename to patches/server/0639-Allow-using-signs-inside-spawn-protection.patch diff --git a/patches/server/0641-Implement-Keyed-on-World.patch b/patches/server/0640-Implement-Keyed-on-World.patch similarity index 100% rename from patches/server/0641-Implement-Keyed-on-World.patch rename to patches/server/0640-Implement-Keyed-on-World.patch diff --git a/patches/server/0642-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0641-Add-fast-alternative-constructor-for-Rotations.patch similarity index 100% rename from patches/server/0642-Add-fast-alternative-constructor-for-Rotations.patch rename to patches/server/0641-Add-fast-alternative-constructor-for-Rotations.patch diff --git a/patches/server/0643-Item-Rarity-API.patch b/patches/server/0642-Item-Rarity-API.patch similarity index 100% rename from patches/server/0643-Item-Rarity-API.patch rename to patches/server/0642-Item-Rarity-API.patch diff --git a/patches/server/0644-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0643-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch similarity index 100% rename from patches/server/0644-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch rename to patches/server/0643-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch diff --git a/patches/server/0645-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0644-copy-TESign-isEditable-from-snapshots.patch similarity index 100% rename from patches/server/0645-copy-TESign-isEditable-from-snapshots.patch rename to patches/server/0644-copy-TESign-isEditable-from-snapshots.patch diff --git a/patches/server/0646-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0645-Drop-carried-item-when-player-has-disconnected.patch similarity index 100% rename from patches/server/0646-Drop-carried-item-when-player-has-disconnected.patch rename to patches/server/0645-Drop-carried-item-when-player-has-disconnected.patch diff --git a/patches/server/0647-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0646-forced-whitelist-use-configurable-kick-message.patch similarity index 100% rename from patches/server/0647-forced-whitelist-use-configurable-kick-message.patch rename to patches/server/0646-forced-whitelist-use-configurable-kick-message.patch diff --git a/patches/server/0648-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0647-Don-t-ignore-result-of-PlayerEditBookEvent.patch similarity index 100% rename from patches/server/0648-Don-t-ignore-result-of-PlayerEditBookEvent.patch rename to patches/server/0647-Don-t-ignore-result-of-PlayerEditBookEvent.patch diff --git a/patches/server/0649-Entity-load-save-limit-per-chunk.patch b/patches/server/0648-Entity-load-save-limit-per-chunk.patch similarity index 100% rename from patches/server/0649-Entity-load-save-limit-per-chunk.patch rename to patches/server/0648-Entity-load-save-limit-per-chunk.patch diff --git a/patches/server/0650-fix-cancelling-block-falling-causing-client-desync.patch b/patches/server/0649-fix-cancelling-block-falling-causing-client-desync.patch similarity index 100% rename from patches/server/0650-fix-cancelling-block-falling-causing-client-desync.patch rename to patches/server/0649-fix-cancelling-block-falling-causing-client-desync.patch diff --git a/patches/server/0651-Expose-protocol-version.patch b/patches/server/0650-Expose-protocol-version.patch similarity index 100% rename from patches/server/0651-Expose-protocol-version.patch rename to patches/server/0650-Expose-protocol-version.patch diff --git a/patches/server/0652-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/server/0651-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch similarity index 100% rename from patches/server/0652-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch rename to patches/server/0651-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch diff --git a/patches/server/0653-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0652-Enhance-console-tab-completions-for-brigadier-comman.patch similarity index 100% rename from patches/server/0653-Enhance-console-tab-completions-for-brigadier-comman.patch rename to patches/server/0652-Enhance-console-tab-completions-for-brigadier-comman.patch diff --git a/patches/server/0654-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0653-Fix-PlayerItemConsumeEvent-cancelling-properly.patch similarity index 92% rename from patches/server/0654-Fix-PlayerItemConsumeEvent-cancelling-properly.patch rename to patches/server/0653-Fix-PlayerItemConsumeEvent-cancelling-properly.patch index aeebfa5b2c..ccf7400a8b 100644 --- a/patches/server/0654-Fix-PlayerItemConsumeEvent-cancelling-properly.patch +++ b/patches/server/0653-Fix-PlayerItemConsumeEvent-cancelling-properly.patch @@ -9,7 +9,7 @@ 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 fdf0c39111059d7030cfc1eddfdcdda375bd2640..99b33003c97bb86b2cfc4a77298ac52efad6e78f 100644 +index f0a2e27c21b0fd9df236a0a145c7cbf37661fa7d..deade89dbbd1d4e548be7be1a46e36b7a9eff809 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3702,6 +3702,7 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0655-Add-bypass-host-check.patch b/patches/server/0654-Add-bypass-host-check.patch similarity index 100% rename from patches/server/0655-Add-bypass-host-check.patch rename to patches/server/0654-Add-bypass-host-check.patch diff --git a/patches/server/0656-Set-area-affect-cloud-rotation.patch b/patches/server/0655-Set-area-affect-cloud-rotation.patch similarity index 92% rename from patches/server/0656-Set-area-affect-cloud-rotation.patch rename to patches/server/0655-Set-area-affect-cloud-rotation.patch index e422274bb7..022dcb3b0a 100644 --- a/patches/server/0656-Set-area-affect-cloud-rotation.patch +++ b/patches/server/0655-Set-area-affect-cloud-rotation.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Set area affect cloud rotation diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 1a078b6c16d5932d4383113e455bd89884d2a98b..753b9773a46ebb4afefa9ccb2435bf48ff09b4b5 100644 +index 2e2566206a3fd229759b9f5f89aa6d89a6061758..833010216e868ade5bb3bb815f7c867c3d04979f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1975,6 +1975,7 @@ public class CraftWorld implements World { diff --git a/patches/server/0657-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0656-add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/server/0657-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/server/0656-add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/server/0658-Fix-duplicating-give-items-on-item-drop-cancel.patch b/patches/server/0657-Fix-duplicating-give-items-on-item-drop-cancel.patch similarity index 100% rename from patches/server/0658-Fix-duplicating-give-items-on-item-drop-cancel.patch rename to patches/server/0657-Fix-duplicating-give-items-on-item-drop-cancel.patch diff --git a/patches/server/0659-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0658-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/server/0659-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/server/0658-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/server/0660-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0659-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/server/0660-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/server/0659-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/server/0661-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0660-fix-PigZombieAngerEvent-cancellation.patch similarity index 100% rename from patches/server/0661-fix-PigZombieAngerEvent-cancellation.patch rename to patches/server/0660-fix-PigZombieAngerEvent-cancellation.patch diff --git a/patches/server/0662-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/server/0661-Fix-checkReach-check-for-Shulker-boxes.patch similarity index 100% rename from patches/server/0662-Fix-checkReach-check-for-Shulker-boxes.patch rename to patches/server/0661-Fix-checkReach-check-for-Shulker-boxes.patch diff --git a/patches/server/0663-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0662-fix-PlayerItemHeldEvent-firing-twice.patch similarity index 100% rename from patches/server/0663-fix-PlayerItemHeldEvent-firing-twice.patch rename to patches/server/0662-fix-PlayerItemHeldEvent-firing-twice.patch diff --git a/patches/server/0664-Added-PlayerDeepSleepEvent.patch b/patches/server/0663-Added-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/server/0664-Added-PlayerDeepSleepEvent.patch rename to patches/server/0663-Added-PlayerDeepSleepEvent.patch diff --git a/patches/server/0665-More-World-API.patch b/patches/server/0664-More-World-API.patch similarity index 100% rename from patches/server/0665-More-World-API.patch rename to patches/server/0664-More-World-API.patch diff --git a/patches/server/0666-Added-PlayerBedFailEnterEvent.patch b/patches/server/0665-Added-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/server/0666-Added-PlayerBedFailEnterEvent.patch rename to patches/server/0665-Added-PlayerBedFailEnterEvent.patch diff --git a/patches/server/0667-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0666-Implement-methods-to-convert-between-Component-and-B.patch similarity index 100% rename from patches/server/0667-Implement-methods-to-convert-between-Component-and-B.patch rename to patches/server/0666-Implement-methods-to-convert-between-Component-and-B.patch diff --git a/patches/server/0668-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0667-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch similarity index 100% rename from patches/server/0668-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch rename to patches/server/0667-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch diff --git a/patches/server/0669-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0668-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/server/0669-Introduce-beacon-activation-deactivation-events.patch rename to patches/server/0668-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/server/0670-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0669-add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 100% rename from patches/server/0670-add-RespawnFlags-to-PlayerRespawnEvent.patch rename to patches/server/0669-add-RespawnFlags-to-PlayerRespawnEvent.patch diff --git a/patches/server/0671-Add-Channel-initialization-listeners.patch b/patches/server/0670-Add-Channel-initialization-listeners.patch similarity index 100% rename from patches/server/0671-Add-Channel-initialization-listeners.patch rename to patches/server/0670-Add-Channel-initialization-listeners.patch diff --git a/patches/server/0672-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0671-Send-empty-commands-if-tab-completion-is-disabled.patch similarity index 100% rename from patches/server/0672-Send-empty-commands-if-tab-completion-is-disabled.patch rename to patches/server/0671-Send-empty-commands-if-tab-completion-is-disabled.patch diff --git a/patches/server/0673-Add-more-WanderingTrader-API.patch b/patches/server/0672-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/server/0673-Add-more-WanderingTrader-API.patch rename to patches/server/0672-Add-more-WanderingTrader-API.patch diff --git a/patches/server/0674-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0673-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/server/0674-Add-EntityBlockStorage-clearEntities.patch rename to patches/server/0673-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/server/0675-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0674-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/server/0675-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/server/0674-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/server/0676-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0675-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0676-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch rename to patches/server/0675-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0677-Inventory-close.patch b/patches/server/0676-Inventory-close.patch similarity index 100% rename from patches/server/0677-Inventory-close.patch rename to patches/server/0676-Inventory-close.patch diff --git a/patches/server/0678-call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/0677-call-PortalCreateEvent-players-and-end-platform.patch similarity index 100% rename from patches/server/0678-call-PortalCreateEvent-players-and-end-platform.patch rename to patches/server/0677-call-PortalCreateEvent-players-and-end-platform.patch diff --git a/patches/server/0679-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0678-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/server/0679-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/server/0678-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/server/0680-Fix-CraftPotionBrewer-cache.patch b/patches/server/0679-Fix-CraftPotionBrewer-cache.patch similarity index 100% rename from patches/server/0680-Fix-CraftPotionBrewer-cache.patch rename to patches/server/0679-Fix-CraftPotionBrewer-cache.patch diff --git a/patches/server/0681-Add-basic-Datapack-API.patch b/patches/server/0680-Add-basic-Datapack-API.patch similarity index 100% rename from patches/server/0681-Add-basic-Datapack-API.patch rename to patches/server/0680-Add-basic-Datapack-API.patch diff --git a/patches/server/0682-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0681-Add-environment-variable-to-disable-server-gui.patch similarity index 100% rename from patches/server/0682-Add-environment-variable-to-disable-server-gui.patch rename to patches/server/0681-Add-environment-variable-to-disable-server-gui.patch diff --git a/patches/server/0683-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0682-additions-to-PlayerGameModeChangeEvent.patch similarity index 100% rename from patches/server/0683-additions-to-PlayerGameModeChangeEvent.patch rename to patches/server/0682-additions-to-PlayerGameModeChangeEvent.patch diff --git a/patches/server/0684-Clear-SyncLoadInfo.patch b/patches/server/0683-Clear-SyncLoadInfo.patch similarity index 100% rename from patches/server/0684-Clear-SyncLoadInfo.patch rename to patches/server/0683-Clear-SyncLoadInfo.patch diff --git a/patches/server/0685-ItemStack-repair-check-API.patch b/patches/server/0684-ItemStack-repair-check-API.patch similarity index 100% rename from patches/server/0685-ItemStack-repair-check-API.patch rename to patches/server/0684-ItemStack-repair-check-API.patch diff --git a/patches/server/0686-More-Enchantment-API.patch b/patches/server/0685-More-Enchantment-API.patch similarity index 100% rename from patches/server/0686-More-Enchantment-API.patch rename to patches/server/0685-More-Enchantment-API.patch diff --git a/patches/server/0687-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/server/0686-Add-command-line-option-to-load-extra-plugin-jars-no.patch similarity index 96% rename from patches/server/0687-Add-command-line-option-to-load-extra-plugin-jars-no.patch rename to patches/server/0686-Add-command-line-option-to-load-extra-plugin-jars-no.patch index 4d9c130539..245c5c84b2 100644 --- a/patches/server/0687-Add-command-line-option-to-load-extra-plugin-jars-no.patch +++ b/patches/server/0686-Add-command-line-option-to-load-extra-plugin-jars-no.patch @@ -46,7 +46,7 @@ index 45ae98058d4207ccf9cc85fe27021356438a08fa..85d078f7c0e5338315ba8290dd4981e5 if (type == PluginLoadOrder.STARTUP) { this.helpMap.clear(); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 87674042ea6ebf17d9f6f5f0839ae4bd3de07932..eb0c436414a66c530d888348c3190eb563b8b44f 100644 +index c687df04b3543df763a4d5225342357355fab7ec..22e9dd17f62103c5061435099ce96a3d70d54808 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -153,6 +153,12 @@ public class Main { diff --git a/patches/server/0688-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0687-Fix-and-optimise-world-force-upgrading.patch similarity index 100% rename from patches/server/0688-Fix-and-optimise-world-force-upgrading.patch rename to patches/server/0687-Fix-and-optimise-world-force-upgrading.patch diff --git a/patches/server/0689-Add-Mob-lookAt-API.patch b/patches/server/0688-Add-Mob-lookAt-API.patch similarity index 100% rename from patches/server/0689-Add-Mob-lookAt-API.patch rename to patches/server/0688-Add-Mob-lookAt-API.patch diff --git a/patches/server/0690-Add-Unix-domain-socket-support.patch b/patches/server/0689-Add-Unix-domain-socket-support.patch similarity index 100% rename from patches/server/0690-Add-Unix-domain-socket-support.patch rename to patches/server/0689-Add-Unix-domain-socket-support.patch diff --git a/patches/server/0691-Add-EntityInsideBlockEvent.patch b/patches/server/0690-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/server/0691-Add-EntityInsideBlockEvent.patch rename to patches/server/0690-Add-EntityInsideBlockEvent.patch diff --git a/patches/server/0692-Attributes-API-for-item-defaults.patch b/patches/server/0691-Attributes-API-for-item-defaults.patch similarity index 100% rename from patches/server/0692-Attributes-API-for-item-defaults.patch rename to patches/server/0691-Attributes-API-for-item-defaults.patch diff --git a/patches/server/0693-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch b/patches/server/0692-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch similarity index 100% rename from patches/server/0693-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch rename to patches/server/0692-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch diff --git a/patches/server/0694-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0693-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 98% rename from patches/server/0694-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/server/0693-Add-cause-to-Weather-ThunderChangeEvents.patch index fb5e77a6c6..dcc4db4209 100644 --- a/patches/server/0694-Add-cause-to-Weather-ThunderChangeEvents.patch +++ b/patches/server/0693-Add-cause-to-Weather-ThunderChangeEvents.patch @@ -104,7 +104,7 @@ index cd840dc4a8ca432868fb3e9c912ea928e5303e0d..4d0af984490b556a9911c3b8fdca1e16 if (weather.isCancelled()) { return; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 36283d4b07a7cfea09da88bcad3c406cb6e0d880..fea56803b648bdda9ba8ead14816b1b4fa6cd73a 100644 +index 019261b244c4a35592cbfeab24c7ed7c45776433..762be168b576247cad2109cbd83518ff237b0632 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1457,7 +1457,7 @@ public class CraftWorld implements World { diff --git a/patches/server/0695-More-Lidded-Block-API.patch b/patches/server/0694-More-Lidded-Block-API.patch similarity index 100% rename from patches/server/0695-More-Lidded-Block-API.patch rename to patches/server/0694-More-Lidded-Block-API.patch diff --git a/patches/server/0696-Limit-item-frame-cursors-on-maps.patch b/patches/server/0695-Limit-item-frame-cursors-on-maps.patch similarity index 100% rename from patches/server/0696-Limit-item-frame-cursors-on-maps.patch rename to patches/server/0695-Limit-item-frame-cursors-on-maps.patch diff --git a/patches/server/0697-Add-PufferFishStateChangeEvent.patch b/patches/server/0696-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/server/0697-Add-PufferFishStateChangeEvent.patch rename to patches/server/0696-Add-PufferFishStateChangeEvent.patch diff --git a/patches/server/0698-Add-PlayerKickEvent-causes.patch b/patches/server/0697-Add-PlayerKickEvent-causes.patch similarity index 100% rename from patches/server/0698-Add-PlayerKickEvent-causes.patch rename to patches/server/0697-Add-PlayerKickEvent-causes.patch diff --git a/patches/server/0699-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0698-Fix-PlayerBucketEmptyEvent-result-itemstack.patch similarity index 100% rename from patches/server/0699-Fix-PlayerBucketEmptyEvent-result-itemstack.patch rename to patches/server/0698-Fix-PlayerBucketEmptyEvent-result-itemstack.patch diff --git a/patches/server/0700-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch b/patches/server/0699-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch similarity index 100% rename from patches/server/0700-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch rename to patches/server/0699-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch diff --git a/patches/server/0701-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0700-Add-option-to-fix-items-merging-through-walls.patch similarity index 100% rename from patches/server/0701-Add-option-to-fix-items-merging-through-walls.patch rename to patches/server/0700-Add-option-to-fix-items-merging-through-walls.patch diff --git a/patches/server/0702-Add-BellRevealRaiderEvent.patch b/patches/server/0701-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/server/0702-Add-BellRevealRaiderEvent.patch rename to patches/server/0701-Add-BellRevealRaiderEvent.patch diff --git a/patches/server/0703-Fix-invulnerable-end-crystals.patch b/patches/server/0702-Fix-invulnerable-end-crystals.patch similarity index 100% rename from patches/server/0703-Fix-invulnerable-end-crystals.patch rename to patches/server/0702-Fix-invulnerable-end-crystals.patch diff --git a/patches/server/0704-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0703-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/server/0704-Add-ElderGuardianAppearanceEvent.patch rename to patches/server/0703-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/server/0705-Fix-dangerous-end-portal-logic.patch b/patches/server/0704-Fix-dangerous-end-portal-logic.patch similarity index 97% rename from patches/server/0705-Fix-dangerous-end-portal-logic.patch rename to patches/server/0704-Fix-dangerous-end-portal-logic.patch index a4a1d44756..51357ce406 100644 --- a/patches/server/0705-Fix-dangerous-end-portal-logic.patch +++ b/patches/server/0704-Fix-dangerous-end-portal-logic.patch @@ -11,7 +11,7 @@ Move the tick logic into the post tick, where portaling was designed to happen in the first place. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 08428a1aa9e9f007415d29c653b8885b09ab3b19..896d892237b29eb404398db07264eb6f04786754 100644 +index 8e530b22413764470dcf5862c1a3ef8e504a124f..1bbfae5171a288a3964ba5b590bd5bab5d96b2a8 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -361,6 +361,37 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0706-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0705-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch similarity index 100% rename from patches/server/0706-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch rename to patches/server/0705-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch diff --git a/patches/server/0707-Make-item-validations-configurable.patch b/patches/server/0706-Make-item-validations-configurable.patch similarity index 100% rename from patches/server/0707-Make-item-validations-configurable.patch rename to patches/server/0706-Make-item-validations-configurable.patch diff --git a/patches/server/0708-Line-Of-Sight-Changes.patch b/patches/server/0707-Line-Of-Sight-Changes.patch similarity index 95% rename from patches/server/0708-Line-Of-Sight-Changes.patch rename to patches/server/0707-Line-Of-Sight-Changes.patch index 0ef4b2df4f..eb470be34d 100644 --- a/patches/server/0708-Line-Of-Sight-Changes.patch +++ b/patches/server/0707-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 99b33003c97bb86b2cfc4a77298ac52efad6e78f..442d0df276defbbea1b4282b99460ab463c2e5e0 100644 +index deade89dbbd1d4e548be7be1a46e36b7a9eff809..8443d1531cf361509abfacff296ce277e35c6b13 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3430,7 +3430,8 @@ public abstract class LivingEntity extends Entity { @@ -19,7 +19,7 @@ index 99b33003c97bb86b2cfc4a77298ac52efad6e78f..442d0df276defbbea1b4282b99460ab4 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index fea56803b648bdda9ba8ead14816b1b4fa6cd73a..39f8ff65ae06a072ad37e80769244895e98a727a 100644 +index 762be168b576247cad2109cbd83518ff237b0632..02269da4bff721682bb6f73ebfef636d140dc0ef 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -331,6 +331,18 @@ public class CraftWorld implements World { diff --git a/patches/server/0709-add-per-world-spawn-limits.patch b/patches/server/0708-add-per-world-spawn-limits.patch similarity index 96% rename from patches/server/0709-add-per-world-spawn-limits.patch rename to patches/server/0708-add-per-world-spawn-limits.patch index 197765e51b..6d103d446d 100644 --- a/patches/server/0709-add-per-world-spawn-limits.patch +++ b/patches/server/0708-add-per-world-spawn-limits.patch @@ -30,7 +30,7 @@ index 97a1ca789eb606b263ebabad188baefe4df69b85..435558eb9f3ce277c14ff5e368d489d1 private void lightQueueSize() { lightQueueSize = getInt("light-queue-size", lightQueueSize); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 39f8ff65ae06a072ad37e80769244895e98a727a..7dc26321e20e26821096e79356a358879306cd78 100644 +index 02269da4bff721682bb6f73ebfef636d140dc0ef..eda5af586fa9710e8bb945bc65b8fe1579daea5a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -352,6 +352,13 @@ public class CraftWorld implements World { diff --git a/patches/server/0710-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/server/0709-Fix-PotionSplashEvent-for-water-splash-potions.patch similarity index 100% rename from patches/server/0710-Fix-PotionSplashEvent-for-water-splash-potions.patch rename to patches/server/0709-Fix-PotionSplashEvent-for-water-splash-potions.patch diff --git a/patches/server/0711-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch b/patches/server/0710-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch similarity index 100% rename from patches/server/0711-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch rename to patches/server/0710-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch diff --git a/patches/server/0712-Add-Feature-Generation-API.patch b/patches/server/0711-Add-Feature-Generation-API.patch similarity index 100% rename from patches/server/0712-Add-Feature-Generation-API.patch rename to patches/server/0711-Add-Feature-Generation-API.patch diff --git a/patches/server/0713-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0712-Fix-PlayerDropItemEvent-using-wrong-item.patch similarity index 100% rename from patches/server/0713-Fix-PlayerDropItemEvent-using-wrong-item.patch rename to patches/server/0712-Fix-PlayerDropItemEvent-using-wrong-item.patch diff --git a/patches/server/0714-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0713-Deobfuscate-stacktraces-in-log-messages-crash-report.patch similarity index 100% rename from patches/server/0714-Deobfuscate-stacktraces-in-log-messages-crash-report.patch rename to patches/server/0713-Deobfuscate-stacktraces-in-log-messages-crash-report.patch diff --git a/patches/server/0715-Missing-Entity-Behavior-API.patch b/patches/server/0714-Missing-Entity-Behavior-API.patch similarity index 100% rename from patches/server/0715-Missing-Entity-Behavior-API.patch rename to patches/server/0714-Missing-Entity-Behavior-API.patch diff --git a/patches/server/0716-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0715-Ensure-disconnect-for-book-edit-is-called-on-main.patch similarity index 100% rename from patches/server/0716-Ensure-disconnect-for-book-edit-is-called-on-main.patch rename to patches/server/0715-Ensure-disconnect-for-book-edit-is-called-on-main.patch diff --git a/patches/server/0717-Add-git-branch-and-commit-to-manifest.patch b/patches/server/0716-Add-git-branch-and-commit-to-manifest.patch similarity index 92% rename from patches/server/0717-Add-git-branch-and-commit-to-manifest.patch rename to patches/server/0716-Add-git-branch-and-commit-to-manifest.patch index c443b1940b..31be099dd4 100644 --- a/patches/server/0717-Add-git-branch-and-commit-to-manifest.patch +++ b/patches/server/0716-Add-git-branch-and-commit-to-manifest.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add git branch and commit to manifest diff --git a/build.gradle.kts b/build.gradle.kts -index 2add85992f6249c826f016826fa28d54b9e7ae89..83ce7b299033806297095028989976259f9c2a92 100644 +index 0311fb1e70eb52da19685f7d9d815daf8f3a83ab..3927eb2cd13499bca7561ae7d9be45ae86522125 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -76,6 +76,7 @@ tasks.jar { diff --git a/patches/server/0718-Improve-CraftChunk-getEntities.patch b/patches/server/0717-Improve-CraftChunk-getEntities.patch similarity index 100% rename from patches/server/0718-Improve-CraftChunk-getEntities.patch rename to patches/server/0717-Improve-CraftChunk-getEntities.patch diff --git a/patches/server/0719-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0718-Fix-return-value-of-Block-applyBoneMeal-always-being.patch similarity index 92% rename from patches/server/0719-Fix-return-value-of-Block-applyBoneMeal-always-being.patch rename to patches/server/0718-Fix-return-value-of-Block-applyBoneMeal-always-being.patch index 2185984709..c9cf7f3390 100644 --- a/patches/server/0719-Fix-return-value-of-Block-applyBoneMeal-always-being.patch +++ b/patches/server/0718-Fix-return-value-of-Block-applyBoneMeal-always-being.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix return value of Block#applyBoneMeal always being false diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java -index 96712906e64e9a0d1325afd55156921f20709988..6e25372a5bb7b38d85312e31330faee5a9c10bbb 100644 +index 0b909c0e2137250895b17a0fb5da0c188c402fe1..f20484b74197353adec0a3cd2c42f88aa9fdd4e6 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java @@ -677,7 +677,7 @@ public class CraftBlock implements Block { diff --git a/patches/server/0720-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0719-Use-getChunkIfLoadedImmediately-in-places.patch similarity index 100% rename from patches/server/0720-Use-getChunkIfLoadedImmediately-in-places.patch rename to patches/server/0719-Use-getChunkIfLoadedImmediately-in-places.patch diff --git a/patches/server/0721-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0720-Fix-commands-from-signs-not-firing-command-events.patch similarity index 100% rename from patches/server/0721-Fix-commands-from-signs-not-firing-command-events.patch rename to patches/server/0720-Fix-commands-from-signs-not-firing-command-events.patch diff --git a/patches/server/0722-Adds-PlayerArmSwingEvent.patch b/patches/server/0721-Adds-PlayerArmSwingEvent.patch similarity index 100% rename from patches/server/0722-Adds-PlayerArmSwingEvent.patch rename to patches/server/0721-Adds-PlayerArmSwingEvent.patch diff --git a/patches/server/0723-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0722-Fixes-kick-event-leave-message-not-being-sent.patch similarity index 100% rename from patches/server/0723-Fixes-kick-event-leave-message-not-being-sent.patch rename to patches/server/0722-Fixes-kick-event-leave-message-not-being-sent.patch diff --git a/patches/server/0724-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0723-Add-config-for-mobs-immune-to-default-effects.patch similarity index 100% rename from patches/server/0724-Add-config-for-mobs-immune-to-default-effects.patch rename to patches/server/0723-Add-config-for-mobs-immune-to-default-effects.patch diff --git a/patches/server/0725-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0724-Fix-incorrect-message-for-outdated-client.patch similarity index 100% rename from patches/server/0725-Fix-incorrect-message-for-outdated-client.patch rename to patches/server/0724-Fix-incorrect-message-for-outdated-client.patch diff --git a/patches/server/0726-Fix-MerchantOffer-BuyB-Only-AssertionError.patch b/patches/server/0725-Fix-MerchantOffer-BuyB-Only-AssertionError.patch similarity index 100% rename from patches/server/0726-Fix-MerchantOffer-BuyB-Only-AssertionError.patch rename to patches/server/0725-Fix-MerchantOffer-BuyB-Only-AssertionError.patch diff --git a/patches/server/0727-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0726-Don-t-apply-cramming-damage-to-players.patch similarity index 100% rename from patches/server/0727-Don-t-apply-cramming-damage-to-players.patch rename to patches/server/0726-Don-t-apply-cramming-damage-to-players.patch diff --git a/patches/server/0728-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0727-Rate-options-and-timings-for-sensors-and-behaviors.patch similarity index 100% rename from patches/server/0728-Rate-options-and-timings-for-sensors-and-behaviors.patch rename to patches/server/0727-Rate-options-and-timings-for-sensors-and-behaviors.patch diff --git a/patches/server/0729-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0728-Add-a-bunch-of-missing-forceDrop-toggles.patch similarity index 100% rename from patches/server/0729-Add-a-bunch-of-missing-forceDrop-toggles.patch rename to patches/server/0728-Add-a-bunch-of-missing-forceDrop-toggles.patch diff --git a/patches/server/0730-Stinger-API.patch b/patches/server/0729-Stinger-API.patch similarity index 100% rename from patches/server/0730-Stinger-API.patch rename to patches/server/0729-Stinger-API.patch diff --git a/patches/server/0731-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0730-Fix-incosistency-issue-with-empty-map-items-in-CB.patch similarity index 100% rename from patches/server/0731-Fix-incosistency-issue-with-empty-map-items-in-CB.patch rename to patches/server/0730-Fix-incosistency-issue-with-empty-map-items-in-CB.patch diff --git a/patches/server/0732-Add-System.out.println-catcher.patch b/patches/server/0731-Add-System.out.println-catcher.patch similarity index 100% rename from patches/server/0732-Add-System.out.println-catcher.patch rename to patches/server/0731-Add-System.out.println-catcher.patch diff --git a/patches/server/0733-Fix-test-not-bootstrapping.patch b/patches/server/0732-Fix-test-not-bootstrapping.patch similarity index 100% rename from patches/server/0733-Fix-test-not-bootstrapping.patch rename to patches/server/0732-Fix-test-not-bootstrapping.patch diff --git a/patches/server/0734-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0733-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/server/0734-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/server/0733-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/server/0735-Improve-boat-collision-performance.patch b/patches/server/0734-Improve-boat-collision-performance.patch similarity index 100% rename from patches/server/0735-Improve-boat-collision-performance.patch rename to patches/server/0734-Improve-boat-collision-performance.patch diff --git a/patches/server/0736-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0735-Prevent-AFK-kick-while-watching-end-credits.patch similarity index 100% rename from patches/server/0736-Prevent-AFK-kick-while-watching-end-credits.patch rename to patches/server/0735-Prevent-AFK-kick-while-watching-end-credits.patch diff --git a/patches/server/0737-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0736-Allow-skipping-writing-of-comments-to-server.propert.patch similarity index 100% rename from patches/server/0737-Allow-skipping-writing-of-comments-to-server.propert.patch rename to patches/server/0736-Allow-skipping-writing-of-comments-to-server.propert.patch diff --git a/patches/server/0738-Add-PlayerSetSpawnEvent.patch b/patches/server/0737-Add-PlayerSetSpawnEvent.patch similarity index 100% rename from patches/server/0738-Add-PlayerSetSpawnEvent.patch rename to patches/server/0737-Add-PlayerSetSpawnEvent.patch diff --git a/patches/server/0739-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0738-Make-hoppers-respect-inventory-max-stack-size.patch similarity index 100% rename from patches/server/0739-Make-hoppers-respect-inventory-max-stack-size.patch rename to patches/server/0738-Make-hoppers-respect-inventory-max-stack-size.patch diff --git a/patches/server/0740-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0739-Optimize-entity-tracker-passenger-checks.patch similarity index 100% rename from patches/server/0740-Optimize-entity-tracker-passenger-checks.patch rename to patches/server/0739-Optimize-entity-tracker-passenger-checks.patch diff --git a/patches/server/0741-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0740-Config-option-for-Piglins-guarding-chests.patch similarity index 100% rename from patches/server/0741-Config-option-for-Piglins-guarding-chests.patch rename to patches/server/0740-Config-option-for-Piglins-guarding-chests.patch diff --git a/patches/server/0742-Added-EntityDamageItemEvent.patch b/patches/server/0741-Added-EntityDamageItemEvent.patch similarity index 100% rename from patches/server/0742-Added-EntityDamageItemEvent.patch rename to patches/server/0741-Added-EntityDamageItemEvent.patch diff --git a/patches/server/0743-Optimize-indirect-passenger-iteration.patch b/patches/server/0742-Optimize-indirect-passenger-iteration.patch similarity index 91% rename from patches/server/0743-Optimize-indirect-passenger-iteration.patch rename to patches/server/0742-Optimize-indirect-passenger-iteration.patch index cb33522246..f6f066275f 100644 --- a/patches/server/0743-Optimize-indirect-passenger-iteration.patch +++ b/patches/server/0742-Optimize-indirect-passenger-iteration.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Optimize indirect passenger iteration diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 896d892237b29eb404398db07264eb6f04786754..895c8d8c676bfd3e11cd8371b2ac115b6a2e52b4 100644 +index 1bbfae5171a288a3964ba5b590bd5bab5d96b2a8..b8f8f4b369ed5f77a644b6bc8aea5068a0f03582 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3475,26 +3475,41 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n @@ -13,7 +13,7 @@ index 896d892237b29eb404398db07264eb6f04786754..895c8d8c676bfd3e11cd8371b2ac115b private Stream getIndirectPassengersStream() { + if (this.passengers.isEmpty()) { return Stream.of(); } // Paper - return ImmutableList.copyOf(this.passengers).stream().flatMap(Entity::getSelfAndPassengers); // Paper + return this.passengers.stream().flatMap(Entity::getSelfAndPassengers); } @Override diff --git a/patches/server/0744-Fix-block-drops-position-losing-precision-millions-o.patch b/patches/server/0743-Fix-block-drops-position-losing-precision-millions-o.patch similarity index 100% rename from patches/server/0744-Fix-block-drops-position-losing-precision-millions-o.patch rename to patches/server/0743-Fix-block-drops-position-losing-precision-millions-o.patch diff --git a/patches/server/0745-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0744-Configurable-item-frame-map-cursor-update-interval.patch similarity index 100% rename from patches/server/0745-Configurable-item-frame-map-cursor-update-interval.patch rename to patches/server/0744-Configurable-item-frame-map-cursor-update-interval.patch diff --git a/patches/server/0746-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0745-Make-EntityUnleashEvent-cancellable.patch similarity index 100% rename from patches/server/0746-Make-EntityUnleashEvent-cancellable.patch rename to patches/server/0745-Make-EntityUnleashEvent-cancellable.patch diff --git a/patches/server/0747-Clear-bucket-NBT-after-dispense.patch b/patches/server/0746-Clear-bucket-NBT-after-dispense.patch similarity index 100% rename from patches/server/0747-Clear-bucket-NBT-after-dispense.patch rename to patches/server/0746-Clear-bucket-NBT-after-dispense.patch