diff --git a/Spigot-Server-Patches/0246-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0246-Option-to-prevent-armor-stands-from-doing-entity-loo.patch index d3e1a4f8e..28ebbe402 100644 --- a/Spigot-Server-Patches/0246-Option-to-prevent-armor-stands-from-doing-entity-loo.patch +++ b/Spigot-Server-Patches/0246-Option-to-prevent-armor-stands-from-doing-entity-loo.patch @@ -31,10 +31,10 @@ index b0847b4e61e587a47fd209eb2ec3772d1486802d..89f6525ef1a4c41d3b662a5ad22b3530 for (int i = 0; i < list.size(); ++i) { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index fa095bb55c09a3b5f8ab70bcce5a03c7eb93dcfa..7affb75a97e49b67861b24de38ef83e72b0abd5a 100644 +index 3bad056cf3c9a4322dbbf3486ea4510117a8d95b..7b2df7f3538f7ee696db08f7d8be74f258ff1996 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -801,6 +801,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -802,6 +802,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable { // Paper end } } diff --git a/Spigot-Server-Patches/0323-BlockDestroyEvent.patch b/Spigot-Server-Patches/0323-BlockDestroyEvent.patch index 850cee7a6..29e57dba9 100644 --- a/Spigot-Server-Patches/0323-BlockDestroyEvent.patch +++ b/Spigot-Server-Patches/0323-BlockDestroyEvent.patch @@ -11,10 +11,10 @@ floating in the air. This can replace many uses of BlockPhysicsEvent diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 3fc77d08e77b1594967c9e08efbd9102265603ea..e3ed6b92d95f4fd061f9de1a17e776358af71763 100644 +index ec77151d0dde422024ae5226ad7e3fb18c08f7c0..89bb995909882a4b35e2d07e5a47739c1d4f46f2 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -499,8 +499,20 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -500,8 +500,20 @@ public abstract class World implements GeneratorAccess, AutoCloseable { return false; } else { Fluid fluid = this.getFluid(blockposition); diff --git a/Spigot-Server-Patches/0342-Optimize-Captured-TileEntity-Lookup.patch b/Spigot-Server-Patches/0342-Optimize-Captured-TileEntity-Lookup.patch index 9f978702e..146aefbed 100644 --- a/Spigot-Server-Patches/0342-Optimize-Captured-TileEntity-Lookup.patch +++ b/Spigot-Server-Patches/0342-Optimize-Captured-TileEntity-Lookup.patch @@ -10,10 +10,10 @@ Optimize to check if the captured list even has values in it, and also to just do a get call since the value can never be null. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index e3ed6b92d95f4fd061f9de1a17e776358af71763..a86d56ebe2cfecca96e8dbf2f108fd2842a7939a 100644 +index 89bb995909882a4b35e2d07e5a47739c1d4f46f2..f96ddcba26155bf179489b9d856305b90d1ae014 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -908,12 +908,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -909,12 +909,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable { return null; } else { // CraftBukkit start diff --git a/Spigot-Server-Patches/0343-Add-Heightmap-API.patch b/Spigot-Server-Patches/0343-Add-Heightmap-API.patch index b128e79b9..4aff2553b 100644 --- a/Spigot-Server-Patches/0343-Add-Heightmap-API.patch +++ b/Spigot-Server-Patches/0343-Add-Heightmap-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add Heightmap API diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index a86d56ebe2cfecca96e8dbf2f108fd2842a7939a..f2d2258feadab1a1cb5fffdabc8d90949b980342 100644 +index f96ddcba26155bf179489b9d856305b90d1ae014..66aeb56325a5dab4ffe4879bf9c4a7414a184397 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -609,8 +609,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -610,8 +610,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable { } } @@ -20,7 +20,7 @@ index a86d56ebe2cfecca96e8dbf2f108fd2842a7939a..f2d2258feadab1a1cb5fffdabc8d9094 if (i >= -30000000 && j >= -30000000 && i < 30000000 && j < 30000000) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 98af366848dba468d526d037a5e78fde4a4eda59..69159ae999af8b48542f69eb60ad0822eca2809d 100644 +index 37c6d278de5055dc40b2386b0bb820f02084f38d..d8ae8e544a6003bd5235cb23dd1739b2c221a333 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -342,6 +342,29 @@ public class CraftWorld implements World { diff --git a/Spigot-Server-Patches/0362-Anti-Xray.patch b/Spigot-Server-Patches/0362-Anti-Xray.patch index 449c78444..e230e16a2 100644 --- a/Spigot-Server-Patches/0362-Anti-Xray.patch +++ b/Spigot-Server-Patches/0362-Anti-Xray.patch @@ -1422,7 +1422,7 @@ index 420bf7116def909d3dd7dc9a799723446ddf8f7f..300cbb8b01d94e7eb0cded0c8e118103 } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 9408f47f757183f9a08b948043ce1aa849a14a25..7e183072be368cc03bd280ee5dbe404cd029fce8 100644 +index 66aeb56325a5dab4ffe4879bf9c4a7414a184397..5bb9cd2a9b00e908af700fa44944b2dd218b9653 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -2,6 +2,8 @@ package net.minecraft.server; @@ -1454,7 +1454,7 @@ index 9408f47f757183f9a08b948043ce1aa849a14a25..7e183072be368cc03bd280ee5dbe404c this.generator = gen; this.world = new CraftWorld((WorldServer) this, gen, env); this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit -@@ -372,6 +376,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -373,6 +377,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { // CraftBukkit end IBlockData iblockdata1 = chunk.setType(blockposition, iblockdata, (i & 64) != 0, (i & 1024) == 0); // CraftBukkit custom NO_PLACE flag diff --git a/Spigot-Server-Patches/0369-Use-getChunkIfLoadedImmediately-in-places.patch b/Spigot-Server-Patches/0369-Use-getChunkIfLoadedImmediately-in-places.patch index c12e20214..450b85fc8 100644 --- a/Spigot-Server-Patches/0369-Use-getChunkIfLoadedImmediately-in-places.patch +++ b/Spigot-Server-Patches/0369-Use-getChunkIfLoadedImmediately-in-places.patch @@ -8,7 +8,7 @@ ticket level 33 (yes getChunkIfLoaded will actually perform a chunk load in that case). diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 7f2a09f940902190fcf7045aab27fa3474eafd14..4dd57152cb0d09b2df08be68ab111623724d52fc 100644 +index 412442e197fff0010e06ce2b604450b91e2a984e..ca5860d69dc729c8e1c2c123471a0a615367f00d 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1094,7 +1094,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -21,7 +21,7 @@ index 7f2a09f940902190fcf7045aab27fa3474eafd14..4dd57152cb0d09b2df08be68ab111623 return; } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 8c725507caaa7729e1b6b56b14a111765e9427f7..ddf5e3f35a37225f292fb1abba7d9132cd397e32 100644 +index 5bb9cd2a9b00e908af700fa44944b2dd218b9653..e2ae32a2bbb02c81ba7bb8c2f75a51f4f61eb218 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -104,6 +104,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -38,7 +38,7 @@ index 8c725507caaa7729e1b6b56b14a111765e9427f7..ddf5e3f35a37225f292fb1abba7d9132 public ResourceKey getTypeKey() { return typeKey; } -@@ -1002,14 +1009,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -1003,14 +1010,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable { } public boolean p(BlockPosition blockposition) { @@ -55,7 +55,7 @@ index 8c725507caaa7729e1b6b56b14a111765e9427f7..ddf5e3f35a37225f292fb1abba7d9132 return ichunkaccess == null ? false : ichunkaccess.getType(blockposition).a((IBlockAccess) this, blockposition, entity, enumdirection); } -@@ -1130,7 +1137,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -1131,7 +1138,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { for (int i1 = i; i1 < j; ++i1) { for (int j1 = k; j1 < l; ++j1) { diff --git a/Spigot-Server-Patches/0370-Reduce-sync-loads.patch b/Spigot-Server-Patches/0370-Reduce-sync-loads.patch index bab78732a..d8347566a 100644 --- a/Spigot-Server-Patches/0370-Reduce-sync-loads.patch +++ b/Spigot-Server-Patches/0370-Reduce-sync-loads.patch @@ -298,10 +298,10 @@ index 77e17feb56cc28e763640b2e37f66788241e09b4..2eb38bfcdc0c232da9dad6921df503e5 this.serverThreadQueue.awaitTasks(completablefuture::isDone); com.destroystokyo.paper.io.chunk.ChunkTaskManager.popChunkWait(); // Paper - async chunk debug diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index e3b4e1cd0384dfda17b5c42577a0f05876e255dc..d4aa3bf40bda5a85cad0b6eaff262581fc25c879 100644 +index e2ae32a2bbb02c81ba7bb8c2f75a51f4f61eb218..16e2f0e9580486337b8bc060d4b088bb1bf40581 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1070,7 +1070,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -1071,7 +1071,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { for (int i1 = i; i1 <= j; ++i1) { for (int j1 = k; j1 <= l; ++j1) { @@ -310,7 +310,7 @@ index e3b4e1cd0384dfda17b5c42577a0f05876e255dc..d4aa3bf40bda5a85cad0b6eaff262581 if (chunk != null) { chunk.a(entity, axisalignedbb, list, predicate); -@@ -1091,7 +1091,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -1092,7 +1092,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { for (int i1 = i; i1 < j; ++i1) { for (int j1 = k; j1 < l; ++j1) { @@ -319,7 +319,7 @@ index e3b4e1cd0384dfda17b5c42577a0f05876e255dc..d4aa3bf40bda5a85cad0b6eaff262581 if (chunk != null) { chunk.a(entitytypes, axisalignedbb, list, predicate); -@@ -1114,7 +1114,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -1115,7 +1115,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { for (int i1 = i; i1 < j; ++i1) { for (int j1 = k; j1 < l; ++j1) { diff --git a/Spigot-Server-Patches/0389-Optimize-Hoppers.patch b/Spigot-Server-Patches/0389-Optimize-Hoppers.patch index e64944f06..c48186964 100644 --- a/Spigot-Server-Patches/0389-Optimize-Hoppers.patch +++ b/Spigot-Server-Patches/0389-Optimize-Hoppers.patch @@ -485,10 +485,10 @@ index d9be182a574daaedcc7a106c759c2bde2e4eb19a..c6df2318762dc6542e73f18ed9a3172e } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index ea4acb47edb1b22d11e932a1b33f4297a18265f4..67a38ed5ec173ece6f072540b9fbb47400bb5af0 100644 +index 16e2f0e9580486337b8bc060d4b088bb1bf40581..2fa1cd43a8a7b083cd1522c32716d21dee922c46 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1102,8 +1102,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -1103,8 +1103,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable { return list; } diff --git a/Spigot-Server-Patches/0407-Optimise-random-block-ticking.patch b/Spigot-Server-Patches/0407-Optimise-random-block-ticking.patch index 79df12f5e..254fcec8f 100644 --- a/Spigot-Server-Patches/0407-Optimise-random-block-ticking.patch +++ b/Spigot-Server-Patches/0407-Optimise-random-block-ticking.patch @@ -243,10 +243,10 @@ index fa8eab20bb839c53bf7989d02d2274f835002609..4ad393bc99881d813e2b349fb929fc8e public BlockPosition getHomePos() { // Paper - public diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 41e84e47cae0012aba023c22e44f3d71c7e86181..ef37b476d26e535bc2b9b970405186090108206d 100644 +index 6a067e4db344ca5fc446650722db7118fa5127a2..a6a16f72b49a8a641dbb8ab580ecd9d61e9f4b37 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1412,10 +1412,18 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -1413,10 +1413,18 @@ public abstract class World implements GeneratorAccess, AutoCloseable { public abstract ITagRegistry p(); public BlockPosition a(int i, int j, int k, int l) { diff --git a/Spigot-Server-Patches/0437-Improved-Watchdog-Support.patch b/Spigot-Server-Patches/0437-Improved-Watchdog-Support.patch index 77d1bd52d..0bdc438c3 100644 --- a/Spigot-Server-Patches/0437-Improved-Watchdog-Support.patch +++ b/Spigot-Server-Patches/0437-Improved-Watchdog-Support.patch @@ -41,7 +41,7 @@ This also moves all plugins who register "delayed init" tasks to occur just befo are properly accounted for and wont trip watchdog on init. diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java -index 081f8d86503b4ab1a704c9fc5ec8a38fd2795427..cef9b0fa633c8b16bb5b99ff94b7b77526034b06 100644 +index 0b9e689d57705965721b5c55bc45d36657f360e4..dee00aac05f1acf050f05d4db557a08dd0f301c8 100644 --- a/src/main/java/com/destroystokyo/paper/Metrics.java +++ b/src/main/java/com/destroystokyo/paper/Metrics.java @@ -92,7 +92,12 @@ public class Metrics { @@ -271,7 +271,7 @@ index 0c469ad1fd477fdb6181c657b7b9e193c790246d..fe88179037f1a56cec3543910cfab67b this.customFunctionData.a(this.dataPackResources.a()); this.ak.a(this.dataPackResources.h()); diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index d3a597d878de4cb625484cbf3a9838961d38ada0..16e4acdb0f834883a480829a864ef7570035bc26 100644 +index 87de764f74e8174da4c1a28238375caa6fdb4d5e..1b5c97c74b7224a8ac4d6e834925c0509a57d308 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -487,6 +487,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -308,10 +308,10 @@ index 1fe1df445ba56b2f176ee25502a774aa0a7bd00b..916a6a1fc1ccc73e4fb974ad77310d16 a(SystemUtils.e); a(SystemUtils.f); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 8c58581417ca3e0336359e7db65568a08e025d6d..0dac8af6680a7dc4ecbedf70707297690fb1e694 100644 +index a6a16f72b49a8a641dbb8ab580ecd9d61e9f4b37..a50b647631eae271380728c890ad3ff67f56bcbe 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -797,6 +797,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -798,6 +798,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { gameprofilerfiller.exit(); } catch (Throwable throwable) { @@ -319,7 +319,7 @@ index 8c58581417ca3e0336359e7db65568a08e025d6d..0dac8af6680a7dc4ecbedf7070729769 // Paper start - Prevent tile entity and entity crashes String msg = "TileEntity threw exception at " + tileentity.world.getWorld().getName() + ":" + tileentity.position.getX() + "," + tileentity.position.getY() + "," + tileentity.position.getZ(); System.err.println(msg); -@@ -872,6 +873,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -873,6 +874,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { try { consumer.accept(entity); } catch (Throwable throwable) { diff --git a/Spigot-Server-Patches/0469-No-Tick-view-distance-implementation.patch b/Spigot-Server-Patches/0469-No-Tick-view-distance-implementation.patch index 5ff5607af..01a747a31 100644 --- a/Spigot-Server-Patches/0469-No-Tick-view-distance-implementation.patch +++ b/Spigot-Server-Patches/0469-No-Tick-view-distance-implementation.patch @@ -608,10 +608,10 @@ index 0f46aac9d021dc115718b1e36b8fbe28cbc820c6..b8ab8150b7dfe9e34910d35f565083e8 while (iterator.hasNext()) { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index bdd1f0873c7b79106d1764eb581b55407d696242..6262db64ae1b615c6742357c32746480eeb69137 100644 +index a50b647631eae271380728c890ad3ff67f56bcbe..8198962c05fe83fd2ff0401c35f4976eb6e6680b 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -464,8 +464,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -465,8 +465,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable { this.b(blockposition, iblockdata1, iblockdata2); } diff --git a/Spigot-Server-Patches/0561-Optimize-redstone-algorithm.patch b/Spigot-Server-Patches/0561-Optimize-redstone-algorithm.patch index b81da7d48..b2bbf3d62 100644 --- a/Spigot-Server-Patches/0561-Optimize-redstone-algorithm.patch +++ b/Spigot-Server-Patches/0561-Optimize-redstone-algorithm.patch @@ -1138,10 +1138,10 @@ index 7b3ccded0451f7b6634aeca0bdc1b5cc94f52b96..7f9ca45d403000d26d84198d8f88cd48 c(iblockdata, world, blockposition); world.a(blockposition, false); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 8d59391befcbc2542a79758d2021ef51df59d815..cbfbdd4c7d91afb779aaf6aa79f9c681078b9b27 100644 +index 14dbedbe879c84d8b0e141d1a4e2e7c1256a6f97..a9a853f176613fae6c1f5937a724f580ce60db2c 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -598,6 +598,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -599,6 +599,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { } @@ -1149,7 +1149,7 @@ index 8d59391befcbc2542a79758d2021ef51df59d815..cbfbdd4c7d91afb779aaf6aa79f9c681 public void a(BlockPosition blockposition, Block block, BlockPosition blockposition1) { if (!this.isClientSide) { IBlockData iblockdata = this.getType(blockposition); -@@ -1227,6 +1228,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -1228,6 +1229,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { return this.getBlockFacePower(blockposition.down(), EnumDirection.DOWN) > 0 ? true : (this.getBlockFacePower(blockposition.up(), EnumDirection.UP) > 0 ? true : (this.getBlockFacePower(blockposition.north(), EnumDirection.NORTH) > 0 ? true : (this.getBlockFacePower(blockposition.south(), EnumDirection.SOUTH) > 0 ? true : (this.getBlockFacePower(blockposition.west(), EnumDirection.WEST) > 0 ? true : this.getBlockFacePower(blockposition.east(), EnumDirection.EAST) > 0)))); } diff --git a/Spigot-Server-Patches/0599-Seed-based-feature-search.patch b/Spigot-Server-Patches/0599-Seed-based-feature-search.patch index ac988781b..e34e1feb5 100644 --- a/Spigot-Server-Patches/0599-Seed-based-feature-search.patch +++ b/Spigot-Server-Patches/0599-Seed-based-feature-search.patch @@ -81,10 +81,10 @@ index c3bd58069d8dbdf36f70f1dafd7c24000f31708b..a62c87bceab2c9700a7b3925f208b0ff StructureStart structurestart = structuremanager.a(SectionPosition.a(ichunkaccess.getPos(), 0), this, ichunkaccess); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 822b587cc92bb25ec8618fd9d86ce2c9233a69b6..9ed21f434c5fb019b74dfe9ee0b802ccc5c07fd8 100644 +index 16c3ef27e8f77942401568727ea78230147dba29..1c0bfeef83c3669651d9b727c4c746441f6b793c 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -1451,8 +1451,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -1452,8 +1452,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable { return this.methodProfiler; } diff --git a/Spigot-Server-Patches/0621-Expose-LivingEntity-hurt-direction.patch b/Spigot-Server-Patches/0620-Expose-LivingEntity-hurt-direction.patch similarity index 94% rename from Spigot-Server-Patches/0621-Expose-LivingEntity-hurt-direction.patch rename to Spigot-Server-Patches/0620-Expose-LivingEntity-hurt-direction.patch index f07fdd673..aa577f9f0 100644 --- a/Spigot-Server-Patches/0621-Expose-LivingEntity-hurt-direction.patch +++ b/Spigot-Server-Patches/0620-Expose-LivingEntity-hurt-direction.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Expose LivingEntity hurt direction diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index dd3287f953a1a24d2406816b3c0ae176476b6452..0294ff10dc8edb24aabfbe1589048a405c356ef0 100644 +index 5f5cea628c7f4c10670524f5fd7d9328f9a685a0..c8cdce899b109a7f554fec7aaa8235df4224cd1d 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -69,7 +69,7 @@ public abstract class EntityLiving extends Entity { diff --git a/Spigot-Server-Patches/0622-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/Spigot-Server-Patches/0621-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from Spigot-Server-Patches/0622-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to Spigot-Server-Patches/0621-Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/Spigot-Server-Patches/0623-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/Spigot-Server-Patches/0622-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch similarity index 100% rename from Spigot-Server-Patches/0623-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch rename to Spigot-Server-Patches/0622-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch diff --git a/Spigot-Server-Patches/0624-added-PlayerTradeEvent.patch b/Spigot-Server-Patches/0623-added-PlayerTradeEvent.patch similarity index 100% rename from Spigot-Server-Patches/0624-added-PlayerTradeEvent.patch rename to Spigot-Server-Patches/0623-added-PlayerTradeEvent.patch diff --git a/Spigot-Server-Patches/0625-Implement-TargetHitEvent.patch b/Spigot-Server-Patches/0624-Implement-TargetHitEvent.patch similarity index 100% rename from Spigot-Server-Patches/0625-Implement-TargetHitEvent.patch rename to Spigot-Server-Patches/0624-Implement-TargetHitEvent.patch diff --git a/Spigot-Server-Patches/0626-Additional-Block-Material-API-s.patch b/Spigot-Server-Patches/0625-Additional-Block-Material-API-s.patch similarity index 100% rename from Spigot-Server-Patches/0626-Additional-Block-Material-API-s.patch rename to Spigot-Server-Patches/0625-Additional-Block-Material-API-s.patch diff --git a/Spigot-Server-Patches/0627-Fix-harming-potion-dupe.patch b/Spigot-Server-Patches/0626-Fix-harming-potion-dupe.patch similarity index 100% rename from Spigot-Server-Patches/0627-Fix-harming-potion-dupe.patch rename to Spigot-Server-Patches/0626-Fix-harming-potion-dupe.patch diff --git a/Spigot-Server-Patches/0628-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/Spigot-Server-Patches/0627-Implement-API-to-get-Material-from-Boats-and-Minecar.patch similarity index 100% rename from Spigot-Server-Patches/0628-Implement-API-to-get-Material-from-Boats-and-Minecar.patch rename to Spigot-Server-Patches/0627-Implement-API-to-get-Material-from-Boats-and-Minecar.patch diff --git a/Spigot-Server-Patches/0629-Optimized-tick-ready-check.patch b/Spigot-Server-Patches/0628-Optimized-tick-ready-check.patch similarity index 92% rename from Spigot-Server-Patches/0629-Optimized-tick-ready-check.patch rename to Spigot-Server-Patches/0628-Optimized-tick-ready-check.patch index 180d3b596..71aa1e744 100644 --- a/Spigot-Server-Patches/0629-Optimized-tick-ready-check.patch +++ b/Spigot-Server-Patches/0628-Optimized-tick-ready-check.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Optimized tick ready check diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 9ed21f434c5fb019b74dfe9ee0b802ccc5c07fd8..97654e0744ef00e9db7b6d473a468b38dce80345 100644 +index 1c0bfeef83c3669651d9b727c4c746441f6b793c..02303f00e243748b9d1c4a37719fcf5c8d271ed9 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java -@@ -793,13 +793,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -794,13 +794,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable { if (!tileentity.isRemoved() && tileentity.hasWorld()) { BlockPosition blockposition = tileentity.getPosition(); @@ -24,7 +24,7 @@ index 9ed21f434c5fb019b74dfe9ee0b802ccc5c07fd8..97654e0744ef00e9db7b6d473a468b38 ((ITickable) tileentity).tick(); } else { tileentity.w(); -@@ -833,9 +833,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -834,9 +834,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable { this.tileEntityListTick.remove(tileTickPosition--); // Spigot end //this.tileEntityList.remove(tileentity); // Paper - remove unused list @@ -38,7 +38,7 @@ index 9ed21f434c5fb019b74dfe9ee0b802ccc5c07fd8..97654e0744ef00e9db7b6d473a468b38 } } -@@ -854,8 +856,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable { +@@ -855,8 +857,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable { } // CraftBukkit end */ diff --git a/Spigot-Server-Patches/0630-Cache-burn-durations.patch b/Spigot-Server-Patches/0629-Cache-burn-durations.patch similarity index 100% rename from Spigot-Server-Patches/0630-Cache-burn-durations.patch rename to Spigot-Server-Patches/0629-Cache-burn-durations.patch diff --git a/Spigot-Server-Patches/0631-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/Spigot-Server-Patches/0630-Allow-disabling-mob-spawner-spawn-egg-transformation.patch similarity index 100% rename from Spigot-Server-Patches/0631-Allow-disabling-mob-spawner-spawn-egg-transformation.patch rename to Spigot-Server-Patches/0630-Allow-disabling-mob-spawner-spawn-egg-transformation.patch diff --git a/Spigot-Server-Patches/0632-Implement-PlayerFlowerPotManipulateEvent.patch b/Spigot-Server-Patches/0631-Implement-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from Spigot-Server-Patches/0632-Implement-PlayerFlowerPotManipulateEvent.patch rename to Spigot-Server-Patches/0631-Implement-PlayerFlowerPotManipulateEvent.patch diff --git a/Spigot-Server-Patches/0633-Fix-interact-event-not-being-called-in-adventure.patch b/Spigot-Server-Patches/0632-Fix-interact-event-not-being-called-in-adventure.patch similarity index 100% rename from Spigot-Server-Patches/0633-Fix-interact-event-not-being-called-in-adventure.patch rename to Spigot-Server-Patches/0632-Fix-interact-event-not-being-called-in-adventure.patch diff --git a/Spigot-Server-Patches/0634-Zombie-API-breaking-doors.patch b/Spigot-Server-Patches/0633-Zombie-API-breaking-doors.patch similarity index 100% rename from Spigot-Server-Patches/0634-Zombie-API-breaking-doors.patch rename to Spigot-Server-Patches/0633-Zombie-API-breaking-doors.patch diff --git a/Spigot-Server-Patches/0635-Fix-nerfed-slime-when-splitting.patch b/Spigot-Server-Patches/0634-Fix-nerfed-slime-when-splitting.patch similarity index 100% rename from Spigot-Server-Patches/0635-Fix-nerfed-slime-when-splitting.patch rename to Spigot-Server-Patches/0634-Fix-nerfed-slime-when-splitting.patch diff --git a/Spigot-Server-Patches/0636-Add-EntityLoadCrossbowEvent.patch b/Spigot-Server-Patches/0635-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from Spigot-Server-Patches/0636-Add-EntityLoadCrossbowEvent.patch rename to Spigot-Server-Patches/0635-Add-EntityLoadCrossbowEvent.patch diff --git a/Spigot-Server-Patches/0637-Guardian-beam-workaround.patch b/Spigot-Server-Patches/0636-Guardian-beam-workaround.patch similarity index 100% rename from Spigot-Server-Patches/0637-Guardian-beam-workaround.patch rename to Spigot-Server-Patches/0636-Guardian-beam-workaround.patch diff --git a/Spigot-Server-Patches/0638-Added-WorldGameRuleChangeEvent.patch b/Spigot-Server-Patches/0637-Added-WorldGameRuleChangeEvent.patch similarity index 100% rename from Spigot-Server-Patches/0638-Added-WorldGameRuleChangeEvent.patch rename to Spigot-Server-Patches/0637-Added-WorldGameRuleChangeEvent.patch diff --git a/Spigot-Server-Patches/0639-Added-ServerResourcesReloadedEvent.patch b/Spigot-Server-Patches/0638-Added-ServerResourcesReloadedEvent.patch similarity index 100% rename from Spigot-Server-Patches/0639-Added-ServerResourcesReloadedEvent.patch rename to Spigot-Server-Patches/0638-Added-ServerResourcesReloadedEvent.patch diff --git a/Spigot-Server-Patches/0640-Added-world-settings-for-mobs-picking-up-loot.patch b/Spigot-Server-Patches/0639-Added-world-settings-for-mobs-picking-up-loot.patch similarity index 100% rename from Spigot-Server-Patches/0640-Added-world-settings-for-mobs-picking-up-loot.patch rename to Spigot-Server-Patches/0639-Added-world-settings-for-mobs-picking-up-loot.patch diff --git a/Spigot-Server-Patches/0641-Implemented-BlockFailedDispenseEvent.patch b/Spigot-Server-Patches/0640-Implemented-BlockFailedDispenseEvent.patch similarity index 100% rename from Spigot-Server-Patches/0641-Implemented-BlockFailedDispenseEvent.patch rename to Spigot-Server-Patches/0640-Implemented-BlockFailedDispenseEvent.patch diff --git a/Spigot-Server-Patches/0642-Added-PlayerLecternPageChangeEvent.patch b/Spigot-Server-Patches/0641-Added-PlayerLecternPageChangeEvent.patch similarity index 100% rename from Spigot-Server-Patches/0642-Added-PlayerLecternPageChangeEvent.patch rename to Spigot-Server-Patches/0641-Added-PlayerLecternPageChangeEvent.patch diff --git a/Spigot-Server-Patches/0643-Fire-event-on-GS4-query.patch b/Spigot-Server-Patches/0642-Fire-event-on-GS4-query.patch similarity index 100% rename from Spigot-Server-Patches/0643-Fire-event-on-GS4-query.patch rename to Spigot-Server-Patches/0642-Fire-event-on-GS4-query.patch diff --git a/Spigot-Server-Patches/0644-Added-PlayerLoomPatternSelectEvent.patch b/Spigot-Server-Patches/0643-Added-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from Spigot-Server-Patches/0644-Added-PlayerLoomPatternSelectEvent.patch rename to Spigot-Server-Patches/0643-Added-PlayerLoomPatternSelectEvent.patch diff --git a/Spigot-Server-Patches/0645-Configurable-door-breaking-difficulty.patch b/Spigot-Server-Patches/0644-Configurable-door-breaking-difficulty.patch similarity index 100% rename from Spigot-Server-Patches/0645-Configurable-door-breaking-difficulty.patch rename to Spigot-Server-Patches/0644-Configurable-door-breaking-difficulty.patch diff --git a/Spigot-Server-Patches/0646-Empty-commands-shall-not-be-dispatched.patch b/Spigot-Server-Patches/0645-Empty-commands-shall-not-be-dispatched.patch similarity index 100% rename from Spigot-Server-Patches/0646-Empty-commands-shall-not-be-dispatched.patch rename to Spigot-Server-Patches/0645-Empty-commands-shall-not-be-dispatched.patch diff --git a/Spigot-Server-Patches/0647-Implement-API-to-expose-exact-interaction-point.patch b/Spigot-Server-Patches/0646-Implement-API-to-expose-exact-interaction-point.patch similarity index 100% rename from Spigot-Server-Patches/0647-Implement-API-to-expose-exact-interaction-point.patch rename to Spigot-Server-Patches/0646-Implement-API-to-expose-exact-interaction-point.patch diff --git a/Spigot-Server-Patches/0648-Remove-stale-POIs.patch b/Spigot-Server-Patches/0647-Remove-stale-POIs.patch similarity index 100% rename from Spigot-Server-Patches/0648-Remove-stale-POIs.patch rename to Spigot-Server-Patches/0647-Remove-stale-POIs.patch