diff --git a/patches/api/0204-Expose-game-version.patch b/patches/api/0203-Expose-game-version.patch similarity index 100% rename from patches/api/0204-Expose-game-version.patch rename to patches/api/0203-Expose-game-version.patch diff --git a/patches/api/0203-Add-villager-reputation-API.patch b/patches/api/0204-Add-villager-reputation-API.patch similarity index 100% rename from patches/api/0203-Add-villager-reputation-API.patch rename to patches/api/0204-Add-villager-reputation-API.patch diff --git a/patches/server/0380-Optimise-random-block-ticking.patch b/patches/removed/1.17/0380-Optimise-random-block-ticking.patch similarity index 99% rename from patches/server/0380-Optimise-random-block-ticking.patch rename to patches/removed/1.17/0380-Optimise-random-block-ticking.patch index 9764a5fbb4..497cf2c771 100644 --- a/patches/server/0380-Optimise-random-block-ticking.patch +++ b/patches/removed/1.17/0380-Optimise-random-block-ticking.patch @@ -18,6 +18,8 @@ total number of blocks ticked per world tick remains the same. Therefore, the chance of a random tickable block being ticked remains the same. +1.17: The IBlockDataList util class needs to be redone to support variable height limits + diff --git a/src/main/java/com/destroystokyo/paper/util/math/ThreadUnsafeRandom.java b/src/main/java/com/destroystokyo/paper/util/math/ThreadUnsafeRandom.java new file mode 100644 index 0000000000000000000000000000000000000000..3edc8e52e06a62ce9f8cc734fd7458b37cfaad91 diff --git a/patches/server/0347-Expose-the-internal-current-tick.patch b/patches/server/0336-Expose-the-internal-current-tick.patch similarity index 100% rename from patches/server/0347-Expose-the-internal-current-tick.patch rename to patches/server/0336-Expose-the-internal-current-tick.patch diff --git a/patches/server/0336-Fix-World-isChunkGenerated-calls.patch b/patches/server/0337-Fix-World-isChunkGenerated-calls.patch similarity index 100% rename from patches/server/0336-Fix-World-isChunkGenerated-calls.patch rename to patches/server/0337-Fix-World-isChunkGenerated-calls.patch diff --git a/patches/server/0337-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/server/0338-Show-blockstate-location-if-we-failed-to-read-it.patch similarity index 100% rename from patches/server/0337-Show-blockstate-location-if-we-failed-to-read-it.patch rename to patches/server/0338-Show-blockstate-location-if-we-failed-to-read-it.patch diff --git a/patches/server/0338-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/server/0339-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch similarity index 100% rename from patches/server/0338-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch rename to patches/server/0339-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch diff --git a/patches/server/0339-Configurable-projectile-relative-velocity.patch b/patches/server/0340-Configurable-projectile-relative-velocity.patch similarity index 100% rename from patches/server/0339-Configurable-projectile-relative-velocity.patch rename to patches/server/0340-Configurable-projectile-relative-velocity.patch diff --git a/patches/server/0340-offset-item-frame-ticking.patch b/patches/server/0341-offset-item-frame-ticking.patch similarity index 100% rename from patches/server/0340-offset-item-frame-ticking.patch rename to patches/server/0341-offset-item-frame-ticking.patch diff --git a/patches/server/0341-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch b/patches/server/0342-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch similarity index 100% rename from patches/server/0341-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch rename to patches/server/0342-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch diff --git a/patches/server/0342-Fix-MC-158900.patch b/patches/server/0343-Fix-MC-158900.patch similarity index 100% rename from patches/server/0342-Fix-MC-158900.patch rename to patches/server/0343-Fix-MC-158900.patch diff --git a/patches/server/0343-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0344-Prevent-consuming-the-wrong-itemstack.patch similarity index 100% rename from patches/server/0343-Prevent-consuming-the-wrong-itemstack.patch rename to patches/server/0344-Prevent-consuming-the-wrong-itemstack.patch diff --git a/patches/server/0344-Generator-Settings.patch b/patches/server/0345-Generator-Settings.patch similarity index 100% rename from patches/server/0344-Generator-Settings.patch rename to patches/server/0345-Generator-Settings.patch diff --git a/patches/server/0345-Fix-MC-161754.patch b/patches/server/0346-Fix-MC-161754.patch similarity index 100% rename from patches/server/0345-Fix-MC-161754.patch rename to patches/server/0346-Fix-MC-161754.patch diff --git a/patches/server/0346-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch b/patches/server/0347-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch similarity index 100% rename from patches/server/0346-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch rename to patches/server/0347-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch diff --git a/patches/server/0381-Entity-Jump-API.patch b/patches/server/0380-Entity-Jump-API.patch similarity index 100% rename from patches/server/0381-Entity-Jump-API.patch rename to patches/server/0380-Entity-Jump-API.patch diff --git a/patches/server/0382-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0381-Add-option-to-nerf-pigmen-from-nether-portals.patch similarity index 97% rename from patches/server/0382-Add-option-to-nerf-pigmen-from-nether-portals.patch rename to patches/server/0381-Add-option-to-nerf-pigmen-from-nether-portals.patch index 1b41ae13af..d55e084988 100644 --- a/patches/server/0382-Add-option-to-nerf-pigmen-from-nether-portals.patch +++ b/patches/server/0381-Add-option-to-nerf-pigmen-from-nether-portals.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add option to nerf pigmen from nether portals diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index b6d680d6d6762125db180638ee43bf9ece4dc51a..c9b5f662b94e47a25949449af8ce42edc78917b1 100644 +index f2e4939c8144b9bc7441130302ab3e2358c42063..3d14a7dbcc6bc46141596a7e04f790bfe8f560c6 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -482,6 +482,11 @@ public class PaperWorldConfig { diff --git a/patches/server/0383-Make-the-GUI-graph-fancier.patch b/patches/server/0382-Make-the-GUI-graph-fancier.patch similarity index 100% rename from patches/server/0383-Make-the-GUI-graph-fancier.patch rename to patches/server/0382-Make-the-GUI-graph-fancier.patch diff --git a/patches/server/0384-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0383-add-hand-to-BlockMultiPlaceEvent.patch similarity index 100% rename from patches/server/0384-add-hand-to-BlockMultiPlaceEvent.patch rename to patches/server/0383-add-hand-to-BlockMultiPlaceEvent.patch diff --git a/patches/server/0385-Prevent-teleporting-dead-entities.patch b/patches/server/0384-Prevent-teleporting-dead-entities.patch similarity index 100% rename from patches/server/0385-Prevent-teleporting-dead-entities.patch rename to patches/server/0384-Prevent-teleporting-dead-entities.patch diff --git a/patches/server/0386-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0385-Validate-tripwire-hook-placement-before-update.patch similarity index 100% rename from patches/server/0386-Validate-tripwire-hook-placement-before-update.patch rename to patches/server/0385-Validate-tripwire-hook-placement-before-update.patch diff --git a/patches/server/0387-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0386-Add-option-to-allow-iron-golems-to-spawn-in-air.patch similarity index 95% rename from patches/server/0387-Add-option-to-allow-iron-golems-to-spawn-in-air.patch rename to patches/server/0386-Add-option-to-allow-iron-golems-to-spawn-in-air.patch index b5cc0ac161..2a6844e61f 100644 --- a/patches/server/0387-Add-option-to-allow-iron-golems-to-spawn-in-air.patch +++ b/patches/server/0386-Add-option-to-allow-iron-golems-to-spawn-in-air.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add option to allow iron golems to spawn in air diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index c9b5f662b94e47a25949449af8ce42edc78917b1..12a2a05b400e314f48b234e160b27f5a883c2c0e 100644 +index 3d14a7dbcc6bc46141596a7e04f790bfe8f560c6..9fb1ea2e363de88c48530341fd11541ebdec8831 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -382,6 +382,11 @@ public class PaperWorldConfig { diff --git a/patches/server/0388-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0387-Configurable-chance-of-villager-zombie-infection.patch similarity index 96% rename from patches/server/0388-Configurable-chance-of-villager-zombie-infection.patch rename to patches/server/0387-Configurable-chance-of-villager-zombie-infection.patch index 5070fa9616..e00e3959f5 100644 --- a/patches/server/0388-Configurable-chance-of-villager-zombie-infection.patch +++ b/patches/server/0387-Configurable-chance-of-villager-zombie-infection.patch @@ -8,7 +8,7 @@ This allows you to solve an issue in vanilla behavior where: * On normal difficulty they will have a 50% of getting infected or dying. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 12a2a05b400e314f48b234e160b27f5a883c2c0e..c5c866c97c22008c3ea2c2f2b125b367072af92d 100644 +index 9fb1ea2e363de88c48530341fd11541ebdec8831..9dc8a9e49cac89e236d9fa0c053b70bf10ed6f6e 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -492,6 +492,11 @@ public class PaperWorldConfig { diff --git a/patches/server/0389-Optimise-Chunk-getFluid.patch b/patches/server/0388-Optimise-Chunk-getFluid.patch similarity index 92% rename from patches/server/0389-Optimise-Chunk-getFluid.patch rename to patches/server/0388-Optimise-Chunk-getFluid.patch index 864d8af90c..c971cc11ac 100644 --- a/patches/server/0389-Optimise-Chunk-getFluid.patch +++ b/patches/server/0388-Optimise-Chunk-getFluid.patch @@ -8,7 +8,7 @@ faster on its own, however removing the try catch makes it easier to inline due to code size diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java -index 1782be43f1dbe2776abe5087d305e271c62285dd..30e3dc506ecf7430b4cc5d3ac51627da8de8b1ba 100644 +index a088cb005525fda2c9d5521ab3bac43cfa38a393..085914b552583f54d0eb0eb5f1e4ac2146c5225c 100644 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java @@ -461,18 +461,20 @@ public class LevelChunk implements ChunkAccess { @@ -49,10 +49,10 @@ index 1782be43f1dbe2776abe5087d305e271c62285dd..30e3dc506ecf7430b4cc5d3ac51627da // CraftBukkit start diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java -index 79fda9a003ca4088404d3f0490c0c6a12afa1711..9ca27907c6e1d4d5cc79e954136c63a59d3be2b8 100644 +index ec8b67c1b024df38d5e1ad81acff33537ae25626..9fcff5c8efe0bd357a102c488b6c55295d2188aa 100644 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java -@@ -51,7 +51,7 @@ public class LevelChunkSection { +@@ -50,7 +50,7 @@ public class LevelChunkSection { } public FluidState getFluidState(int x, int y, int z) { diff --git a/patches/server/0390-Optimise-TickListServer-by-rewriting-it.patch b/patches/server/0389-Optimise-TickListServer-by-rewriting-it.patch similarity index 99% rename from patches/server/0390-Optimise-TickListServer-by-rewriting-it.patch rename to patches/server/0389-Optimise-TickListServer-by-rewriting-it.patch index 990782ae6c..0aa0cdd86f 100644 --- a/patches/server/0390-Optimise-TickListServer-by-rewriting-it.patch +++ b/patches/server/0389-Optimise-TickListServer-by-rewriting-it.patch @@ -941,7 +941,7 @@ index acb710c25a3b1a151a6dbf579a871529f077b70f..b0ff4a46807994e3afe4c8dc3810ecdd public ServerChunkCache(ServerLevel world, LevelStorageSource.LevelStorageAccess session, DataFixer dataFixer, StructureManager structureManager, Executor workerExecutor, ChunkGenerator chunkGenerator, int viewDistance, boolean flag, ChunkProgressListener worldGenerationProgressListener, ChunkStatusUpdateListener chunkstatusupdatelistener, Supplier supplier) { this.level = world; diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 5f499f2d8e62fc6f28c180c857582bd6c895c98c..6d2cad8e6bee4f83e39bc0d6949c3c94b1961bc2 100644 +index 3b7585760483b077783a28de8d04ba438eb25c16..e687eba2029b114a3272037c7be11160076afbcf 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -295,6 +295,15 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl diff --git a/patches/server/0391-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0390-Pillager-patrol-spawn-settings-and-per-player-option.patch similarity index 98% rename from patches/server/0391-Pillager-patrol-spawn-settings-and-per-player-option.patch rename to patches/server/0390-Pillager-patrol-spawn-settings-and-per-player-option.patch index d187b654da..37c03bc193 100644 --- a/patches/server/0391-Pillager-patrol-spawn-settings-and-per-player-option.patch +++ b/patches/server/0390-Pillager-patrol-spawn-settings-and-per-player-option.patch @@ -10,7 +10,7 @@ When not per player it will use the Vanilla mechanic of one delay per world and the world age for the start day. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index c5c866c97c22008c3ea2c2f2b125b367072af92d..c26f08f6fd53cd44e5679f19bd3fdaa04f60a437 100644 +index 9dc8a9e49cac89e236d9fa0c053b70bf10ed6f6e..2d038185846ae34bc301ab93d881022a05ee458b 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -469,10 +469,21 @@ public class PaperWorldConfig { diff --git a/patches/server/0392-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0391-Remote-Connections-shouldn-t-hold-up-shutdown.patch similarity index 100% rename from patches/server/0392-Remote-Connections-shouldn-t-hold-up-shutdown.patch rename to patches/server/0391-Remote-Connections-shouldn-t-hold-up-shutdown.patch diff --git a/patches/server/0393-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0392-Do-not-allow-bees-to-load-chunks-for-beehives.patch similarity index 100% rename from patches/server/0393-Do-not-allow-bees-to-load-chunks-for-beehives.patch rename to patches/server/0392-Do-not-allow-bees-to-load-chunks-for-beehives.patch diff --git a/patches/server/0394-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0393-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch similarity index 92% rename from patches/server/0394-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch rename to patches/server/0393-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch index 802b6b56ae..d9d0ac8a86 100644 --- a/patches/server/0394-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch +++ b/patches/server/0393-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch @@ -26,10 +26,10 @@ index d329d07532d4e4017a4c5cfad7b18795ab8a5186..d3966c1e648df8714b422644703b4d27 EntityType entitytypes = entity.getType(); int i = entitytypes.clientTrackingRange() * 16; diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 6d2cad8e6bee4f83e39bc0d6949c3c94b1961bc2..7ab4d8459b3396640f711f2670d91ba4945dc074 100644 +index e687eba2029b114a3272037c7be11160076afbcf..d2acfa3de9f5ac380b6bde1d4e8406db9e182371 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -2126,7 +2126,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl +@@ -2106,7 +2106,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl public void onTrackingStart(Entity entity) { org.spigotmc.AsyncCatcher.catchOp("entity register"); // Spigot @@ -38,7 +38,7 @@ index 6d2cad8e6bee4f83e39bc0d6949c3c94b1961bc2..7ab4d8459b3396640f711f2670d91ba4 if (entity instanceof ServerPlayer) { ServerLevel.this.players.add((ServerPlayer) entity); ServerLevel.this.updateSleepingPlayerList(); -@@ -2148,6 +2148,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl +@@ -2128,6 +2128,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl } entity.valid = true; // CraftBukkit diff --git a/patches/server/0395-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0394-Optimize-Collision-to-not-load-chunks.patch similarity index 100% rename from patches/server/0395-Optimize-Collision-to-not-load-chunks.patch rename to patches/server/0394-Optimize-Collision-to-not-load-chunks.patch diff --git a/patches/server/0396-Don-t-tick-dead-players.patch b/patches/server/0395-Don-t-tick-dead-players.patch similarity index 100% rename from patches/server/0396-Don-t-tick-dead-players.patch rename to patches/server/0395-Don-t-tick-dead-players.patch diff --git a/patches/server/0397-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0396-Dead-Player-s-shouldn-t-be-able-to-move.patch similarity index 100% rename from patches/server/0397-Dead-Player-s-shouldn-t-be-able-to-move.patch rename to patches/server/0396-Dead-Player-s-shouldn-t-be-able-to-move.patch diff --git a/patches/server/0398-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch b/patches/server/0397-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch similarity index 100% rename from patches/server/0398-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch rename to patches/server/0397-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch diff --git a/patches/server/0399-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch b/patches/server/0398-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch similarity index 99% rename from patches/server/0399-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch rename to patches/server/0398-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch index 506c1b1a98..f2e59de390 100644 --- a/patches/server/0399-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch +++ b/patches/server/0398-Mid-Tick-Chunk-Tasks-Speed-up-processing-of-chunk-lo.patch @@ -226,7 +226,7 @@ index d8cd652f76232b43b104b11247682288e99d9521..b464db85829f2f97926791056b339b93 // CraftBukkit start - process pending Chunk loadCallback() and unloadCallback() after each run task public boolean pollTask() { diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 7ab4d8459b3396640f711f2670d91ba4945dc074..0d553955460bf54181b8e3674c783c0febc30ce9 100644 +index d2acfa3de9f5ac380b6bde1d4e8406db9e182371..d724ce8cf79fe7194e79da2e8e369777bbe638d2 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -587,6 +587,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl diff --git a/patches/server/0400-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0399-Don-t-move-existing-players-to-world-spawn.patch similarity index 100% rename from patches/server/0400-Don-t-move-existing-players-to-world-spawn.patch rename to patches/server/0399-Don-t-move-existing-players-to-world-spawn.patch diff --git a/patches/server/0401-Add-tick-times-API-and-mspt-command.patch b/patches/server/0400-Add-tick-times-API-and-mspt-command.patch similarity index 100% rename from patches/server/0401-Add-tick-times-API-and-mspt-command.patch rename to patches/server/0400-Add-tick-times-API-and-mspt-command.patch diff --git a/patches/server/0402-Expose-MinecraftServer-isRunning.patch b/patches/server/0401-Expose-MinecraftServer-isRunning.patch similarity index 100% rename from patches/server/0402-Expose-MinecraftServer-isRunning.patch rename to patches/server/0401-Expose-MinecraftServer-isRunning.patch diff --git a/patches/server/0403-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0402-Add-Raw-Byte-ItemStack-Serialization.patch similarity index 100% rename from patches/server/0403-Add-Raw-Byte-ItemStack-Serialization.patch rename to patches/server/0402-Add-Raw-Byte-ItemStack-Serialization.patch diff --git a/patches/server/0404-Remove-streams-from-Mob-AI-System.patch b/patches/server/0403-Remove-streams-from-Mob-AI-System.patch similarity index 100% rename from patches/server/0404-Remove-streams-from-Mob-AI-System.patch rename to patches/server/0403-Remove-streams-from-Mob-AI-System.patch diff --git a/patches/server/0405-Async-command-map-building.patch b/patches/server/0404-Async-command-map-building.patch similarity index 100% rename from patches/server/0405-Async-command-map-building.patch rename to patches/server/0404-Async-command-map-building.patch diff --git a/patches/server/0406-Improved-Watchdog-Support.patch b/patches/server/0405-Improved-Watchdog-Support.patch similarity index 99% rename from patches/server/0406-Improved-Watchdog-Support.patch rename to patches/server/0405-Improved-Watchdog-Support.patch index 0646c4bf19..a374c33f72 100644 --- a/patches/server/0406-Improved-Watchdog-Support.patch +++ b/patches/server/0405-Improved-Watchdog-Support.patch @@ -299,7 +299,7 @@ index 7bf4bf5cb2c1b54a7e2733091f48f3a824336d36..dcce05d2f4ab16424db4ab103a12188e } diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 1e373db7080bd4fa5c62188e3ddb3e5206e9b5b1..df28b1d2a67b327f6375290126943ae0292d5595 100644 +index 02c4396f3f42c1ec387eae9b2f7815f6e9f9e1c4..cddf6d95b13635459cc1206a3f6f9a4a151d4066 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -844,6 +844,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { @@ -311,10 +311,10 @@ index 1e373db7080bd4fa5c62188e3ddb3e5206e9b5b1..df28b1d2a67b327f6375290126943ae0 String msg = "Entity threw exception at " + entity.level.getWorld().getName() + ":" + entity.getX() + "," + entity.getY() + "," + entity.getZ(); System.err.println(msg); diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java -index 30e3dc506ecf7430b4cc5d3ac51627da8de8b1ba..be5dfaa7259e5415e3ccbefdc2eae402fe2aebe0 100644 +index 085914b552583f54d0eb0eb5f1e4ac2146c5225c..cc72c5c7e63794974080648abc94646819ea0924 100644 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java -@@ -1320,6 +1320,7 @@ public class LevelChunk implements ChunkAccess { +@@ -1319,6 +1319,7 @@ public class LevelChunk implements ChunkAccess { gameprofilerfiller.pop(); } catch (Throwable throwable) { diff --git a/patches/server/0407-Optimize-Pathfinding.patch b/patches/server/0406-Optimize-Pathfinding.patch similarity index 100% rename from patches/server/0407-Optimize-Pathfinding.patch rename to patches/server/0406-Optimize-Pathfinding.patch diff --git a/patches/server/0408-Reduce-Either-Optional-allocation.patch b/patches/server/0407-Reduce-Either-Optional-allocation.patch similarity index 100% rename from patches/server/0408-Reduce-Either-Optional-allocation.patch rename to patches/server/0407-Reduce-Either-Optional-allocation.patch diff --git a/patches/server/0409-Remove-streams-from-PairedQueue.patch b/patches/server/0408-Remove-streams-from-PairedQueue.patch similarity index 100% rename from patches/server/0409-Remove-streams-from-PairedQueue.patch rename to patches/server/0408-Remove-streams-from-PairedQueue.patch diff --git a/patches/server/0410-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/server/0409-Reduce-memory-footprint-of-NBTTagCompound.patch similarity index 100% rename from patches/server/0410-Reduce-memory-footprint-of-NBTTagCompound.patch rename to patches/server/0409-Reduce-memory-footprint-of-NBTTagCompound.patch diff --git a/patches/server/0411-Prevent-opening-inventories-when-frozen.patch b/patches/server/0410-Prevent-opening-inventories-when-frozen.patch similarity index 100% rename from patches/server/0411-Prevent-opening-inventories-when-frozen.patch rename to patches/server/0410-Prevent-opening-inventories-when-frozen.patch diff --git a/patches/server/0412-Optimise-ArraySetSorted-removeIf.patch b/patches/server/0411-Optimise-ArraySetSorted-removeIf.patch similarity index 100% rename from patches/server/0412-Optimise-ArraySetSorted-removeIf.patch rename to patches/server/0411-Optimise-ArraySetSorted-removeIf.patch diff --git a/patches/server/0413-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0412-Don-t-run-entity-collision-code-if-not-needed.patch similarity index 100% rename from patches/server/0413-Don-t-run-entity-collision-code-if-not-needed.patch rename to patches/server/0412-Don-t-run-entity-collision-code-if-not-needed.patch diff --git a/patches/server/0414-Restrict-vanilla-teleport-command-to-valid-locations.patch b/patches/server/0413-Restrict-vanilla-teleport-command-to-valid-locations.patch similarity index 100% rename from patches/server/0414-Restrict-vanilla-teleport-command-to-valid-locations.patch rename to patches/server/0413-Restrict-vanilla-teleport-command-to-valid-locations.patch diff --git a/patches/server/0415-Implement-Player-Client-Options-API.patch b/patches/server/0414-Implement-Player-Client-Options-API.patch similarity index 100% rename from patches/server/0415-Implement-Player-Client-Options-API.patch rename to patches/server/0414-Implement-Player-Client-Options-API.patch diff --git a/patches/server/0416-Fix-Chunk-Post-Processing-deadlock-risk.patch b/patches/server/0415-Fix-Chunk-Post-Processing-deadlock-risk.patch similarity index 100% rename from patches/server/0416-Fix-Chunk-Post-Processing-deadlock-risk.patch rename to patches/server/0415-Fix-Chunk-Post-Processing-deadlock-risk.patch diff --git a/patches/server/0417-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0416-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch similarity index 100% rename from patches/server/0417-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch rename to patches/server/0416-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch diff --git a/patches/server/0418-Broadcast-join-message-to-console.patch b/patches/server/0417-Broadcast-join-message-to-console.patch similarity index 100% rename from patches/server/0418-Broadcast-join-message-to-console.patch rename to patches/server/0417-Broadcast-join-message-to-console.patch diff --git a/patches/server/0419-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/server/0418-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch similarity index 100% rename from patches/server/0419-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch rename to patches/server/0418-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch diff --git a/patches/server/0420-Load-Chunks-for-Login-Asynchronously.patch b/patches/server/0419-Load-Chunks-for-Login-Asynchronously.patch similarity index 100% rename from patches/server/0420-Load-Chunks-for-Login-Asynchronously.patch rename to patches/server/0419-Load-Chunks-for-Login-Asynchronously.patch diff --git a/patches/server/0421-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0420-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch similarity index 100% rename from patches/server/0421-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch rename to patches/server/0420-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch diff --git a/patches/server/0422-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0421-Add-PlayerAttackEntityCooldownResetEvent.patch similarity index 100% rename from patches/server/0422-Add-PlayerAttackEntityCooldownResetEvent.patch rename to patches/server/0421-Add-PlayerAttackEntityCooldownResetEvent.patch diff --git a/patches/server/0423-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch b/patches/server/0422-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch similarity index 100% rename from patches/server/0423-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch rename to patches/server/0422-Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch diff --git a/patches/server/0424-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0423-Don-t-fire-BlockFade-on-worldgen-threads.patch similarity index 100% rename from patches/server/0424-Don-t-fire-BlockFade-on-worldgen-threads.patch rename to patches/server/0423-Don-t-fire-BlockFade-on-worldgen-threads.patch diff --git a/patches/server/0425-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0424-Add-phantom-creative-and-insomniac-controls.patch similarity index 97% rename from patches/server/0425-Add-phantom-creative-and-insomniac-controls.patch rename to patches/server/0424-Add-phantom-creative-and-insomniac-controls.patch index 0861cb5aee..aba773d80b 100644 --- a/patches/server/0425-Add-phantom-creative-and-insomniac-controls.patch +++ b/patches/server/0424-Add-phantom-creative-and-insomniac-controls.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add phantom creative and insomniac controls diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index c26f08f6fd53cd44e5679f19bd3fdaa04f60a437..4acfd9aa46aed545591a46afe3fa162bf710d5c9 100644 +index 2d038185846ae34bc301ab93d881022a05ee458b..1460cd36e8d38c1c4318adf818b87961bfe07aec 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -513,6 +513,13 @@ public class PaperWorldConfig { diff --git a/patches/server/0426-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/server/0425-Fix-numerous-item-duplication-issues-and-teleport-is.patch similarity index 100% rename from patches/server/0426-Fix-numerous-item-duplication-issues-and-teleport-is.patch rename to patches/server/0425-Fix-numerous-item-duplication-issues-and-teleport-is.patch diff --git a/patches/server/0427-Implement-Brigadier-Mojang-API.patch b/patches/server/0426-Implement-Brigadier-Mojang-API.patch similarity index 100% rename from patches/server/0427-Implement-Brigadier-Mojang-API.patch rename to patches/server/0426-Implement-Brigadier-Mojang-API.patch diff --git a/patches/server/0428-Villager-Restocks-API.patch b/patches/server/0427-Villager-Restocks-API.patch similarity index 100% rename from patches/server/0428-Villager-Restocks-API.patch rename to patches/server/0427-Villager-Restocks-API.patch diff --git a/patches/server/0429-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0428-Validate-PickItem-Packet-and-kick-for-invalid.patch similarity index 100% rename from patches/server/0429-Validate-PickItem-Packet-and-kick-for-invalid.patch rename to patches/server/0428-Validate-PickItem-Packet-and-kick-for-invalid.patch diff --git a/patches/server/0430-Expose-game-version.patch b/patches/server/0429-Expose-game-version.patch similarity index 100% rename from patches/server/0430-Expose-game-version.patch rename to patches/server/0429-Expose-game-version.patch diff --git a/patches/server/0431-Optimize-Voxel-Shape-Merging.patch b/patches/server/0430-Optimize-Voxel-Shape-Merging.patch similarity index 100% rename from patches/server/0431-Optimize-Voxel-Shape-Merging.patch rename to patches/server/0430-Optimize-Voxel-Shape-Merging.patch diff --git a/patches/server/0432-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0431-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch similarity index 100% rename from patches/server/0432-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch rename to patches/server/0431-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch diff --git a/patches/server/0433-Implement-Mob-Goal-API.patch b/patches/server/0432-Implement-Mob-Goal-API.patch similarity index 100% rename from patches/server/0433-Implement-Mob-Goal-API.patch rename to patches/server/0432-Implement-Mob-Goal-API.patch diff --git a/patches/server/0434-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/0433-Use-distance-map-to-optimise-entity-tracker.patch similarity index 100% rename from patches/server/0434-Use-distance-map-to-optimise-entity-tracker.patch rename to patches/server/0433-Use-distance-map-to-optimise-entity-tracker.patch diff --git a/patches/server/0435-Optimize-isOutsideRange-to-use-distance-maps.patch b/patches/server/0434-Optimize-isOutsideRange-to-use-distance-maps.patch similarity index 100% rename from patches/server/0435-Optimize-isOutsideRange-to-use-distance-maps.patch rename to patches/server/0434-Optimize-isOutsideRange-to-use-distance-maps.patch diff --git a/patches/server/0436-Add-villager-reputation-API.patch b/patches/server/0435-Add-villager-reputation-API.patch similarity index 100% rename from patches/server/0436-Add-villager-reputation-API.patch rename to patches/server/0435-Add-villager-reputation-API.patch diff --git a/patches/server/0437-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0436-Option-for-maximum-exp-value-when-merging-orbs.patch similarity index 97% rename from patches/server/0437-Option-for-maximum-exp-value-when-merging-orbs.patch rename to patches/server/0436-Option-for-maximum-exp-value-when-merging-orbs.patch index 88b30399e5..0fd2b8d804 100644 --- a/patches/server/0437-Option-for-maximum-exp-value-when-merging-orbs.patch +++ b/patches/server/0436-Option-for-maximum-exp-value-when-merging-orbs.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Option for maximum exp value when merging orbs diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 4acfd9aa46aed545591a46afe3fa162bf710d5c9..157d19c9e1d86922392a1542109312565abc7561 100644 +index 1460cd36e8d38c1c4318adf818b87961bfe07aec..b6742a4ef1a798e60289586f5cccf6886afa360a 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -356,6 +356,12 @@ public class PaperWorldConfig { diff --git a/patches/server/0438-ExperienceOrbMergeEvent.patch b/patches/server/0437-ExperienceOrbMergeEvent.patch similarity index 100% rename from patches/server/0438-ExperienceOrbMergeEvent.patch rename to patches/server/0437-ExperienceOrbMergeEvent.patch diff --git a/patches/server/0439-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0438-Fix-PotionEffect-ignores-icon-flag.patch similarity index 100% rename from patches/server/0439-Fix-PotionEffect-ignores-icon-flag.patch rename to patches/server/0438-Fix-PotionEffect-ignores-icon-flag.patch diff --git a/patches/server/0440-Optimize-brigadier-child-sorting-performance.patch b/patches/server/0439-Optimize-brigadier-child-sorting-performance.patch similarity index 100% rename from patches/server/0440-Optimize-brigadier-child-sorting-performance.patch rename to patches/server/0439-Optimize-brigadier-child-sorting-performance.patch diff --git a/patches/server/0441-Potential-bed-API.patch b/patches/server/0440-Potential-bed-API.patch similarity index 100% rename from patches/server/0441-Potential-bed-API.patch rename to patches/server/0440-Potential-bed-API.patch diff --git a/patches/server/0442-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0441-Wait-for-Async-Tasks-during-shutdown.patch similarity index 100% rename from patches/server/0442-Wait-for-Async-Tasks-during-shutdown.patch rename to patches/server/0441-Wait-for-Async-Tasks-during-shutdown.patch diff --git a/patches/server/0443-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0442-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch similarity index 100% rename from patches/server/0443-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch rename to patches/server/0442-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch diff --git a/patches/server/0444-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0443-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch similarity index 99% rename from patches/server/0444-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch rename to patches/server/0443-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch index 96a35d0f61..4ca0da93d1 100644 --- a/patches/server/0444-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch +++ b/patches/server/0443-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch @@ -56,7 +56,7 @@ index cdf214fca3b0055efa56702470d9d2f890a8aead..a12af10e28f2d023ba6f916b5e7a5353 this.level.getProfiler().push("explosion_blocks"); diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index df28b1d2a67b327f6375290126943ae0292d5595..5e18a44af40c5c3d5276608b4ab9e83988027c32 100644 +index cddf6d95b13635459cc1206a3f6f9a4a151d4066..f0914b506254791115b465a42a4f816f9cc0dba6 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -424,6 +424,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0445-Reduce-MutableInt-allocations-from-light-engine.patch b/patches/server/0444-Reduce-MutableInt-allocations-from-light-engine.patch similarity index 100% rename from patches/server/0445-Reduce-MutableInt-allocations-from-light-engine.patch rename to patches/server/0444-Reduce-MutableInt-allocations-from-light-engine.patch diff --git a/patches/server/0446-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0445-Reduce-allocation-of-Vec3D-by-entity-tracker.patch similarity index 100% rename from patches/server/0446-Reduce-allocation-of-Vec3D-by-entity-tracker.patch rename to patches/server/0445-Reduce-allocation-of-Vec3D-by-entity-tracker.patch diff --git a/patches/server/0447-Ensure-safe-gateway-teleport.patch b/patches/server/0446-Ensure-safe-gateway-teleport.patch similarity index 100% rename from patches/server/0447-Ensure-safe-gateway-teleport.patch rename to patches/server/0446-Ensure-safe-gateway-teleport.patch diff --git a/patches/server/0448-Add-option-for-console-having-all-permissions.patch b/patches/server/0447-Add-option-for-console-having-all-permissions.patch similarity index 100% rename from patches/server/0448-Add-option-for-console-having-all-permissions.patch rename to patches/server/0447-Add-option-for-console-having-all-permissions.patch diff --git a/patches/server/0449-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch b/patches/server/0448-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch similarity index 100% rename from patches/server/0449-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch rename to patches/server/0448-Fix-Non-Full-Status-Chunk-NBT-Memory-Leak.patch diff --git a/patches/server/0450-Optimize-sending-packets-to-nearby-locations-sounds-.patch b/patches/server/0449-Optimize-sending-packets-to-nearby-locations-sounds-.patch similarity index 100% rename from patches/server/0450-Optimize-sending-packets-to-nearby-locations-sounds-.patch rename to patches/server/0449-Optimize-sending-packets-to-nearby-locations-sounds-.patch diff --git a/patches/server/0451-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0450-Fix-villager-trading-demand-MC-163962.patch similarity index 100% rename from patches/server/0451-Fix-villager-trading-demand-MC-163962.patch rename to patches/server/0450-Fix-villager-trading-demand-MC-163962.patch diff --git a/patches/server/0452-Maps-shouldn-t-load-chunks.patch b/patches/server/0451-Maps-shouldn-t-load-chunks.patch similarity index 100% rename from patches/server/0452-Maps-shouldn-t-load-chunks.patch rename to patches/server/0451-Maps-shouldn-t-load-chunks.patch diff --git a/patches/server/0453-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0452-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch similarity index 100% rename from patches/server/0453-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch rename to patches/server/0452-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch diff --git a/patches/server/0454-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/patches/server/0453-Delay-Chunk-Unloads-based-on-Player-Movement.patch similarity index 98% rename from patches/server/0454-Delay-Chunk-Unloads-based-on-Player-Movement.patch rename to patches/server/0453-Delay-Chunk-Unloads-based-on-Player-Movement.patch index 485789d86b..43cf042cd8 100644 --- a/patches/server/0454-Delay-Chunk-Unloads-based-on-Player-Movement.patch +++ b/patches/server/0453-Delay-Chunk-Unloads-based-on-Player-Movement.patch @@ -17,7 +17,7 @@ This allows servers with smaller worlds who do less long distance exploring to s wasting cpu cycles on saving/unloading/reloading chunks repeatedly. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 157d19c9e1d86922392a1542109312565abc7561..2216fc05ef5f1c2f7e4dcab7bb20b9944838c5f4 100644 +index b6742a4ef1a798e60289586f5cccf6886afa360a..9e5810eb0085ad956f0bd1cd69fa88909d9d638a 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -531,6 +531,15 @@ public class PaperWorldConfig { diff --git a/patches/server/0455-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0454-Optimize-Bit-Operations-by-inlining.patch similarity index 100% rename from patches/server/0455-Optimize-Bit-Operations-by-inlining.patch rename to patches/server/0454-Optimize-Bit-Operations-by-inlining.patch diff --git a/patches/server/0456-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0455-Add-Plugin-Tickets-to-API-Chunk-Methods.patch similarity index 100% rename from patches/server/0456-Add-Plugin-Tickets-to-API-Chunk-Methods.patch rename to patches/server/0455-Add-Plugin-Tickets-to-API-Chunk-Methods.patch diff --git a/patches/server/0457-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0456-Fix-missing-chunks-due-to-integer-overflow.patch similarity index 100% rename from patches/server/0457-Fix-missing-chunks-due-to-integer-overflow.patch rename to patches/server/0456-Fix-missing-chunks-due-to-integer-overflow.patch diff --git a/patches/server/0458-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0457-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch similarity index 100% rename from patches/server/0458-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch rename to patches/server/0457-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch diff --git a/patches/server/0459-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0458-Fix-piston-physics-inconsistency-MC-188840.patch similarity index 100% rename from patches/server/0459-Fix-piston-physics-inconsistency-MC-188840.patch rename to patches/server/0458-Fix-piston-physics-inconsistency-MC-188840.patch diff --git a/patches/server/0460-Fix-sand-duping.patch b/patches/server/0459-Fix-sand-duping.patch similarity index 100% rename from patches/server/0460-Fix-sand-duping.patch rename to patches/server/0459-Fix-sand-duping.patch diff --git a/patches/server/0461-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/server/0460-Prevent-position-desync-in-playerconnection-causing-.patch similarity index 100% rename from patches/server/0461-Prevent-position-desync-in-playerconnection-causing-.patch rename to patches/server/0460-Prevent-position-desync-in-playerconnection-causing-.patch diff --git a/patches/server/0462-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0461-Inventory-getHolder-method-without-block-snapshot.patch similarity index 100% rename from patches/server/0462-Inventory-getHolder-method-without-block-snapshot.patch rename to patches/server/0461-Inventory-getHolder-method-without-block-snapshot.patch diff --git a/patches/server/0463-Expose-Arrow-getItemStack.patch b/patches/server/0462-Expose-Arrow-getItemStack.patch similarity index 100% rename from patches/server/0463-Expose-Arrow-getItemStack.patch rename to patches/server/0462-Expose-Arrow-getItemStack.patch diff --git a/patches/server/0464-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0463-Add-and-implement-PlayerRecipeBookClickEvent.patch similarity index 100% rename from patches/server/0464-Add-and-implement-PlayerRecipeBookClickEvent.patch rename to patches/server/0463-Add-and-implement-PlayerRecipeBookClickEvent.patch diff --git a/patches/server/0465-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0464-Hide-sync-chunk-writes-behind-flag.patch similarity index 100% rename from patches/server/0465-Hide-sync-chunk-writes-behind-flag.patch rename to patches/server/0464-Hide-sync-chunk-writes-behind-flag.patch diff --git a/patches/server/0466-Add-permission-for-command-blocks.patch b/patches/server/0465-Add-permission-for-command-blocks.patch similarity index 100% rename from patches/server/0466-Add-permission-for-command-blocks.patch rename to patches/server/0465-Add-permission-for-command-blocks.patch diff --git a/patches/server/0467-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0466-Ensure-Entity-AABB-s-are-never-invalid.patch similarity index 100% rename from patches/server/0467-Ensure-Entity-AABB-s-are-never-invalid.patch rename to patches/server/0466-Ensure-Entity-AABB-s-are-never-invalid.patch diff --git a/patches/server/0468-Optimize-WorldBorder-collision-checks-and-air.patch b/patches/server/0467-Optimize-WorldBorder-collision-checks-and-air.patch similarity index 100% rename from patches/server/0468-Optimize-WorldBorder-collision-checks-and-air.patch rename to patches/server/0467-Optimize-WorldBorder-collision-checks-and-air.patch diff --git a/patches/server/0469-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0468-Fix-Per-World-Difficulty-Remembering-Difficulty.patch similarity index 100% rename from patches/server/0469-Fix-Per-World-Difficulty-Remembering-Difficulty.patch rename to patches/server/0468-Fix-Per-World-Difficulty-Remembering-Difficulty.patch diff --git a/patches/server/0470-Paper-dumpitem-command.patch b/patches/server/0469-Paper-dumpitem-command.patch similarity index 100% rename from patches/server/0470-Paper-dumpitem-command.patch rename to patches/server/0469-Paper-dumpitem-command.patch diff --git a/patches/server/0471-Don-t-allow-null-UUID-s-for-chat.patch b/patches/server/0470-Don-t-allow-null-UUID-s-for-chat.patch similarity index 100% rename from patches/server/0471-Don-t-allow-null-UUID-s-for-chat.patch rename to patches/server/0470-Don-t-allow-null-UUID-s-for-chat.patch diff --git a/patches/server/0472-Improve-Legacy-Component-serialization-size.patch b/patches/server/0471-Improve-Legacy-Component-serialization-size.patch similarity index 100% rename from patches/server/0472-Improve-Legacy-Component-serialization-size.patch rename to patches/server/0471-Improve-Legacy-Component-serialization-size.patch diff --git a/patches/server/0473-Stop-copy-on-write-operations-for-updating-light-dat.patch b/patches/server/0472-Stop-copy-on-write-operations-for-updating-light-dat.patch similarity index 100% rename from patches/server/0473-Stop-copy-on-write-operations-for-updating-light-dat.patch rename to patches/server/0472-Stop-copy-on-write-operations-for-updating-light-dat.patch diff --git a/patches/server/0474-Support-old-UUID-format-for-NBT.patch b/patches/server/0473-Support-old-UUID-format-for-NBT.patch similarity index 100% rename from patches/server/0474-Support-old-UUID-format-for-NBT.patch rename to patches/server/0473-Support-old-UUID-format-for-NBT.patch diff --git a/patches/server/0475-Clean-up-duplicated-GameProfile-Properties.patch b/patches/server/0474-Clean-up-duplicated-GameProfile-Properties.patch similarity index 100% rename from patches/server/0475-Clean-up-duplicated-GameProfile-Properties.patch rename to patches/server/0474-Clean-up-duplicated-GameProfile-Properties.patch diff --git a/patches/server/0476-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0475-Convert-legacy-attributes-in-Item-Meta.patch similarity index 100% rename from patches/server/0476-Convert-legacy-attributes-in-Item-Meta.patch rename to patches/server/0475-Convert-legacy-attributes-in-Item-Meta.patch diff --git a/patches/server/0477-Remove-some-streams-from-structures.patch b/patches/server/0476-Remove-some-streams-from-structures.patch similarity index 100% rename from patches/server/0477-Remove-some-streams-from-structures.patch rename to patches/server/0476-Remove-some-streams-from-structures.patch diff --git a/patches/server/0478-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0477-Remove-streams-from-classes-related-villager-gossip.patch similarity index 100% rename from patches/server/0478-Remove-streams-from-classes-related-villager-gossip.patch rename to patches/server/0477-Remove-streams-from-classes-related-villager-gossip.patch diff --git a/patches/server/0479-Optimize-NibbleArray-to-use-pooled-buffers.patch b/patches/server/0478-Optimize-NibbleArray-to-use-pooled-buffers.patch similarity index 100% rename from patches/server/0479-Optimize-NibbleArray-to-use-pooled-buffers.patch rename to patches/server/0478-Optimize-NibbleArray-to-use-pooled-buffers.patch diff --git a/patches/server/0480-Support-components-in-ItemMeta.patch b/patches/server/0479-Support-components-in-ItemMeta.patch similarity index 100% rename from patches/server/0480-Support-components-in-ItemMeta.patch rename to patches/server/0479-Support-components-in-ItemMeta.patch diff --git a/patches/server/0481-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/patches/server/0480-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch similarity index 100% rename from patches/server/0481-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch rename to patches/server/0480-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch diff --git a/patches/server/0482-Add-entity-liquid-API.patch b/patches/server/0481-Add-entity-liquid-API.patch similarity index 100% rename from patches/server/0482-Add-entity-liquid-API.patch rename to patches/server/0481-Add-entity-liquid-API.patch diff --git a/patches/server/0483-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0482-Update-itemstack-legacy-name-and-lore.patch similarity index 100% rename from patches/server/0483-Update-itemstack-legacy-name-and-lore.patch rename to patches/server/0482-Update-itemstack-legacy-name-and-lore.patch diff --git a/patches/server/0484-Spawn-player-in-correct-world-on-login.patch b/patches/server/0483-Spawn-player-in-correct-world-on-login.patch similarity index 100% rename from patches/server/0484-Spawn-player-in-correct-world-on-login.patch rename to patches/server/0483-Spawn-player-in-correct-world-on-login.patch diff --git a/patches/server/0485-Add-PrepareResultEvent.patch b/patches/server/0484-Add-PrepareResultEvent.patch similarity index 100% rename from patches/server/0485-Add-PrepareResultEvent.patch rename to patches/server/0484-Add-PrepareResultEvent.patch diff --git a/patches/server/0486-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0485-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 100% rename from patches/server/0486-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/server/0485-Allow-delegation-to-vanilla-chunk-gen.patch diff --git a/patches/server/0487-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0486-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch similarity index 100% rename from patches/server/0487-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch rename to patches/server/0486-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch diff --git a/patches/server/0488-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/patches/server/0487-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch similarity index 100% rename from patches/server/0488-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch rename to patches/server/0487-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch diff --git a/patches/server/0489-Improve-Chunk-Status-Transition-Speed.patch b/patches/server/0488-Improve-Chunk-Status-Transition-Speed.patch similarity index 100% rename from patches/server/0489-Improve-Chunk-Status-Transition-Speed.patch rename to patches/server/0488-Improve-Chunk-Status-Transition-Speed.patch diff --git a/patches/server/0490-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0489-Optimize-NetworkManager-Exception-Handling.patch similarity index 100% rename from patches/server/0490-Optimize-NetworkManager-Exception-Handling.patch rename to patches/server/0489-Optimize-NetworkManager-Exception-Handling.patch diff --git a/patches/server/0491-Optimize-the-advancement-data-player-iteration-to-be.patch b/patches/server/0490-Optimize-the-advancement-data-player-iteration-to-be.patch similarity index 100% rename from patches/server/0491-Optimize-the-advancement-data-player-iteration-to-be.patch rename to patches/server/0490-Optimize-the-advancement-data-player-iteration-to-be.patch diff --git a/patches/server/0492-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0491-Fix-arrows-never-despawning-MC-125757.patch similarity index 100% rename from patches/server/0492-Fix-arrows-never-despawning-MC-125757.patch rename to patches/server/0491-Fix-arrows-never-despawning-MC-125757.patch diff --git a/patches/server/0493-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0492-Thread-Safe-Vanilla-Command-permission-checking.patch similarity index 100% rename from patches/server/0493-Thread-Safe-Vanilla-Command-permission-checking.patch rename to patches/server/0492-Thread-Safe-Vanilla-Command-permission-checking.patch diff --git a/patches/server/0494-Move-range-check-for-block-placing-up.patch b/patches/server/0493-Move-range-check-for-block-placing-up.patch similarity index 100% rename from patches/server/0494-Move-range-check-for-block-placing-up.patch rename to patches/server/0493-Move-range-check-for-block-placing-up.patch diff --git a/patches/server/0495-Fix-SPIGOT-5989.patch b/patches/server/0494-Fix-SPIGOT-5989.patch similarity index 100% rename from patches/server/0495-Fix-SPIGOT-5989.patch rename to patches/server/0494-Fix-SPIGOT-5989.patch diff --git a/patches/server/0496-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0495-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch similarity index 100% rename from patches/server/0496-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch rename to patches/server/0495-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch diff --git a/patches/server/0497-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0496-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch similarity index 100% rename from patches/server/0497-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch rename to patches/server/0496-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch diff --git a/patches/server/0498-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0497-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch similarity index 100% rename from patches/server/0498-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch rename to patches/server/0497-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch diff --git a/patches/server/0499-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/patches/server/0498-Add-missing-strikeLighting-call-to-World-spigot-stri.patch similarity index 100% rename from patches/server/0499-Add-missing-strikeLighting-call-to-World-spigot-stri.patch rename to patches/server/0498-Add-missing-strikeLighting-call-to-World-spigot-stri.patch diff --git a/patches/server/0500-Fix-some-rails-connecting-improperly.patch b/patches/server/0499-Fix-some-rails-connecting-improperly.patch similarity index 100% rename from patches/server/0500-Fix-some-rails-connecting-improperly.patch rename to patches/server/0499-Fix-some-rails-connecting-improperly.patch diff --git a/patches/server/0501-Fix-MC-187716-Use-configured-height.patch b/patches/server/0500-Fix-MC-187716-Use-configured-height.patch similarity index 100% rename from patches/server/0501-Fix-MC-187716-Use-configured-height.patch rename to patches/server/0500-Fix-MC-187716-Use-configured-height.patch diff --git a/patches/server/0502-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0501-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch similarity index 100% rename from patches/server/0502-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch rename to patches/server/0501-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch diff --git a/patches/server/0503-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0502-Do-not-let-the-server-load-chunks-from-newer-version.patch similarity index 100% rename from patches/server/0503-Do-not-let-the-server-load-chunks-from-newer-version.patch rename to patches/server/0502-Do-not-let-the-server-load-chunks-from-newer-version.patch diff --git a/patches/server/0504-Brand-support.patch b/patches/server/0503-Brand-support.patch similarity index 100% rename from patches/server/0504-Brand-support.patch rename to patches/server/0503-Brand-support.patch diff --git a/patches/server/0505-Add-setMaxPlayers-API.patch b/patches/server/0504-Add-setMaxPlayers-API.patch similarity index 100% rename from patches/server/0505-Add-setMaxPlayers-API.patch rename to patches/server/0504-Add-setMaxPlayers-API.patch diff --git a/patches/server/0506-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0505-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from patches/server/0506-Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/server/0505-Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/patches/server/0507-Don-t-require-FACING-data.patch b/patches/server/0506-Don-t-require-FACING-data.patch similarity index 100% rename from patches/server/0507-Don-t-require-FACING-data.patch rename to patches/server/0506-Don-t-require-FACING-data.patch diff --git a/patches/server/0508-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0507-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch similarity index 94% rename from patches/server/0508-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch rename to patches/server/0507-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch index 356421a5bd..bb27d7241d 100644 --- a/patches/server/0508-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch +++ b/patches/server/0507-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 0d553955460bf54181b8e3674c783c0febc30ce9..6a2b683ee5ec38da8b87a0f9eb09e9ad8431a56f 100644 +index d724ce8cf79fe7194e79da2e8e369777bbe638d2..5d40d8eab8c12379fd32abc1b069ad95130a833f 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -1649,12 +1649,14 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl +@@ -1629,12 +1629,14 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl } // Paper end diff --git a/patches/server/0509-Add-moon-phase-API.patch b/patches/server/0508-Add-moon-phase-API.patch similarity index 100% rename from patches/server/0509-Add-moon-phase-API.patch rename to patches/server/0508-Add-moon-phase-API.patch diff --git a/patches/server/0510-Prevent-headless-pistons-from-being-created.patch b/patches/server/0509-Prevent-headless-pistons-from-being-created.patch similarity index 100% rename from patches/server/0510-Prevent-headless-pistons-from-being-created.patch rename to patches/server/0509-Prevent-headless-pistons-from-being-created.patch diff --git a/patches/server/0511-Add-BellRingEvent.patch b/patches/server/0510-Add-BellRingEvent.patch similarity index 100% rename from patches/server/0511-Add-BellRingEvent.patch rename to patches/server/0510-Add-BellRingEvent.patch diff --git a/patches/server/0512-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0511-Add-zombie-targets-turtle-egg-config.patch similarity index 100% rename from patches/server/0512-Add-zombie-targets-turtle-egg-config.patch rename to patches/server/0511-Add-zombie-targets-turtle-egg-config.patch diff --git a/patches/server/0513-Buffer-joins-to-world.patch b/patches/server/0512-Buffer-joins-to-world.patch similarity index 100% rename from patches/server/0513-Buffer-joins-to-world.patch rename to patches/server/0512-Buffer-joins-to-world.patch diff --git a/patches/server/0514-Optimize-redstone-algorithm.patch b/patches/server/0513-Optimize-redstone-algorithm.patch similarity index 100% rename from patches/server/0514-Optimize-redstone-algorithm.patch rename to patches/server/0513-Optimize-redstone-algorithm.patch diff --git a/patches/server/0515-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0514-Fix-hex-colors-not-working-in-some-kick-messages.patch similarity index 100% rename from patches/server/0515-Fix-hex-colors-not-working-in-some-kick-messages.patch rename to patches/server/0514-Fix-hex-colors-not-working-in-some-kick-messages.patch diff --git a/patches/server/0516-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0515-PortalCreateEvent-needs-to-know-its-entity.patch similarity index 100% rename from patches/server/0516-PortalCreateEvent-needs-to-know-its-entity.patch rename to patches/server/0515-PortalCreateEvent-needs-to-know-its-entity.patch diff --git a/patches/server/0517-Fix-CraftTeam-null-check.patch b/patches/server/0516-Fix-CraftTeam-null-check.patch similarity index 100% rename from patches/server/0517-Fix-CraftTeam-null-check.patch rename to patches/server/0516-Fix-CraftTeam-null-check.patch diff --git a/patches/server/0518-Add-more-Evoker-API.patch b/patches/server/0517-Add-more-Evoker-API.patch similarity index 100% rename from patches/server/0518-Add-more-Evoker-API.patch rename to patches/server/0517-Add-more-Evoker-API.patch diff --git a/patches/server/0519-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch b/patches/server/0518-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch similarity index 100% rename from patches/server/0519-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch rename to patches/server/0518-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch diff --git a/patches/server/0520-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0519-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from patches/server/0520-Create-HoverEvent-from-ItemStack-Entity.patch rename to patches/server/0519-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/patches/server/0521-Cache-block-data-strings.patch b/patches/server/0520-Cache-block-data-strings.patch similarity index 100% rename from patches/server/0521-Cache-block-data-strings.patch rename to patches/server/0520-Cache-block-data-strings.patch diff --git a/patches/server/0522-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0521-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch similarity index 100% rename from patches/server/0522-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch rename to patches/server/0521-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch diff --git a/patches/server/0523-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0522-Add-additional-open-container-api-to-HumanEntity.patch similarity index 100% rename from patches/server/0523-Add-additional-open-container-api-to-HumanEntity.patch rename to patches/server/0522-Add-additional-open-container-api-to-HumanEntity.patch diff --git a/patches/server/0524-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0523-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch similarity index 100% rename from patches/server/0524-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch rename to patches/server/0523-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch diff --git a/patches/server/0525-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0524-Extend-block-drop-capture-to-capture-all-items-added.patch similarity index 94% rename from patches/server/0525-Extend-block-drop-capture-to-capture-all-items-added.patch rename to patches/server/0524-Extend-block-drop-capture-to-capture-all-items-added.patch index abeb9c2865..446eeb8da0 100644 --- a/patches/server/0525-Extend-block-drop-capture-to-capture-all-items-added.patch +++ b/patches/server/0524-Extend-block-drop-capture-to-capture-all-items-added.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Extend block drop capture to capture all items added to the diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 6a2b683ee5ec38da8b87a0f9eb09e9ad8431a56f..898a2549900b1af70a0bed94a9c9c1f5fbb3c15d 100644 +index 5d40d8eab8c12379fd32abc1b069ad95130a833f..e683e3b3e1ee6fddddd9f237344961e0e2ad8ca5 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -1194,6 +1194,13 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl +@@ -1174,6 +1174,13 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getName(entity.getEntityType())); // CraftBukkit return false; } else { diff --git a/patches/server/0526-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch b/patches/server/0525-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch similarity index 100% rename from patches/server/0526-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch rename to patches/server/0525-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch diff --git a/patches/server/0527-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0526-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch similarity index 100% rename from patches/server/0527-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch rename to patches/server/0526-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch diff --git a/patches/server/0528-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0527-Lazily-track-plugin-scoreboards-by-default.patch similarity index 100% rename from patches/server/0528-Lazily-track-plugin-scoreboards-by-default.patch rename to patches/server/0527-Lazily-track-plugin-scoreboards-by-default.patch diff --git a/patches/server/0529-Entity-isTicking.patch b/patches/server/0528-Entity-isTicking.patch similarity index 100% rename from patches/server/0529-Entity-isTicking.patch rename to patches/server/0528-Entity-isTicking.patch diff --git a/patches/server/0530-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0529-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch similarity index 100% rename from patches/server/0530-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch rename to patches/server/0529-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch diff --git a/patches/server/0531-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch b/patches/server/0530-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch similarity index 100% rename from patches/server/0531-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch rename to patches/server/0530-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch diff --git a/patches/server/0532-Fix-Concurrency-issue-in-WeightedList.patch b/patches/server/0531-Fix-Concurrency-issue-in-WeightedList.patch similarity index 100% rename from patches/server/0532-Fix-Concurrency-issue-in-WeightedList.patch rename to patches/server/0531-Fix-Concurrency-issue-in-WeightedList.patch diff --git a/patches/server/0533-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0532-Reset-Ender-Crystals-on-Dragon-Spawn.patch similarity index 100% rename from patches/server/0533-Reset-Ender-Crystals-on-Dragon-Spawn.patch rename to patches/server/0532-Reset-Ender-Crystals-on-Dragon-Spawn.patch diff --git a/patches/server/0534-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0533-Fix-for-large-move-vectors-crashing-server.patch similarity index 100% rename from patches/server/0534-Fix-for-large-move-vectors-crashing-server.patch rename to patches/server/0533-Fix-for-large-move-vectors-crashing-server.patch diff --git a/patches/server/0535-Optimise-getType-calls.patch b/patches/server/0534-Optimise-getType-calls.patch similarity index 100% rename from patches/server/0535-Optimise-getType-calls.patch rename to patches/server/0534-Optimise-getType-calls.patch diff --git a/patches/server/0536-Villager-resetOffers.patch b/patches/server/0535-Villager-resetOffers.patch similarity index 100% rename from patches/server/0536-Villager-resetOffers.patch rename to patches/server/0535-Villager-resetOffers.patch diff --git a/patches/server/0537-Improve-inlinig-for-some-hot-IBlockData-methods.patch b/patches/server/0536-Improve-inlinig-for-some-hot-IBlockData-methods.patch similarity index 100% rename from patches/server/0537-Improve-inlinig-for-some-hot-IBlockData-methods.patch rename to patches/server/0536-Improve-inlinig-for-some-hot-IBlockData-methods.patch diff --git a/patches/server/0538-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0537-Retain-block-place-order-when-capturing-blockstates.patch similarity index 93% rename from patches/server/0538-Retain-block-place-order-when-capturing-blockstates.patch rename to patches/server/0537-Retain-block-place-order-when-capturing-blockstates.patch index a795154add..78109fb8cb 100644 --- a/patches/server/0538-Retain-block-place-order-when-capturing-blockstates.patch +++ b/patches/server/0537-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/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 5e18a44af40c5c3d5276608b4ab9e83988027c32..bade87f842bf36b948bdeacf6d22715a5b075f3e 100644 +index f0914b506254791115b465a42a4f816f9cc0dba6..11b454836610f07fffc0efcb60ac5960757a0644 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -147,7 +147,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0539-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0538-Reduce-blockpos-allocation-from-pathfinding.patch similarity index 100% rename from patches/server/0539-Reduce-blockpos-allocation-from-pathfinding.patch rename to patches/server/0538-Reduce-blockpos-allocation-from-pathfinding.patch diff --git a/patches/server/0540-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0539-Fix-item-locations-dropped-from-campfires.patch similarity index 100% rename from patches/server/0540-Fix-item-locations-dropped-from-campfires.patch rename to patches/server/0539-Fix-item-locations-dropped-from-campfires.patch diff --git a/patches/server/0541-Player-elytra-boost-API.patch b/patches/server/0540-Player-elytra-boost-API.patch similarity index 100% rename from patches/server/0541-Player-elytra-boost-API.patch rename to patches/server/0540-Player-elytra-boost-API.patch diff --git a/patches/server/0542-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0541-Fixed-TileEntityBell-memory-leak.patch similarity index 100% rename from patches/server/0542-Fixed-TileEntityBell-memory-leak.patch rename to patches/server/0541-Fixed-TileEntityBell-memory-leak.patch diff --git a/patches/server/0543-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0542-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch similarity index 100% rename from patches/server/0543-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch rename to patches/server/0542-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch diff --git a/patches/server/0544-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0543-Add-getOfflinePlayerIfCached-String.patch similarity index 100% rename from patches/server/0544-Add-getOfflinePlayerIfCached-String.patch rename to patches/server/0543-Add-getOfflinePlayerIfCached-String.patch diff --git a/patches/server/0545-Add-ignore-discounts-API.patch b/patches/server/0544-Add-ignore-discounts-API.patch similarity index 100% rename from patches/server/0545-Add-ignore-discounts-API.patch rename to patches/server/0544-Add-ignore-discounts-API.patch diff --git a/patches/server/0546-Toggle-for-removing-existing-dragon.patch b/patches/server/0545-Toggle-for-removing-existing-dragon.patch similarity index 100% rename from patches/server/0546-Toggle-for-removing-existing-dragon.patch rename to patches/server/0545-Toggle-for-removing-existing-dragon.patch diff --git a/patches/server/0547-Fix-client-lag-on-advancement-loading.patch b/patches/server/0546-Fix-client-lag-on-advancement-loading.patch similarity index 100% rename from patches/server/0547-Fix-client-lag-on-advancement-loading.patch rename to patches/server/0546-Fix-client-lag-on-advancement-loading.patch diff --git a/patches/server/0548-Item-no-age-no-player-pickup.patch b/patches/server/0547-Item-no-age-no-player-pickup.patch similarity index 100% rename from patches/server/0548-Item-no-age-no-player-pickup.patch rename to patches/server/0547-Item-no-age-no-player-pickup.patch diff --git a/patches/server/0549-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0548-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch similarity index 100% rename from patches/server/0549-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch rename to patches/server/0548-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch diff --git a/patches/server/0550-Beacon-API-custom-effect-ranges.patch b/patches/server/0549-Beacon-API-custom-effect-ranges.patch similarity index 100% rename from patches/server/0550-Beacon-API-custom-effect-ranges.patch rename to patches/server/0549-Beacon-API-custom-effect-ranges.patch diff --git a/patches/server/0551-Add-API-for-quit-reason.patch b/patches/server/0550-Add-API-for-quit-reason.patch similarity index 100% rename from patches/server/0551-Add-API-for-quit-reason.patch rename to patches/server/0550-Add-API-for-quit-reason.patch diff --git a/patches/server/0552-Seed-based-feature-search.patch b/patches/server/0551-Seed-based-feature-search.patch similarity index 100% rename from patches/server/0552-Seed-based-feature-search.patch rename to patches/server/0551-Seed-based-feature-search.patch diff --git a/patches/server/0553-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0552-Add-Wandering-Trader-spawn-rate-config-options.patch similarity index 100% rename from patches/server/0553-Add-Wandering-Trader-spawn-rate-config-options.patch rename to patches/server/0552-Add-Wandering-Trader-spawn-rate-config-options.patch diff --git a/patches/server/0554-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0553-Significantly-improve-performance-of-the-end-generat.patch similarity index 100% rename from patches/server/0554-Significantly-improve-performance-of-the-end-generat.patch rename to patches/server/0553-Significantly-improve-performance-of-the-end-generat.patch diff --git a/patches/server/0555-Expose-world-spawn-angle.patch b/patches/server/0554-Expose-world-spawn-angle.patch similarity index 100% rename from patches/server/0555-Expose-world-spawn-angle.patch rename to patches/server/0554-Expose-world-spawn-angle.patch diff --git a/patches/server/0556-Add-Destroy-Speed-API.patch b/patches/server/0555-Add-Destroy-Speed-API.patch similarity index 100% rename from patches/server/0556-Add-Destroy-Speed-API.patch rename to patches/server/0555-Add-Destroy-Speed-API.patch diff --git a/patches/server/0557-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0556-Fix-Player-spawnParticle-x-y-z-precision-loss.patch similarity index 100% rename from patches/server/0557-Fix-Player-spawnParticle-x-y-z-precision-loss.patch rename to patches/server/0556-Fix-Player-spawnParticle-x-y-z-precision-loss.patch diff --git a/patches/server/0558-Add-LivingEntity-clearActiveItem.patch b/patches/server/0557-Add-LivingEntity-clearActiveItem.patch similarity index 100% rename from patches/server/0558-Add-LivingEntity-clearActiveItem.patch rename to patches/server/0557-Add-LivingEntity-clearActiveItem.patch diff --git a/patches/server/0559-Add-PlayerItemCooldownEvent.patch b/patches/server/0558-Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/server/0559-Add-PlayerItemCooldownEvent.patch rename to patches/server/0558-Add-PlayerItemCooldownEvent.patch diff --git a/patches/server/0560-More-lightning-API.patch b/patches/server/0559-More-lightning-API.patch similarity index 100% rename from patches/server/0560-More-lightning-API.patch rename to patches/server/0559-More-lightning-API.patch diff --git a/patches/server/0561-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0560-Climbing-should-not-bypass-cramming-gamerule.patch similarity index 100% rename from patches/server/0561-Climbing-should-not-bypass-cramming-gamerule.patch rename to patches/server/0560-Climbing-should-not-bypass-cramming-gamerule.patch diff --git a/patches/server/0562-Added-missing-default-perms-for-commands.patch b/patches/server/0561-Added-missing-default-perms-for-commands.patch similarity index 100% rename from patches/server/0562-Added-missing-default-perms-for-commands.patch rename to patches/server/0561-Added-missing-default-perms-for-commands.patch diff --git a/patches/server/0563-Add-PlayerShearBlockEvent.patch b/patches/server/0562-Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/server/0563-Add-PlayerShearBlockEvent.patch rename to patches/server/0562-Add-PlayerShearBlockEvent.patch diff --git a/patches/server/0564-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0563-Set-spigots-verbose-world-setting-to-false-by-def.patch similarity index 100% rename from patches/server/0564-Set-spigots-verbose-world-setting-to-false-by-def.patch rename to patches/server/0563-Set-spigots-verbose-world-setting-to-false-by-def.patch diff --git a/patches/server/0565-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0564-Fix-curing-zombie-villager-discount-exploit.patch similarity index 100% rename from patches/server/0565-Fix-curing-zombie-villager-discount-exploit.patch rename to patches/server/0564-Fix-curing-zombie-villager-discount-exploit.patch diff --git a/patches/server/0566-Limit-recipe-packets.patch b/patches/server/0565-Limit-recipe-packets.patch similarity index 100% rename from patches/server/0566-Limit-recipe-packets.patch rename to patches/server/0565-Limit-recipe-packets.patch diff --git a/patches/server/0567-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0566-Fix-CraftSound-backwards-compatibility.patch similarity index 100% rename from patches/server/0567-Fix-CraftSound-backwards-compatibility.patch rename to patches/server/0566-Fix-CraftSound-backwards-compatibility.patch diff --git a/patches/server/0568-MC-4-Fix-item-position-desync.patch b/patches/server/0567-MC-4-Fix-item-position-desync.patch similarity index 100% rename from patches/server/0568-MC-4-Fix-item-position-desync.patch rename to patches/server/0567-MC-4-Fix-item-position-desync.patch diff --git a/patches/server/0569-Player-Chunk-Load-Unload-Events.patch b/patches/server/0568-Player-Chunk-Load-Unload-Events.patch similarity index 100% rename from patches/server/0569-Player-Chunk-Load-Unload-Events.patch rename to patches/server/0568-Player-Chunk-Load-Unload-Events.patch diff --git a/patches/server/0570-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0569-Optimize-Dynamic-get-Missing-Keys.patch similarity index 100% rename from patches/server/0570-Optimize-Dynamic-get-Missing-Keys.patch rename to patches/server/0569-Optimize-Dynamic-get-Missing-Keys.patch diff --git a/patches/server/0571-Expose-LivingEntity-hurt-direction.patch b/patches/server/0570-Expose-LivingEntity-hurt-direction.patch similarity index 100% rename from patches/server/0571-Expose-LivingEntity-hurt-direction.patch rename to patches/server/0570-Expose-LivingEntity-hurt-direction.patch diff --git a/patches/server/0572-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0571-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from patches/server/0572-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/server/0571-Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/patches/server/0573-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0572-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch similarity index 100% rename from patches/server/0573-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch rename to patches/server/0572-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch diff --git a/patches/server/0574-added-PlayerTradeEvent.patch b/patches/server/0573-added-PlayerTradeEvent.patch similarity index 100% rename from patches/server/0574-added-PlayerTradeEvent.patch rename to patches/server/0573-added-PlayerTradeEvent.patch diff --git a/patches/server/0575-Implement-TargetHitEvent.patch b/patches/server/0574-Implement-TargetHitEvent.patch similarity index 100% rename from patches/server/0575-Implement-TargetHitEvent.patch rename to patches/server/0574-Implement-TargetHitEvent.patch diff --git a/patches/server/0576-Additional-Block-Material-API-s.patch b/patches/server/0575-Additional-Block-Material-API-s.patch similarity index 100% rename from patches/server/0576-Additional-Block-Material-API-s.patch rename to patches/server/0575-Additional-Block-Material-API-s.patch diff --git a/patches/server/0577-Fix-harming-potion-dupe.patch b/patches/server/0576-Fix-harming-potion-dupe.patch similarity index 100% rename from patches/server/0577-Fix-harming-potion-dupe.patch rename to patches/server/0576-Fix-harming-potion-dupe.patch diff --git a/patches/server/0578-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0577-Implement-API-to-get-Material-from-Boats-and-Minecar.patch similarity index 100% rename from patches/server/0578-Implement-API-to-get-Material-from-Boats-and-Minecar.patch rename to patches/server/0577-Implement-API-to-get-Material-from-Boats-and-Minecar.patch diff --git a/patches/server/0579-Cache-burn-durations.patch b/patches/server/0578-Cache-burn-durations.patch similarity index 100% rename from patches/server/0579-Cache-burn-durations.patch rename to patches/server/0578-Cache-burn-durations.patch diff --git a/patches/server/0580-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0579-Allow-disabling-mob-spawner-spawn-egg-transformation.patch similarity index 100% rename from patches/server/0580-Allow-disabling-mob-spawner-spawn-egg-transformation.patch rename to patches/server/0579-Allow-disabling-mob-spawner-spawn-egg-transformation.patch diff --git a/patches/server/0581-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0580-Fix-Not-a-string-Map-Conversion-spam.patch similarity index 100% rename from patches/server/0581-Fix-Not-a-string-Map-Conversion-spam.patch rename to patches/server/0580-Fix-Not-a-string-Map-Conversion-spam.patch diff --git a/patches/server/0582-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0581-Implement-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/server/0582-Implement-PlayerFlowerPotManipulateEvent.patch rename to patches/server/0581-Implement-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/server/0583-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0582-Fix-interact-event-not-being-called-in-adventure.patch similarity index 100% rename from patches/server/0583-Fix-interact-event-not-being-called-in-adventure.patch rename to patches/server/0582-Fix-interact-event-not-being-called-in-adventure.patch diff --git a/patches/server/0584-Zombie-API-breaking-doors.patch b/patches/server/0583-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/server/0584-Zombie-API-breaking-doors.patch rename to patches/server/0583-Zombie-API-breaking-doors.patch diff --git a/patches/server/0585-Fix-nerfed-slime-when-splitting.patch b/patches/server/0584-Fix-nerfed-slime-when-splitting.patch similarity index 100% rename from patches/server/0585-Fix-nerfed-slime-when-splitting.patch rename to patches/server/0584-Fix-nerfed-slime-when-splitting.patch diff --git a/patches/server/0586-Add-EntityLoadCrossbowEvent.patch b/patches/server/0585-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/server/0586-Add-EntityLoadCrossbowEvent.patch rename to patches/server/0585-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/server/0587-Guardian-beam-workaround.patch b/patches/server/0586-Guardian-beam-workaround.patch similarity index 100% rename from patches/server/0587-Guardian-beam-workaround.patch rename to patches/server/0586-Guardian-beam-workaround.patch diff --git a/patches/server/0588-Added-WorldGameRuleChangeEvent.patch b/patches/server/0587-Added-WorldGameRuleChangeEvent.patch similarity index 100% rename from patches/server/0588-Added-WorldGameRuleChangeEvent.patch rename to patches/server/0587-Added-WorldGameRuleChangeEvent.patch diff --git a/patches/server/0589-Added-ServerResourcesReloadedEvent.patch b/patches/server/0588-Added-ServerResourcesReloadedEvent.patch similarity index 100% rename from patches/server/0589-Added-ServerResourcesReloadedEvent.patch rename to patches/server/0588-Added-ServerResourcesReloadedEvent.patch diff --git a/patches/server/0590-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0589-Added-world-settings-for-mobs-picking-up-loot.patch similarity index 100% rename from patches/server/0590-Added-world-settings-for-mobs-picking-up-loot.patch rename to patches/server/0589-Added-world-settings-for-mobs-picking-up-loot.patch diff --git a/patches/server/0591-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0590-Implemented-BlockFailedDispenseEvent.patch similarity index 100% rename from patches/server/0591-Implemented-BlockFailedDispenseEvent.patch rename to patches/server/0590-Implemented-BlockFailedDispenseEvent.patch diff --git a/patches/server/0592-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0591-Added-PlayerLecternPageChangeEvent.patch similarity index 100% rename from patches/server/0592-Added-PlayerLecternPageChangeEvent.patch rename to patches/server/0591-Added-PlayerLecternPageChangeEvent.patch diff --git a/patches/server/0593-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0592-Added-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from patches/server/0593-Added-PlayerLoomPatternSelectEvent.patch rename to patches/server/0592-Added-PlayerLoomPatternSelectEvent.patch diff --git a/patches/server/0594-Configurable-door-breaking-difficulty.patch b/patches/server/0593-Configurable-door-breaking-difficulty.patch similarity index 100% rename from patches/server/0594-Configurable-door-breaking-difficulty.patch rename to patches/server/0593-Configurable-door-breaking-difficulty.patch diff --git a/patches/server/0595-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0594-Empty-commands-shall-not-be-dispatched.patch similarity index 100% rename from patches/server/0595-Empty-commands-shall-not-be-dispatched.patch rename to patches/server/0594-Empty-commands-shall-not-be-dispatched.patch diff --git a/patches/server/0596-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0595-Implement-API-to-expose-exact-interaction-point.patch similarity index 100% rename from patches/server/0596-Implement-API-to-expose-exact-interaction-point.patch rename to patches/server/0595-Implement-API-to-expose-exact-interaction-point.patch diff --git a/patches/server/0597-Remove-stale-POIs.patch b/patches/server/0596-Remove-stale-POIs.patch similarity index 87% rename from patches/server/0597-Remove-stale-POIs.patch rename to patches/server/0596-Remove-stale-POIs.patch index bb517555d4..573df62cfc 100644 --- a/patches/server/0597-Remove-stale-POIs.patch +++ b/patches/server/0596-Remove-stale-POIs.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Remove stale POIs diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 898a2549900b1af70a0bed94a9c9c1f5fbb3c15d..be7d1046bc759d494c7fcfc30d762b42fd659992 100644 +index e683e3b3e1ee6fddddd9f237344961e0e2ad8ca5..0f6c872288b1ea7cf1dc552827d116360d3c54bb 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -1738,6 +1738,11 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl +@@ -1718,6 +1718,11 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl }); optional1.ifPresent((villageplacetype) -> { this.getServer().execute(() -> { diff --git a/patches/server/0598-Fix-villager-boat-exploit.patch b/patches/server/0597-Fix-villager-boat-exploit.patch similarity index 100% rename from patches/server/0598-Fix-villager-boat-exploit.patch rename to patches/server/0597-Fix-villager-boat-exploit.patch diff --git a/patches/server/0599-Add-sendOpLevel-API.patch b/patches/server/0598-Add-sendOpLevel-API.patch similarity index 100% rename from patches/server/0599-Add-sendOpLevel-API.patch rename to patches/server/0598-Add-sendOpLevel-API.patch diff --git a/patches/server/0600-Add-StructureLocateEvent.patch b/patches/server/0599-Add-StructureLocateEvent.patch similarity index 100% rename from patches/server/0600-Add-StructureLocateEvent.patch rename to patches/server/0599-Add-StructureLocateEvent.patch diff --git a/patches/server/0601-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0600-Collision-option-for-requiring-a-player-participant.patch similarity index 100% rename from patches/server/0601-Collision-option-for-requiring-a-player-participant.patch rename to patches/server/0600-Collision-option-for-requiring-a-player-participant.patch diff --git a/patches/server/0602-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0601-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch similarity index 100% rename from patches/server/0602-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch rename to patches/server/0601-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch diff --git a/patches/server/0603-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0602-Return-chat-component-with-empty-text-instead-of-thr.patch similarity index 100% rename from patches/server/0603-Return-chat-component-with-empty-text-instead-of-thr.patch rename to patches/server/0602-Return-chat-component-with-empty-text-instead-of-thr.patch diff --git a/patches/server/0604-Make-schedule-command-per-world.patch b/patches/server/0603-Make-schedule-command-per-world.patch similarity index 100% rename from patches/server/0604-Make-schedule-command-per-world.patch rename to patches/server/0603-Make-schedule-command-per-world.patch diff --git a/patches/server/0605-Configurable-max-leash-distance.patch b/patches/server/0604-Configurable-max-leash-distance.patch similarity index 100% rename from patches/server/0605-Configurable-max-leash-distance.patch rename to patches/server/0604-Configurable-max-leash-distance.patch diff --git a/patches/server/0606-Implement-BlockPreDispenseEvent.patch b/patches/server/0605-Implement-BlockPreDispenseEvent.patch similarity index 100% rename from patches/server/0606-Implement-BlockPreDispenseEvent.patch rename to patches/server/0605-Implement-BlockPreDispenseEvent.patch diff --git a/patches/server/0607-Added-Vanilla-Entity-Tags.patch b/patches/server/0606-Added-Vanilla-Entity-Tags.patch similarity index 100% rename from patches/server/0607-Added-Vanilla-Entity-Tags.patch rename to patches/server/0606-Added-Vanilla-Entity-Tags.patch diff --git a/patches/server/0608-added-Wither-API.patch b/patches/server/0607-added-Wither-API.patch similarity index 100% rename from patches/server/0608-added-Wither-API.patch rename to patches/server/0607-added-Wither-API.patch diff --git a/patches/server/0609-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0608-Added-firing-of-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/server/0609-Added-firing-of-PlayerChangeBeaconEffectEvent.patch rename to patches/server/0608-Added-firing-of-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/server/0610-Fix-console-spam-when-removing-chests-in-water.patch b/patches/server/0609-Fix-console-spam-when-removing-chests-in-water.patch similarity index 100% rename from patches/server/0610-Fix-console-spam-when-removing-chests-in-water.patch rename to patches/server/0609-Fix-console-spam-when-removing-chests-in-water.patch diff --git a/patches/server/0611-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0610-Add-toggle-for-always-placing-the-dragon-egg.patch similarity index 100% rename from patches/server/0611-Add-toggle-for-always-placing-the-dragon-egg.patch rename to patches/server/0610-Add-toggle-for-always-placing-the-dragon-egg.patch diff --git a/patches/server/0612-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0611-Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/server/0612-Added-PlayerStonecutterRecipeSelectEvent.patch rename to patches/server/0611-Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/server/0613-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0612-Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 100% rename from patches/server/0613-Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to patches/server/0612-Add-dropLeash-variable-to-EntityUnleashEvent.patch diff --git a/patches/server/0614-Skip-distance-map-update-when-spawning-disabled.patch b/patches/server/0613-Skip-distance-map-update-when-spawning-disabled.patch similarity index 100% rename from patches/server/0614-Skip-distance-map-update-when-spawning-disabled.patch rename to patches/server/0613-Skip-distance-map-update-when-spawning-disabled.patch diff --git a/patches/server/0615-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0614-Reset-shield-blocking-on-dimension-change.patch similarity index 100% rename from patches/server/0615-Reset-shield-blocking-on-dimension-change.patch rename to patches/server/0614-Reset-shield-blocking-on-dimension-change.patch diff --git a/patches/server/0616-add-DragonEggFormEvent.patch b/patches/server/0615-add-DragonEggFormEvent.patch similarity index 100% rename from patches/server/0616-add-DragonEggFormEvent.patch rename to patches/server/0615-add-DragonEggFormEvent.patch diff --git a/patches/server/0617-EntityMoveEvent.patch b/patches/server/0616-EntityMoveEvent.patch similarity index 97% rename from patches/server/0617-EntityMoveEvent.patch rename to patches/server/0616-EntityMoveEvent.patch index 992da64f2b..51f58bc817 100644 --- a/patches/server/0617-EntityMoveEvent.patch +++ b/patches/server/0616-EntityMoveEvent.patch @@ -17,7 +17,7 @@ index e73c211627f7aa5d6aa5525dba7e9601fbbc6794..d66d93c0eb5a26b61821029f9c470a73 this.profiler.push(() -> { diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index be7d1046bc759d494c7fcfc30d762b42fd659992..3d79984d15ee36107522b65f5dcfb4d2fa3538ab 100644 +index 0f6c872288b1ea7cf1dc552827d116360d3c54bb..150b3b2411a803d6fb4d2f105752d6dd334d261d 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -200,6 +200,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl diff --git a/patches/server/0618-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0617-added-option-to-disable-pathfinding-updates-on-block.patch similarity index 89% rename from patches/server/0618-added-option-to-disable-pathfinding-updates-on-block.patch rename to patches/server/0617-added-option-to-disable-pathfinding-updates-on-block.patch index 06656d7b8c..f5c40c8731 100644 --- a/patches/server/0618-added-option-to-disable-pathfinding-updates-on-block.patch +++ b/patches/server/0617-added-option-to-disable-pathfinding-updates-on-block.patch @@ -20,10 +20,10 @@ index 618acd1b5e65cbff345b35a9ea90f5c77f76436c..4a44e264e817169ed0d8933d3645c3c6 } diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 3d79984d15ee36107522b65f5dcfb4d2fa3538ab..15f92317cfff94eb0d6c585a69f7d3f65c550f21 100644 +index 150b3b2411a803d6fb4d2f105752d6dd334d261d..e37d6b2627d29c5023aa2ad82456e73dd214f54d 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -1334,6 +1334,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl +@@ -1314,6 +1314,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl @Override public void sendBlockUpdated(BlockPos pos, BlockState oldState, BlockState newState, int flags) { this.getChunkSource().blockChanged(pos); @@ -31,7 +31,7 @@ index 3d79984d15ee36107522b65f5dcfb4d2fa3538ab..15f92317cfff94eb0d6c585a69f7d3f6 VoxelShape voxelshape = oldState.getCollisionShape(this, pos); VoxelShape voxelshape1 = newState.getCollisionShape(this, pos); -@@ -1361,6 +1362,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl +@@ -1341,6 +1342,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl } } diff --git a/patches/server/0619-Inline-shift-direction-fields.patch b/patches/server/0618-Inline-shift-direction-fields.patch similarity index 100% rename from patches/server/0619-Inline-shift-direction-fields.patch rename to patches/server/0618-Inline-shift-direction-fields.patch diff --git a/patches/server/0620-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0619-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/server/0620-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/server/0619-Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/server/0621-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0620-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/server/0621-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/server/0620-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/server/0622-living-entity-allow-attribute-registration.patch b/patches/server/0621-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/server/0622-living-entity-allow-attribute-registration.patch rename to patches/server/0621-living-entity-allow-attribute-registration.patch diff --git a/patches/server/0623-fix-dead-slime-setSize-invincibility.patch b/patches/server/0622-fix-dead-slime-setSize-invincibility.patch similarity index 100% rename from patches/server/0623-fix-dead-slime-setSize-invincibility.patch rename to patches/server/0622-fix-dead-slime-setSize-invincibility.patch diff --git a/patches/server/0624-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0623-Merchant-getRecipes-should-return-an-immutable-list.patch similarity index 100% rename from patches/server/0624-Merchant-getRecipes-should-return-an-immutable-list.patch rename to patches/server/0623-Merchant-getRecipes-should-return-an-immutable-list.patch diff --git a/patches/server/0625-misc-debugging-dumps.patch b/patches/server/0624-misc-debugging-dumps.patch similarity index 100% rename from patches/server/0625-misc-debugging-dumps.patch rename to patches/server/0624-misc-debugging-dumps.patch diff --git a/patches/server/0626-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0625-Add-support-for-hex-color-codes-in-console.patch similarity index 100% rename from patches/server/0626-Add-support-for-hex-color-codes-in-console.patch rename to patches/server/0625-Add-support-for-hex-color-codes-in-console.patch diff --git a/patches/server/0627-Expose-Tracked-Players.patch b/patches/server/0626-Expose-Tracked-Players.patch similarity index 100% rename from patches/server/0627-Expose-Tracked-Players.patch rename to patches/server/0626-Expose-Tracked-Players.patch diff --git a/patches/server/0628-Remove-streams-from-SensorNearest.patch b/patches/server/0627-Remove-streams-from-SensorNearest.patch similarity index 100% rename from patches/server/0628-Remove-streams-from-SensorNearest.patch rename to patches/server/0627-Remove-streams-from-SensorNearest.patch diff --git a/patches/server/0629-MC-29274-Fix-Wither-hostility-towards-players.patch b/patches/server/0628-MC-29274-Fix-Wither-hostility-towards-players.patch similarity index 100% rename from patches/server/0629-MC-29274-Fix-Wither-hostility-towards-players.patch rename to patches/server/0628-MC-29274-Fix-Wither-hostility-towards-players.patch diff --git a/patches/server/0630-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0629-Throw-proper-exception-on-empty-JsonList-file.patch similarity index 100% rename from patches/server/0630-Throw-proper-exception-on-empty-JsonList-file.patch rename to patches/server/0629-Throw-proper-exception-on-empty-JsonList-file.patch diff --git a/patches/server/0631-Improve-ServerGUI.patch b/patches/server/0630-Improve-ServerGUI.patch similarity index 100% rename from patches/server/0631-Improve-ServerGUI.patch rename to patches/server/0630-Improve-ServerGUI.patch diff --git a/patches/server/0632-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/0631-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch similarity index 100% rename from patches/server/0632-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch rename to patches/server/0631-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch diff --git a/patches/server/0633-fix-converting-txt-to-json-file.patch b/patches/server/0632-fix-converting-txt-to-json-file.patch similarity index 100% rename from patches/server/0633-fix-converting-txt-to-json-file.patch rename to patches/server/0632-fix-converting-txt-to-json-file.patch diff --git a/patches/server/0634-Add-worldborder-events.patch b/patches/server/0633-Add-worldborder-events.patch similarity index 100% rename from patches/server/0634-Add-worldborder-events.patch rename to patches/server/0633-Add-worldborder-events.patch diff --git a/patches/server/0635-added-PlayerNameEntityEvent.patch b/patches/server/0634-added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/server/0635-added-PlayerNameEntityEvent.patch rename to patches/server/0634-added-PlayerNameEntityEvent.patch diff --git a/patches/server/0636-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0635-Prevent-grindstones-from-overstacking-items.patch similarity index 100% rename from patches/server/0636-Prevent-grindstones-from-overstacking-items.patch rename to patches/server/0635-Prevent-grindstones-from-overstacking-items.patch diff --git a/patches/server/0637-Add-recipe-to-cook-events.patch b/patches/server/0636-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/server/0637-Add-recipe-to-cook-events.patch rename to patches/server/0636-Add-recipe-to-cook-events.patch diff --git a/patches/server/0638-Add-Block-isValidTool.patch b/patches/server/0637-Add-Block-isValidTool.patch similarity index 100% rename from patches/server/0638-Add-Block-isValidTool.patch rename to patches/server/0637-Add-Block-isValidTool.patch diff --git a/patches/server/0639-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0638-Allow-using-signs-inside-spawn-protection.patch similarity index 100% rename from patches/server/0639-Allow-using-signs-inside-spawn-protection.patch rename to patches/server/0638-Allow-using-signs-inside-spawn-protection.patch diff --git a/patches/server/0640-Implement-Keyed-on-World.patch b/patches/server/0639-Implement-Keyed-on-World.patch similarity index 100% rename from patches/server/0640-Implement-Keyed-on-World.patch rename to patches/server/0639-Implement-Keyed-on-World.patch diff --git a/patches/server/0641-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0640-Add-fast-alternative-constructor-for-Rotations.patch similarity index 100% rename from patches/server/0641-Add-fast-alternative-constructor-for-Rotations.patch rename to patches/server/0640-Add-fast-alternative-constructor-for-Rotations.patch diff --git a/patches/server/0642-Item-Rarity-API.patch b/patches/server/0641-Item-Rarity-API.patch similarity index 100% rename from patches/server/0642-Item-Rarity-API.patch rename to patches/server/0641-Item-Rarity-API.patch diff --git a/patches/server/0643-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0642-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch similarity index 100% rename from patches/server/0643-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch rename to patches/server/0642-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch diff --git a/patches/server/0644-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0643-copy-TESign-isEditable-from-snapshots.patch similarity index 100% rename from patches/server/0644-copy-TESign-isEditable-from-snapshots.patch rename to patches/server/0643-copy-TESign-isEditable-from-snapshots.patch diff --git a/patches/server/0645-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0644-Drop-carried-item-when-player-has-disconnected.patch similarity index 100% rename from patches/server/0645-Drop-carried-item-when-player-has-disconnected.patch rename to patches/server/0644-Drop-carried-item-when-player-has-disconnected.patch diff --git a/patches/server/0646-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0645-forced-whitelist-use-configurable-kick-message.patch similarity index 100% rename from patches/server/0646-forced-whitelist-use-configurable-kick-message.patch rename to patches/server/0645-forced-whitelist-use-configurable-kick-message.patch diff --git a/patches/server/0647-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0646-Don-t-ignore-result-of-PlayerEditBookEvent.patch similarity index 100% rename from patches/server/0647-Don-t-ignore-result-of-PlayerEditBookEvent.patch rename to patches/server/0646-Don-t-ignore-result-of-PlayerEditBookEvent.patch diff --git a/patches/server/0648-fix-cancelling-block-falling-causing-client-desync.patch b/patches/server/0647-fix-cancelling-block-falling-causing-client-desync.patch similarity index 100% rename from patches/server/0648-fix-cancelling-block-falling-causing-client-desync.patch rename to patches/server/0647-fix-cancelling-block-falling-causing-client-desync.patch diff --git a/patches/server/0649-Expose-protocol-version.patch b/patches/server/0648-Expose-protocol-version.patch similarity index 100% rename from patches/server/0649-Expose-protocol-version.patch rename to patches/server/0648-Expose-protocol-version.patch diff --git a/patches/server/0650-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/server/0649-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch similarity index 100% rename from patches/server/0650-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch rename to patches/server/0649-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch diff --git a/patches/server/0651-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0650-Enhance-console-tab-completions-for-brigadier-comman.patch similarity index 100% rename from patches/server/0651-Enhance-console-tab-completions-for-brigadier-comman.patch rename to patches/server/0650-Enhance-console-tab-completions-for-brigadier-comman.patch diff --git a/patches/server/0652-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0651-Fix-PlayerItemConsumeEvent-cancelling-properly.patch similarity index 100% rename from patches/server/0652-Fix-PlayerItemConsumeEvent-cancelling-properly.patch rename to patches/server/0651-Fix-PlayerItemConsumeEvent-cancelling-properly.patch diff --git a/patches/server/0653-Add-bypass-host-check.patch b/patches/server/0652-Add-bypass-host-check.patch similarity index 100% rename from patches/server/0653-Add-bypass-host-check.patch rename to patches/server/0652-Add-bypass-host-check.patch diff --git a/patches/server/0654-Set-area-affect-cloud-rotation.patch b/patches/server/0653-Set-area-affect-cloud-rotation.patch similarity index 100% rename from patches/server/0654-Set-area-affect-cloud-rotation.patch rename to patches/server/0653-Set-area-affect-cloud-rotation.patch diff --git a/patches/server/0655-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0654-add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/server/0655-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/server/0654-add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/server/0656-Fix-duplicating-give-items-on-item-drop-cancel.patch b/patches/server/0655-Fix-duplicating-give-items-on-item-drop-cancel.patch similarity index 100% rename from patches/server/0656-Fix-duplicating-give-items-on-item-drop-cancel.patch rename to patches/server/0655-Fix-duplicating-give-items-on-item-drop-cancel.patch diff --git a/patches/server/0657-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0656-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/server/0657-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/server/0656-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/server/0658-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0657-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/server/0658-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/server/0657-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/server/0659-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0658-fix-PigZombieAngerEvent-cancellation.patch similarity index 100% rename from patches/server/0659-fix-PigZombieAngerEvent-cancellation.patch rename to patches/server/0658-fix-PigZombieAngerEvent-cancellation.patch diff --git a/patches/server/0660-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/server/0659-Fix-checkReach-check-for-Shulker-boxes.patch similarity index 100% rename from patches/server/0660-Fix-checkReach-check-for-Shulker-boxes.patch rename to patches/server/0659-Fix-checkReach-check-for-Shulker-boxes.patch diff --git a/patches/server/0661-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0660-fix-PlayerItemHeldEvent-firing-twice.patch similarity index 100% rename from patches/server/0661-fix-PlayerItemHeldEvent-firing-twice.patch rename to patches/server/0660-fix-PlayerItemHeldEvent-firing-twice.patch diff --git a/patches/server/0662-Added-PlayerDeepSleepEvent.patch b/patches/server/0661-Added-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/server/0662-Added-PlayerDeepSleepEvent.patch rename to patches/server/0661-Added-PlayerDeepSleepEvent.patch diff --git a/patches/server/0663-More-World-API.patch b/patches/server/0662-More-World-API.patch similarity index 100% rename from patches/server/0663-More-World-API.patch rename to patches/server/0662-More-World-API.patch diff --git a/patches/server/0664-Added-PlayerBedFailEnterEvent.patch b/patches/server/0663-Added-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/server/0664-Added-PlayerBedFailEnterEvent.patch rename to patches/server/0663-Added-PlayerBedFailEnterEvent.patch diff --git a/patches/server/0665-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0664-Implement-methods-to-convert-between-Component-and-B.patch similarity index 100% rename from patches/server/0665-Implement-methods-to-convert-between-Component-and-B.patch rename to patches/server/0664-Implement-methods-to-convert-between-Component-and-B.patch diff --git a/patches/server/0666-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0665-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch similarity index 100% rename from patches/server/0666-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch rename to patches/server/0665-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch diff --git a/patches/server/0667-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0666-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/server/0667-Introduce-beacon-activation-deactivation-events.patch rename to patches/server/0666-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/server/0668-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0667-add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 100% rename from patches/server/0668-add-RespawnFlags-to-PlayerRespawnEvent.patch rename to patches/server/0667-add-RespawnFlags-to-PlayerRespawnEvent.patch diff --git a/patches/server/0669-Add-Channel-initialization-listeners.patch b/patches/server/0668-Add-Channel-initialization-listeners.patch similarity index 100% rename from patches/server/0669-Add-Channel-initialization-listeners.patch rename to patches/server/0668-Add-Channel-initialization-listeners.patch diff --git a/patches/server/0670-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0669-Send-empty-commands-if-tab-completion-is-disabled.patch similarity index 100% rename from patches/server/0670-Send-empty-commands-if-tab-completion-is-disabled.patch rename to patches/server/0669-Send-empty-commands-if-tab-completion-is-disabled.patch diff --git a/patches/server/0671-Add-more-WanderingTrader-API.patch b/patches/server/0670-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/server/0671-Add-more-WanderingTrader-API.patch rename to patches/server/0670-Add-more-WanderingTrader-API.patch diff --git a/patches/server/0672-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0671-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/server/0672-Add-EntityBlockStorage-clearEntities.patch rename to patches/server/0671-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/server/0673-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0672-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/server/0673-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/server/0672-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/server/0674-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0673-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0674-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch rename to patches/server/0673-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0675-Inventory-close.patch b/patches/server/0674-Inventory-close.patch similarity index 100% rename from patches/server/0675-Inventory-close.patch rename to patches/server/0674-Inventory-close.patch diff --git a/patches/server/0676-call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/0675-call-PortalCreateEvent-players-and-end-platform.patch similarity index 100% rename from patches/server/0676-call-PortalCreateEvent-players-and-end-platform.patch rename to patches/server/0675-call-PortalCreateEvent-players-and-end-platform.patch diff --git a/patches/server/0677-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0676-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/server/0677-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/server/0676-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/server/0678-Fix-CraftPotionBrewer-cache.patch b/patches/server/0677-Fix-CraftPotionBrewer-cache.patch similarity index 100% rename from patches/server/0678-Fix-CraftPotionBrewer-cache.patch rename to patches/server/0677-Fix-CraftPotionBrewer-cache.patch diff --git a/patches/server/0679-Add-basic-Datapack-API.patch b/patches/server/0678-Add-basic-Datapack-API.patch similarity index 100% rename from patches/server/0679-Add-basic-Datapack-API.patch rename to patches/server/0678-Add-basic-Datapack-API.patch diff --git a/patches/server/0680-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0679-Add-environment-variable-to-disable-server-gui.patch similarity index 100% rename from patches/server/0680-Add-environment-variable-to-disable-server-gui.patch rename to patches/server/0679-Add-environment-variable-to-disable-server-gui.patch diff --git a/patches/server/0681-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0680-additions-to-PlayerGameModeChangeEvent.patch similarity index 100% rename from patches/server/0681-additions-to-PlayerGameModeChangeEvent.patch rename to patches/server/0680-additions-to-PlayerGameModeChangeEvent.patch diff --git a/patches/server/0682-Clear-SyncLoadInfo.patch b/patches/server/0681-Clear-SyncLoadInfo.patch similarity index 100% rename from patches/server/0682-Clear-SyncLoadInfo.patch rename to patches/server/0681-Clear-SyncLoadInfo.patch diff --git a/patches/server/0683-ItemStack-repair-check-API.patch b/patches/server/0682-ItemStack-repair-check-API.patch similarity index 100% rename from patches/server/0683-ItemStack-repair-check-API.patch rename to patches/server/0682-ItemStack-repair-check-API.patch diff --git a/patches/server/0684-More-Enchantment-API.patch b/patches/server/0683-More-Enchantment-API.patch similarity index 100% rename from patches/server/0684-More-Enchantment-API.patch rename to patches/server/0683-More-Enchantment-API.patch diff --git a/patches/server/0685-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/server/0684-Add-command-line-option-to-load-extra-plugin-jars-no.patch similarity index 100% rename from patches/server/0685-Add-command-line-option-to-load-extra-plugin-jars-no.patch rename to patches/server/0684-Add-command-line-option-to-load-extra-plugin-jars-no.patch diff --git a/patches/server/0686-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0685-Fix-and-optimise-world-force-upgrading.patch similarity index 99% rename from patches/server/0686-Fix-and-optimise-world-force-upgrading.patch rename to patches/server/0685-Fix-and-optimise-world-force-upgrading.patch index 410e1b01dc..de71eaee1b 100644 --- a/patches/server/0686-Fix-and-optimise-world-force-upgrading.patch +++ b/patches/server/0685-Fix-and-optimise-world-force-upgrading.patch @@ -297,7 +297,7 @@ index 8ab99b04ef3e85b64ea78680aa85df1a0894399f..43f9143e892111aa9901454b3de7b579 if (dimensionKey == LevelStem.OVERWORLD) { diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index bade87f842bf36b948bdeacf6d22715a5b075f3e..274a8bf3d5009e4207ca05348e2f813f257fd934 100644 +index 11b454836610f07fffc0efcb60ac5960757a0644..5635b1049f950b8520f527b015c9404c80f5d86c 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -174,6 +174,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0687-Add-Mob-lookAt-API.patch b/patches/server/0686-Add-Mob-lookAt-API.patch similarity index 100% rename from patches/server/0687-Add-Mob-lookAt-API.patch rename to patches/server/0686-Add-Mob-lookAt-API.patch diff --git a/patches/server/0688-Add-Unix-domain-socket-support.patch b/patches/server/0687-Add-Unix-domain-socket-support.patch similarity index 100% rename from patches/server/0688-Add-Unix-domain-socket-support.patch rename to patches/server/0687-Add-Unix-domain-socket-support.patch diff --git a/patches/server/0689-Add-EntityInsideBlockEvent.patch b/patches/server/0688-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/server/0689-Add-EntityInsideBlockEvent.patch rename to patches/server/0688-Add-EntityInsideBlockEvent.patch diff --git a/patches/server/0690-Attributes-API-for-item-defaults.patch b/patches/server/0689-Attributes-API-for-item-defaults.patch similarity index 100% rename from patches/server/0690-Attributes-API-for-item-defaults.patch rename to patches/server/0689-Attributes-API-for-item-defaults.patch diff --git a/patches/server/0691-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch b/patches/server/0690-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch similarity index 100% rename from patches/server/0691-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch rename to patches/server/0690-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch diff --git a/patches/server/0692-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0691-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 97% rename from patches/server/0692-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/server/0691-Add-cause-to-Weather-ThunderChangeEvents.patch index b5f3bbda93..0ab384d158 100644 --- a/patches/server/0692-Add-cause-to-Weather-ThunderChangeEvents.patch +++ b/patches/server/0691-Add-cause-to-Weather-ThunderChangeEvents.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add cause to Weather/ThunderChangeEvents diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 15f92317cfff94eb0d6c585a69f7d3f65c550f21..ace160125bed7ee7fcc715a52436b12f4849b774 100644 +index e37d6b2627d29c5023aa2ad82456e73dd214f54d..fe6d8b93f5685b611f1f2fe6ac28a0b718e198cc 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -425,8 +425,8 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl @@ -30,7 +30,7 @@ index 15f92317cfff94eb0d6c585a69f7d3f65c550f21..ace160125bed7ee7fcc715a52436b12f } this.oThunderLevel = this.thunderLevel; -@@ -893,14 +893,14 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl +@@ -873,14 +873,14 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl private void stopWeather() { // CraftBukkit start diff --git a/patches/server/0693-More-Lidded-Block-API.patch b/patches/server/0692-More-Lidded-Block-API.patch similarity index 100% rename from patches/server/0693-More-Lidded-Block-API.patch rename to patches/server/0692-More-Lidded-Block-API.patch diff --git a/patches/server/0694-Limit-item-frame-cursors-on-maps.patch b/patches/server/0693-Limit-item-frame-cursors-on-maps.patch similarity index 100% rename from patches/server/0694-Limit-item-frame-cursors-on-maps.patch rename to patches/server/0693-Limit-item-frame-cursors-on-maps.patch diff --git a/patches/server/0695-Add-PufferFishStateChangeEvent.patch b/patches/server/0694-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/server/0695-Add-PufferFishStateChangeEvent.patch rename to patches/server/0694-Add-PufferFishStateChangeEvent.patch diff --git a/patches/server/0696-Add-PlayerKickEvent-causes.patch b/patches/server/0695-Add-PlayerKickEvent-causes.patch similarity index 100% rename from patches/server/0696-Add-PlayerKickEvent-causes.patch rename to patches/server/0695-Add-PlayerKickEvent-causes.patch diff --git a/patches/server/0697-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0696-Fix-PlayerBucketEmptyEvent-result-itemstack.patch similarity index 100% rename from patches/server/0697-Fix-PlayerBucketEmptyEvent-result-itemstack.patch rename to patches/server/0696-Fix-PlayerBucketEmptyEvent-result-itemstack.patch diff --git a/patches/server/0698-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch b/patches/server/0697-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch similarity index 97% rename from patches/server/0698-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch rename to patches/server/0697-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch index 3382f26a07..2a6493c294 100644 --- a/patches/server/0698-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch +++ b/patches/server/0697-Synchronize-PalettedContainer-instead-of-ReentrantLo.patch @@ -13,7 +13,7 @@ contention situations. And this is extremely a low contention situation. diff --git a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java -index 2bedc0f38ef16e922197a6f8e4c17aeb9cab92fd..33ffda30ce812a2497ba220046119445d00a11d3 100644 +index b5b0dbbb21f15a61017d8fc936feed30c2b193dc..418eb1ec7dd407ec751b22aa6c7c96069c7eb2ff 100644 --- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java +++ b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java @@ -37,16 +37,18 @@ public class PalettedContainer implements PaletteResize { diff --git a/patches/server/0699-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0698-Add-option-to-fix-items-merging-through-walls.patch similarity index 100% rename from patches/server/0699-Add-option-to-fix-items-merging-through-walls.patch rename to patches/server/0698-Add-option-to-fix-items-merging-through-walls.patch diff --git a/patches/server/0700-Add-BellRevealRaiderEvent.patch b/patches/server/0699-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/server/0700-Add-BellRevealRaiderEvent.patch rename to patches/server/0699-Add-BellRevealRaiderEvent.patch diff --git a/patches/server/0701-Fix-invulnerable-end-crystals.patch b/patches/server/0700-Fix-invulnerable-end-crystals.patch similarity index 100% rename from patches/server/0701-Fix-invulnerable-end-crystals.patch rename to patches/server/0700-Fix-invulnerable-end-crystals.patch diff --git a/patches/server/0702-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0701-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/server/0702-Add-ElderGuardianAppearanceEvent.patch rename to patches/server/0701-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/server/0703-Reset-villager-inventory-on-cancelled-pickup-event.patch b/patches/server/0702-Reset-villager-inventory-on-cancelled-pickup-event.patch similarity index 100% rename from patches/server/0703-Reset-villager-inventory-on-cancelled-pickup-event.patch rename to patches/server/0702-Reset-villager-inventory-on-cancelled-pickup-event.patch diff --git a/patches/server/0704-Fix-dangerous-end-portal-logic.patch b/patches/server/0703-Fix-dangerous-end-portal-logic.patch similarity index 100% rename from patches/server/0704-Fix-dangerous-end-portal-logic.patch rename to patches/server/0703-Fix-dangerous-end-portal-logic.patch diff --git a/patches/server/0705-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0704-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch similarity index 100% rename from patches/server/0705-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch rename to patches/server/0704-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch diff --git a/patches/server/0706-Make-item-validations-configurable.patch b/patches/server/0705-Make-item-validations-configurable.patch similarity index 100% rename from patches/server/0706-Make-item-validations-configurable.patch rename to patches/server/0705-Make-item-validations-configurable.patch diff --git a/patches/server/0707-Add-more-line-of-sight-methods.patch b/patches/server/0706-Add-more-line-of-sight-methods.patch similarity index 100% rename from patches/server/0707-Add-more-line-of-sight-methods.patch rename to patches/server/0706-Add-more-line-of-sight-methods.patch diff --git a/patches/server/0708-add-per-world-spawn-limits.patch b/patches/server/0707-add-per-world-spawn-limits.patch similarity index 100% rename from patches/server/0708-add-per-world-spawn-limits.patch rename to patches/server/0707-add-per-world-spawn-limits.patch diff --git a/patches/server/0709-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/server/0708-Fix-PotionSplashEvent-for-water-splash-potions.patch similarity index 100% rename from patches/server/0709-Fix-PotionSplashEvent-for-water-splash-potions.patch rename to patches/server/0708-Fix-PotionSplashEvent-for-water-splash-potions.patch diff --git a/patches/server/0710-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch b/patches/server/0709-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch similarity index 100% rename from patches/server/0710-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch rename to patches/server/0709-Fix-incorrect-status-dataconverter-for-pre-1.13-chun.patch