diff --git a/patches/removed/1.17/0446-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch b/patches/removed/1.17/0446-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch deleted file mode 100644 index 083f25a75d..0000000000 --- a/patches/removed/1.17/0446-Optimize-ChunkProviderServer-s-chunk-level-checking-.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Spottedleaf -Date: Thu, 16 Apr 2020 16:13:59 -0700 -Subject: [PATCH] Optimize ChunkProviderServer's chunk level checking helper - methods - -These can be hot functions (i.e entity ticking and block ticking), -so inline where possible, and avoid the abstraction of the -Either class. - -1.17: needs to be looked at again - -diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index 3744cce8611ac01b1b6c76cd3c4890795c1f06a2..531fe1259a1d60ff69321c3fefbf97f7141e6475 100644 ---- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java -+++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -@@ -24,7 +24,6 @@ import net.minecraft.network.protocol.Packet; - import net.minecraft.server.MCUtil; - import net.minecraft.server.MinecraftServer; - import net.minecraft.server.level.progress.ChunkProgressListener; --import net.minecraft.util.Mth; - import net.minecraft.util.profiling.ProfilerFiller; - import net.minecraft.util.thread.BlockableEventLoop; - import net.minecraft.world.entity.Entity; -@@ -644,21 +643,29 @@ public class ServerChunkCache extends ChunkSource { - - public final boolean isInEntityTickingChunk(Entity entity) { return this.isEntityTickingChunk(entity); } // Paper - OBFHELPER - @Override public boolean isEntityTickingChunk(Entity entity) { -- long i = ChunkPos.asLong(Mth.floor(entity.getX()) >> 4, Mth.floor(entity.getZ()) >> 4); -- -- return this.checkChunkFuture(i, (Function>>) ChunkHolder::getEntityTickingChunkFuture); // CraftBukkit - decompile error -+ // Paper start - optimize is ticking ready type functions -+ // entity ticking -+ ChunkHolder playerChunk = this.getVisibleChunkIfPresent(MCUtil.getCoordinateKey(entity)); -+ return playerChunk != null && playerChunk.isEntityTickingReady(); -+ // Paper end - optimize is ticking ready type functions - } - - public final boolean isEntityTickingChunk(ChunkPos chunkcoordintpair) { return this.isEntityTickingChunk(chunkcoordintpair); } // Paper - OBFHELPER - @Override public boolean isEntityTickingChunk(ChunkPos pos) { -- return this.checkChunkFuture(pos.toLong(), (Function>>) ChunkHolder::getEntityTickingChunkFuture); // CraftBukkit - decompile error -+ // Paper start - optimize is ticking ready type functions -+ // is entity ticking ready -+ ChunkHolder playerChunk = this.getVisibleChunkIfPresent(MCUtil.getCoordinateKey(pos)); -+ return playerChunk != null && playerChunk.isEntityTickingReady(); -+ // Paper end - optimize is ticking ready type functions - } - - @Override - public boolean isTickingChunk(BlockPos pos) { -- long i = ChunkPos.asLong(pos.getX() >> 4, pos.getZ() >> 4); -- -- return this.checkChunkFuture(i, (Function>>) ChunkHolder::getTickingChunkFuture); // CraftBukkit - decompile error -+ // Paper start - optimize is ticking ready type functions -+ // is ticking ready -+ ChunkHolder playerChunk = this.getVisibleChunkIfPresent(MCUtil.getCoordinateKey(pos)); -+ return playerChunk != null && playerChunk.isTickingReady(); -+ // Paper end - optimize is ticking ready type functions - } - - private boolean checkChunkFuture(long pos, Function>> futureFunction) { diff --git a/patches/server/0447-Optimize-ServerLevels-chunk-level-checking-methods.patch b/patches/server/0447-Optimize-ServerLevels-chunk-level-checking-methods.patch new file mode 100644 index 0000000000..5b4299195f --- /dev/null +++ b/patches/server/0447-Optimize-ServerLevels-chunk-level-checking-methods.patch @@ -0,0 +1,64 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Spottedleaf +Date: Thu, 16 Apr 2020 16:13:59 -0700 +Subject: [PATCH] Optimize ServerLevels chunk level checking methods + +These can be hot functions (i.e entity ticking and block ticking), +so inline where possible, and avoid the abstraction of the +Either class. + +diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java +index 7e1062df9c2fd2d9be82fb84b7b93eb6fa207e57..3327fb07840e6dc6d2249b05a403f52ccd531b0f 100644 +--- a/src/main/java/net/minecraft/server/level/ServerLevel.java ++++ b/src/main/java/net/minecraft/server/level/ServerLevel.java +@@ -2073,15 +2073,18 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl + public boolean isPositionTickingWithEntitiesLoaded(BlockPos blockposition) { + long i = ChunkPos.asLong(blockposition); + +- return this.chunkSource.isPositionTicking(i) && this.areEntitiesLoaded(i); ++ // Paper start - optimize is ticking ready type functions ++ ChunkHolder chunkHolder = this.chunkSource.chunkMap.getVisibleChunkIfPresent(i); ++ return chunkHolder != null && chunkHolder.isTickingReady() && this.areEntitiesLoaded(i); ++ // Paper end + } + + public boolean isPositionEntityTicking(BlockPos blockposition) { +- return this.entityManager.isPositionTicking(blockposition); ++ return this.entityManager.isPositionTicking(ChunkPos.asLong(blockposition)); // Paper + } + + public boolean isPositionEntityTicking(ChunkPos chunkcoordintpair) { +- return this.entityManager.isPositionTicking(chunkcoordintpair); ++ return this.entityManager.isPositionTicking(chunkcoordintpair.toLong()); // Paper + } + + private final class EntityCallbacks implements LevelCallback { +diff --git a/src/main/java/net/minecraft/world/level/ChunkPos.java b/src/main/java/net/minecraft/world/level/ChunkPos.java +index 439f82a48e6f6ce7b4773505ced32324cacb302d..2a99aa989ac5c19d99bb3cbc0934425e46573cd7 100644 +--- a/src/main/java/net/minecraft/world/level/ChunkPos.java ++++ b/src/main/java/net/minecraft/world/level/ChunkPos.java +@@ -48,7 +48,7 @@ public class ChunkPos { + } + + public static long asLong(BlockPos blockPos) { +- return asLong(SectionPos.blockToSectionCoord(blockPos.getX()), SectionPos.blockToSectionCoord(blockPos.getZ())); ++ return (((long)blockPos.getX() >> 4) & 4294967295L) | ((((long)blockPos.getZ() >> 4) & 4294967295L) << 32); // Paper - inline + } + + public static int getX(long pos) { +diff --git a/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java b/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java +index 624fd443d2cc71605cfff996140b00f37c8d8841..e94b5a7fe47831e2c3e0935e316737a2422e4250 100644 +--- a/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java ++++ b/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java +@@ -326,6 +326,11 @@ public class PersistentEntitySectionManager implements A + public LevelEntityGetter getEntityGetter() { + return this.entityGetter; + } ++ // Paper start ++ public final boolean isPositionTicking(long position) { ++ return this.chunkVisibility.get(position).isTicking(); ++ } ++ // Paper end + + public boolean isPositionTicking(BlockPos blockPos) { + return this.chunkVisibility.get(ChunkPos.asLong(blockPos)).isTicking(); diff --git a/patches/server/0447-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/0447-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/0448-Optimize-sending-packets-to-nearby-locations-sounds-.patch b/patches/server/0449-Optimize-sending-packets-to-nearby-locations-sounds-.patch similarity index 97% rename from patches/server/0448-Optimize-sending-packets-to-nearby-locations-sounds-.patch rename to patches/server/0449-Optimize-sending-packets-to-nearby-locations-sounds-.patch index 986355438b..61c833b5e2 100644 --- a/patches/server/0448-Optimize-sending-packets-to-nearby-locations-sounds-.patch +++ b/patches/server/0449-Optimize-sending-packets-to-nearby-locations-sounds-.patch @@ -11,7 +11,7 @@ This will drastically cut down on packet sending cost for worlds with lots of players in them. diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 846b0dcee92f71d1c887ea88744c36f6a870c5e2..4c5a3b53e0fbaeb1a9ae85b499a1e630255f88ea 100644 +index 529fc8732b67a3349672224723725e38925f8f09..28b203a5c8a65ba96bf239c270fa6445f94e887e 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -1129,16 +1129,40 @@ public abstract class PlayerList { diff --git a/patches/server/0449-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/0449-Fix-villager-trading-demand-MC-163962.patch rename to patches/server/0450-Fix-villager-trading-demand-MC-163962.patch diff --git a/patches/server/0450-Maps-shouldn-t-load-chunks.patch b/patches/server/0451-Maps-shouldn-t-load-chunks.patch similarity index 100% rename from patches/server/0450-Maps-shouldn-t-load-chunks.patch rename to patches/server/0451-Maps-shouldn-t-load-chunks.patch diff --git a/patches/server/0451-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/0451-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/0452-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/patches/server/0453-Delay-Chunk-Unloads-based-on-Player-Movement.patch similarity index 100% rename from patches/server/0452-Delay-Chunk-Unloads-based-on-Player-Movement.patch rename to patches/server/0453-Delay-Chunk-Unloads-based-on-Player-Movement.patch diff --git a/patches/server/0453-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0454-Optimize-Bit-Operations-by-inlining.patch similarity index 99% rename from patches/server/0453-Optimize-Bit-Operations-by-inlining.patch rename to patches/server/0454-Optimize-Bit-Operations-by-inlining.patch index c474f730a7..db577042d8 100644 --- a/patches/server/0453-Optimize-Bit-Operations-by-inlining.patch +++ b/patches/server/0454-Optimize-Bit-Operations-by-inlining.patch @@ -7,7 +7,7 @@ Inline bit operations and reduce instruction count to make these hot operations faster diff --git a/src/main/java/net/minecraft/core/BlockPos.java b/src/main/java/net/minecraft/core/BlockPos.java -index c4e622143073edbb4891ac9bd4fe30f32aede8f6..1c980abc4fb5cab2a6dc9d1a8a3e8fdd0a7e3a4b 100644 +index 80d8873bc2512ecde6a531e974b14e9b48402d64..b70aa66732fb5e957aed0901f4c76358b2c56f8e 100644 --- a/src/main/java/net/minecraft/core/BlockPos.java +++ b/src/main/java/net/minecraft/core/BlockPos.java @@ -30,15 +30,16 @@ public class BlockPos extends Vec3i { diff --git a/patches/server/0454-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/0454-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/0455-incremental-chunk-saving.patch b/patches/server/0456-incremental-chunk-saving.patch similarity index 99% rename from patches/server/0455-incremental-chunk-saving.patch rename to patches/server/0456-incremental-chunk-saving.patch index 7f1213a6c5..2041e93073 100644 --- a/patches/server/0455-incremental-chunk-saving.patch +++ b/patches/server/0456-incremental-chunk-saving.patch @@ -260,7 +260,7 @@ index 147f6fd5174a2c489dfb7ea2ce2d2dc7dacfb89d..6c565751c36daa0084196dce5d2f82df public void close() throws IOException { // CraftBukkit start diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 16ff687d16bef0a485aacbcd80a3bcfa1bb08224..070bc5f072163b35868ef234e5f34c3eede4c934 100644 +index cd322d31a079dcd50ca62a2898608e2cf89a3edf..4b8748d955fce10536847a44e22d53d6d491ac1d 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1003,6 +1003,37 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl diff --git a/patches/server/0456-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0457-Fix-missing-chunks-due-to-integer-overflow.patch similarity index 100% rename from patches/server/0456-Fix-missing-chunks-due-to-integer-overflow.patch rename to patches/server/0457-Fix-missing-chunks-due-to-integer-overflow.patch diff --git a/patches/server/0457-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0458-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch similarity index 100% rename from patches/server/0457-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch rename to patches/server/0458-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch diff --git a/patches/server/0458-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0459-Fix-piston-physics-inconsistency-MC-188840.patch similarity index 98% rename from patches/server/0458-Fix-piston-physics-inconsistency-MC-188840.patch rename to patches/server/0459-Fix-piston-physics-inconsistency-MC-188840.patch index 8910512100..c1c7c9df66 100644 --- a/patches/server/0458-Fix-piston-physics-inconsistency-MC-188840.patch +++ b/patches/server/0459-Fix-piston-physics-inconsistency-MC-188840.patch @@ -47,7 +47,7 @@ index 7f140333c2e62012fa572c1a061d84432426997f..b67ba8f75e4a3358d7c2462918b85b0b + } } diff --git a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java -index 44cc09006eac6315d167a2628857f9942eb1fc13..aea9a2dc4164f5728e711efb3009bde8862c7345 100644 +index 4eac07022a7d896ee8921afa6d35cba7f0c89941..dd50a29d47a62df8cdfd69358218d1559b6794ef 100644 --- a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java +++ b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java @@ -411,14 +411,26 @@ public class PistonBaseBlock extends DirectionalBlock { diff --git a/patches/server/0459-Fix-sand-duping.patch b/patches/server/0460-Fix-sand-duping.patch similarity index 100% rename from patches/server/0459-Fix-sand-duping.patch rename to patches/server/0460-Fix-sand-duping.patch diff --git a/patches/server/0460-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/server/0461-Prevent-position-desync-in-playerconnection-causing-.patch similarity index 100% rename from patches/server/0460-Prevent-position-desync-in-playerconnection-causing-.patch rename to patches/server/0461-Prevent-position-desync-in-playerconnection-causing-.patch diff --git a/patches/server/0461-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0462-Inventory-getHolder-method-without-block-snapshot.patch similarity index 100% rename from patches/server/0461-Inventory-getHolder-method-without-block-snapshot.patch rename to patches/server/0462-Inventory-getHolder-method-without-block-snapshot.patch diff --git a/patches/server/0462-Expose-Arrow-getItemStack.patch b/patches/server/0463-Expose-Arrow-getItemStack.patch similarity index 100% rename from patches/server/0462-Expose-Arrow-getItemStack.patch rename to patches/server/0463-Expose-Arrow-getItemStack.patch diff --git a/patches/server/0463-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0464-Add-and-implement-PlayerRecipeBookClickEvent.patch similarity index 100% rename from patches/server/0463-Add-and-implement-PlayerRecipeBookClickEvent.patch rename to patches/server/0464-Add-and-implement-PlayerRecipeBookClickEvent.patch diff --git a/patches/server/0464-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0465-Hide-sync-chunk-writes-behind-flag.patch similarity index 100% rename from patches/server/0464-Hide-sync-chunk-writes-behind-flag.patch rename to patches/server/0465-Hide-sync-chunk-writes-behind-flag.patch diff --git a/patches/server/0465-Add-permission-for-command-blocks.patch b/patches/server/0466-Add-permission-for-command-blocks.patch similarity index 100% rename from patches/server/0465-Add-permission-for-command-blocks.patch rename to patches/server/0466-Add-permission-for-command-blocks.patch diff --git a/patches/server/0466-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0467-Ensure-Entity-AABB-s-are-never-invalid.patch similarity index 100% rename from patches/server/0466-Ensure-Entity-AABB-s-are-never-invalid.patch rename to patches/server/0467-Ensure-Entity-AABB-s-are-never-invalid.patch diff --git a/patches/server/0467-Optimize-WorldBorder-collision-checks-and-air.patch b/patches/server/0468-Optimize-WorldBorder-collision-checks-and-air.patch similarity index 100% rename from patches/server/0467-Optimize-WorldBorder-collision-checks-and-air.patch rename to patches/server/0468-Optimize-WorldBorder-collision-checks-and-air.patch diff --git a/patches/server/0468-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0469-Fix-Per-World-Difficulty-Remembering-Difficulty.patch similarity index 98% rename from patches/server/0468-Fix-Per-World-Difficulty-Remembering-Difficulty.patch rename to patches/server/0469-Fix-Per-World-Difficulty-Remembering-Difficulty.patch index 59b5569581..9b6923eb9d 100644 --- a/patches/server/0468-Fix-Per-World-Difficulty-Remembering-Difficulty.patch +++ b/patches/server/0469-Fix-Per-World-Difficulty-Remembering-Difficulty.patch @@ -8,7 +8,7 @@ makes it so that the server keeps the last difficulty used instead of restoring the server.properties every single load. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index a465baa097339a5f661c2c331cbd3cbe854e53b2..b4ad624270406d86fb2d18edc1d94979454e779c 100644 +index 9f80206f966689b79df4e3b9b82ef9f4d2170bfe..21c16bf341e846f90a24fe2395ff89f1ace70d73 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1721,11 +1721,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop> { @@ -25,7 +25,7 @@ index d32b96a5f51d745869cfc40c01c54de58e1eb843..759e563d1ed13249fada8a8eab6b6a10 Connection.LOGGER.debug("Failed to sent packet", throwable); ConnectionProtocol enumprotocol = this.getCurrentProtocol(); diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 486d09f332b2e5efe60a808f93d668e4d24a8051..ec86adc73fdf1b7bd36829ef1df6d9760c7b0bb8 100644 +index 88a7f2e69ad74303cbb779d06903d34a5ff40a6c..9a729aecfa8c901159c74c42544ba31b69bab199 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -256,6 +256,7 @@ public class ServerPlayer extends Player { @@ -49,7 +49,7 @@ index 3db026216308628321a334ccb64b0ea97e524393..1b6610cc04f6bcb6d3153886e62ce117 this.connection.disconnect(ichatbasecomponent); }); diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index c401a83bf2c0dae63ac6d2a5d5b39f47293e64ea..b500800e9b30374721d0b855d2389b656f73176f 100644 +index eb12da04a495166e101b234ec3640363ec2403a5..295a2c9328172923d470e2c9e8338e0edb020ede 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -588,7 +588,7 @@ public abstract class PlayerList { diff --git a/patches/server/0552-Seed-based-feature-search.patch b/patches/server/0553-Seed-based-feature-search.patch similarity index 100% rename from patches/server/0552-Seed-based-feature-search.patch rename to patches/server/0553-Seed-based-feature-search.patch diff --git a/patches/server/0553-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0554-Add-Wandering-Trader-spawn-rate-config-options.patch similarity index 100% rename from patches/server/0553-Add-Wandering-Trader-spawn-rate-config-options.patch rename to patches/server/0554-Add-Wandering-Trader-spawn-rate-config-options.patch diff --git a/patches/server/0554-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0555-Significantly-improve-performance-of-the-end-generat.patch similarity index 100% rename from patches/server/0554-Significantly-improve-performance-of-the-end-generat.patch rename to patches/server/0555-Significantly-improve-performance-of-the-end-generat.patch diff --git a/patches/server/0555-Expose-world-spawn-angle.patch b/patches/server/0556-Expose-world-spawn-angle.patch similarity index 95% rename from patches/server/0555-Expose-world-spawn-angle.patch rename to patches/server/0556-Expose-world-spawn-angle.patch index 78ea094aa2..9213c6e141 100644 --- a/patches/server/0555-Expose-world-spawn-angle.patch +++ b/patches/server/0556-Expose-world-spawn-angle.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Expose world spawn angle diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index b500800e9b30374721d0b855d2389b656f73176f..6b4bd115c39bbaa9d9dbeb6ac590e6b0138aa5b3 100644 +index 295a2c9328172923d470e2c9e8338e0edb020ede..d9a14f58b9249ff10cc7f5fde60f3aa8bd1e9235 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -866,7 +866,7 @@ public abstract class PlayerList { diff --git a/patches/server/0556-Add-Destroy-Speed-API.patch b/patches/server/0557-Add-Destroy-Speed-API.patch similarity index 100% rename from patches/server/0556-Add-Destroy-Speed-API.patch rename to patches/server/0557-Add-Destroy-Speed-API.patch diff --git a/patches/server/0557-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0558-Fix-Player-spawnParticle-x-y-z-precision-loss.patch similarity index 100% rename from patches/server/0557-Fix-Player-spawnParticle-x-y-z-precision-loss.patch rename to patches/server/0558-Fix-Player-spawnParticle-x-y-z-precision-loss.patch diff --git a/patches/server/0558-Add-LivingEntity-clearActiveItem.patch b/patches/server/0559-Add-LivingEntity-clearActiveItem.patch similarity index 100% rename from patches/server/0558-Add-LivingEntity-clearActiveItem.patch rename to patches/server/0559-Add-LivingEntity-clearActiveItem.patch diff --git a/patches/server/0559-Add-PlayerItemCooldownEvent.patch b/patches/server/0560-Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/server/0559-Add-PlayerItemCooldownEvent.patch rename to patches/server/0560-Add-PlayerItemCooldownEvent.patch diff --git a/patches/server/0560-More-lightning-API.patch b/patches/server/0561-More-lightning-API.patch similarity index 100% rename from patches/server/0560-More-lightning-API.patch rename to patches/server/0561-More-lightning-API.patch diff --git a/patches/server/0561-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0562-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/0562-Climbing-should-not-bypass-cramming-gamerule.patch diff --git a/patches/server/0562-Added-missing-default-perms-for-commands.patch b/patches/server/0563-Added-missing-default-perms-for-commands.patch similarity index 100% rename from patches/server/0562-Added-missing-default-perms-for-commands.patch rename to patches/server/0563-Added-missing-default-perms-for-commands.patch diff --git a/patches/server/0563-Add-PlayerShearBlockEvent.patch b/patches/server/0564-Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/server/0563-Add-PlayerShearBlockEvent.patch rename to patches/server/0564-Add-PlayerShearBlockEvent.patch diff --git a/patches/server/0564-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0565-Set-spigots-verbose-world-setting-to-false-by-def.patch similarity index 100% rename from patches/server/0564-Set-spigots-verbose-world-setting-to-false-by-def.patch rename to patches/server/0565-Set-spigots-verbose-world-setting-to-false-by-def.patch diff --git a/patches/server/0565-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0566-Fix-curing-zombie-villager-discount-exploit.patch similarity index 96% rename from patches/server/0565-Fix-curing-zombie-villager-discount-exploit.patch rename to patches/server/0566-Fix-curing-zombie-villager-discount-exploit.patch index 27c7932fd3..e9111dfda9 100644 --- a/patches/server/0565-Fix-curing-zombie-villager-discount-exploit.patch +++ b/patches/server/0566-Fix-curing-zombie-villager-discount-exploit.patch @@ -24,7 +24,7 @@ index 208690ceca2485b54acde5123ba494d71367791b..561976466cae6e4df63433c4631c516c private void keepLoadedRange() { keepLoadedRange = (short) (getInt("keep-spawn-loaded-range", Math.min(spigotConfig.viewDistance, 10)) * 16); diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java -index 67ff39fa0a94aec858ee7f9643565b4a16e4444a..1741b04b470443fcc534a49b16bc0b247160f8ea 100644 +index 4a7de0ae19d49d868a5e6696e1a01871b654bf48..2ad93ff0bb46a282df706438b7c039c46323979a 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java @@ -1056,6 +1056,15 @@ public class Villager extends AbstractVillager implements ReputationEventHandler diff --git a/patches/server/0566-Limit-recipe-packets.patch b/patches/server/0567-Limit-recipe-packets.patch similarity index 100% rename from patches/server/0566-Limit-recipe-packets.patch rename to patches/server/0567-Limit-recipe-packets.patch diff --git a/patches/server/0567-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0568-Fix-CraftSound-backwards-compatibility.patch similarity index 100% rename from patches/server/0567-Fix-CraftSound-backwards-compatibility.patch rename to patches/server/0568-Fix-CraftSound-backwards-compatibility.patch diff --git a/patches/server/0568-MC-4-Fix-item-position-desync.patch b/patches/server/0569-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/0569-MC-4-Fix-item-position-desync.patch diff --git a/patches/server/0569-Player-Chunk-Load-Unload-Events.patch b/patches/server/0570-Player-Chunk-Load-Unload-Events.patch similarity index 94% rename from patches/server/0569-Player-Chunk-Load-Unload-Events.patch rename to patches/server/0570-Player-Chunk-Load-Unload-Events.patch index bad5587824..eaf918519f 100644 --- a/patches/server/0569-Player-Chunk-Load-Unload-Events.patch +++ b/patches/server/0570-Player-Chunk-Load-Unload-Events.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Player Chunk Load/Unload Events diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index ec86adc73fdf1b7bd36829ef1df6d9760c7b0bb8..534307c9e7610c4b65d0614a7434ed3212fd0a52 100644 +index 9a729aecfa8c901159c74c42544ba31b69bab199..b057d99f6777b1e051235f228aaa6d10457b76d0 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -2089,11 +2089,21 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0570-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0571-Optimize-Dynamic-get-Missing-Keys.patch similarity index 100% rename from patches/server/0570-Optimize-Dynamic-get-Missing-Keys.patch rename to patches/server/0571-Optimize-Dynamic-get-Missing-Keys.patch diff --git a/patches/server/0571-Expose-LivingEntity-hurt-direction.patch b/patches/server/0572-Expose-LivingEntity-hurt-direction.patch similarity index 100% rename from patches/server/0571-Expose-LivingEntity-hurt-direction.patch rename to patches/server/0572-Expose-LivingEntity-hurt-direction.patch diff --git a/patches/server/0572-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0573-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 91% rename from patches/server/0572-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/server/0573-Add-OBSTRUCTED-reason-to-BedEnterResult.patch index 0c421f800b..2c3377bb01 100644 --- a/patches/server/0572-Add-OBSTRUCTED-reason-to-BedEnterResult.patch +++ b/patches/server/0573-Add-OBSTRUCTED-reason-to-BedEnterResult.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add OBSTRUCTED reason to BedEnterResult diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index c25586aa8d2e9ddaa7839020ecb499b12d5fe381..6f2c166ffc128fc3400b6d831274a2957b2d1153 100644 +index 7159d63c7708cebda60da33eefc8a492d8de6219..ef4efe95bfa9058b9f9a6736e111b7cddfee4fbd 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -257,6 +257,10 @@ public class CraftEventFactory { diff --git a/patches/server/0573-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0574-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch similarity index 100% rename from patches/server/0573-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch rename to patches/server/0574-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch diff --git a/patches/server/0574-added-PlayerTradeEvent.patch b/patches/server/0575-added-PlayerTradeEvent.patch similarity index 100% rename from patches/server/0574-added-PlayerTradeEvent.patch rename to patches/server/0575-added-PlayerTradeEvent.patch diff --git a/patches/server/0575-Implement-TargetHitEvent.patch b/patches/server/0576-Implement-TargetHitEvent.patch similarity index 100% rename from patches/server/0575-Implement-TargetHitEvent.patch rename to patches/server/0576-Implement-TargetHitEvent.patch diff --git a/patches/server/0576-Additional-Block-Material-API-s.patch b/patches/server/0577-Additional-Block-Material-API-s.patch similarity index 100% rename from patches/server/0576-Additional-Block-Material-API-s.patch rename to patches/server/0577-Additional-Block-Material-API-s.patch diff --git a/patches/server/0577-Fix-harming-potion-dupe.patch b/patches/server/0578-Fix-harming-potion-dupe.patch similarity index 100% rename from patches/server/0577-Fix-harming-potion-dupe.patch rename to patches/server/0578-Fix-harming-potion-dupe.patch diff --git a/patches/server/0578-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0579-Implement-API-to-get-Material-from-Boats-and-Minecar.patch similarity index 100% rename from patches/server/0578-Implement-API-to-get-Material-from-Boats-and-Minecar.patch rename to patches/server/0579-Implement-API-to-get-Material-from-Boats-and-Minecar.patch diff --git a/patches/server/0579-Cache-burn-durations.patch b/patches/server/0580-Cache-burn-durations.patch similarity index 100% rename from patches/server/0579-Cache-burn-durations.patch rename to patches/server/0580-Cache-burn-durations.patch diff --git a/patches/server/0580-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0581-Allow-disabling-mob-spawner-spawn-egg-transformation.patch similarity index 100% rename from patches/server/0580-Allow-disabling-mob-spawner-spawn-egg-transformation.patch rename to patches/server/0581-Allow-disabling-mob-spawner-spawn-egg-transformation.patch diff --git a/patches/server/0581-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0582-Fix-Not-a-string-Map-Conversion-spam.patch similarity index 100% rename from patches/server/0581-Fix-Not-a-string-Map-Conversion-spam.patch rename to patches/server/0582-Fix-Not-a-string-Map-Conversion-spam.patch diff --git a/patches/server/0582-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0583-Implement-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/server/0582-Implement-PlayerFlowerPotManipulateEvent.patch rename to patches/server/0583-Implement-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/server/0583-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0584-Fix-interact-event-not-being-called-in-adventure.patch similarity index 100% rename from patches/server/0583-Fix-interact-event-not-being-called-in-adventure.patch rename to patches/server/0584-Fix-interact-event-not-being-called-in-adventure.patch diff --git a/patches/server/0584-Zombie-API-breaking-doors.patch b/patches/server/0585-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/server/0584-Zombie-API-breaking-doors.patch rename to patches/server/0585-Zombie-API-breaking-doors.patch diff --git a/patches/server/0585-Fix-nerfed-slime-when-splitting.patch b/patches/server/0586-Fix-nerfed-slime-when-splitting.patch similarity index 100% rename from patches/server/0585-Fix-nerfed-slime-when-splitting.patch rename to patches/server/0586-Fix-nerfed-slime-when-splitting.patch diff --git a/patches/server/0586-Add-EntityLoadCrossbowEvent.patch b/patches/server/0587-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/server/0586-Add-EntityLoadCrossbowEvent.patch rename to patches/server/0587-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/server/0587-Guardian-beam-workaround.patch b/patches/server/0588-Guardian-beam-workaround.patch similarity index 100% rename from patches/server/0587-Guardian-beam-workaround.patch rename to patches/server/0588-Guardian-beam-workaround.patch diff --git a/patches/server/0588-Added-WorldGameRuleChangeEvent.patch b/patches/server/0589-Added-WorldGameRuleChangeEvent.patch similarity index 100% rename from patches/server/0588-Added-WorldGameRuleChangeEvent.patch rename to patches/server/0589-Added-WorldGameRuleChangeEvent.patch diff --git a/patches/server/0589-Added-ServerResourcesReloadedEvent.patch b/patches/server/0590-Added-ServerResourcesReloadedEvent.patch similarity index 97% rename from patches/server/0589-Added-ServerResourcesReloadedEvent.patch rename to patches/server/0590-Added-ServerResourcesReloadedEvent.patch index a17fa64312..07768a8c59 100644 --- a/patches/server/0589-Added-ServerResourcesReloadedEvent.patch +++ b/patches/server/0590-Added-ServerResourcesReloadedEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Added ServerResourcesReloadedEvent diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 16bb7d28c8b0e3b60def7ef0e93e648df22c6302..75782de78255e0d52f85034973dbef3aeca3ac7e 100644 +index 2672f9ea9c1213fea5ec212012cb0fbd173c7324..bbc96d35ffb0d6cd0f8964ea25e1d6585fbee1d7 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -2016,7 +2016,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index e0f478f234f53d9bfb600ce69463ae6d8bfc100c..a678cab496bbeb757a3b60267e4cc3c0e54dfa2f 100644 +index a194558e5dc0feb57681084240822a9d4b6b9bab..e418bcda3d6b5f219fc8a6431b449ef4de9a8a4e 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 @@ -29,7 +29,7 @@ index e0f478f234f53d9bfb600ce69463ae6d8bfc100c..a678cab496bbeb757a3b60267e4cc3c0 return new Throwable(entity + " Added to world at " + new java.util.Date()); } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 6af985b2eba28d3a694afe663e1d76628add940c..9e89e7fc7061bbd9f09744f8fcf706c43bda693f 100644 +index 34304fd25a73b3b7e4f078e85b6bee94ab2cc8c8..89dc5a1a70ab31ea3a1a7924e0ecaadebcfb524d 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3217,6 +3217,20 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0618-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0619-added-option-to-disable-pathfinding-updates-on-block.patch similarity index 95% rename from patches/server/0618-added-option-to-disable-pathfinding-updates-on-block.patch rename to patches/server/0619-added-option-to-disable-pathfinding-updates-on-block.patch index 02c877b768..46e44f9106 100644 --- a/patches/server/0618-added-option-to-disable-pathfinding-updates-on-block.patch +++ b/patches/server/0619-added-option-to-disable-pathfinding-updates-on-block.patch @@ -20,7 +20,7 @@ index 7fc5bf095afa6d5881285b89091d2ff48ffb69f0..0eba516110b82d917c3374a9fe5bbf33 } diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index f690f20d8dc7c3957aa5287c74e5366db57a5bd4..26024b122c4a7c4339114191a544230a223fd5f7 100644 +index e418bcda3d6b5f219fc8a6431b449ef4de9a8a4e..ecfa6089be3f81704a88877357e3aa0cf45ee332 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1339,6 +1339,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/0620-Inline-shift-direction-fields.patch similarity index 100% rename from patches/server/0619-Inline-shift-direction-fields.patch rename to patches/server/0620-Inline-shift-direction-fields.patch diff --git a/patches/server/0620-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0621-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 95% rename from patches/server/0620-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/server/0621-Allow-adding-items-to-BlockDropItemEvent.patch index 8f6f5b70a0..c150fb34b5 100644 --- a/patches/server/0620-Allow-adding-items-to-BlockDropItemEvent.patch +++ b/patches/server/0621-Allow-adding-items-to-BlockDropItemEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow adding items to BlockDropItemEvent diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 2c26ac546ae5915c200c616927e8f9ed3dc8c1f5..71571868090062f02579d50ae483d9f367de5016 100644 +index 4991ee6671f73b446e5dff958427b10aac78c63a..a59a449c0a7b76527f009031aee2d11d6b43cadf 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -390,13 +390,30 @@ public class CraftEventFactory { diff --git a/patches/server/0621-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0622-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/server/0621-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/server/0622-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/server/0622-living-entity-allow-attribute-registration.patch b/patches/server/0623-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/server/0622-living-entity-allow-attribute-registration.patch rename to patches/server/0623-living-entity-allow-attribute-registration.patch diff --git a/patches/server/0623-fix-dead-slime-setSize-invincibility.patch b/patches/server/0624-fix-dead-slime-setSize-invincibility.patch similarity index 100% rename from patches/server/0623-fix-dead-slime-setSize-invincibility.patch rename to patches/server/0624-fix-dead-slime-setSize-invincibility.patch diff --git a/patches/server/0624-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0625-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/0625-Merchant-getRecipes-should-return-an-immutable-list.patch diff --git a/patches/server/0625-misc-debugging-dumps.patch b/patches/server/0626-misc-debugging-dumps.patch similarity index 97% rename from patches/server/0625-misc-debugging-dumps.patch rename to patches/server/0626-misc-debugging-dumps.patch index ea7df47132..55f51bd385 100644 --- a/patches/server/0625-misc-debugging-dumps.patch +++ b/patches/server/0626-misc-debugging-dumps.patch @@ -29,7 +29,7 @@ index 0000000000000000000000000000000000000000..2d5494d2813b773e60ddba6790b750a9 + } +} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index bba3905043a4943a920fe48be5b8b591bb19a9ea..280a7ca4ae3a0ed92dd411c8e4e3f253b60f9a9d 100644 +index 127691d19e02ef5e725ce338d732fcced428fa66..7c1ae542ea9da28ccc40b4608a970ef0617b03e8 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -913,6 +913,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0.0F) { diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index e11bdb3ee9512898dde4575633617658ac4bd951..a1a6c03daf2aa3babef6426e7abd3a37c470b100 100644 +index e7c126e9ed76026c0c814cf4278ae522c9fc39bf..1e2ad223ae9c3270548de89acc91f1e6780af539 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -800,6 +800,12 @@ public abstract class PlayerList { diff --git a/patches/server/0670-Add-Channel-initialization-listeners.patch b/patches/server/0671-Add-Channel-initialization-listeners.patch similarity index 100% rename from patches/server/0670-Add-Channel-initialization-listeners.patch rename to patches/server/0671-Add-Channel-initialization-listeners.patch diff --git a/patches/server/0671-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0672-Send-empty-commands-if-tab-completion-is-disabled.patch similarity index 100% rename from patches/server/0671-Send-empty-commands-if-tab-completion-is-disabled.patch rename to patches/server/0672-Send-empty-commands-if-tab-completion-is-disabled.patch diff --git a/patches/server/0672-Add-more-WanderingTrader-API.patch b/patches/server/0673-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/server/0672-Add-more-WanderingTrader-API.patch rename to patches/server/0673-Add-more-WanderingTrader-API.patch diff --git a/patches/server/0673-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0674-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/server/0673-Add-EntityBlockStorage-clearEntities.patch rename to patches/server/0674-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/server/0674-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0675-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/server/0674-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/server/0675-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/server/0675-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0676-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch similarity index 95% rename from patches/server/0675-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch rename to patches/server/0676-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch index 6f98ab292b..c50fbf775b 100644 --- a/patches/server/0675-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch +++ b/patches/server/0676-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add raw address to AsyncPlayerPreLoginEvent diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -index 93f52208785c1632e945a49ce1f91a50c4c2fb03..c6840521fc0734670c50ef4519e13962416ca7a7 100644 +index b8fb3f99e4af5768d8afc1b143e5585f08cc21a9..9e9f0fb1dd6b9a92bd84c50ebdbd79beaf45b58c 100644 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java @@ -346,12 +346,13 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener diff --git a/patches/server/0676-Inventory-close.patch b/patches/server/0677-Inventory-close.patch similarity index 100% rename from patches/server/0676-Inventory-close.patch rename to patches/server/0677-Inventory-close.patch diff --git a/patches/server/0677-call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/0678-call-PortalCreateEvent-players-and-end-platform.patch similarity index 94% rename from patches/server/0677-call-PortalCreateEvent-players-and-end-platform.patch rename to patches/server/0678-call-PortalCreateEvent-players-and-end-platform.patch index a150865bea..e4a5972e06 100644 --- a/patches/server/0677-call-PortalCreateEvent-players-and-end-platform.patch +++ b/patches/server/0678-call-PortalCreateEvent-players-and-end-platform.patch @@ -5,7 +5,7 @@ Subject: [PATCH] call PortalCreateEvent players and end platform diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 1d885c1c0709d49c3fddc174300b3fdd478e761b..90b5bfe7bd0deae842bf6ef228f5a0e09326518e 100644 +index 25fb48d3ff5b0116a6a942fd9d0958ab9ea0bdeb..5de75fb683fb98c8d3948f84e3b65f92665222cd 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1168,15 +1168,21 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0678-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0679-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/server/0678-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/server/0679-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/server/0679-Fix-CraftPotionBrewer-cache.patch b/patches/server/0680-Fix-CraftPotionBrewer-cache.patch similarity index 100% rename from patches/server/0679-Fix-CraftPotionBrewer-cache.patch rename to patches/server/0680-Fix-CraftPotionBrewer-cache.patch diff --git a/patches/server/0680-Add-basic-Datapack-API.patch b/patches/server/0681-Add-basic-Datapack-API.patch similarity index 100% rename from patches/server/0680-Add-basic-Datapack-API.patch rename to patches/server/0681-Add-basic-Datapack-API.patch diff --git a/patches/server/0681-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0682-Add-environment-variable-to-disable-server-gui.patch similarity index 100% rename from patches/server/0681-Add-environment-variable-to-disable-server-gui.patch rename to patches/server/0682-Add-environment-variable-to-disable-server-gui.patch diff --git a/patches/server/0682-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0683-additions-to-PlayerGameModeChangeEvent.patch similarity index 98% rename from patches/server/0682-additions-to-PlayerGameModeChangeEvent.patch rename to patches/server/0683-additions-to-PlayerGameModeChangeEvent.patch index e63d24e10b..ec68953d32 100644 --- a/patches/server/0682-additions-to-PlayerGameModeChangeEvent.patch +++ b/patches/server/0683-additions-to-PlayerGameModeChangeEvent.patch @@ -45,7 +45,7 @@ index d75f78d2e3fb1376e8f6a8668c98a04a693c99e1..79f6089b934124c3309c6bee2e48b36b } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 90b5bfe7bd0deae842bf6ef228f5a0e09326518e..5561d878ad47b9cd70aebec3a36a9296041e6e2d 100644 +index 5de75fb683fb98c8d3948f84e3b65f92665222cd..181ab56448796a617f30f1b9e0fec8917b5d8e07 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1785,8 +1785,15 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0683-Clear-SyncLoadInfo.patch b/patches/server/0684-Clear-SyncLoadInfo.patch similarity index 95% rename from patches/server/0683-Clear-SyncLoadInfo.patch rename to patches/server/0684-Clear-SyncLoadInfo.patch index f25dc4d1a6..b58770b5f0 100644 --- a/patches/server/0683-Clear-SyncLoadInfo.patch +++ b/patches/server/0684-Clear-SyncLoadInfo.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Clear SyncLoadInfo This patch merely adds the extra argument "clear" after /paper syncloadinfo to clear currently stored syncload info. diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java -index 160f3cdee21d8a3aa2ed726a7fbfce460dff26f3..f8d282b962f2d63e0245797538f67391d47dab0f 100644 +index 847ff34a56b7477996901662c25f50b79262f4e1..ba8395435482fc4d6e02fc86794cdb0d35d4399c 100644 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java @@ -205,6 +205,13 @@ public class PaperCommand extends Command { diff --git a/patches/server/0684-ItemStack-repair-check-API.patch b/patches/server/0685-ItemStack-repair-check-API.patch similarity index 97% rename from patches/server/0684-ItemStack-repair-check-API.patch rename to patches/server/0685-ItemStack-repair-check-API.patch index 9c063a37d8..6a1f65b969 100644 --- a/patches/server/0684-ItemStack-repair-check-API.patch +++ b/patches/server/0685-ItemStack-repair-check-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] ItemStack repair check API diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 13c57a457a33746ceb7d43ebac10df17f1a05315..917b14b338e151c5168a5f7e8a68eea206857500 100644 +index fa3c5f2b24dc89b07991fae5e463ea53abdd78b4..0c720f3a75cff8e62802b1fe6e3c5f594c5cc1a8 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -485,6 +485,14 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0685-More-Enchantment-API.patch b/patches/server/0686-More-Enchantment-API.patch similarity index 100% rename from patches/server/0685-More-Enchantment-API.patch rename to patches/server/0686-More-Enchantment-API.patch diff --git a/patches/server/0686-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/server/0687-Add-command-line-option-to-load-extra-plugin-jars-no.patch similarity index 100% rename from patches/server/0686-Add-command-line-option-to-load-extra-plugin-jars-no.patch rename to patches/server/0687-Add-command-line-option-to-load-extra-plugin-jars-no.patch diff --git a/patches/server/0687-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0688-Fix-and-optimise-world-force-upgrading.patch similarity index 98% rename from patches/server/0687-Fix-and-optimise-world-force-upgrading.patch rename to patches/server/0688-Fix-and-optimise-world-force-upgrading.patch index 2f1a0edd93..2c2d2f9b40 100644 --- a/patches/server/0687-Fix-and-optimise-world-force-upgrading.patch +++ b/patches/server/0688-Fix-and-optimise-world-force-upgrading.patch @@ -263,7 +263,7 @@ index cf0a74b8a1c31d4bc493eb09a69ee2bd94cb6485..6fa1a7da70896d0ff34d38698769195a Main.LOGGER.info("Forcing world upgrade! {}", session.getLevelId()); // CraftBukkit WorldUpgrader worldupgrader = new WorldUpgrader(session, dataFixer, worlds, eraseCache); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 6003dff25e78395a92ab279f1a93f016f4a79c56..9feb9e64e64e19d99f6ba01e203b81f13235d12d 100644 +index 4ad480092a87b7bede679cf5e86000702ab8ee6a..2b7b63ea08c8e4f43c9678671fb8d08628b48b36 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -563,13 +563,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop Reviewed-by: Mariell Hoversholm diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java -index 759e563d1ed13249fada8a8eab6b6a10e5ef0d37..e1ecfe280f97985fadbe22db7e420f04c38dd672 100644 +index 35a03d15f87be8eb86d65e1863a3e0cb2dd201ee..c203a78a28e6457bd25b34b5c5ecaa35e3f9211e 100644 --- a/src/main/java/net/minecraft/network/Connection.java +++ b/src/main/java/net/minecraft/network/Connection.java @@ -614,6 +614,11 @@ public class Connection extends SimpleChannelInboundHandler> { diff --git a/patches/server/0690-Add-EntityInsideBlockEvent.patch b/patches/server/0691-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/server/0690-Add-EntityInsideBlockEvent.patch rename to patches/server/0691-Add-EntityInsideBlockEvent.patch diff --git a/patches/server/0691-Attributes-API-for-item-defaults.patch b/patches/server/0692-Attributes-API-for-item-defaults.patch similarity index 95% rename from patches/server/0691-Attributes-API-for-item-defaults.patch rename to patches/server/0692-Attributes-API-for-item-defaults.patch index e1930631f2..2df94b7e85 100644 --- a/patches/server/0691-Attributes-API-for-item-defaults.patch +++ b/patches/server/0692-Attributes-API-for-item-defaults.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Attributes API for item defaults diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 917b14b338e151c5168a5f7e8a68eea206857500..5770fbf1e5c32e342c8366688d8514b35f48a075 100644 +index 0c720f3a75cff8e62802b1fe6e3c5f594c5cc1a8..edf7e8d65d7f67f2f34490fdb766eca7d3b17aee 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -493,6 +493,19 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0692-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch b/patches/server/0693-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch similarity index 100% rename from patches/server/0692-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch rename to patches/server/0693-Have-CraftMerchantCustom-emit-PlayerPurchaseEvent.patch diff --git a/patches/server/0693-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0694-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 98% rename from patches/server/0693-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/server/0694-Add-cause-to-Weather-ThunderChangeEvents.patch index 83adf4714d..1fd63b7892 100644 --- a/patches/server/0693-Add-cause-to-Weather-ThunderChangeEvents.patch +++ b/patches/server/0694-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 1e2139e7f82009e3f9a8b89b10a1fc031602d430..b9400635ec3c530ccc2734e2dd30a0df16885399 100644 +index ecfa6089be3f81704a88877357e3aa0cf45ee332..746124647657d0ccfc9d6dc3db3657c05327d6ac 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 diff --git a/patches/server/0694-More-Lidded-Block-API.patch b/patches/server/0695-More-Lidded-Block-API.patch similarity index 100% rename from patches/server/0694-More-Lidded-Block-API.patch rename to patches/server/0695-More-Lidded-Block-API.patch diff --git a/patches/server/0695-Limit-item-frame-cursors-on-maps.patch b/patches/server/0696-Limit-item-frame-cursors-on-maps.patch similarity index 95% rename from patches/server/0695-Limit-item-frame-cursors-on-maps.patch rename to patches/server/0696-Limit-item-frame-cursors-on-maps.patch index 3cf3896862..f1630e8e78 100644 --- a/patches/server/0695-Limit-item-frame-cursors-on-maps.patch +++ b/patches/server/0696-Limit-item-frame-cursors-on-maps.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Limit item frame cursors on maps diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 20ce2c304ba57e2399e966da7dee9a02e57d9fa5..86f84a7ebc7a118187aabaf44c83ea737af34c6e 100644 +index c94579d5db6802ef27c6c64cde1cdfdff5040ed2..05c1aa7c49134e099e3d14a244252173e6755401 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -792,5 +792,10 @@ public class PaperWorldConfig { diff --git a/patches/server/0696-Add-PufferFishStateChangeEvent.patch b/patches/server/0697-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/server/0696-Add-PufferFishStateChangeEvent.patch rename to patches/server/0697-Add-PufferFishStateChangeEvent.patch diff --git a/patches/server/0697-Add-PlayerKickEvent-causes.patch b/patches/server/0698-Add-PlayerKickEvent-causes.patch similarity index 99% rename from patches/server/0697-Add-PlayerKickEvent-causes.patch rename to patches/server/0698-Add-PlayerKickEvent-causes.patch index 50dc035441..d06869463a 100644 --- a/patches/server/0697-Add-PlayerKickEvent-causes.patch +++ b/patches/server/0698-Add-PlayerKickEvent-causes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerKickEvent causes diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 9feb9e64e64e19d99f6ba01e203b81f13235d12d..6620d1a16522d37746c9300768e21b58b52b764d 100644 +index 2b7b63ea08c8e4f43c9678671fb8d08628b48b36..3bf39c2d2aa3fc4fd0815dacea57e4899ec0da0e 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -2124,7 +2124,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop