diff --git a/Spigot-Server-Patches/0474-Don-t-toString-block-unless-actually-showing-the-mes.patch b/Spigot-Server-Patches/0474-Don-t-toString-block-unless-actually-showing-the-mes.patch deleted file mode 100644 index 11c031b70c..0000000000 --- a/Spigot-Server-Patches/0474-Don-t-toString-block-unless-actually-showing-the-mes.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Aikar <aikar@aikar.co> -Date: Sat, 9 May 2020 13:54:25 -0400 -Subject: [PATCH] Don't toString block unless actually showing the message - -This is causing MASSIVE performance issues with hoppers and block states -in general. - -diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java -index 6e9eff2c29528b857cf758e9e45606c8a1c1cc8d..dc0e6e49e9eb5004e53d24304bce095bcef8f4c2 100644 ---- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java -+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java -@@ -26,7 +26,7 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState - // get tile entity from block: - CraftWorld world = (CraftWorld) this.getWorld(); - this.tileEntity = tileEntityClass.cast(world.getHandle().getTileEntity(this.getPosition())); -- Preconditions.checkState(this.tileEntity != null, "Tile is null, asynchronous access? " + block); -+ if (tileEntity == null) Preconditions.checkState(false, "Tile is null, asynchronous access? " + block); // Paper - Don't toString block unless actually error'ing... - - // Paper start - this.snapshotDisabled = DISABLE_SNAPSHOT; diff --git a/Spigot-Server-Patches/0475-Potential-bed-API.patch b/Spigot-Server-Patches/0474-Potential-bed-API.patch similarity index 100% rename from Spigot-Server-Patches/0475-Potential-bed-API.patch rename to Spigot-Server-Patches/0474-Potential-bed-API.patch diff --git a/Spigot-Server-Patches/0476-Wait-for-Async-Tasks-during-shutdown.patch b/Spigot-Server-Patches/0475-Wait-for-Async-Tasks-during-shutdown.patch similarity index 100% rename from Spigot-Server-Patches/0476-Wait-for-Async-Tasks-during-shutdown.patch rename to Spigot-Server-Patches/0475-Wait-for-Async-Tasks-during-shutdown.patch diff --git a/Spigot-Server-Patches/0477-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/Spigot-Server-Patches/0476-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch similarity index 100% rename from Spigot-Server-Patches/0477-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch rename to Spigot-Server-Patches/0476-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch diff --git a/Spigot-Server-Patches/0478-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/Spigot-Server-Patches/0477-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch similarity index 98% rename from Spigot-Server-Patches/0478-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch rename to Spigot-Server-Patches/0477-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch index f7caafd067..1b57f1a077 100644 --- a/Spigot-Server-Patches/0478-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch +++ b/Spigot-Server-Patches/0477-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch @@ -13,7 +13,7 @@ A config is provided if you rather let players use these exploits, and let them destroy the worlds End Portals and get on top of the nether easy. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 6f0c5a2d33001f59e560ec239c0edbd32de84ed8..ac6b291c103c432fdced603674345096326a9efe 100644 +index 2f9398f7bb90e8ae0a1cb81b162dba28706d408a..5b5edd2aed9cf76535104df65783bfd1d5bb7c85 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -411,4 +411,17 @@ public class PaperConfig { @@ -157,7 +157,7 @@ index a552cc5bebb1a70db2e679a514769d0ad791ad68..72de544c0782e4daff222a0ca04e5bc8 this.world.getMethodProfiler().enter("explosion_blocks"); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index b479a25044ecf8c1a791729d643cf8dc90193b2b..8d59391befcbc2542a79758d2021ef51df59d815 100644 +index b5127f4b2deaa70b411991d78657f0c9e73d9e43..f2944dcf6b83b530124d53743a3d58b68ecec6f8 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -362,6 +362,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable { diff --git a/Spigot-Server-Patches/0479-Optimize-NibbleArray-to-use-pooled-buffers.patch b/Spigot-Server-Patches/0478-Optimize-NibbleArray-to-use-pooled-buffers.patch similarity index 100% rename from Spigot-Server-Patches/0479-Optimize-NibbleArray-to-use-pooled-buffers.patch rename to Spigot-Server-Patches/0478-Optimize-NibbleArray-to-use-pooled-buffers.patch diff --git a/Spigot-Server-Patches/0480-Reduce-MutableInt-allocations-from-light-engine.patch b/Spigot-Server-Patches/0479-Reduce-MutableInt-allocations-from-light-engine.patch similarity index 100% rename from Spigot-Server-Patches/0480-Reduce-MutableInt-allocations-from-light-engine.patch rename to Spigot-Server-Patches/0479-Reduce-MutableInt-allocations-from-light-engine.patch diff --git a/Spigot-Server-Patches/0481-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/Spigot-Server-Patches/0480-Reduce-allocation-of-Vec3D-by-entity-tracker.patch similarity index 95% rename from Spigot-Server-Patches/0481-Reduce-allocation-of-Vec3D-by-entity-tracker.patch rename to Spigot-Server-Patches/0480-Reduce-allocation-of-Vec3D-by-entity-tracker.patch index 483839bca0..a18dab39a9 100644 --- a/Spigot-Server-Patches/0481-Reduce-allocation-of-Vec3D-by-entity-tracker.patch +++ b/Spigot-Server-Patches/0480-Reduce-allocation-of-Vec3D-by-entity-tracker.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Reduce allocation of Vec3D by entity tracker diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java -index 4965d0fbc123071a2f2f44f559336f7ab9013293..4efc40c01ec12b80bd7cf9d35cf0ea0df973baf7 100644 +index d40d41faae13ee17bbe1c7bd4b64126bcaee5643..3960a975e74ed81c45819fe5e0f01c6c18252982 100644 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java @@ -127,8 +127,12 @@ public class EntityTrackerEntry { @@ -39,7 +39,7 @@ index 4965d0fbc123071a2f2f44f559336f7ab9013293..4efc40c01ec12b80bd7cf9d35cf0ea0d if (!flag4 && this.o <= 400 && !this.q && this.r == this.tracker.isOnGround()) { diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 56a2d028040bb77bffee72330bc2a19986b45d00..21aba92fe1b5036a4df3add7688019446a1d5fe5 100644 +index c507e71cef1da50e3709e358def6548cc69546e9..1685d6f9f497455636dbcef057db48f9d4039be4 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -2134,9 +2134,14 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { diff --git a/Spigot-Server-Patches/0482-Ensure-safe-gateway-teleport.patch b/Spigot-Server-Patches/0481-Ensure-safe-gateway-teleport.patch similarity index 100% rename from Spigot-Server-Patches/0482-Ensure-safe-gateway-teleport.patch rename to Spigot-Server-Patches/0481-Ensure-safe-gateway-teleport.patch diff --git a/Spigot-Server-Patches/0483-Add-option-for-console-having-all-permissions.patch b/Spigot-Server-Patches/0482-Add-option-for-console-having-all-permissions.patch similarity index 96% rename from Spigot-Server-Patches/0483-Add-option-for-console-having-all-permissions.patch rename to Spigot-Server-Patches/0482-Add-option-for-console-having-all-permissions.patch index e4d87154e1..fbe50a7185 100644 --- a/Spigot-Server-Patches/0483-Add-option-for-console-having-all-permissions.patch +++ b/Spigot-Server-Patches/0482-Add-option-for-console-having-all-permissions.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add option for console having all permissions diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index ac6b291c103c432fdced603674345096326a9efe..7e577b889738a5d0b3e5be66d9266cdf01c70b1d 100644 +index 5b5edd2aed9cf76535104df65783bfd1d5bb7c85..456e6363758c41e1d58e178bf839e96aa6df6381 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -424,4 +424,9 @@ public class PaperConfig { diff --git a/Spigot-Server-Patches/0484-Workaround-for-Client-Lag-Spikes-MC-162253.patch b/Spigot-Server-Patches/0483-Workaround-for-Client-Lag-Spikes-MC-162253.patch similarity index 100% rename from Spigot-Server-Patches/0484-Workaround-for-Client-Lag-Spikes-MC-162253.patch rename to Spigot-Server-Patches/0483-Workaround-for-Client-Lag-Spikes-MC-162253.patch diff --git a/Spigot-Server-Patches/0485-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/Spigot-Server-Patches/0484-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch similarity index 100% rename from Spigot-Server-Patches/0485-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch rename to Spigot-Server-Patches/0484-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch diff --git a/Spigot-Server-Patches/0486-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch b/Spigot-Server-Patches/0485-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch similarity index 100% rename from Spigot-Server-Patches/0486-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch rename to Spigot-Server-Patches/0485-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch diff --git a/Spigot-Server-Patches/0487-Optimize-sending-packets-to-nearby-locations-sounds-.patch b/Spigot-Server-Patches/0486-Optimize-sending-packets-to-nearby-locations-sounds-.patch similarity index 100% rename from Spigot-Server-Patches/0487-Optimize-sending-packets-to-nearby-locations-sounds-.patch rename to Spigot-Server-Patches/0486-Optimize-sending-packets-to-nearby-locations-sounds-.patch diff --git a/Spigot-Server-Patches/0488-Improve-Chunk-Status-Transition-Speed.patch b/Spigot-Server-Patches/0487-Improve-Chunk-Status-Transition-Speed.patch similarity index 96% rename from Spigot-Server-Patches/0488-Improve-Chunk-Status-Transition-Speed.patch rename to Spigot-Server-Patches/0487-Improve-Chunk-Status-Transition-Speed.patch index 7e27534594..2110039894 100644 --- a/Spigot-Server-Patches/0488-Improve-Chunk-Status-Transition-Speed.patch +++ b/Spigot-Server-Patches/0487-Improve-Chunk-Status-Transition-Speed.patch @@ -36,7 +36,7 @@ scenario / path: Previously would have hopped to SERVER around 12+ times there extra. diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java -index ca9e0208aa35c597a947485f67213ff4b1b1185f..7de56172023e49cd8957e3dd45fa8e731809c16a 100644 +index 371a301f4a295c59ce40fefc6ef07e544414d94b..025ab54dddbf4ef80ce2253f9b6cabcb8e46bfd2 100644 --- a/src/main/java/net/minecraft/server/PlayerChunk.java +++ b/src/main/java/net/minecraft/server/PlayerChunk.java @@ -58,6 +58,13 @@ public class PlayerChunk { @@ -54,7 +54,7 @@ index ca9e0208aa35c597a947485f67213ff4b1b1185f..7de56172023e49cd8957e3dd45fa8e73 // Paper start - no-tick view distance public final Chunk getSendingChunk() { diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index b6ae589548bdc75052f4986069b3374cb5fd837c..c44eeaae0cff03ae5cfa53b3c0f240ef5e982083 100644 +index 19a31536d40289cba25120d4cc4788e93401ce62..bb515e4c08bccff2a737aed924c5cf59800ecf47 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -741,7 +741,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { diff --git a/Spigot-Server-Patches/0489-Fix-villager-trading-demand-MC-163962.patch b/Spigot-Server-Patches/0488-Fix-villager-trading-demand-MC-163962.patch similarity index 100% rename from Spigot-Server-Patches/0489-Fix-villager-trading-demand-MC-163962.patch rename to Spigot-Server-Patches/0488-Fix-villager-trading-demand-MC-163962.patch diff --git a/Spigot-Server-Patches/0490-Maps-shouldn-t-load-chunks.patch b/Spigot-Server-Patches/0489-Maps-shouldn-t-load-chunks.patch similarity index 100% rename from Spigot-Server-Patches/0490-Maps-shouldn-t-load-chunks.patch rename to Spigot-Server-Patches/0489-Maps-shouldn-t-load-chunks.patch diff --git a/Spigot-Server-Patches/0491-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/Spigot-Server-Patches/0490-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch similarity index 94% rename from Spigot-Server-Patches/0491-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch rename to Spigot-Server-Patches/0490-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch index 12467ab4ba..e2d64ce4cd 100644 --- a/Spigot-Server-Patches/0491-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch +++ b/Spigot-Server-Patches/0490-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch @@ -19,7 +19,7 @@ index 63b112b38a51873cf5769ad8506c3fdb9d52d42c..910d1b3788fa713cadf2c8a56f595282 } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 00e88ddd3d41491db2508dba2a544df807703fb0..54de557dd5ff0cae168fc51a5c3cf3d3e4e0d64b 100644 +index 5d299a65417ff17eae3dfe52841c1a27a6d75677..bb73dc2cfca633f85aa0aa1c988d3cdd86be8e4e 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -307,8 +307,8 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/Spigot-Server-Patches/0492-Optimize-Bit-Operations-by-inlining.patch b/Spigot-Server-Patches/0491-Optimize-Bit-Operations-by-inlining.patch similarity index 100% rename from Spigot-Server-Patches/0492-Optimize-Bit-Operations-by-inlining.patch rename to Spigot-Server-Patches/0491-Optimize-Bit-Operations-by-inlining.patch diff --git a/Spigot-Server-Patches/0493-Optimize-Light-Engine.patch b/Spigot-Server-Patches/0492-Optimize-Light-Engine.patch similarity index 99% rename from Spigot-Server-Patches/0493-Optimize-Light-Engine.patch rename to Spigot-Server-Patches/0492-Optimize-Light-Engine.patch index d6b8da5e70..7bb82ae8c6 100644 --- a/Spigot-Server-Patches/0493-Optimize-Light-Engine.patch +++ b/Spigot-Server-Patches/0492-Optimize-Light-Engine.patch @@ -1400,7 +1400,7 @@ index b7af235dc2841dc9c8296805624f6ee763b86dfb..faf4745d368993ccdf0c017937efc5be this.a.a(t0); this.f(); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 54de557dd5ff0cae168fc51a5c3cf3d3e4e0d64b..1f1ea5c64f325f54a56a3b060706db13c18aca61 100644 +index bb73dc2cfca633f85aa0aa1c988d3cdd86be8e4e..61eeba3c25fecfdebfeb546b7e18ff4464eedfc2 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -714,6 +714,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/Spigot-Server-Patches/0494-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0493-Delay-Chunk-Unloads-based-on-Player-Movement.patch similarity index 98% rename from Spigot-Server-Patches/0494-Delay-Chunk-Unloads-based-on-Player-Movement.patch rename to Spigot-Server-Patches/0493-Delay-Chunk-Unloads-based-on-Player-Movement.patch index d0fee909c9..303d97155c 100644 --- a/Spigot-Server-Patches/0494-Delay-Chunk-Unloads-based-on-Player-Movement.patch +++ b/Spigot-Server-Patches/0493-Delay-Chunk-Unloads-based-on-Player-Movement.patch @@ -35,7 +35,7 @@ index 6463d3e4837d032a35654a035f42b8a805e0e286..1655bca0502e7b871de4addaa163536d + } } diff --git a/src/main/java/net/minecraft/server/ChunkMapDistance.java b/src/main/java/net/minecraft/server/ChunkMapDistance.java -index 09fec533d7feebb90e989007dd19c952823550ba..3c7b225edbe23dc1959002293a6f8b816287b5a8 100644 +index d0bdffadefa6ed67bd30d833891256cc39a8f7f0..76f9bb728def91744910d0b680b73e753f1a2b26 100644 --- a/src/main/java/net/minecraft/server/ChunkMapDistance.java +++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java @@ -176,6 +176,27 @@ public abstract class ChunkMapDistance { diff --git a/Spigot-Server-Patches/0495-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/Spigot-Server-Patches/0494-Add-Plugin-Tickets-to-API-Chunk-Methods.patch similarity index 100% rename from Spigot-Server-Patches/0495-Add-Plugin-Tickets-to-API-Chunk-Methods.patch rename to Spigot-Server-Patches/0494-Add-Plugin-Tickets-to-API-Chunk-Methods.patch diff --git a/Spigot-Server-Patches/0496-Fix-missing-chunks-due-to-integer-overflow.patch b/Spigot-Server-Patches/0495-Fix-missing-chunks-due-to-integer-overflow.patch similarity index 100% rename from Spigot-Server-Patches/0496-Fix-missing-chunks-due-to-integer-overflow.patch rename to Spigot-Server-Patches/0495-Fix-missing-chunks-due-to-integer-overflow.patch diff --git a/Spigot-Server-Patches/0497-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/Spigot-Server-Patches/0496-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch similarity index 91% rename from Spigot-Server-Patches/0497-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch rename to Spigot-Server-Patches/0496-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch index d34a476cfb..423af0ebf9 100644 --- a/Spigot-Server-Patches/0497-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch +++ b/Spigot-Server-Patches/0496-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch @@ -7,7 +7,7 @@ Subject: [PATCH] Fix CraftScheduler#runTaskTimerAsynchronously(Plugin, diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java -index 7532bbd82559763cfaf5433a07914b5fb906122c..1bc65ae63673b1de3aa6e0c49bf95dadd7d7b355 100644 +index ca90237a53c9a026919d28adaedf483ca3c7c2a8..13e461ffb2ee2e7d0440c0f60809ea99629b843c 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java @@ -184,7 +184,7 @@ public class CraftScheduler implements BukkitScheduler { diff --git a/Spigot-Server-Patches/0498-Fix-piston-physics-inconsistency-MC-188840.patch b/Spigot-Server-Patches/0497-Fix-piston-physics-inconsistency-MC-188840.patch similarity index 98% rename from Spigot-Server-Patches/0498-Fix-piston-physics-inconsistency-MC-188840.patch rename to Spigot-Server-Patches/0497-Fix-piston-physics-inconsistency-MC-188840.patch index b70c92bcaf..8a0c17195d 100644 --- a/Spigot-Server-Patches/0498-Fix-piston-physics-inconsistency-MC-188840.patch +++ b/Spigot-Server-Patches/0497-Fix-piston-physics-inconsistency-MC-188840.patch @@ -32,7 +32,7 @@ This patch fixes https://bugs.mojang.com/browse/MC-188840 This patch also fixes rail duping and carpet duping. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 7e577b889738a5d0b3e5be66d9266cdf01c70b1d..fc03df234fc641f72b4d4a79535860300006ff50 100644 +index 456e6363758c41e1d58e178bf839e96aa6df6381..fd3b4a01c84da110d41b7224ebb38ae78b389f79 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -429,4 +429,10 @@ public class PaperConfig { diff --git a/Spigot-Server-Patches/0499-Fix-sand-duping.patch b/Spigot-Server-Patches/0498-Fix-sand-duping.patch similarity index 100% rename from Spigot-Server-Patches/0499-Fix-sand-duping.patch rename to Spigot-Server-Patches/0498-Fix-sand-duping.patch diff --git a/Spigot-Server-Patches/0500-Prevent-position-desync-in-playerconnection-causing-.patch b/Spigot-Server-Patches/0499-Prevent-position-desync-in-playerconnection-causing-.patch similarity index 94% rename from Spigot-Server-Patches/0500-Prevent-position-desync-in-playerconnection-causing-.patch rename to Spigot-Server-Patches/0499-Prevent-position-desync-in-playerconnection-causing-.patch index 43147b0a6b..08e643ebf1 100644 --- a/Spigot-Server-Patches/0500-Prevent-position-desync-in-playerconnection-causing-.patch +++ b/Spigot-Server-Patches/0499-Prevent-position-desync-in-playerconnection-causing-.patch @@ -14,7 +14,7 @@ behaviour, we need to move all of this dangerous logic outside of the move call and into an appropriate place in the tick method. diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index e76c01a33bfcee1a9d312247b8d08026055204c8..45379bf4903ca8044145504207acd59c221b7f26 100644 +index 257c3489f9add056966cdb8eaaa49fa438369bb6..d47ad31ac47565298bc3e5614a78f7f42d5f4c11 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1176,6 +1176,11 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/Spigot-Server-Patches/0501-Fix-enderdragon-exp-dupe.patch b/Spigot-Server-Patches/0500-Fix-enderdragon-exp-dupe.patch similarity index 100% rename from Spigot-Server-Patches/0501-Fix-enderdragon-exp-dupe.patch rename to Spigot-Server-Patches/0500-Fix-enderdragon-exp-dupe.patch diff --git a/Spigot-Server-Patches/0502-Inventory-getHolder-method-without-block-snapshot.patch b/Spigot-Server-Patches/0501-Inventory-getHolder-method-without-block-snapshot.patch similarity index 100% rename from Spigot-Server-Patches/0502-Inventory-getHolder-method-without-block-snapshot.patch rename to Spigot-Server-Patches/0501-Inventory-getHolder-method-without-block-snapshot.patch diff --git a/Spigot-Server-Patches/0503-Expose-Arrow-getItemStack.patch b/Spigot-Server-Patches/0502-Expose-Arrow-getItemStack.patch similarity index 100% rename from Spigot-Server-Patches/0503-Expose-Arrow-getItemStack.patch rename to Spigot-Server-Patches/0502-Expose-Arrow-getItemStack.patch diff --git a/Spigot-Server-Patches/0504-Add-and-implement-PlayerRecipeBookClickEvent.patch b/Spigot-Server-Patches/0503-Add-and-implement-PlayerRecipeBookClickEvent.patch similarity index 95% rename from Spigot-Server-Patches/0504-Add-and-implement-PlayerRecipeBookClickEvent.patch rename to Spigot-Server-Patches/0503-Add-and-implement-PlayerRecipeBookClickEvent.patch index cb0770ff5e..bb6090a5b2 100644 --- a/Spigot-Server-Patches/0504-Add-and-implement-PlayerRecipeBookClickEvent.patch +++ b/Spigot-Server-Patches/0503-Add-and-implement-PlayerRecipeBookClickEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add and implement PlayerRecipeBookClickEvent diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 45379bf4903ca8044145504207acd59c221b7f26..c9b834c38f8d7b21d0a7a0d04762f66d41b0c39d 100644 +index d47ad31ac47565298bc3e5614a78f7f42d5f4c11..9e8d28146658782c7a89dca7b12c68ea70e132b2 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -2612,9 +2612,15 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/Spigot-Server-Patches/0505-Hide-sync-chunk-writes-behind-flag.patch b/Spigot-Server-Patches/0504-Hide-sync-chunk-writes-behind-flag.patch similarity index 100% rename from Spigot-Server-Patches/0505-Hide-sync-chunk-writes-behind-flag.patch rename to Spigot-Server-Patches/0504-Hide-sync-chunk-writes-behind-flag.patch diff --git a/Spigot-Server-Patches/0506-Limit-lightning-strike-effect-distance.patch b/Spigot-Server-Patches/0505-Limit-lightning-strike-effect-distance.patch similarity index 100% rename from Spigot-Server-Patches/0506-Limit-lightning-strike-effect-distance.patch rename to Spigot-Server-Patches/0505-Limit-lightning-strike-effect-distance.patch diff --git a/Spigot-Server-Patches/0507-Add-permission-for-command-blocks.patch b/Spigot-Server-Patches/0506-Add-permission-for-command-blocks.patch similarity index 98% rename from Spigot-Server-Patches/0507-Add-permission-for-command-blocks.patch rename to Spigot-Server-Patches/0506-Add-permission-for-command-blocks.patch index e4edb6c284..9fb565dfe6 100644 --- a/Spigot-Server-Patches/0507-Add-permission-for-command-blocks.patch +++ b/Spigot-Server-Patches/0506-Add-permission-for-command-blocks.patch @@ -31,7 +31,7 @@ index 7e13b1cf6d92c3e0f2dab1ba1d42bd4f250e256c..3820acd65f3cd488dba964e6d9c45885 } else { if (entityhuman.getWorld().isClientSide) { diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index c33707d55c80341eaacd6c6a7526444ee5b2cc0a..b1156e31ec45b7515734a440f07331cf731c3ab6 100644 +index 9e8d28146658782c7a89dca7b12c68ea70e132b2..2d2fd9a45bcfd2b1da8b7dd109eb50257ab394c9 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -648,7 +648,7 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/Spigot-Server-Patches/0508-Ensure-Entity-AABB-s-are-never-invalid.patch b/Spigot-Server-Patches/0507-Ensure-Entity-AABB-s-are-never-invalid.patch similarity index 95% rename from Spigot-Server-Patches/0508-Ensure-Entity-AABB-s-are-never-invalid.patch rename to Spigot-Server-Patches/0507-Ensure-Entity-AABB-s-are-never-invalid.patch index 1919d3882c..f34e3ff38e 100644 --- a/Spigot-Server-Patches/0508-Ensure-Entity-AABB-s-are-never-invalid.patch +++ b/Spigot-Server-Patches/0507-Ensure-Entity-AABB-s-are-never-invalid.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Ensure Entity AABB's are never invalid diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 48373bf947fc19a34caa34daeed980cc433bc600..896832d4742969e6cc2f58bbba281b4a60ef28b0 100644 +index feeb792e3357c14662a2a2dc5c294befd4bdc7c3..23e8de6d059a4976646184bc3a141d38291fadd1 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -389,7 +389,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/Spigot-Server-Patches/0509-Optimize-WorldBorder-collision-checks-and-air.patch b/Spigot-Server-Patches/0508-Optimize-WorldBorder-collision-checks-and-air.patch similarity index 97% rename from Spigot-Server-Patches/0509-Optimize-WorldBorder-collision-checks-and-air.patch rename to Spigot-Server-Patches/0508-Optimize-WorldBorder-collision-checks-and-air.patch index bef5281674..e622695b3c 100644 --- a/Spigot-Server-Patches/0509-Optimize-WorldBorder-collision-checks-and-air.patch +++ b/Spigot-Server-Patches/0508-Optimize-WorldBorder-collision-checks-and-air.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Optimize WorldBorder collision checks and air diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index c9f5f341371e1ccc7c9a71bb357862424d801d8a..422b82f15c323f504458a1fdcd5cf7018ab53468 100644 +index 23e8de6d059a4976646184bc3a141d38291fadd1..ad5139428e8cc10ed702dce3fa9c091c22eafa15 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -818,7 +818,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/Spigot-Server-Patches/0510-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/Spigot-Server-Patches/0509-Fix-Per-World-Difficulty-Remembering-Difficulty.patch similarity index 100% rename from Spigot-Server-Patches/0510-Fix-Per-World-Difficulty-Remembering-Difficulty.patch rename to Spigot-Server-Patches/0509-Fix-Per-World-Difficulty-Remembering-Difficulty.patch diff --git a/Spigot-Server-Patches/0511-Paper-dumpitem-command.patch b/Spigot-Server-Patches/0510-Paper-dumpitem-command.patch similarity index 100% rename from Spigot-Server-Patches/0511-Paper-dumpitem-command.patch rename to Spigot-Server-Patches/0510-Paper-dumpitem-command.patch diff --git a/Spigot-Server-Patches/0512-Don-t-allow-null-UUID-s-for-chat.patch b/Spigot-Server-Patches/0511-Don-t-allow-null-UUID-s-for-chat.patch similarity index 100% rename from Spigot-Server-Patches/0512-Don-t-allow-null-UUID-s-for-chat.patch rename to Spigot-Server-Patches/0511-Don-t-allow-null-UUID-s-for-chat.patch diff --git a/Spigot-Server-Patches/0513-Improve-Legacy-Component-serialization-size.patch b/Spigot-Server-Patches/0512-Improve-Legacy-Component-serialization-size.patch similarity index 100% rename from Spigot-Server-Patches/0513-Improve-Legacy-Component-serialization-size.patch rename to Spigot-Server-Patches/0512-Improve-Legacy-Component-serialization-size.patch diff --git a/Spigot-Server-Patches/0514-Support-old-UUID-format-for-NBT.patch b/Spigot-Server-Patches/0513-Support-old-UUID-format-for-NBT.patch similarity index 100% rename from Spigot-Server-Patches/0514-Support-old-UUID-format-for-NBT.patch rename to Spigot-Server-Patches/0513-Support-old-UUID-format-for-NBT.patch diff --git a/Spigot-Server-Patches/0515-Clean-up-duplicated-GameProfile-Properties.patch b/Spigot-Server-Patches/0514-Clean-up-duplicated-GameProfile-Properties.patch similarity index 100% rename from Spigot-Server-Patches/0515-Clean-up-duplicated-GameProfile-Properties.patch rename to Spigot-Server-Patches/0514-Clean-up-duplicated-GameProfile-Properties.patch diff --git a/Spigot-Server-Patches/0516-Convert-legacy-attributes-in-Item-Meta.patch b/Spigot-Server-Patches/0515-Convert-legacy-attributes-in-Item-Meta.patch similarity index 100% rename from Spigot-Server-Patches/0516-Convert-legacy-attributes-in-Item-Meta.patch rename to Spigot-Server-Patches/0515-Convert-legacy-attributes-in-Item-Meta.patch diff --git a/Spigot-Server-Patches/0517-Remove-some-streams-from-structures.patch b/Spigot-Server-Patches/0516-Remove-some-streams-from-structures.patch similarity index 100% rename from Spigot-Server-Patches/0517-Remove-some-streams-from-structures.patch rename to Spigot-Server-Patches/0516-Remove-some-streams-from-structures.patch diff --git a/Spigot-Server-Patches/0518-Remove-streams-from-classes-related-villager-gossip.patch b/Spigot-Server-Patches/0517-Remove-streams-from-classes-related-villager-gossip.patch similarity index 100% rename from Spigot-Server-Patches/0518-Remove-streams-from-classes-related-villager-gossip.patch rename to Spigot-Server-Patches/0517-Remove-streams-from-classes-related-villager-gossip.patch diff --git a/Spigot-Server-Patches/0519-Support-components-in-ItemMeta.patch b/Spigot-Server-Patches/0518-Support-components-in-ItemMeta.patch similarity index 100% rename from Spigot-Server-Patches/0519-Support-components-in-ItemMeta.patch rename to Spigot-Server-Patches/0518-Support-components-in-ItemMeta.patch diff --git a/Spigot-Server-Patches/0520-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/Spigot-Server-Patches/0519-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch similarity index 100% rename from Spigot-Server-Patches/0520-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch rename to Spigot-Server-Patches/0519-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch diff --git a/Spigot-Server-Patches/0521-Add-entity-liquid-API.patch b/Spigot-Server-Patches/0520-Add-entity-liquid-API.patch similarity index 96% rename from Spigot-Server-Patches/0521-Add-entity-liquid-API.patch rename to Spigot-Server-Patches/0520-Add-entity-liquid-API.patch index ebe59cbc51..d905cc3eda 100644 --- a/Spigot-Server-Patches/0521-Add-entity-liquid-API.patch +++ b/Spigot-Server-Patches/0520-Add-entity-liquid-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add entity liquid API diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index ded88464d102679423ac69d8a6c3cf4ba6fc516f..bf0ef3998ff5dd71d3d6489184ece7fdce8afdd5 100644 +index ad5139428e8cc10ed702dce3fa9c091c22eafa15..83a469447e39b801442769fcb5979e987e2adae9 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1075,12 +1075,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/Spigot-Server-Patches/0522-Update-itemstack-legacy-name-and-lore.patch b/Spigot-Server-Patches/0521-Update-itemstack-legacy-name-and-lore.patch similarity index 97% rename from Spigot-Server-Patches/0522-Update-itemstack-legacy-name-and-lore.patch rename to Spigot-Server-Patches/0521-Update-itemstack-legacy-name-and-lore.patch index 95c238c6db..687777151b 100644 --- a/Spigot-Server-Patches/0522-Update-itemstack-legacy-name-and-lore.patch +++ b/Spigot-Server-Patches/0521-Update-itemstack-legacy-name-and-lore.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Update itemstack legacy name and lore diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index 8c82f80bb21611b54a35e61c04f5ba3ee9efbd7d..ace50805bfebbf4c3485ba1de334d975830a7d3c 100644 +index b6f771ed5032cd18b1bcc086a937f66996a26057..a3d8d8ec0e99435a58ab93a7b1f90d16be2a2289 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -83,6 +83,44 @@ public final class ItemStack { diff --git a/Spigot-Server-Patches/0523-Spawn-player-in-correct-world-on-login.patch b/Spigot-Server-Patches/0522-Spawn-player-in-correct-world-on-login.patch similarity index 100% rename from Spigot-Server-Patches/0523-Spawn-player-in-correct-world-on-login.patch rename to Spigot-Server-Patches/0522-Spawn-player-in-correct-world-on-login.patch diff --git a/Spigot-Server-Patches/0524-Add-PrepareResultEvent.patch b/Spigot-Server-Patches/0523-Add-PrepareResultEvent.patch similarity index 100% rename from Spigot-Server-Patches/0524-Add-PrepareResultEvent.patch rename to Spigot-Server-Patches/0523-Add-PrepareResultEvent.patch diff --git a/Spigot-Server-Patches/0525-Allow-delegation-to-vanilla-chunk-gen.patch b/Spigot-Server-Patches/0524-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 100% rename from Spigot-Server-Patches/0525-Allow-delegation-to-vanilla-chunk-gen.patch rename to Spigot-Server-Patches/0524-Allow-delegation-to-vanilla-chunk-gen.patch diff --git a/Spigot-Server-Patches/0526-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/Spigot-Server-Patches/0525-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch similarity index 100% rename from Spigot-Server-Patches/0526-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch rename to Spigot-Server-Patches/0525-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch diff --git a/Spigot-Server-Patches/0527-Optimize-NetworkManager-Exception-Handling.patch b/Spigot-Server-Patches/0526-Optimize-NetworkManager-Exception-Handling.patch similarity index 97% rename from Spigot-Server-Patches/0527-Optimize-NetworkManager-Exception-Handling.patch rename to Spigot-Server-Patches/0526-Optimize-NetworkManager-Exception-Handling.patch index e0061a881a..2c6ec15d51 100644 --- a/Spigot-Server-Patches/0527-Optimize-NetworkManager-Exception-Handling.patch +++ b/Spigot-Server-Patches/0526-Optimize-NetworkManager-Exception-Handling.patch @@ -44,7 +44,7 @@ index cdaa8be90d16b0e9e2f92a3e2ed120b856feab54..2aaa8770edfd8acc6861c23176e40586 for (int i = 0; i < abyte.length; ++i) { if (!bytebuf.isReadable()) { diff --git a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java -index eb3269e0ea3ce33d08e9eee3bca7cf434921e991..7ea293f38dedd6066601d94adbe175a31c502e1f 100644 +index 9c810b5aa21ca714ccf355d5648b7612f99b6884..8c7080777b370f97e1291dfedde5b419290f39cc 100644 --- a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java +++ b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java @@ -22,6 +22,21 @@ public class PlayerConnectionUtils { diff --git a/Spigot-Server-Patches/0528-Fix-Concurrency-issue-in-WeightedList.patch b/Spigot-Server-Patches/0527-Fix-Concurrency-issue-in-WeightedList.patch similarity index 100% rename from Spigot-Server-Patches/0528-Fix-Concurrency-issue-in-WeightedList.patch rename to Spigot-Server-Patches/0527-Fix-Concurrency-issue-in-WeightedList.patch diff --git a/Spigot-Server-Patches/0529-Optimize-the-advancement-data-player-iteration-to-be.patch b/Spigot-Server-Patches/0528-Optimize-the-advancement-data-player-iteration-to-be.patch similarity index 100% rename from Spigot-Server-Patches/0529-Optimize-the-advancement-data-player-iteration-to-be.patch rename to Spigot-Server-Patches/0528-Optimize-the-advancement-data-player-iteration-to-be.patch diff --git a/Spigot-Server-Patches/0530-Fix-arrows-never-despawning-MC-125757.patch b/Spigot-Server-Patches/0529-Fix-arrows-never-despawning-MC-125757.patch similarity index 100% rename from Spigot-Server-Patches/0530-Fix-arrows-never-despawning-MC-125757.patch rename to Spigot-Server-Patches/0529-Fix-arrows-never-despawning-MC-125757.patch diff --git a/Spigot-Server-Patches/0531-Thread-Safe-Vanilla-Command-permission-checking.patch b/Spigot-Server-Patches/0530-Thread-Safe-Vanilla-Command-permission-checking.patch similarity index 100% rename from Spigot-Server-Patches/0531-Thread-Safe-Vanilla-Command-permission-checking.patch rename to Spigot-Server-Patches/0530-Thread-Safe-Vanilla-Command-permission-checking.patch diff --git a/Spigot-Server-Patches/0532-Move-range-check-for-block-placing-up.patch b/Spigot-Server-Patches/0531-Move-range-check-for-block-placing-up.patch similarity index 96% rename from Spigot-Server-Patches/0532-Move-range-check-for-block-placing-up.patch rename to Spigot-Server-Patches/0531-Move-range-check-for-block-placing-up.patch index fe85ce1c4e..71078ed629 100644 --- a/Spigot-Server-Patches/0532-Move-range-check-for-block-placing-up.patch +++ b/Spigot-Server-Patches/0531-Move-range-check-for-block-placing-up.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Move range check for block placing up diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 9b54d690e09f719a18ba321a0c927bb31c71bf01..f19fd40cdc1e758ebefb85201358e314428bd8c6 100644 +index d9911b214e83e4046b4ad82be904600a00955384..601a6fdf52ac0002f130ea27d4dd3e6f64acc381 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1512,15 +1512,19 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/Spigot-Server-Patches/0533-Fix-SPIGOT-5989.patch b/Spigot-Server-Patches/0532-Fix-SPIGOT-5989.patch similarity index 100% rename from Spigot-Server-Patches/0533-Fix-SPIGOT-5989.patch rename to Spigot-Server-Patches/0532-Fix-SPIGOT-5989.patch diff --git a/Spigot-Server-Patches/0534-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/Spigot-Server-Patches/0533-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch similarity index 95% rename from Spigot-Server-Patches/0534-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch rename to Spigot-Server-Patches/0533-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch index 7316194c87..22c95979c9 100644 --- a/Spigot-Server-Patches/0534-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch +++ b/Spigot-Server-Patches/0533-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix SPIGOT-5824 Bukkit world-container is not used diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java -index 80a95441ec2b8394b74818ab74de070ba1ce2754..9b2fba00b574087575ba70c82613fbcd343de826 100644 +index e79ed0b5702688aaa5a86dc5a511c32685c883d9..a2cfd23e537de64ca8af26853fdede59af64108d 100644 --- a/src/main/java/net/minecraft/server/Main.java +++ b/src/main/java/net/minecraft/server/Main.java @@ -92,11 +92,20 @@ public class Main { diff --git a/Spigot-Server-Patches/0535-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/Spigot-Server-Patches/0534-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch similarity index 89% rename from Spigot-Server-Patches/0535-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch rename to Spigot-Server-Patches/0534-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch index cfdde62b34..9e12530490 100644 --- a/Spigot-Server-Patches/0535-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch +++ b/Spigot-Server-Patches/0534-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix SPIGOT-5885 Unable to disable advancements diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java -index 9b2fba00b574087575ba70c82613fbcd343de826..ae48df4b9b78bc3a687166fdaa7b8a60bd13ec35 100644 +index a2cfd23e537de64ca8af26853fdede59af64108d..1c6dbd29c8414b3e33aedcc50bee5b5d9ce134d1 100644 --- a/src/main/java/net/minecraft/server/Main.java +++ b/src/main/java/net/minecraft/server/Main.java @@ -92,6 +92,7 @@ public class Main { diff --git a/Spigot-Server-Patches/0536-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/Spigot-Server-Patches/0535-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch similarity index 100% rename from Spigot-Server-Patches/0536-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch rename to Spigot-Server-Patches/0535-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch diff --git a/Spigot-Server-Patches/0537-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/Spigot-Server-Patches/0536-Add-missing-strikeLighting-call-to-World-spigot-stri.patch similarity index 89% rename from Spigot-Server-Patches/0537-Add-missing-strikeLighting-call-to-World-spigot-stri.patch rename to Spigot-Server-Patches/0536-Add-missing-strikeLighting-call-to-World-spigot-stri.patch index d83992a7d5..61be8b9226 100644 --- a/Spigot-Server-Patches/0537-Add-missing-strikeLighting-call-to-World-spigot-stri.patch +++ b/Spigot-Server-Patches/0536-Add-missing-strikeLighting-call-to-World-spigot-stri.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add missing strikeLighting call to diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 24546615dcd9b4f5fa140137ff59d8efe9e3b52f..e50a16991cf3f5df04c9410b211a13c33bbe91d1 100644 +index 10697f8b5208a72bf3d7248c5abd73ddd10420cd..f3aab5be1722651a27bb48a33618650b807d4e07 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -2609,6 +2609,7 @@ public class CraftWorld implements World { diff --git a/Spigot-Server-Patches/0538-Fix-some-rails-connecting-improperly.patch b/Spigot-Server-Patches/0537-Fix-some-rails-connecting-improperly.patch similarity index 100% rename from Spigot-Server-Patches/0538-Fix-some-rails-connecting-improperly.patch rename to Spigot-Server-Patches/0537-Fix-some-rails-connecting-improperly.patch diff --git a/Spigot-Server-Patches/0539-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/Spigot-Server-Patches/0538-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch similarity index 100% rename from Spigot-Server-Patches/0539-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch rename to Spigot-Server-Patches/0538-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch diff --git a/Spigot-Server-Patches/0540-Incremental-player-saving.patch b/Spigot-Server-Patches/0539-Incremental-player-saving.patch similarity index 100% rename from Spigot-Server-Patches/0540-Incremental-player-saving.patch rename to Spigot-Server-Patches/0539-Incremental-player-saving.patch diff --git a/Spigot-Server-Patches/0541-Import-fastutil-classes.patch b/Spigot-Server-Patches/0540-Import-fastutil-classes.patch similarity index 100% rename from Spigot-Server-Patches/0541-Import-fastutil-classes.patch rename to Spigot-Server-Patches/0540-Import-fastutil-classes.patch diff --git a/Spigot-Server-Patches/0542-Don-t-mark-null-chunk-sections-for-block-updates.patch b/Spigot-Server-Patches/0541-Don-t-mark-null-chunk-sections-for-block-updates.patch similarity index 92% rename from Spigot-Server-Patches/0542-Don-t-mark-null-chunk-sections-for-block-updates.patch rename to Spigot-Server-Patches/0541-Don-t-mark-null-chunk-sections-for-block-updates.patch index ffd3355802..bdcec6e3fc 100644 --- a/Spigot-Server-Patches/0542-Don-t-mark-null-chunk-sections-for-block-updates.patch +++ b/Spigot-Server-Patches/0541-Don-t-mark-null-chunk-sections-for-block-updates.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't mark null chunk sections for block updates diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java -index 8146d88a90a758760e383985170d580372577615..c69b5a2c7b8061a65b2d5bb7ceb3ffe39dc36b8c 100644 +index acb07a2a7a7606470aa938ffc8f6a54fd7b9f5f9..014c0249b22eb4703d2d6b430afb402689a54e2a 100644 --- a/src/main/java/net/minecraft/server/PlayerChunk.java +++ b/src/main/java/net/minecraft/server/PlayerChunk.java @@ -420,6 +420,7 @@ public class PlayerChunk { diff --git a/Spigot-Server-Patches/0543-Remove-armour-stand-double-add-to-world.patch b/Spigot-Server-Patches/0542-Remove-armour-stand-double-add-to-world.patch similarity index 100% rename from Spigot-Server-Patches/0543-Remove-armour-stand-double-add-to-world.patch rename to Spigot-Server-Patches/0542-Remove-armour-stand-double-add-to-world.patch diff --git a/Spigot-Server-Patches/0544-Fix-MC-187716-Use-configured-height.patch b/Spigot-Server-Patches/0543-Fix-MC-187716-Use-configured-height.patch similarity index 100% rename from Spigot-Server-Patches/0544-Fix-MC-187716-Use-configured-height.patch rename to Spigot-Server-Patches/0543-Fix-MC-187716-Use-configured-height.patch diff --git a/Spigot-Server-Patches/0545-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/Spigot-Server-Patches/0544-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch similarity index 100% rename from Spigot-Server-Patches/0545-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch rename to Spigot-Server-Patches/0544-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch diff --git a/Spigot-Server-Patches/0546-Do-not-let-the-server-load-chunks-from-newer-version.patch b/Spigot-Server-Patches/0545-Do-not-let-the-server-load-chunks-from-newer-version.patch similarity index 100% rename from Spigot-Server-Patches/0546-Do-not-let-the-server-load-chunks-from-newer-version.patch rename to Spigot-Server-Patches/0545-Do-not-let-the-server-load-chunks-from-newer-version.patch diff --git a/Spigot-Server-Patches/0547-Brand-support.patch b/Spigot-Server-Patches/0546-Brand-support.patch similarity index 100% rename from Spigot-Server-Patches/0547-Brand-support.patch rename to Spigot-Server-Patches/0546-Brand-support.patch diff --git a/Spigot-Server-Patches/0548-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch b/Spigot-Server-Patches/0547-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch similarity index 100% rename from Spigot-Server-Patches/0548-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch rename to Spigot-Server-Patches/0547-Fix-MC-99259-Wither-Boss-Bar-doesn-t-update-until-in.patch diff --git a/Spigot-Server-Patches/0549-Fix-MC-197271.patch b/Spigot-Server-Patches/0548-Fix-MC-197271.patch similarity index 100% rename from Spigot-Server-Patches/0549-Fix-MC-197271.patch rename to Spigot-Server-Patches/0548-Fix-MC-197271.patch diff --git a/Spigot-Server-Patches/0550-MC-197883-Bandaid-decode-issue.patch b/Spigot-Server-Patches/0549-MC-197883-Bandaid-decode-issue.patch similarity index 100% rename from Spigot-Server-Patches/0550-MC-197883-Bandaid-decode-issue.patch rename to Spigot-Server-Patches/0549-MC-197883-Bandaid-decode-issue.patch diff --git a/Spigot-Server-Patches/0551-Add-setMaxPlayers-API.patch b/Spigot-Server-Patches/0550-Add-setMaxPlayers-API.patch similarity index 100% rename from Spigot-Server-Patches/0551-Add-setMaxPlayers-API.patch rename to Spigot-Server-Patches/0550-Add-setMaxPlayers-API.patch diff --git a/Spigot-Server-Patches/0552-Add-playPickupItemAnimation-to-LivingEntity.patch b/Spigot-Server-Patches/0551-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from Spigot-Server-Patches/0552-Add-playPickupItemAnimation-to-LivingEntity.patch rename to Spigot-Server-Patches/0551-Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/Spigot-Server-Patches/0553-Don-t-require-FACING-data.patch b/Spigot-Server-Patches/0552-Don-t-require-FACING-data.patch similarity index 100% rename from Spigot-Server-Patches/0553-Don-t-require-FACING-data.patch rename to Spigot-Server-Patches/0552-Don-t-require-FACING-data.patch diff --git a/Spigot-Server-Patches/0554-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/Spigot-Server-Patches/0553-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch similarity index 92% rename from Spigot-Server-Patches/0554-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch rename to Spigot-Server-Patches/0553-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch index c6f64ef3d5..8cac7a4a73 100644 --- a/Spigot-Server-Patches/0554-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch +++ b/Spigot-Server-Patches/0553-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 1f1ea5c64f325f54a56a3b060706db13c18aca61..6286ef81cb5ef95c4d5e0c384e73fbece0a096f6 100644 +index 61eeba3c25fecfdebfeb546b7e18ff4464eedfc2..705ce638416e98166a5c659f425be90af1a9a59b 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1864,12 +1864,14 @@ public class WorldServer extends World implements GeneratorAccessSeed { @@ -24,7 +24,7 @@ index 1f1ea5c64f325f54a56a3b060706db13c18aca61..6286ef81cb5ef95c4d5e0c384e73fbec // if this keepSpawnInMemory is false a plugin has already removed our tickets, do not re-add this.removeTicketsForSpawn(this.paperConfig.keepLoadedRange, prevSpawn); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 4ab3db10e26dc9739c5afcfc423d1c68a2c4d1c9..3e6924a05bd85563d75f51e4e275896c77d7ad42 100644 +index f3aab5be1722651a27bb48a33618650b807d4e07..257d3d9fe97122b5d123509d54916e0c1b16788d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -388,11 +388,13 @@ public class CraftWorld implements World { diff --git a/Spigot-Server-Patches/0555-Add-moon-phase-API.patch b/Spigot-Server-Patches/0554-Add-moon-phase-API.patch similarity index 89% rename from Spigot-Server-Patches/0555-Add-moon-phase-API.patch rename to Spigot-Server-Patches/0554-Add-moon-phase-API.patch index fe747e3407..661ac5dbfb 100644 --- a/Spigot-Server-Patches/0555-Add-moon-phase-API.patch +++ b/Spigot-Server-Patches/0554-Add-moon-phase-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add moon phase API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 3e6924a05bd85563d75f51e4e275896c77d7ad42..299f57ca2a65887a0d7e7c584fc1bd5c783b0db2 100644 +index 257d3d9fe97122b5d123509d54916e0c1b16788d..1162bf553ff6e5c5faf688b080a202dc55650ced 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -327,6 +327,11 @@ public class CraftWorld implements World { diff --git a/Spigot-Server-Patches/0556-Prevent-headless-pistons-from-being-created.patch b/Spigot-Server-Patches/0555-Prevent-headless-pistons-from-being-created.patch similarity index 97% rename from Spigot-Server-Patches/0556-Prevent-headless-pistons-from-being-created.patch rename to Spigot-Server-Patches/0555-Prevent-headless-pistons-from-being-created.patch index 4a559ed86c..de13b6cddf 100644 --- a/Spigot-Server-Patches/0556-Prevent-headless-pistons-from-being-created.patch +++ b/Spigot-Server-Patches/0555-Prevent-headless-pistons-from-being-created.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Prevent headless pistons from being created Prevent headless pistons from being created by explosions or tree/mushroom growth. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index d86474a1a97597c14ea8a28444e2a5d82fcda2a7..e0422471776f34b8e3c753d855aa06f00cc049ec 100644 +index deb77934dcba8c9209c942a6521dd8486cb5a48d..35a6b9b6d0eed316cafced70fe98b7477450c435 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -436,6 +436,12 @@ public class PaperConfig { diff --git a/Spigot-Server-Patches/0557-Brand-support.patch b/Spigot-Server-Patches/0556-Brand-support.patch similarity index 100% rename from Spigot-Server-Patches/0557-Brand-support.patch rename to Spigot-Server-Patches/0556-Brand-support.patch diff --git a/Spigot-Server-Patches/0558-Add-BellRingEvent.patch b/Spigot-Server-Patches/0557-Add-BellRingEvent.patch similarity index 100% rename from Spigot-Server-Patches/0558-Add-BellRingEvent.patch rename to Spigot-Server-Patches/0557-Add-BellRingEvent.patch diff --git a/Spigot-Server-Patches/0559-Add-zombie-targets-turtle-egg-config.patch b/Spigot-Server-Patches/0558-Add-zombie-targets-turtle-egg-config.patch similarity index 94% rename from Spigot-Server-Patches/0559-Add-zombie-targets-turtle-egg-config.patch rename to Spigot-Server-Patches/0558-Add-zombie-targets-turtle-egg-config.patch index 4c34c141c9..5ed39517b0 100644 --- a/Spigot-Server-Patches/0559-Add-zombie-targets-turtle-egg-config.patch +++ b/Spigot-Server-Patches/0558-Add-zombie-targets-turtle-egg-config.patch @@ -19,7 +19,7 @@ index 978062774c1db286bfb9b0ffdef19d880b1f249b..36ecdfce84141ac731b827e469ac842f + } } diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java -index f390abf65d648e1e0697e2d802f3195a0241116e..e3606722cb1b3f6a11d34e1cdef7210280dba677 100644 +index 360f14a3128f9a4c31fadb5a6f245d15845c8ae0..59bfb9c269aa95d66e7b9f107f6798f7f86fd245 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/src/main/java/net/minecraft/server/EntityZombie.java @@ -46,7 +46,7 @@ public class EntityZombie extends EntityMonster { diff --git a/Spigot-Server-Patches/0560-Buffer-joins-to-world.patch b/Spigot-Server-Patches/0559-Buffer-joins-to-world.patch similarity index 96% rename from Spigot-Server-Patches/0560-Buffer-joins-to-world.patch rename to Spigot-Server-Patches/0559-Buffer-joins-to-world.patch index 219f968a81..2aa1e083e2 100644 --- a/Spigot-Server-Patches/0560-Buffer-joins-to-world.patch +++ b/Spigot-Server-Patches/0559-Buffer-joins-to-world.patch @@ -8,7 +8,7 @@ the world per tick, this attempts to reduce the impact that join floods has on the server diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index e0422471776f34b8e3c753d855aa06f00cc049ec..2e9c3b45052ad641bee091ee28cc57b93cd19ffe 100644 +index 35a6b9b6d0eed316cafced70fe98b7477450c435..110cee7228b17a2378523883a1a83cc97da7608d 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -452,4 +452,9 @@ public class PaperConfig { diff --git a/Spigot-Server-Patches/0561-Optimize-redstone-algorithm.patch b/Spigot-Server-Patches/0560-Optimize-redstone-algorithm.patch similarity index 100% rename from Spigot-Server-Patches/0561-Optimize-redstone-algorithm.patch rename to Spigot-Server-Patches/0560-Optimize-redstone-algorithm.patch diff --git a/Spigot-Server-Patches/0562-Fix-hex-colors-not-working-in-some-kick-messages.patch b/Spigot-Server-Patches/0561-Fix-hex-colors-not-working-in-some-kick-messages.patch similarity index 98% rename from Spigot-Server-Patches/0562-Fix-hex-colors-not-working-in-some-kick-messages.patch rename to Spigot-Server-Patches/0561-Fix-hex-colors-not-working-in-some-kick-messages.patch index 44fcc867bb..50834a6919 100644 --- a/Spigot-Server-Patches/0562-Fix-hex-colors-not-working-in-some-kick-messages.patch +++ b/Spigot-Server-Patches/0561-Fix-hex-colors-not-working-in-some-kick-messages.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix hex colors not working in some kick messages diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java -index 5e1747dc176ef855829a38605ec85c8494fb0d21..1d60def8fa7041b3383c287153cbb9c6cec3d0f9 100644 +index 471826ee4b32fe73d3c39755005e3287f9673c3c..79f726ef43e70b8882890007146df199824d14e3 100644 --- a/src/main/java/net/minecraft/server/HandshakeListener.java +++ b/src/main/java/net/minecraft/server/HandshakeListener.java @@ -35,7 +35,7 @@ public class HandshakeListener implements PacketHandshakingInListener { diff --git a/Spigot-Server-Patches/0563-PortalCreateEvent-needs-to-know-its-entity.patch b/Spigot-Server-Patches/0562-PortalCreateEvent-needs-to-know-its-entity.patch similarity index 96% rename from Spigot-Server-Patches/0563-PortalCreateEvent-needs-to-know-its-entity.patch rename to Spigot-Server-Patches/0562-PortalCreateEvent-needs-to-know-its-entity.patch index 7a3ed6afc0..efafc39257 100644 --- a/Spigot-Server-Patches/0563-PortalCreateEvent-needs-to-know-its-entity.patch +++ b/Spigot-Server-Patches/0562-PortalCreateEvent-needs-to-know-its-entity.patch @@ -39,7 +39,7 @@ index e5d75a8a93ffe7bc3747b48210eea6189a956d54..0e6ce21db67447d0eb84eb1633653dec } diff --git a/src/main/java/net/minecraft/server/BlockFireAbstract.java b/src/main/java/net/minecraft/server/BlockFireAbstract.java -index fcd989ade672a96d0905590484941ce4508dae4d..172e4b3eeecc3808a335b80bb44bc6be3d8dd33d 100644 +index 7e95b150c4c87445ec221f1b9b7d2e7f7899688b..691346f69e5afd2eb96411c485ba8071d491d12a 100644 --- a/src/main/java/net/minecraft/server/BlockFireAbstract.java +++ b/src/main/java/net/minecraft/server/BlockFireAbstract.java @@ -52,14 +52,17 @@ public abstract class BlockFireAbstract extends Block { @@ -88,7 +88,7 @@ index b7635ab1625c5b2540e44aafc2b908749820f7e2..6ef81aeb4c63bc6c23163796dbd97760 if (event.isCancelled()) { diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index ace50805bfebbf4c3485ba1de334d975830a7d3c..3adb29f004d2fee36f3ee9b21ee5417e84b64837 100644 +index a3d8d8ec0e99435a58ab93a7b1f90d16be2a2289..afa1dc693bc2e2e68294a1d3dec1c078ea95b286 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -313,7 +313,7 @@ public final class ItemStack { diff --git a/Spigot-Server-Patches/0564-Fix-CraftTeam-null-check.patch b/Spigot-Server-Patches/0563-Fix-CraftTeam-null-check.patch similarity index 100% rename from Spigot-Server-Patches/0564-Fix-CraftTeam-null-check.patch rename to Spigot-Server-Patches/0563-Fix-CraftTeam-null-check.patch diff --git a/Spigot-Server-Patches/0565-Add-more-Evoker-API.patch b/Spigot-Server-Patches/0564-Add-more-Evoker-API.patch similarity index 100% rename from Spigot-Server-Patches/0565-Add-more-Evoker-API.patch rename to Spigot-Server-Patches/0564-Add-more-Evoker-API.patch diff --git a/Spigot-Server-Patches/0566-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch b/Spigot-Server-Patches/0565-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch similarity index 98% rename from Spigot-Server-Patches/0566-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch rename to Spigot-Server-Patches/0565-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch index b03f84b43f..34dbc2c476 100644 --- a/Spigot-Server-Patches/0566-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch +++ b/Spigot-Server-Patches/0565-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch @@ -74,7 +74,7 @@ index f787238575ed7ac9108a2fd9782af55056219767..3524b677525bf2bb529b797fe1f258ef // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 22d41555ddc8c79609bea9f8dc510ab8a02e7872..1718735d00a0316b5b7a61adaf22f7118daaff08 100644 +index 324afd2a5e50a3b1fd9de926f6da8836b00e173b..865c1e4cf18b25ecf2ba8d592d9ca40f631e2215 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -45,6 +45,7 @@ import org.bukkit.Registry; diff --git a/Spigot-Server-Patches/0567-Create-HoverEvent-from-ItemStack-Entity.patch b/Spigot-Server-Patches/0566-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from Spigot-Server-Patches/0567-Create-HoverEvent-from-ItemStack-Entity.patch rename to Spigot-Server-Patches/0566-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/Spigot-Server-Patches/0568-Cache-block-data-strings.patch b/Spigot-Server-Patches/0567-Cache-block-data-strings.patch similarity index 96% rename from Spigot-Server-Patches/0568-Cache-block-data-strings.patch rename to Spigot-Server-Patches/0567-Cache-block-data-strings.patch index 1231703b20..860d705a45 100644 --- a/Spigot-Server-Patches/0568-Cache-block-data-strings.patch +++ b/Spigot-Server-Patches/0567-Cache-block-data-strings.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Cache block data strings diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 84b304b4998f682688be26b9402da8eed8c265a8..3d4ecddcbfedb54d26888ff464bd0e6c7eec82e3 100644 +index 69fcfff3f21168f334fd526cb65e63e086d32a70..1c59c40693359224004ed1ae19fa1d32a8053970 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1831,6 +1831,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas diff --git a/Spigot-Server-Patches/0569-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/Spigot-Server-Patches/0568-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch similarity index 95% rename from Spigot-Server-Patches/0569-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch rename to Spigot-Server-Patches/0568-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch index 6b79f4fb79..e4b63df286 100644 --- a/Spigot-Server-Patches/0569-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch +++ b/Spigot-Server-Patches/0568-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch @@ -9,7 +9,7 @@ as this is how Vanilla teleports entities. Cancel any pending motion when teleported. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 6aeea48d4cf4732f6a5a5dba12af873c2aee493b..fa0256a99c833e6035b8d3e873a93af2b674ef52 100644 +index 83a469447e39b801442769fcb5979e987e2adae9..e65cb9c72e46d50b871d1c7b5789a1855622d934 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -54,6 +54,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -35,7 +35,7 @@ index 6aeea48d4cf4732f6a5a5dba12af873c2aee493b..fa0256a99c833e6035b8d3e873a93af2 this.yaw = f; this.pitch = f1; diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 444355e81bd7f5d07e3ef5f4b9d91d1bf11428ef..cef65c7bde4b759014312c6bcc3b0ac6c4b0c462 100644 +index f1e3c764fc8d5b6acb2ae94276e31fe37af817b6..5af38d36f64020d1df492ad57fafd2baf867536a 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -542,7 +542,7 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/Spigot-Server-Patches/0570-Add-additional-open-container-api-to-HumanEntity.patch b/Spigot-Server-Patches/0569-Add-additional-open-container-api-to-HumanEntity.patch similarity index 100% rename from Spigot-Server-Patches/0570-Add-additional-open-container-api-to-HumanEntity.patch rename to Spigot-Server-Patches/0569-Add-additional-open-container-api-to-HumanEntity.patch diff --git a/Spigot-Server-Patches/0571-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/Spigot-Server-Patches/0570-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch similarity index 100% rename from Spigot-Server-Patches/0571-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch rename to Spigot-Server-Patches/0570-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch diff --git a/Spigot-Server-Patches/0572-Extend-block-drop-capture-to-capture-all-items-added.patch b/Spigot-Server-Patches/0571-Extend-block-drop-capture-to-capture-all-items-added.patch similarity index 96% rename from Spigot-Server-Patches/0572-Extend-block-drop-capture-to-capture-all-items-added.patch rename to Spigot-Server-Patches/0571-Extend-block-drop-capture-to-capture-all-items-added.patch index 5756d7b3b7..3abca3ad0d 100644 --- a/Spigot-Server-Patches/0572-Extend-block-drop-capture-to-capture-all-items-added.patch +++ b/Spigot-Server-Patches/0571-Extend-block-drop-capture-to-capture-all-items-added.patch @@ -25,7 +25,7 @@ index 4b564d36135e9dbdbb57a95791f89aefd180457b..485b609bb5387b0f8a46c1201177cdc6 // Drop event experience if (flag && event != null) { diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 6286ef81cb5ef95c4d5e0c384e73fbece0a096f6..5b0b6edfa790918e56399ff6c83f3feb6e5aca49 100644 +index 705ce638416e98166a5c659f425be90af1a9a59b..91d759fee68e8b285f912406fb338750c286f6a0 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1177,6 +1177,13 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/Spigot-Server-Patches/0573-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch b/Spigot-Server-Patches/0572-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch similarity index 89% rename from Spigot-Server-Patches/0573-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch rename to Spigot-Server-Patches/0572-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch index 8176571527..f56a06c90f 100644 --- a/Spigot-Server-Patches/0573-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch +++ b/Spigot-Server-Patches/0572-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't mark dirty in invalid locations (SPIGOT-6086) diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java -index c69b5a2c7b8061a65b2d5bb7ceb3ffe39dc36b8c..11a67ca18f566bfc214659e7fb454ea2b4d8a7ad 100644 +index 014c0249b22eb4703d2d6b430afb402689a54e2a..42b12ad5ba68bdf8f76704ddd970715770183de0 100644 --- a/src/main/java/net/minecraft/server/PlayerChunk.java +++ b/src/main/java/net/minecraft/server/PlayerChunk.java @@ -359,6 +359,7 @@ public class PlayerChunk { diff --git a/Spigot-Server-Patches/0574-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/Spigot-Server-Patches/0573-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch similarity index 88% rename from Spigot-Server-Patches/0574-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch rename to Spigot-Server-Patches/0573-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch index 0f0fdccf8b..4509ab74a2 100644 --- a/Spigot-Server-Patches/0574-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch +++ b/Spigot-Server-Patches/0573-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Expose the Entity Counter to allow plugins to use valid and diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 857c6699a8d582a56506b9083089e77faad6b492..0a47fb31922662d35306d0759e69799ceeca12c7 100644 +index e65cb9c72e46d50b871d1c7b5789a1855622d934..9415588d7df27fb6907381cff802fd8ad983663f 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -3382,4 +3382,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -21,7 +21,7 @@ index 857c6699a8d582a56506b9083089e77faad6b492..0a47fb31922662d35306d0759e69799c + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 1718735d00a0316b5b7a61adaf22f7118daaff08..ed926fc6ebbabd50a73d216a9e018a9427f5b128 100644 +index 865c1e4cf18b25ecf2ba8d592d9ca40f631e2215..e073db219a35c3ac02e4c5f65a9ad405cd148d1d 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -410,6 +410,10 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/Spigot-Server-Patches/0575-Lazily-track-plugin-scoreboards-by-default.patch b/Spigot-Server-Patches/0574-Lazily-track-plugin-scoreboards-by-default.patch similarity index 98% rename from Spigot-Server-Patches/0575-Lazily-track-plugin-scoreboards-by-default.patch rename to Spigot-Server-Patches/0574-Lazily-track-plugin-scoreboards-by-default.patch index 7dcd7bbdc7..07960166e8 100644 --- a/Spigot-Server-Patches/0575-Lazily-track-plugin-scoreboards-by-default.patch +++ b/Spigot-Server-Patches/0574-Lazily-track-plugin-scoreboards-by-default.patch @@ -14,7 +14,7 @@ this breaks your workflow you can always force all scoreboards to be tracked wit settings.track-plugin-scoreboards in paper.yml. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 2e9c3b45052ad641bee091ee28cc57b93cd19ffe..6ab0a51b421dc696aec292f2db955311c9cc31e3 100644 +index 110cee7228b17a2378523883a1a83cc97da7608d..da48ad0e4725d9a9fcb2d60f82249be97be29033 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -457,4 +457,9 @@ public class PaperConfig { diff --git a/Spigot-Server-Patches/0576-Entity-isTicking.patch b/Spigot-Server-Patches/0575-Entity-isTicking.patch similarity index 93% rename from Spigot-Server-Patches/0576-Entity-isTicking.patch rename to Spigot-Server-Patches/0575-Entity-isTicking.patch index 7fada76091..1331f9f05e 100644 --- a/Spigot-Server-Patches/0576-Entity-isTicking.patch +++ b/Spigot-Server-Patches/0575-Entity-isTicking.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Entity#isTicking diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 0a47fb31922662d35306d0759e69799ceeca12c7..81ff0fd4587d0220f49573c393c8412e2b55d115 100644 +index 9415588d7df27fb6907381cff802fd8ad983663f..1840d64d1bbb1165981f79dd3deeb19816e6a230 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -3387,5 +3387,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/Spigot-Server-Patches/0577-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/Spigot-Server-Patches/0576-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch similarity index 91% rename from Spigot-Server-Patches/0577-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch rename to Spigot-Server-Patches/0576-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch index 70ce2cb594..4f04ecdd4b 100644 --- a/Spigot-Server-Patches/0577-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch +++ b/Spigot-Server-Patches/0576-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix deop kicking non-whitelisted player when white list is diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 3d4ecddcbfedb54d26888ff464bd0e6c7eec82e3..057f49ac7cbe6f866beec18e0c2fb5323f10791b 100644 +index 1c59c40693359224004ed1ae19fa1d32a8053970..c4b1b18d2e67c71b061d99c9fb71270bdff434d8 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1896,6 +1896,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas diff --git a/Spigot-Server-Patches/0578-Fix-Not-a-string-Map-Conversion-spam.patch b/Spigot-Server-Patches/0577-Fix-Not-a-string-Map-Conversion-spam.patch similarity index 100% rename from Spigot-Server-Patches/0578-Fix-Not-a-string-Map-Conversion-spam.patch rename to Spigot-Server-Patches/0577-Fix-Not-a-string-Map-Conversion-spam.patch diff --git a/Spigot-Server-Patches/0579-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch b/Spigot-Server-Patches/0578-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch similarity index 100% rename from Spigot-Server-Patches/0579-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch rename to Spigot-Server-Patches/0578-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch diff --git a/Spigot-Server-Patches/0580-MC-147729-Drop-items-that-are-extra-from-a-crafting-.patch b/Spigot-Server-Patches/0579-MC-147729-Drop-items-that-are-extra-from-a-crafting-.patch similarity index 100% rename from Spigot-Server-Patches/0580-MC-147729-Drop-items-that-are-extra-from-a-crafting-.patch rename to Spigot-Server-Patches/0579-MC-147729-Drop-items-that-are-extra-from-a-crafting-.patch diff --git a/Spigot-Server-Patches/0581-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/Spigot-Server-Patches/0580-Reset-Ender-Crystals-on-Dragon-Spawn.patch similarity index 100% rename from Spigot-Server-Patches/0581-Reset-Ender-Crystals-on-Dragon-Spawn.patch rename to Spigot-Server-Patches/0580-Reset-Ender-Crystals-on-Dragon-Spawn.patch diff --git a/Spigot-Server-Patches/0582-Fix-for-large-move-vectors-crashing-server.patch b/Spigot-Server-Patches/0581-Fix-for-large-move-vectors-crashing-server.patch similarity index 97% rename from Spigot-Server-Patches/0582-Fix-for-large-move-vectors-crashing-server.patch rename to Spigot-Server-Patches/0581-Fix-for-large-move-vectors-crashing-server.patch index fcfd088cf5..5c81770046 100644 --- a/Spigot-Server-Patches/0582-Fix-for-large-move-vectors-crashing-server.patch +++ b/Spigot-Server-Patches/0581-Fix-for-large-move-vectors-crashing-server.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix for large move vectors crashing server Check movement distance also based on current position. diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index cef65c7bde4b759014312c6bcc3b0ac6c4b0c462..e9715d7a44338af4104bfd44857df0af7a0df012 100644 +index 5af38d36f64020d1df492ad57fafd2baf867536a..9fd9d81b1d875c4f465f8fb509b35da49695d4c8 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -367,19 +367,24 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/Spigot-Server-Patches/0583-Optimise-getType-calls.patch b/Spigot-Server-Patches/0582-Optimise-getType-calls.patch similarity index 96% rename from Spigot-Server-Patches/0583-Optimise-getType-calls.patch rename to Spigot-Server-Patches/0582-Optimise-getType-calls.patch index f5dc00293e..4db23777b6 100644 --- a/Spigot-Server-Patches/0583-Optimise-getType-calls.patch +++ b/Spigot-Server-Patches/0582-Optimise-getType-calls.patch @@ -30,7 +30,7 @@ index 10a5901db1e0efe0b7d6958098bb0ae492a9e76f..e7aa8aca2458a7fea7bc3bf1335b04da super(block, immutablemap, mapcodec); } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java b/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java -index ff8ba545748c1065f6560d9d11a22c64d9a5347b..db1edc07e4a797280ee872168b69a0e2232529b6 100644 +index 6cd662c9130e6282ab520d0d471f56d9a66da5ea..0160bf9e64f0a3befe60d9945648cb4dfd297877 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java @@ -79,7 +79,7 @@ public class CraftChunkSnapshot implements ChunkSnapshot { @@ -69,7 +69,7 @@ index 0f89e776816ad4ecb6c3e54c2549692f1b5b6aae..36d7de6e6540e156499edb4b69b8bbae public void setFlag(int flag) { diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java -index f44fc4a95954e0745fbcd6d06b79acc37699c77a..4a9245fa5b91b894f982b29f7b87878453189cb9 100644 +index 590236ccc6c15f8c4ad15913fb3ac36d28414318..5207e58670b25d60886bfd66dfb9e8acd1552f5f 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java +++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java @@ -44,7 +44,7 @@ public class CraftBlockData implements BlockData { diff --git a/Spigot-Server-Patches/0584-Villager-resetOffers.patch b/Spigot-Server-Patches/0583-Villager-resetOffers.patch similarity index 100% rename from Spigot-Server-Patches/0584-Villager-resetOffers.patch rename to Spigot-Server-Patches/0583-Villager-resetOffers.patch diff --git a/Spigot-Server-Patches/0585-Improve-inlinig-for-some-hot-IBlockData-methods.patch b/Spigot-Server-Patches/0584-Improve-inlinig-for-some-hot-IBlockData-methods.patch similarity index 100% rename from Spigot-Server-Patches/0585-Improve-inlinig-for-some-hot-IBlockData-methods.patch rename to Spigot-Server-Patches/0584-Improve-inlinig-for-some-hot-IBlockData-methods.patch diff --git a/Spigot-Server-Patches/0586-Retain-block-place-order-when-capturing-blockstates.patch b/Spigot-Server-Patches/0585-Retain-block-place-order-when-capturing-blockstates.patch similarity index 93% rename from Spigot-Server-Patches/0586-Retain-block-place-order-when-capturing-blockstates.patch rename to Spigot-Server-Patches/0585-Retain-block-place-order-when-capturing-blockstates.patch index 3ccd0c90ad..0b934d17f3 100644 --- a/Spigot-Server-Patches/0586-Retain-block-place-order-when-capturing-blockstates.patch +++ b/Spigot-Server-Patches/0585-Retain-block-place-order-when-capturing-blockstates.patch @@ -10,7 +10,7 @@ In general, look at making this logic more robust (i.e properly handling cases where a captured entry is overriden) - but for now this will do. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index cbfbdd4c7d91afb779aaf6aa79f9c681078b9b27..822b587cc92bb25ec8618fd9d86ce2c9233a69b6 100644 +index b91f1a4623a7d2d49bdd4265df3b1cfcdcb0ef88..23e5ad868f1acfb99ec313fbda9bb83a138ccf0b 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -75,7 +75,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { diff --git a/Spigot-Server-Patches/0587-Reduce-blockpos-allocation-from-pathfinding.patch b/Spigot-Server-Patches/0586-Reduce-blockpos-allocation-from-pathfinding.patch similarity index 100% rename from Spigot-Server-Patches/0587-Reduce-blockpos-allocation-from-pathfinding.patch rename to Spigot-Server-Patches/0586-Reduce-blockpos-allocation-from-pathfinding.patch diff --git a/Spigot-Server-Patches/0588-Fix-item-locations-dropped-from-campfires.patch b/Spigot-Server-Patches/0587-Fix-item-locations-dropped-from-campfires.patch similarity index 94% rename from Spigot-Server-Patches/0588-Fix-item-locations-dropped-from-campfires.patch rename to Spigot-Server-Patches/0587-Fix-item-locations-dropped-from-campfires.patch index 94f969f3c0..59eeb732cc 100644 --- a/Spigot-Server-Patches/0588-Fix-item-locations-dropped-from-campfires.patch +++ b/Spigot-Server-Patches/0587-Fix-item-locations-dropped-from-campfires.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix item locations dropped from campfires Fixes #4259 by not flooring the blockposition among other weirdness diff --git a/src/main/java/net/minecraft/server/TileEntityCampfire.java b/src/main/java/net/minecraft/server/TileEntityCampfire.java -index 4e59659061bb1c36424c229cca9f937786e2cb28..e09b014b5e587fe3504ce7d9384892a3b7075487 100644 +index 92e70c18d79007fca458bcbb70c05b94f272f731..0a60141b9ef3ac9eca7913d168d73ca5862a9bfa 100644 --- a/src/main/java/net/minecraft/server/TileEntityCampfire.java +++ b/src/main/java/net/minecraft/server/TileEntityCampfire.java @@ -74,7 +74,11 @@ public class TileEntityCampfire extends TileEntity implements Clearable, ITickab diff --git a/Spigot-Server-Patches/0589-Player-elytra-boost-API.patch b/Spigot-Server-Patches/0588-Player-elytra-boost-API.patch similarity index 100% rename from Spigot-Server-Patches/0589-Player-elytra-boost-API.patch rename to Spigot-Server-Patches/0588-Player-elytra-boost-API.patch diff --git a/Spigot-Server-Patches/0590-Fixed-TileEntityBell-memory-leak.patch b/Spigot-Server-Patches/0589-Fixed-TileEntityBell-memory-leak.patch similarity index 100% rename from Spigot-Server-Patches/0590-Fixed-TileEntityBell-memory-leak.patch rename to Spigot-Server-Patches/0589-Fixed-TileEntityBell-memory-leak.patch diff --git a/Spigot-Server-Patches/0591-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/Spigot-Server-Patches/0590-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch similarity index 97% rename from Spigot-Server-Patches/0591-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch rename to Spigot-Server-Patches/0590-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch index 76e73624d9..be020edbf4 100644 --- a/Spigot-Server-Patches/0591-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch +++ b/Spigot-Server-Patches/0590-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch @@ -8,7 +8,7 @@ This can realistically only happen if there's custom loot active on fishing which can return 0 items. This would disconnect the player who's fishing. diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java -index 7c3e36f62f4ab076807cd4b85a70528fffbbc2af..519df0002be34da47ea967e5c0d2cf828c166df8 100644 +index 723cd60254111579b157684dc82311af5cf9fd13..e97c7794e86c0518bcec0a0370bffbeab20e2623 100644 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java @@ -445,9 +445,15 @@ public class EntityFishingHook extends IProjectile { diff --git a/Spigot-Server-Patches/0592-Add-getOfflinePlayerIfCached-String.patch b/Spigot-Server-Patches/0591-Add-getOfflinePlayerIfCached-String.patch similarity index 100% rename from Spigot-Server-Patches/0592-Add-getOfflinePlayerIfCached-String.patch rename to Spigot-Server-Patches/0591-Add-getOfflinePlayerIfCached-String.patch diff --git a/Spigot-Server-Patches/0593-Add-ignore-discounts-API.patch b/Spigot-Server-Patches/0592-Add-ignore-discounts-API.patch similarity index 100% rename from Spigot-Server-Patches/0593-Add-ignore-discounts-API.patch rename to Spigot-Server-Patches/0592-Add-ignore-discounts-API.patch diff --git a/Spigot-Server-Patches/0594-Toggle-for-removing-existing-dragon.patch b/Spigot-Server-Patches/0593-Toggle-for-removing-existing-dragon.patch similarity index 100% rename from Spigot-Server-Patches/0594-Toggle-for-removing-existing-dragon.patch rename to Spigot-Server-Patches/0593-Toggle-for-removing-existing-dragon.patch diff --git a/Spigot-Server-Patches/0595-Fix-client-lag-on-advancement-loading.patch b/Spigot-Server-Patches/0594-Fix-client-lag-on-advancement-loading.patch similarity index 96% rename from Spigot-Server-Patches/0595-Fix-client-lag-on-advancement-loading.patch rename to Spigot-Server-Patches/0594-Fix-client-lag-on-advancement-loading.patch index a2f5305751..170420cb78 100644 --- a/Spigot-Server-Patches/0595-Fix-client-lag-on-advancement-loading.patch +++ b/Spigot-Server-Patches/0594-Fix-client-lag-on-advancement-loading.patch @@ -35,7 +35,7 @@ index 17789407b9e86896a963a305a13357286aa5f319..c680319e4040be2b60795b22a5e65d64 if (this.m || !this.i.isEmpty() || !this.j.isEmpty()) { Map<MinecraftKey, AdvancementProgress> map = Maps.newHashMap(); diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index ed926fc6ebbabd50a73d216a9e018a9427f5b128..0f7f1503d07bdff7ce7644dfe21e444adb52c7db 100644 +index e073db219a35c3ac02e4c5f65a9ad405cd148d1d..979f3504e6a6ca46993f3d9b0f408ab6744bdccd 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -282,7 +282,13 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/Spigot-Server-Patches/0596-Item-no-age-no-player-pickup.patch b/Spigot-Server-Patches/0595-Item-no-age-no-player-pickup.patch similarity index 100% rename from Spigot-Server-Patches/0596-Item-no-age-no-player-pickup.patch rename to Spigot-Server-Patches/0595-Item-no-age-no-player-pickup.patch diff --git a/Spigot-Server-Patches/0597-Beacon-API-custom-effect-ranges.patch b/Spigot-Server-Patches/0596-Beacon-API-custom-effect-ranges.patch similarity index 100% rename from Spigot-Server-Patches/0597-Beacon-API-custom-effect-ranges.patch rename to Spigot-Server-Patches/0596-Beacon-API-custom-effect-ranges.patch diff --git a/Spigot-Server-Patches/0598-Add-API-for-quit-reason.patch b/Spigot-Server-Patches/0597-Add-API-for-quit-reason.patch similarity index 100% rename from Spigot-Server-Patches/0598-Add-API-for-quit-reason.patch rename to Spigot-Server-Patches/0597-Add-API-for-quit-reason.patch diff --git a/Spigot-Server-Patches/0599-Seed-based-feature-search.patch b/Spigot-Server-Patches/0598-Seed-based-feature-search.patch similarity index 100% rename from Spigot-Server-Patches/0599-Seed-based-feature-search.patch rename to Spigot-Server-Patches/0598-Seed-based-feature-search.patch diff --git a/Spigot-Server-Patches/0600-Add-Wandering-Trader-spawn-rate-config-options.patch b/Spigot-Server-Patches/0599-Add-Wandering-Trader-spawn-rate-config-options.patch similarity index 100% rename from Spigot-Server-Patches/0600-Add-Wandering-Trader-spawn-rate-config-options.patch rename to Spigot-Server-Patches/0599-Add-Wandering-Trader-spawn-rate-config-options.patch diff --git a/Spigot-Server-Patches/0601-Significantly-improve-performance-of-the-end-generat.patch b/Spigot-Server-Patches/0600-Significantly-improve-performance-of-the-end-generat.patch similarity index 100% rename from Spigot-Server-Patches/0601-Significantly-improve-performance-of-the-end-generat.patch rename to Spigot-Server-Patches/0600-Significantly-improve-performance-of-the-end-generat.patch diff --git a/Spigot-Server-Patches/0602-Expose-world-spawn-angle.patch b/Spigot-Server-Patches/0601-Expose-world-spawn-angle.patch similarity index 96% rename from Spigot-Server-Patches/0602-Expose-world-spawn-angle.patch rename to Spigot-Server-Patches/0601-Expose-world-spawn-angle.patch index 0b0610dd98..9206c0e33e 100644 --- a/Spigot-Server-Patches/0602-Expose-world-spawn-angle.patch +++ b/Spigot-Server-Patches/0601-Expose-world-spawn-angle.patch @@ -30,7 +30,7 @@ index faf931785ea35df4525d4a429bdb2363e26e491b..14e1762bf8669ef9e8444f5a73952daa long getTime(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 299f57ca2a65887a0d7e7c584fc1bd5c783b0db2..4f8c5e8ebda3e3fe1d2f61ef24ec698caae9a0bb 100644 +index 1162bf553ff6e5c5faf688b080a202dc55650ced..597d7a36d7d0b19502d92cf13da53d96c6ede58a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -379,7 +379,7 @@ public class CraftWorld implements World { diff --git a/Spigot-Server-Patches/0603-Add-Destroy-Speed-API.patch b/Spigot-Server-Patches/0602-Add-Destroy-Speed-API.patch similarity index 100% rename from Spigot-Server-Patches/0603-Add-Destroy-Speed-API.patch rename to Spigot-Server-Patches/0602-Add-Destroy-Speed-API.patch diff --git a/Spigot-Server-Patches/0604-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/Spigot-Server-Patches/0603-Fix-Player-spawnParticle-x-y-z-precision-loss.patch similarity index 100% rename from Spigot-Server-Patches/0604-Fix-Player-spawnParticle-x-y-z-precision-loss.patch rename to Spigot-Server-Patches/0603-Fix-Player-spawnParticle-x-y-z-precision-loss.patch diff --git a/Spigot-Server-Patches/0605-Add-LivingEntity-clearActiveItem.patch b/Spigot-Server-Patches/0604-Add-LivingEntity-clearActiveItem.patch similarity index 100% rename from Spigot-Server-Patches/0605-Add-LivingEntity-clearActiveItem.patch rename to Spigot-Server-Patches/0604-Add-LivingEntity-clearActiveItem.patch diff --git a/Spigot-Server-Patches/0606-Add-PlayerItemCooldownEvent.patch b/Spigot-Server-Patches/0605-Add-PlayerItemCooldownEvent.patch similarity index 100% rename from Spigot-Server-Patches/0606-Add-PlayerItemCooldownEvent.patch rename to Spigot-Server-Patches/0605-Add-PlayerItemCooldownEvent.patch diff --git a/Spigot-Server-Patches/0607-More-lightning-API.patch b/Spigot-Server-Patches/0606-More-lightning-API.patch similarity index 100% rename from Spigot-Server-Patches/0607-More-lightning-API.patch rename to Spigot-Server-Patches/0606-More-lightning-API.patch diff --git a/Spigot-Server-Patches/0608-Climbing-should-not-bypass-cramming-gamerule.patch b/Spigot-Server-Patches/0607-Climbing-should-not-bypass-cramming-gamerule.patch similarity index 100% rename from Spigot-Server-Patches/0608-Climbing-should-not-bypass-cramming-gamerule.patch rename to Spigot-Server-Patches/0607-Climbing-should-not-bypass-cramming-gamerule.patch diff --git a/Spigot-Server-Patches/0609-Added-missing-default-perms-for-commands.patch b/Spigot-Server-Patches/0608-Added-missing-default-perms-for-commands.patch similarity index 100% rename from Spigot-Server-Patches/0609-Added-missing-default-perms-for-commands.patch rename to Spigot-Server-Patches/0608-Added-missing-default-perms-for-commands.patch diff --git a/Spigot-Server-Patches/0610-Add-PlayerShearBlockEvent.patch b/Spigot-Server-Patches/0609-Add-PlayerShearBlockEvent.patch similarity index 100% rename from Spigot-Server-Patches/0610-Add-PlayerShearBlockEvent.patch rename to Spigot-Server-Patches/0609-Add-PlayerShearBlockEvent.patch diff --git a/Spigot-Server-Patches/0611-Add-warning-for-servers-not-running-on-Java-11.patch b/Spigot-Server-Patches/0610-Add-warning-for-servers-not-running-on-Java-11.patch similarity index 97% rename from Spigot-Server-Patches/0611-Add-warning-for-servers-not-running-on-Java-11.patch rename to Spigot-Server-Patches/0610-Add-warning-for-servers-not-running-on-Java-11.patch index f462573c7b..e334eb967b 100644 --- a/Spigot-Server-Patches/0611-Add-warning-for-servers-not-running-on-Java-11.patch +++ b/Spigot-Server-Patches/0610-Add-warning-for-servers-not-running-on-Java-11.patch @@ -59,7 +59,7 @@ index 0000000000000000000000000000000000000000..c6ea429819c07e7f4bc257cad73463a0 + } +} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 057f49ac7cbe6f866beec18e0c2fb5323f10791b..4d7e8e8eed7786c602e54786cb142972f75ca65d 100644 +index c4b1b18d2e67c71b061d99c9fb71270bdff434d8..242b2924c4b0b163b010a9d771130a6b15160e4c 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -69,6 +69,7 @@ import org.bukkit.craftbukkit.Main; diff --git a/Spigot-Server-Patches/0612-Set-spigots-verbose-world-setting-to-false-by-def.patch b/Spigot-Server-Patches/0611-Set-spigots-verbose-world-setting-to-false-by-def.patch similarity index 89% rename from Spigot-Server-Patches/0612-Set-spigots-verbose-world-setting-to-false-by-def.patch rename to Spigot-Server-Patches/0611-Set-spigots-verbose-world-setting-to-false-by-def.patch index dda892e52b..95be56a7de 100644 --- a/Spigot-Server-Patches/0612-Set-spigots-verbose-world-setting-to-false-by-def.patch +++ b/Spigot-Server-Patches/0611-Set-spigots-verbose-world-setting-to-false-by-def.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Set spigots verbose world setting to false by def diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 9859e0c964e4d1e7dc7689cb97f40643a8e5cdd7..61ad08b09cd2fe25471bb6c838b8bb3d8102e693 100644 +index 6b015c1f26facb4e82d75b252164dec05731ca6c..094a934c168d232b0550c3efe722f2ebfbdf8e24 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -20,7 +20,7 @@ public class SpigotWorldConfig diff --git a/Spigot-Server-Patches/0613-Fix-curing-zombie-villager-discount-exploit.patch b/Spigot-Server-Patches/0612-Fix-curing-zombie-villager-discount-exploit.patch similarity index 100% rename from Spigot-Server-Patches/0613-Fix-curing-zombie-villager-discount-exploit.patch rename to Spigot-Server-Patches/0612-Fix-curing-zombie-villager-discount-exploit.patch diff --git a/Spigot-Server-Patches/0614-Fix-curing-villager-makes-equipment-disappear.patch b/Spigot-Server-Patches/0613-Fix-curing-villager-makes-equipment-disappear.patch similarity index 100% rename from Spigot-Server-Patches/0614-Fix-curing-villager-makes-equipment-disappear.patch rename to Spigot-Server-Patches/0613-Fix-curing-villager-makes-equipment-disappear.patch diff --git a/Spigot-Server-Patches/0615-Limit-recipe-packets.patch b/Spigot-Server-Patches/0614-Limit-recipe-packets.patch similarity index 100% rename from Spigot-Server-Patches/0615-Limit-recipe-packets.patch rename to Spigot-Server-Patches/0614-Limit-recipe-packets.patch diff --git a/Spigot-Server-Patches/0616-Fix-CraftSound-backwards-compatibility.patch b/Spigot-Server-Patches/0615-Fix-CraftSound-backwards-compatibility.patch similarity index 100% rename from Spigot-Server-Patches/0616-Fix-CraftSound-backwards-compatibility.patch rename to Spigot-Server-Patches/0615-Fix-CraftSound-backwards-compatibility.patch diff --git a/Spigot-Server-Patches/0617-MC-4-Fix-item-position-desync.patch b/Spigot-Server-Patches/0616-MC-4-Fix-item-position-desync.patch similarity index 97% rename from Spigot-Server-Patches/0617-MC-4-Fix-item-position-desync.patch rename to Spigot-Server-Patches/0616-MC-4-Fix-item-position-desync.patch index a6bc4262e6..b52dcd0082 100644 --- a/Spigot-Server-Patches/0617-MC-4-Fix-item-position-desync.patch +++ b/Spigot-Server-Patches/0616-MC-4-Fix-item-position-desync.patch @@ -9,7 +9,7 @@ loss, which forces the server to lose the same precision as the client keeping them in sync. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index cdf1177ca7b4b1b0808176c455f62b395146da50..26db8a5d92d494e5f6ba9498d5a1aa555642a92b 100644 +index 6a9f41eafcd48ff029f027eeebfc0dc956564d2c..673c40d952bae6ae9e92aac9742e58ffb6a8b1bb 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -469,4 +469,9 @@ public class PaperConfig { diff --git a/Spigot-Server-Patches/0618-Player-Chunk-Load-Unload-Events.patch b/Spigot-Server-Patches/0617-Player-Chunk-Load-Unload-Events.patch similarity index 100% rename from Spigot-Server-Patches/0618-Player-Chunk-Load-Unload-Events.patch rename to Spigot-Server-Patches/0617-Player-Chunk-Load-Unload-Events.patch diff --git a/Spigot-Server-Patches/0619-Optimize-Dynamic-get-Missing-Keys.patch b/Spigot-Server-Patches/0618-Optimize-Dynamic-get-Missing-Keys.patch similarity index 100% rename from Spigot-Server-Patches/0619-Optimize-Dynamic-get-Missing-Keys.patch rename to Spigot-Server-Patches/0618-Optimize-Dynamic-get-Missing-Keys.patch diff --git a/Spigot-Server-Patches/0620-Expose-LivingEntity-hurt-direction.patch b/Spigot-Server-Patches/0619-Expose-LivingEntity-hurt-direction.patch similarity index 94% rename from Spigot-Server-Patches/0620-Expose-LivingEntity-hurt-direction.patch rename to Spigot-Server-Patches/0619-Expose-LivingEntity-hurt-direction.patch index aa577f9f00..16f4d832e5 100644 --- a/Spigot-Server-Patches/0620-Expose-LivingEntity-hurt-direction.patch +++ b/Spigot-Server-Patches/0619-Expose-LivingEntity-hurt-direction.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Expose LivingEntity hurt direction diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 5f5cea628c7f4c10670524f5fd7d9328f9a685a0..c8cdce899b109a7f554fec7aaa8235df4224cd1d 100644 +index 2a1b17717b37e5f839e357c2196287a4024852e9..3c23a8ab3fe5e4b58816cf051dbe237530bff4a0 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -69,7 +69,7 @@ public abstract class EntityLiving extends Entity { diff --git a/Spigot-Server-Patches/0621-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/Spigot-Server-Patches/0620-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from Spigot-Server-Patches/0621-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to Spigot-Server-Patches/0620-Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/Spigot-Server-Patches/0622-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/Spigot-Server-Patches/0621-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch similarity index 100% rename from Spigot-Server-Patches/0622-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch rename to Spigot-Server-Patches/0621-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch diff --git a/Spigot-Server-Patches/0623-added-PlayerTradeEvent.patch b/Spigot-Server-Patches/0622-added-PlayerTradeEvent.patch similarity index 97% rename from Spigot-Server-Patches/0623-added-PlayerTradeEvent.patch rename to Spigot-Server-Patches/0622-added-PlayerTradeEvent.patch index a67eae3726..01db63daea 100644 --- a/Spigot-Server-Patches/0623-added-PlayerTradeEvent.patch +++ b/Spigot-Server-Patches/0622-added-PlayerTradeEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] added PlayerTradeEvent diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index dcc5b098bfe36ef7ee8536b3da65c4ce1748c9d8..6d716214e756fe1326cd3d2becea969076f6fd5b 100644 +index 73ceb0f14610fe1d4d55542dad957b1fdf9f8e04..eb5c3a1f0d9ff665631caf5bf579e83d1ed25e4f 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -25,7 +25,7 @@ import org.bukkit.event.entity.EntityUnleashEvent.UnleashReason; diff --git a/Spigot-Server-Patches/0624-Implement-TargetHitEvent.patch b/Spigot-Server-Patches/0623-Implement-TargetHitEvent.patch similarity index 100% rename from Spigot-Server-Patches/0624-Implement-TargetHitEvent.patch rename to Spigot-Server-Patches/0623-Implement-TargetHitEvent.patch diff --git a/Spigot-Server-Patches/0625-Additional-Block-Material-API-s.patch b/Spigot-Server-Patches/0624-Additional-Block-Material-API-s.patch similarity index 100% rename from Spigot-Server-Patches/0625-Additional-Block-Material-API-s.patch rename to Spigot-Server-Patches/0624-Additional-Block-Material-API-s.patch diff --git a/Spigot-Server-Patches/0626-Fix-harming-potion-dupe.patch b/Spigot-Server-Patches/0625-Fix-harming-potion-dupe.patch similarity index 100% rename from Spigot-Server-Patches/0626-Fix-harming-potion-dupe.patch rename to Spigot-Server-Patches/0625-Fix-harming-potion-dupe.patch diff --git a/Spigot-Server-Patches/0627-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/Spigot-Server-Patches/0626-Implement-API-to-get-Material-from-Boats-and-Minecar.patch similarity index 100% rename from Spigot-Server-Patches/0627-Implement-API-to-get-Material-from-Boats-and-Minecar.patch rename to Spigot-Server-Patches/0626-Implement-API-to-get-Material-from-Boats-and-Minecar.patch diff --git a/Spigot-Server-Patches/0628-Optimized-tick-ready-check.patch b/Spigot-Server-Patches/0627-Optimized-tick-ready-check.patch similarity index 100% rename from Spigot-Server-Patches/0628-Optimized-tick-ready-check.patch rename to Spigot-Server-Patches/0627-Optimized-tick-ready-check.patch diff --git a/Spigot-Server-Patches/0629-Cache-burn-durations.patch b/Spigot-Server-Patches/0628-Cache-burn-durations.patch similarity index 100% rename from Spigot-Server-Patches/0629-Cache-burn-durations.patch rename to Spigot-Server-Patches/0628-Cache-burn-durations.patch diff --git a/Spigot-Server-Patches/0630-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/Spigot-Server-Patches/0629-Allow-disabling-mob-spawner-spawn-egg-transformation.patch similarity index 100% rename from Spigot-Server-Patches/0630-Allow-disabling-mob-spawner-spawn-egg-transformation.patch rename to Spigot-Server-Patches/0629-Allow-disabling-mob-spawner-spawn-egg-transformation.patch diff --git a/Spigot-Server-Patches/0631-Implement-PlayerFlowerPotManipulateEvent.patch b/Spigot-Server-Patches/0630-Implement-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from Spigot-Server-Patches/0631-Implement-PlayerFlowerPotManipulateEvent.patch rename to Spigot-Server-Patches/0630-Implement-PlayerFlowerPotManipulateEvent.patch diff --git a/Spigot-Server-Patches/0632-Fix-interact-event-not-being-called-in-adventure.patch b/Spigot-Server-Patches/0631-Fix-interact-event-not-being-called-in-adventure.patch similarity index 100% rename from Spigot-Server-Patches/0632-Fix-interact-event-not-being-called-in-adventure.patch rename to Spigot-Server-Patches/0631-Fix-interact-event-not-being-called-in-adventure.patch diff --git a/Spigot-Server-Patches/0633-Zombie-API-breaking-doors.patch b/Spigot-Server-Patches/0632-Zombie-API-breaking-doors.patch similarity index 95% rename from Spigot-Server-Patches/0633-Zombie-API-breaking-doors.patch rename to Spigot-Server-Patches/0632-Zombie-API-breaking-doors.patch index 08073e65fd..06762d7654 100644 --- a/Spigot-Server-Patches/0633-Zombie-API-breaking-doors.patch +++ b/Spigot-Server-Patches/0632-Zombie-API-breaking-doors.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Zombie API - breaking doors diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java -index e3606722cb1b3f6a11d34e1cdef7210280dba677..096c345da09b273c9e3e30e93759f5901c5e6fb4 100644 +index 59bfb9c269aa95d66e7b9f107f6798f7f86fd245..2aaa6aa323e805423a8fd2bd32cc6a1e48edc817 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/src/main/java/net/minecraft/server/EntityZombie.java @@ -79,10 +79,12 @@ public class EntityZombie extends EntityMonster { diff --git a/Spigot-Server-Patches/0634-Fix-nerfed-slime-when-splitting.patch b/Spigot-Server-Patches/0633-Fix-nerfed-slime-when-splitting.patch similarity index 100% rename from Spigot-Server-Patches/0634-Fix-nerfed-slime-when-splitting.patch rename to Spigot-Server-Patches/0633-Fix-nerfed-slime-when-splitting.patch diff --git a/Spigot-Server-Patches/0635-Add-EntityLoadCrossbowEvent.patch b/Spigot-Server-Patches/0634-Add-EntityLoadCrossbowEvent.patch similarity index 96% rename from Spigot-Server-Patches/0635-Add-EntityLoadCrossbowEvent.patch rename to Spigot-Server-Patches/0634-Add-EntityLoadCrossbowEvent.patch index 82f277001b..4f6c5eb776 100644 --- a/Spigot-Server-Patches/0635-Add-EntityLoadCrossbowEvent.patch +++ b/Spigot-Server-Patches/0634-Add-EntityLoadCrossbowEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add EntityLoadCrossbowEvent diff --git a/src/main/java/net/minecraft/server/ItemCrossbow.java b/src/main/java/net/minecraft/server/ItemCrossbow.java -index 14c0e7382292b3d39858d4d957df8016c301c712..ac60163117a52ea97b710fc93552dd1699e8a092 100644 +index 658b5ca36d951f2f58d91613b89a328109606fd6..10b1f219fb41bffa09aeeedd4eeb4d432d35ed38 100644 --- a/src/main/java/net/minecraft/server/ItemCrossbow.java +++ b/src/main/java/net/minecraft/server/ItemCrossbow.java @@ -1,6 +1,10 @@ diff --git a/Spigot-Server-Patches/0636-Guardian-beam-workaround.patch b/Spigot-Server-Patches/0635-Guardian-beam-workaround.patch similarity index 100% rename from Spigot-Server-Patches/0636-Guardian-beam-workaround.patch rename to Spigot-Server-Patches/0635-Guardian-beam-workaround.patch diff --git a/Spigot-Server-Patches/0637-Added-WorldGameRuleChangeEvent.patch b/Spigot-Server-Patches/0636-Added-WorldGameRuleChangeEvent.patch similarity index 98% rename from Spigot-Server-Patches/0637-Added-WorldGameRuleChangeEvent.patch rename to Spigot-Server-Patches/0636-Added-WorldGameRuleChangeEvent.patch index 32c7d06bc8..5014da1a10 100644 --- a/Spigot-Server-Patches/0637-Added-WorldGameRuleChangeEvent.patch +++ b/Spigot-Server-Patches/0636-Added-WorldGameRuleChangeEvent.patch @@ -74,7 +74,7 @@ index b245428604e2a432fa3bab4836a5ca1fb35c3f64..53b40f8947c9380ef57ecc7edca203c5 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index b71316cce3bdbf3485be456f0260c6b3463cff8e..0314cb1270803265dc4bf4268697b09aabf2c612 100644 +index 597d7a36d7d0b19502d92cf13da53d96c6ede58a..d86c25593db7cc0a73db1c37af94ae4e41bb4e93 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -2345,8 +2345,13 @@ public class CraftWorld implements World { diff --git a/Spigot-Server-Patches/0638-Added-ServerResourcesReloadedEvent.patch b/Spigot-Server-Patches/0637-Added-ServerResourcesReloadedEvent.patch similarity index 97% rename from Spigot-Server-Patches/0638-Added-ServerResourcesReloadedEvent.patch rename to Spigot-Server-Patches/0637-Added-ServerResourcesReloadedEvent.patch index b9ea97154b..7fb1818f62 100644 --- a/Spigot-Server-Patches/0638-Added-ServerResourcesReloadedEvent.patch +++ b/Spigot-Server-Patches/0637-Added-ServerResourcesReloadedEvent.patch @@ -34,7 +34,7 @@ index 08e472b71cf85b854eaa831881577ce2c3c03b11..4558147a51be6713c11bda6a60fd5ca3 // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 4d7e8e8eed7786c602e54786cb142972f75ca65d..c3fb69b18bf66ac8532196d953d9729ffb394721 100644 +index 242b2924c4b0b163b010a9d771130a6b15160e4c..8c384171ca56a0989ffef1813ad0a9ee3ea31d29 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -2,9 +2,6 @@ package net.minecraft.server; diff --git a/Spigot-Server-Patches/0639-Added-world-settings-for-mobs-picking-up-loot.patch b/Spigot-Server-Patches/0638-Added-world-settings-for-mobs-picking-up-loot.patch similarity index 100% rename from Spigot-Server-Patches/0639-Added-world-settings-for-mobs-picking-up-loot.patch rename to Spigot-Server-Patches/0638-Added-world-settings-for-mobs-picking-up-loot.patch diff --git a/Spigot-Server-Patches/0640-Implemented-BlockFailedDispenseEvent.patch b/Spigot-Server-Patches/0639-Implemented-BlockFailedDispenseEvent.patch similarity index 100% rename from Spigot-Server-Patches/0640-Implemented-BlockFailedDispenseEvent.patch rename to Spigot-Server-Patches/0639-Implemented-BlockFailedDispenseEvent.patch diff --git a/Spigot-Server-Patches/0641-Added-PlayerLecternPageChangeEvent.patch b/Spigot-Server-Patches/0640-Added-PlayerLecternPageChangeEvent.patch similarity index 100% rename from Spigot-Server-Patches/0641-Added-PlayerLecternPageChangeEvent.patch rename to Spigot-Server-Patches/0640-Added-PlayerLecternPageChangeEvent.patch diff --git a/Spigot-Server-Patches/0642-Fire-event-on-GS4-query.patch b/Spigot-Server-Patches/0641-Fire-event-on-GS4-query.patch similarity index 100% rename from Spigot-Server-Patches/0642-Fire-event-on-GS4-query.patch rename to Spigot-Server-Patches/0641-Fire-event-on-GS4-query.patch diff --git a/Spigot-Server-Patches/0643-Added-PlayerLoomPatternSelectEvent.patch b/Spigot-Server-Patches/0642-Added-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from Spigot-Server-Patches/0643-Added-PlayerLoomPatternSelectEvent.patch rename to Spigot-Server-Patches/0642-Added-PlayerLoomPatternSelectEvent.patch diff --git a/Spigot-Server-Patches/0644-Configurable-door-breaking-difficulty.patch b/Spigot-Server-Patches/0643-Configurable-door-breaking-difficulty.patch similarity index 98% rename from Spigot-Server-Patches/0644-Configurable-door-breaking-difficulty.patch rename to Spigot-Server-Patches/0643-Configurable-door-breaking-difficulty.patch index e1944ebfb6..a97b0bde38 100644 --- a/Spigot-Server-Patches/0644-Configurable-door-breaking-difficulty.patch +++ b/Spigot-Server-Patches/0643-Configurable-door-breaking-difficulty.patch @@ -79,7 +79,7 @@ index c0d26aa9dcd02c44d744b10e18609857ada95889..4761ddfedeed54e79788a6f60f06a805 } diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java -index 62d202ff871cf3f3deea69931fbee84131bdda8b..752e39ad94ea9e8254853a3fda846be2bd436918 100644 +index cab4226166c43f11f77be262e0ced1b223764b7d..4078f5dd68d0ca49886911d1bf58731129d731be 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/src/main/java/net/minecraft/server/EntityZombie.java @@ -25,6 +25,7 @@ public class EntityZombie extends EntityMonster { diff --git a/Spigot-Server-Patches/0645-Empty-commands-shall-not-be-dispatched.patch b/Spigot-Server-Patches/0644-Empty-commands-shall-not-be-dispatched.patch similarity index 100% rename from Spigot-Server-Patches/0645-Empty-commands-shall-not-be-dispatched.patch rename to Spigot-Server-Patches/0644-Empty-commands-shall-not-be-dispatched.patch diff --git a/Spigot-Server-Patches/0646-Implement-API-to-expose-exact-interaction-point.patch b/Spigot-Server-Patches/0645-Implement-API-to-expose-exact-interaction-point.patch similarity index 97% rename from Spigot-Server-Patches/0646-Implement-API-to-expose-exact-interaction-point.patch rename to Spigot-Server-Patches/0645-Implement-API-to-expose-exact-interaction-point.patch index fd4b90bb34..5edff01a84 100644 --- a/Spigot-Server-Patches/0646-Implement-API-to-expose-exact-interaction-point.patch +++ b/Spigot-Server-Patches/0645-Implement-API-to-expose-exact-interaction-point.patch @@ -18,7 +18,7 @@ index 485b609bb5387b0f8a46c1201177cdc6d183ad91..114e986e5132e5e4bb42d0f08a067429 interactResult = event.useItemInHand() == Event.Result.DENY; interactPosition = blockposition.immutableCopy(); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 4534d22aec95cf247daf7575472acd0eba91a3c9..c762015e1402b59bf28dae7f947e7737fbac5c1d 100644 +index 636f2c0a83a6651dae99b39fd96c0c9f065b29b5..d543e9ff0622c8fcab9c8ec24648a8038f080a5f 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -64,9 +64,11 @@ import net.minecraft.server.NPC; diff --git a/Spigot-Server-Patches/0647-Remove-stale-POIs.patch b/Spigot-Server-Patches/0646-Remove-stale-POIs.patch similarity index 97% rename from Spigot-Server-Patches/0647-Remove-stale-POIs.patch rename to Spigot-Server-Patches/0646-Remove-stale-POIs.patch index f05a9b6441..6494c68c6c 100644 --- a/Spigot-Server-Patches/0647-Remove-stale-POIs.patch +++ b/Spigot-Server-Patches/0646-Remove-stale-POIs.patch @@ -25,7 +25,7 @@ index b926cebd053bef829517c9d9bbf1c609c23ca04a..6a0f07b13eef5560dfc7c7b39618c0b8 return (Boolean) this.d(SectionPosition.a(blockposition).s()).map((villageplacesection) -> { return villageplacesection.a(blockposition, predicate); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 5b0b6edfa790918e56399ff6c83f3feb6e5aca49..9c50357bb5da309b7cad74fdee15697a20e2e15f 100644 +index 91d759fee68e8b285f912406fb338750c286f6a0..fbe7f43f6c1010e7a34114f8afb0e64934744335 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1942,8 +1942,16 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/Spigot-Server-Patches/0648-Fix-villager-boat-exploit.patch b/Spigot-Server-Patches/0647-Fix-villager-boat-exploit.patch similarity index 100% rename from Spigot-Server-Patches/0648-Fix-villager-boat-exploit.patch rename to Spigot-Server-Patches/0647-Fix-villager-boat-exploit.patch diff --git a/Spigot-Server-Patches/0649-Entity-load-save-limit-per-chunk.patch b/Spigot-Server-Patches/0648-Entity-load-save-limit-per-chunk.patch similarity index 100% rename from Spigot-Server-Patches/0649-Entity-load-save-limit-per-chunk.patch rename to Spigot-Server-Patches/0648-Entity-load-save-limit-per-chunk.patch diff --git a/Spigot-Server-Patches/0650-Add-sendOpLevel-API.patch b/Spigot-Server-Patches/0649-Add-sendOpLevel-API.patch similarity index 100% rename from Spigot-Server-Patches/0650-Add-sendOpLevel-API.patch rename to Spigot-Server-Patches/0649-Add-sendOpLevel-API.patch diff --git a/Spigot-Server-Patches/0651-Add-StructureLocateEvent.patch b/Spigot-Server-Patches/0650-Add-StructureLocateEvent.patch similarity index 100% rename from Spigot-Server-Patches/0651-Add-StructureLocateEvent.patch rename to Spigot-Server-Patches/0650-Add-StructureLocateEvent.patch diff --git a/Spigot-Server-Patches/0652-Collision-option-for-requiring-a-player-participant.patch b/Spigot-Server-Patches/0651-Collision-option-for-requiring-a-player-participant.patch similarity index 100% rename from Spigot-Server-Patches/0652-Collision-option-for-requiring-a-player-participant.patch rename to Spigot-Server-Patches/0651-Collision-option-for-requiring-a-player-participant.patch diff --git a/Spigot-Server-Patches/0653-Make-ProjectileHitEvent-Cancellable.patch b/Spigot-Server-Patches/0652-Make-ProjectileHitEvent-Cancellable.patch similarity index 97% rename from Spigot-Server-Patches/0653-Make-ProjectileHitEvent-Cancellable.patch rename to Spigot-Server-Patches/0652-Make-ProjectileHitEvent-Cancellable.patch index 4c1d17f76b..d2892415e9 100644 --- a/Spigot-Server-Patches/0653-Make-ProjectileHitEvent-Cancellable.patch +++ b/Spigot-Server-Patches/0652-Make-ProjectileHitEvent-Cancellable.patch @@ -32,7 +32,7 @@ index 9f5ce64a60fe7c312399ee416b11b84213dd3bee..bbc089b41fcbe0141f13591db2cb44b9 if (movingobjectposition_enummovingobjecttype == MovingObjectPosition.EnumMovingObjectType.ENTITY) { diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index c762015e1402b59bf28dae7f947e7737fbac5c1d..63d329dca12f902e2fb2a62ee4c86aea6453f1a3 100644 +index d543e9ff0622c8fcab9c8ec24648a8038f080a5f..622014739f3b37e9c62d7923c6d105c8b53f1ceb 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1295,9 +1295,9 @@ public class CraftEventFactory { diff --git a/Spigot-Server-Patches/0654-Return-chat-component-with-empty-text-instead-of-thr.patch b/Spigot-Server-Patches/0653-Return-chat-component-with-empty-text-instead-of-thr.patch similarity index 100% rename from Spigot-Server-Patches/0654-Return-chat-component-with-empty-text-instead-of-thr.patch rename to Spigot-Server-Patches/0653-Return-chat-component-with-empty-text-instead-of-thr.patch diff --git a/Spigot-Server-Patches/0655-Make-schedule-command-per-world.patch b/Spigot-Server-Patches/0654-Make-schedule-command-per-world.patch similarity index 100% rename from Spigot-Server-Patches/0655-Make-schedule-command-per-world.patch rename to Spigot-Server-Patches/0654-Make-schedule-command-per-world.patch diff --git a/Spigot-Server-Patches/0656-Configurable-max-leash-distance.patch b/Spigot-Server-Patches/0655-Configurable-max-leash-distance.patch similarity index 100% rename from Spigot-Server-Patches/0656-Configurable-max-leash-distance.patch rename to Spigot-Server-Patches/0655-Configurable-max-leash-distance.patch diff --git a/Spigot-Server-Patches/0657-Implement-BlockPreDispenseEvent.patch b/Spigot-Server-Patches/0656-Implement-BlockPreDispenseEvent.patch similarity index 96% rename from Spigot-Server-Patches/0657-Implement-BlockPreDispenseEvent.patch rename to Spigot-Server-Patches/0656-Implement-BlockPreDispenseEvent.patch index 84e1db2f66..53fe5edfb6 100644 --- a/Spigot-Server-Patches/0657-Implement-BlockPreDispenseEvent.patch +++ b/Spigot-Server-Patches/0656-Implement-BlockPreDispenseEvent.patch @@ -17,7 +17,7 @@ index 063453552b7b6c2395c8f9be27cdb71a15a56ca4..89325af931b5ca43729758e94e971b61 tileentitydispenser.setItem(i, idispensebehavior.dispense(sourceblock, itemstack)); } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 63d329dca12f902e2fb2a62ee4c86aea6453f1a3..696ded96e6018bc5289cc20f72d6dc9395d3b6a6 100644 +index 622014739f3b37e9c62d7923c6d105c8b53f1ceb..db56b48f2fd2d45f286339e62090155f8d802969 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -13,6 +13,7 @@ import java.util.List; diff --git a/Spigot-Server-Patches/0658-Added-Vanilla-Entity-Tags.patch b/Spigot-Server-Patches/0657-Added-Vanilla-Entity-Tags.patch similarity index 100% rename from Spigot-Server-Patches/0658-Added-Vanilla-Entity-Tags.patch rename to Spigot-Server-Patches/0657-Added-Vanilla-Entity-Tags.patch diff --git a/Spigot-Server-Patches/0659-added-Wither-API.patch b/Spigot-Server-Patches/0658-added-Wither-API.patch similarity index 100% rename from Spigot-Server-Patches/0659-added-Wither-API.patch rename to Spigot-Server-Patches/0658-added-Wither-API.patch diff --git a/Spigot-Server-Patches/0660-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/Spigot-Server-Patches/0659-Added-firing-of-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from Spigot-Server-Patches/0660-Added-firing-of-PlayerChangeBeaconEffectEvent.patch rename to Spigot-Server-Patches/0659-Added-firing-of-PlayerChangeBeaconEffectEvent.patch diff --git a/Spigot-Server-Patches/0661-Fix-console-spam-when-removing-chests-in-water.patch b/Spigot-Server-Patches/0660-Fix-console-spam-when-removing-chests-in-water.patch similarity index 100% rename from Spigot-Server-Patches/0661-Fix-console-spam-when-removing-chests-in-water.patch rename to Spigot-Server-Patches/0660-Fix-console-spam-when-removing-chests-in-water.patch diff --git a/Spigot-Server-Patches/0662-Add-toggle-for-always-placing-the-dragon-egg.patch b/Spigot-Server-Patches/0661-Add-toggle-for-always-placing-the-dragon-egg.patch similarity index 100% rename from Spigot-Server-Patches/0662-Add-toggle-for-always-placing-the-dragon-egg.patch rename to Spigot-Server-Patches/0661-Add-toggle-for-always-placing-the-dragon-egg.patch diff --git a/Spigot-Server-Patches/0663-Added-PlayerStonecutterRecipeSelectEvent.patch b/Spigot-Server-Patches/0662-Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from Spigot-Server-Patches/0663-Added-PlayerStonecutterRecipeSelectEvent.patch rename to Spigot-Server-Patches/0662-Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/Spigot-Server-Patches/0664-Skip-distance-map-update-when-spawning-disabled.patch b/Spigot-Server-Patches/0663-Skip-distance-map-update-when-spawning-disabled.patch similarity index 100% rename from Spigot-Server-Patches/0664-Skip-distance-map-update-when-spawning-disabled.patch rename to Spigot-Server-Patches/0663-Skip-distance-map-update-when-spawning-disabled.patch diff --git a/Spigot-Server-Patches/0665-Reset-shield-blocking-on-dimension-change.patch b/Spigot-Server-Patches/0664-Reset-shield-blocking-on-dimension-change.patch similarity index 100% rename from Spigot-Server-Patches/0665-Reset-shield-blocking-on-dimension-change.patch rename to Spigot-Server-Patches/0664-Reset-shield-blocking-on-dimension-change.patch diff --git a/Spigot-Server-Patches/0666-EntityMoveEvent.patch b/Spigot-Server-Patches/0665-EntityMoveEvent.patch similarity index 100% rename from Spigot-Server-Patches/0666-EntityMoveEvent.patch rename to Spigot-Server-Patches/0665-EntityMoveEvent.patch diff --git a/Spigot-Server-Patches/0667-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/Spigot-Server-Patches/0666-Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 97% rename from Spigot-Server-Patches/0667-Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to Spigot-Server-Patches/0666-Add-dropLeash-variable-to-EntityUnleashEvent.patch index c5a094af28..f367be4fe1 100644 --- a/Spigot-Server-Patches/0667-Add-dropLeash-variable-to-EntityUnleashEvent.patch +++ b/Spigot-Server-Patches/0666-Add-dropLeash-variable-to-EntityUnleashEvent.patch @@ -37,7 +37,7 @@ index eaa10d6e3a3c37b83fed58637941273fee9b0be8..2a5160a937a6a9968f9357c5ea3e4ced } else if (f > 6.0F) { double d0 = (entity.locX() - this.locX()) / (double) f; diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index eb5c3a1f0d9ff665631caf5bf579e83d1ed25e4f..54bb846fe07f232f3bfb53353064d9a572fdd803 100644 +index eb5c3a1f0d9ff665631caf5bf579e83d1ed25e4f..a88521745f9f9b6935a61db52db915ea483af227 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -20,6 +20,7 @@ import org.bukkit.event.entity.EntityTargetEvent; @@ -108,7 +108,7 @@ index eb5c3a1f0d9ff665631caf5bf579e83d1ed25e4f..54bb846fe07f232f3bfb53353064d9a5 } } diff --git a/src/main/java/net/minecraft/server/EntityLeash.java b/src/main/java/net/minecraft/server/EntityLeash.java -index 6bd25833bc3ff3ca46367a48da001ed9bda8c19d..4d64bd3da64af122fe966d37367f87140447df83 100644 +index 6bd25833bc3ff3ca46367a48da001ed9bda8c19d..5e4652e997362e7c3fac05ac8a4fcdd6051c4f4a 100644 --- a/src/main/java/net/minecraft/server/EntityLeash.java +++ b/src/main/java/net/minecraft/server/EntityLeash.java @@ -5,6 +5,7 @@ import java.util.List; @@ -137,7 +137,7 @@ index 6bd25833bc3ff3ca46367a48da001ed9bda8c19d..4d64bd3da64af122fe966d37367f8714 } } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 696ded96e6018bc5289cc20f72d6dc9395d3b6a6..c9e2d2f0eb1f4075da2b5fa05198de4940ebf354 100644 +index db56b48f2fd2d45f286339e62090155f8d802969..a0a116ac7a4e5ecfd7514b26add44e75be88f631 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1447,8 +1447,10 @@ public class CraftEventFactory { diff --git a/Spigot-Server-Patches/0668-add-DragonEggFormEvent.patch b/Spigot-Server-Patches/0667-add-DragonEggFormEvent.patch similarity index 100% rename from Spigot-Server-Patches/0668-add-DragonEggFormEvent.patch rename to Spigot-Server-Patches/0667-add-DragonEggFormEvent.patch diff --git a/Spigot-Server-Patches/0669-added-option-to-disable-pathfinding-updates-on-block.patch b/Spigot-Server-Patches/0668-added-option-to-disable-pathfinding-updates-on-block.patch similarity index 100% rename from Spigot-Server-Patches/0669-added-option-to-disable-pathfinding-updates-on-block.patch rename to Spigot-Server-Patches/0668-added-option-to-disable-pathfinding-updates-on-block.patch diff --git a/Spigot-Server-Patches/0670-Inline-shift-direction-fields.patch b/Spigot-Server-Patches/0669-Inline-shift-direction-fields.patch similarity index 100% rename from Spigot-Server-Patches/0670-Inline-shift-direction-fields.patch rename to Spigot-Server-Patches/0669-Inline-shift-direction-fields.patch diff --git a/Spigot-Server-Patches/0671-Allow-adding-items-to-BlockDropItemEvent.patch b/Spigot-Server-Patches/0670-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 95% rename from Spigot-Server-Patches/0671-Allow-adding-items-to-BlockDropItemEvent.patch rename to Spigot-Server-Patches/0670-Allow-adding-items-to-BlockDropItemEvent.patch index 1937b667c7..f501a92886 100644 --- a/Spigot-Server-Patches/0671-Allow-adding-items-to-BlockDropItemEvent.patch +++ b/Spigot-Server-Patches/0670-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 c9e2d2f0eb1f4075da2b5fa05198de4940ebf354..b66fb60ad3949cebb3ff10878b7490675e703234 100644 +index a0a116ac7a4e5ecfd7514b26add44e75be88f631..9ff0f70154367b99317ed3927a97ec08c7e9e015 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -380,13 +380,30 @@ public class CraftEventFactory { diff --git a/Spigot-Server-Patches/0672-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/Spigot-Server-Patches/0671-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from Spigot-Server-Patches/0672-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to Spigot-Server-Patches/0671-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/Spigot-Server-Patches/0673-living-entity-allow-attribute-registration.patch b/Spigot-Server-Patches/0672-living-entity-allow-attribute-registration.patch similarity index 100% rename from Spigot-Server-Patches/0673-living-entity-allow-attribute-registration.patch rename to Spigot-Server-Patches/0672-living-entity-allow-attribute-registration.patch diff --git a/Spigot-Server-Patches/0674-fix-dead-slime-setSize-invincibility.patch b/Spigot-Server-Patches/0673-fix-dead-slime-setSize-invincibility.patch similarity index 100% rename from Spigot-Server-Patches/0674-fix-dead-slime-setSize-invincibility.patch rename to Spigot-Server-Patches/0673-fix-dead-slime-setSize-invincibility.patch