diff --git a/patches/unapplied/server/0298-Handle-Oversized-Tile-Entities-in-chunks.patch b/patches/server/0299-Handle-Oversized-Tile-Entities-in-chunks.patch similarity index 88% rename from patches/unapplied/server/0298-Handle-Oversized-Tile-Entities-in-chunks.patch rename to patches/server/0299-Handle-Oversized-Tile-Entities-in-chunks.patch index aec3766df76b..a99bed730527 100644 --- a/patches/unapplied/server/0298-Handle-Oversized-Tile-Entities-in-chunks.patch +++ b/patches/server/0299-Handle-Oversized-Tile-Entities-in-chunks.patch @@ -9,7 +9,7 @@ creating too large of a packet to sed. Co authored by Spottedleaf diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java -index f47eeb70661661610ef1a96dd9da67785825c126..0ef3e9b472e35bd2572b04722781abf7d4a1094b 100644 +index f47eeb70661661610ef1a96dd9da67785825c126..0711ad682206e783fd0a1e566828670321f297e2 100644 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java @@ -24,6 +24,14 @@ public class ClientboundLevelChunkPacketData { @@ -17,10 +17,10 @@ index f47eeb70661661610ef1a96dd9da67785825c126..0ef3e9b472e35bd2572b04722781abf7 private final byte[] buffer; private final List blockEntitiesData; + // Paper start -+ private final java.util.List extraPackets = new java.util.ArrayList<>(); ++ private final java.util.List> extraPackets = new java.util.ArrayList<>(); + private static final int TE_LIMIT = Integer.getInteger("Paper.excessiveTELimit", 750); + -+ public List getExtraPackets() { ++ public List> getExtraPackets() { + return this.extraPackets; + } + // Paper end @@ -47,7 +47,7 @@ index f47eeb70661661610ef1a96dd9da67785825c126..0ef3e9b472e35bd2572b04722781abf7 } diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkWithLightPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkWithLightPacket.java -index 26e46d751c8f8162c2bafe2fc109fc91dc4b7c0f..ff42a3e76500ad6e087b7f1cd6ec45acde124180 100644 +index 26e46d751c8f8162c2bafe2fc109fc91dc4b7c0f..be89e5b8c1ea7f85aef267a15986affa5fa1fd4b 100644 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkWithLightPacket.java +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkWithLightPacket.java @@ -57,4 +57,11 @@ public class ClientboundLevelChunkWithLightPacket implements Packet getExtraPackets() { ++ public java.util.List> getExtraPackets() { + return this.chunkData.getExtraPackets(); + } + // Paper end diff --git a/patches/server/0299-Entity-getEntitySpawnReason.patch b/patches/server/0300-Entity-getEntitySpawnReason.patch similarity index 100% rename from patches/server/0299-Entity-getEntitySpawnReason.patch rename to patches/server/0300-Entity-getEntitySpawnReason.patch diff --git a/patches/server/0300-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0301-Optimize-Network-Manager-and-add-advanced-packet-sup.patch similarity index 100% rename from patches/server/0300-Optimize-Network-Manager-and-add-advanced-packet-sup.patch rename to patches/server/0301-Optimize-Network-Manager-and-add-advanced-packet-sup.patch diff --git a/patches/server/0301-Fire-event-on-GS4-query.patch b/patches/server/0302-Fire-event-on-GS4-query.patch similarity index 100% rename from patches/server/0301-Fire-event-on-GS4-query.patch rename to patches/server/0302-Fire-event-on-GS4-query.patch diff --git a/patches/server/0302-Implement-PlayerPostRespawnEvent.patch b/patches/server/0303-Implement-PlayerPostRespawnEvent.patch similarity index 100% rename from patches/server/0302-Implement-PlayerPostRespawnEvent.patch rename to patches/server/0303-Implement-PlayerPostRespawnEvent.patch diff --git a/patches/server/0303-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/server/0304-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch similarity index 100% rename from patches/server/0303-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch rename to patches/server/0304-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch diff --git a/patches/server/0304-Server-Tick-Events.patch b/patches/server/0305-Server-Tick-Events.patch similarity index 100% rename from patches/server/0304-Server-Tick-Events.patch rename to patches/server/0305-Server-Tick-Events.patch diff --git a/patches/server/0305-PlayerDeathEvent-getItemsToKeep.patch b/patches/server/0306-PlayerDeathEvent-getItemsToKeep.patch similarity index 100% rename from patches/server/0305-PlayerDeathEvent-getItemsToKeep.patch rename to patches/server/0306-PlayerDeathEvent-getItemsToKeep.patch diff --git a/patches/server/0306-Optimize-Captured-TileEntity-Lookup.patch b/patches/server/0307-Optimize-Captured-TileEntity-Lookup.patch similarity index 100% rename from patches/server/0306-Optimize-Captured-TileEntity-Lookup.patch rename to patches/server/0307-Optimize-Captured-TileEntity-Lookup.patch diff --git a/patches/server/0307-Add-Heightmap-API.patch b/patches/server/0308-Add-Heightmap-API.patch similarity index 100% rename from patches/server/0307-Add-Heightmap-API.patch rename to patches/server/0308-Add-Heightmap-API.patch diff --git a/patches/server/0308-Mob-Spawner-API-Enhancements.patch b/patches/server/0309-Mob-Spawner-API-Enhancements.patch similarity index 100% rename from patches/server/0308-Mob-Spawner-API-Enhancements.patch rename to patches/server/0309-Mob-Spawner-API-Enhancements.patch diff --git a/patches/server/0309-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/server/0310-Fix-CB-call-to-changed-postToMainThread-method.patch similarity index 100% rename from patches/server/0309-Fix-CB-call-to-changed-postToMainThread-method.patch rename to patches/server/0310-Fix-CB-call-to-changed-postToMainThread-method.patch diff --git a/patches/server/0310-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/server/0311-Fix-sounds-when-item-frames-are-modified-MC-123450.patch similarity index 100% rename from patches/server/0310-Fix-sounds-when-item-frames-are-modified-MC-123450.patch rename to patches/server/0311-Fix-sounds-when-item-frames-are-modified-MC-123450.patch diff --git a/patches/server/0311-Implement-CraftBlockSoundGroup.patch b/patches/server/0312-Implement-CraftBlockSoundGroup.patch similarity index 100% rename from patches/server/0311-Implement-CraftBlockSoundGroup.patch rename to patches/server/0312-Implement-CraftBlockSoundGroup.patch diff --git a/patches/server/0312-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/server/0313-Configurable-Keep-Spawn-Loaded-range-per-world.patch similarity index 100% rename from patches/server/0312-Configurable-Keep-Spawn-Loaded-range-per-world.patch rename to patches/server/0313-Configurable-Keep-Spawn-Loaded-range-per-world.patch diff --git a/patches/server/0313-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0314-Allow-Saving-of-Oversized-Chunks.patch similarity index 100% rename from patches/server/0313-Allow-Saving-of-Oversized-Chunks.patch rename to patches/server/0314-Allow-Saving-of-Oversized-Chunks.patch diff --git a/patches/server/0314-Expose-the-internal-current-tick.patch b/patches/server/0315-Expose-the-internal-current-tick.patch similarity index 100% rename from patches/server/0314-Expose-the-internal-current-tick.patch rename to patches/server/0315-Expose-the-internal-current-tick.patch diff --git a/patches/server/0315-Fix-World-isChunkGenerated-calls.patch b/patches/server/0316-Fix-World-isChunkGenerated-calls.patch similarity index 100% rename from patches/server/0315-Fix-World-isChunkGenerated-calls.patch rename to patches/server/0316-Fix-World-isChunkGenerated-calls.patch diff --git a/patches/server/0316-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/server/0317-Show-blockstate-location-if-we-failed-to-read-it.patch similarity index 100% rename from patches/server/0316-Show-blockstate-location-if-we-failed-to-read-it.patch rename to patches/server/0317-Show-blockstate-location-if-we-failed-to-read-it.patch diff --git a/patches/server/0317-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/server/0318-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch similarity index 100% rename from patches/server/0317-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch rename to patches/server/0318-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch diff --git a/patches/server/0318-Configurable-projectile-relative-velocity.patch b/patches/server/0319-Configurable-projectile-relative-velocity.patch similarity index 100% rename from patches/server/0318-Configurable-projectile-relative-velocity.patch rename to patches/server/0319-Configurable-projectile-relative-velocity.patch diff --git a/patches/server/0319-offset-item-frame-ticking.patch b/patches/server/0320-offset-item-frame-ticking.patch similarity index 100% rename from patches/server/0319-offset-item-frame-ticking.patch rename to patches/server/0320-offset-item-frame-ticking.patch diff --git a/patches/server/0320-Fix-MC-158900.patch b/patches/server/0321-Fix-MC-158900.patch similarity index 100% rename from patches/server/0320-Fix-MC-158900.patch rename to patches/server/0321-Fix-MC-158900.patch diff --git a/patches/server/0321-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0322-Prevent-consuming-the-wrong-itemstack.patch similarity index 100% rename from patches/server/0321-Prevent-consuming-the-wrong-itemstack.patch rename to patches/server/0322-Prevent-consuming-the-wrong-itemstack.patch diff --git a/patches/server/0322-Dont-send-unnecessary-sign-update.patch b/patches/server/0323-Dont-send-unnecessary-sign-update.patch similarity index 100% rename from patches/server/0322-Dont-send-unnecessary-sign-update.patch rename to patches/server/0323-Dont-send-unnecessary-sign-update.patch diff --git a/patches/server/0323-Add-option-to-disable-pillager-patrols.patch b/patches/server/0324-Add-option-to-disable-pillager-patrols.patch similarity index 100% rename from patches/server/0323-Add-option-to-disable-pillager-patrols.patch rename to patches/server/0324-Add-option-to-disable-pillager-patrols.patch diff --git a/patches/server/0324-Flat-bedrock-generator-settings.patch b/patches/server/0325-Flat-bedrock-generator-settings.patch similarity index 100% rename from patches/server/0324-Flat-bedrock-generator-settings.patch rename to patches/server/0325-Flat-bedrock-generator-settings.patch diff --git a/patches/server/0325-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0326-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch similarity index 100% rename from patches/server/0325-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch rename to patches/server/0326-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch diff --git a/patches/server/0326-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/server/0327-MC-145656-Fix-Follow-Range-Initial-Target.patch similarity index 100% rename from patches/server/0326-MC-145656-Fix-Follow-Range-Initial-Target.patch rename to patches/server/0327-MC-145656-Fix-Follow-Range-Initial-Target.patch diff --git a/patches/server/0327-Duplicate-UUID-Resolve-Option.patch b/patches/server/0328-Duplicate-UUID-Resolve-Option.patch similarity index 100% rename from patches/server/0327-Duplicate-UUID-Resolve-Option.patch rename to patches/server/0328-Duplicate-UUID-Resolve-Option.patch diff --git a/patches/server/0328-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0329-PlayerDeathEvent-shouldDropExperience.patch similarity index 100% rename from patches/server/0328-PlayerDeathEvent-shouldDropExperience.patch rename to patches/server/0329-PlayerDeathEvent-shouldDropExperience.patch diff --git a/patches/server/0329-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0330-Prevent-bees-loading-chunks-checking-hive-position.patch similarity index 100% rename from patches/server/0329-Prevent-bees-loading-chunks-checking-hive-position.patch rename to patches/server/0330-Prevent-bees-loading-chunks-checking-hive-position.patch diff --git a/patches/server/0330-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0331-Don-t-load-Chunks-from-Hoppers-and-other-things.patch similarity index 100% rename from patches/server/0330-Don-t-load-Chunks-from-Hoppers-and-other-things.patch rename to patches/server/0331-Don-t-load-Chunks-from-Hoppers-and-other-things.patch diff --git a/patches/server/0331-Optimise-EntityGetter-getPlayerByUUID.patch b/patches/server/0332-Optimise-EntityGetter-getPlayerByUUID.patch similarity index 100% rename from patches/server/0331-Optimise-EntityGetter-getPlayerByUUID.patch rename to patches/server/0332-Optimise-EntityGetter-getPlayerByUUID.patch diff --git a/patches/server/0332-Fix-items-not-falling-correctly.patch b/patches/server/0333-Fix-items-not-falling-correctly.patch similarity index 100% rename from patches/server/0332-Fix-items-not-falling-correctly.patch rename to patches/server/0333-Fix-items-not-falling-correctly.patch diff --git a/patches/server/0333-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0334-Optimize-call-to-getFluid-for-explosions.patch similarity index 100% rename from patches/server/0333-Optimize-call-to-getFluid-for-explosions.patch rename to patches/server/0334-Optimize-call-to-getFluid-for-explosions.patch diff --git a/patches/server/0334-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/server/0335-Fix-last-firework-in-stack-not-having-effects-when-d.patch similarity index 100% rename from patches/server/0334-Fix-last-firework-in-stack-not-having-effects-when-d.patch rename to patches/server/0335-Fix-last-firework-in-stack-not-having-effects-when-d.patch diff --git a/patches/server/0335-Entity-Activation-Range-2.0.patch b/patches/server/0336-Entity-Activation-Range-2.0.patch similarity index 100% rename from patches/server/0335-Entity-Activation-Range-2.0.patch rename to patches/server/0336-Entity-Activation-Range-2.0.patch diff --git a/patches/server/0336-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/server/0337-Guard-against-serializing-mismatching-chunk-coordina.patch similarity index 100% rename from patches/server/0336-Guard-against-serializing-mismatching-chunk-coordina.patch rename to patches/server/0337-Guard-against-serializing-mismatching-chunk-coordina.patch diff --git a/patches/server/0337-Implement-alternative-item-despawn-rate.patch b/patches/server/0338-Implement-alternative-item-despawn-rate.patch similarity index 100% rename from patches/server/0337-Implement-alternative-item-despawn-rate.patch rename to patches/server/0338-Implement-alternative-item-despawn-rate.patch diff --git a/patches/server/0338-Lag-compensate-eating.patch b/patches/server/0339-Lag-compensate-eating.patch similarity index 100% rename from patches/server/0338-Lag-compensate-eating.patch rename to patches/server/0339-Lag-compensate-eating.patch diff --git a/patches/server/0339-Tracking-Range-Improvements.patch b/patches/server/0340-Tracking-Range-Improvements.patch similarity index 100% rename from patches/server/0339-Tracking-Range-Improvements.patch rename to patches/server/0340-Tracking-Range-Improvements.patch diff --git a/patches/server/0340-Fix-items-vanishing-through-end-portal.patch b/patches/server/0341-Fix-items-vanishing-through-end-portal.patch similarity index 100% rename from patches/server/0340-Fix-items-vanishing-through-end-portal.patch rename to patches/server/0341-Fix-items-vanishing-through-end-portal.patch diff --git a/patches/server/0341-implement-optional-per-player-mob-spawns.patch b/patches/server/0342-implement-optional-per-player-mob-spawns.patch similarity index 100% rename from patches/server/0341-implement-optional-per-player-mob-spawns.patch rename to patches/server/0342-implement-optional-per-player-mob-spawns.patch diff --git a/patches/unapplied/server/0343-Anti-Xray.patch b/patches/server/0343-Anti-Xray.patch similarity index 95% rename from patches/unapplied/server/0343-Anti-Xray.patch rename to patches/server/0343-Anti-Xray.patch index f50b774a7916..286de288fc37 100644 --- a/patches/unapplied/server/0343-Anti-Xray.patch +++ b/patches/server/0343-Anti-Xray.patch @@ -1013,7 +1013,7 @@ index 6cff1a98dc7cf33947ec760dbc3d3d0ec5db5f6c..51f647de153255c919b1440338cf1b3e } diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java -index 0ef3e9b472e35bd2572b04722781abf7d4a1094b..c08440826d84f97412e2587cb98daae04e1bdd32 100644 +index 0711ad682206e783fd0a1e566828670321f297e2..bf6cdc08367fc26716e7904162a21e63fecab3ed 100644 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java @@ -33,7 +33,10 @@ public class ClientboundLevelChunkPacketData { @@ -1063,7 +1063,7 @@ index 0ef3e9b472e35bd2572b04722781abf7d4a1094b..c08440826d84f97412e2587cb98daae0 } diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkWithLightPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkWithLightPacket.java -index ff42a3e76500ad6e087b7f1cd6ec45acde124180..978fc83b209ae831ba1d6315cad1adeefe58a98c 100644 +index be89e5b8c1ea7f85aef267a15986affa5fa1fd4b..43472855136f26b282d94fd241853d862a19ae17 100644 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkWithLightPacket.java +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkWithLightPacket.java @@ -13,13 +13,30 @@ public class ClientboundLevelChunkWithLightPacket implements Packet packet, boolean oldWithinViewDistance, boolean newWithinViewDistance) { // Paper - public -+ public void updateChunkTracking(ServerPlayer player, ChunkPos pos, MutableObject> packet, boolean oldWithinViewDistance, boolean newWithinViewDistance) { // Paper - public // Paper - Anti-Xray - Bypass - io.papermc.paper.util.TickThread.ensureTickThread(this.level, pos, "May not update chunk tracking for chunk async"); // Paper - replace chunk loader system - io.papermc.paper.util.TickThread.ensureTickThread(player, "May not update chunk tracking for player async"); // Paper - replace chunk loader system - if (player.level() == this.level) { -@@ -1185,12 +1185,17 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider - }); - } - -- private void playerLoadedChunk(ServerPlayer player, MutableObject cachedDataPacket, LevelChunk chunk) { -- if (cachedDataPacket.getValue() == null) { -- cachedDataPacket.setValue(new ClientboundLevelChunkWithLightPacket(chunk, this.lightEngine, (BitSet) null, (BitSet) null)); -+ // Paper start - Anti-Xray - Bypass -+ private void playerLoadedChunk(ServerPlayer player, MutableObject> cachedDataPackets, LevelChunk chunk) { -+ if (cachedDataPackets.getValue() == null) { -+ cachedDataPackets.setValue(new java.util.HashMap<>()); - } - -- player.trackChunk(chunk.getPos(), (Packet) cachedDataPacket.getValue()); -+ Boolean shouldModify = chunk.getLevel().chunkPacketBlockController.shouldModify(player, chunk); -+ player.trackChunk(chunk.getPos(), (Packet) cachedDataPackets.getValue().computeIfAbsent(shouldModify, (s) -> { -+ return new ClientboundLevelChunkWithLightPacket(chunk, this.lightEngine, (BitSet) null, (BitSet) null, (Boolean) s); -+ })); -+ // Paper end - DebugPackets.sendPoiPacketsForChunk(this.level, chunk.getPos()); - List list = Lists.newArrayList(); - List list1 = Lists.newArrayList(); diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index b12e9da3eebda396769b30f4b7e37a78f3bcb060..62ea2bb2fdd1f2de31b08c88193887989fbd3ece 100644 +index 35e2688f9252fbc12b69519e5e5fbaec5ff82e42..041a6b20fa88852cd5b37438f2ddf30517b95820 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -564,7 +564,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -566,7 +566,7 @@ public class ServerLevel extends Level implements WorldGenLevel { // Holder holder = worlddimension.type(); // CraftBukkit - decompile error // Objects.requireNonNull(minecraftserver); // CraftBukkit - decompile error @@ -1169,6 +1134,22 @@ index bdf11a98614c9c12d3112f437651be81d0d9872a..58a1a54b676922ef0862dcab98e7aada } public void destroyAndAck(BlockPos pos, int sequence, String reason) { +diff --git a/src/main/java/net/minecraft/server/network/PlayerChunkSender.java b/src/main/java/net/minecraft/server/network/PlayerChunkSender.java +index 5de5209e04d631bd6a50e28e8d3abebf148252c1..19b3f4fa7678a038bf25efc2a8b46ddad0193fde 100644 +--- a/src/main/java/net/minecraft/server/network/PlayerChunkSender.java ++++ b/src/main/java/net/minecraft/server/network/PlayerChunkSender.java +@@ -85,7 +85,10 @@ public class PlayerChunkSender { + + public static void sendChunk(ServerGamePacketListenerImpl handler, ServerLevel world, LevelChunk chunk) { // Paper - rewrite chunk loader - public + handler.player.serverLevel().chunkSource.chunkMap.getVisibleChunkIfPresent(chunk.getPos().toLong()).addPlayer(handler.player); +- handler.send(new ClientboundLevelChunkWithLightPacket(chunk, world.getLightEngine(), (BitSet)null, (BitSet)null)); ++ // Paper start - Anti-Xray ++ final boolean shouldModify = world.chunkPacketBlockController.shouldModify(handler.player, chunk); ++ handler.send(new ClientboundLevelChunkWithLightPacket(chunk, world.getLightEngine(), (BitSet)null, (BitSet)null, shouldModify)); ++ // Paper end - Anti-Xray + ChunkPos chunkPos = chunk.getPos(); + DebugPackets.sendPoiPacketsForChunk(world, chunkPos); + } diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java index 9a6ed3aa55f988ed30669fab2a2513741eda399b..7a1886585bd00dc8213ce22130b8b6fea52c5cf6 100644 --- a/src/main/java/net/minecraft/world/level/Level.java @@ -1232,7 +1213,7 @@ index 525c89bc926f13af6f94fc46c897525e37477eca..8b96d1b7548d354fbcabe6d1b5e9d6c3 } 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 704f0500649acdbff2caf94f702a6685ecf4c986..24a1d04d01d01262facbac9c3683c21b7f54fd6d 100644 +index cf910b466a4b75c0b9219abef5c9bff30793d7bf..1bb82df6602bddd3f5785c800124d2a3096c0f8d 100644 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java @@ -90,7 +90,7 @@ public class LevelChunk extends ChunkAccess { @@ -1282,10 +1263,10 @@ index 2c3ea88bac229df67bd742e16d2106d80bcc8889..4eeb719b40ff1c18a7cdda7ecc6b135d public int getSerializedSize() { 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 cd82985b0aa821dccc0484f328407381d58ec81f..5f832a684067f4770ade1f24a29047f0f1fe0860 100644 +index 1219200cd915d6239a32a2bd09d325cd8fa9b346..98e720a21432fff7fce8653095a56e2ef56f1d30 100644 --- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java +++ b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java -@@ -29,6 +29,7 @@ public class PalettedContainer implements PaletteResize, PalettedContainer +@@ -30,6 +30,7 @@ public class PalettedContainer implements PaletteResize, PalettedContainer return 0; }; public final IdMap registry; @@ -1293,7 +1274,7 @@ index cd82985b0aa821dccc0484f328407381d58ec81f..5f832a684067f4770ade1f24a29047f0 private volatile PalettedContainer.Data data; private final PalettedContainer.Strategy strategy; private final ThreadingDetector threadingDetector = new ThreadingDetector("PalettedContainer"); -@@ -41,14 +42,19 @@ public class PalettedContainer implements PaletteResize, PalettedContainer +@@ -42,14 +43,19 @@ public class PalettedContainer implements PaletteResize, PalettedContainer this.threadingDetector.checkAndUnlock(); } @@ -1316,7 +1297,7 @@ index cd82985b0aa821dccc0484f328407381d58ec81f..5f832a684067f4770ade1f24a29047f0 return result; }); }; -@@ -65,19 +71,52 @@ public class PalettedContainer implements PaletteResize, PalettedContainer +@@ -66,19 +72,52 @@ public class PalettedContainer implements PaletteResize, PalettedContainer }); } @@ -1372,7 +1353,7 @@ index cd82985b0aa821dccc0484f328407381d58ec81f..5f832a684067f4770ade1f24a29047f0 this.strategy = paletteProvider; this.registry = idList; this.data = this.createOrReuseData((PalettedContainer.Data)null, 0); -@@ -92,11 +131,33 @@ public class PalettedContainer implements PaletteResize, PalettedContainer +@@ -93,11 +132,33 @@ public class PalettedContainer implements PaletteResize, PalettedContainer @Override public int onResize(int newBits, T object) { PalettedContainer.Data data = this.data; @@ -1407,7 +1388,7 @@ index cd82985b0aa821dccc0484f328407381d58ec81f..5f832a684067f4770ade1f24a29047f0 public T getAndSet(int x, int y, int z, T value) { this.acquire(); -@@ -166,25 +227,34 @@ public class PalettedContainer implements PaletteResize, PalettedContainer +@@ -167,25 +228,34 @@ public class PalettedContainer implements PaletteResize, PalettedContainer data.palette.read(buf); buf.readLongArray(data.storage.getRaw()); this.data = data; @@ -1445,7 +1426,7 @@ index cd82985b0aa821dccc0484f328407381d58ec81f..5f832a684067f4770ade1f24a29047f0 List list = serialized.paletteEntries(); int i = paletteProvider.size(); int j = paletteProvider.calculateBitsForSerialization(idList, list.size()); -@@ -224,7 +294,7 @@ public class PalettedContainer implements PaletteResize, PalettedContainer +@@ -225,7 +295,7 @@ public class PalettedContainer implements PaletteResize, PalettedContainer } } @@ -1454,7 +1435,7 @@ index cd82985b0aa821dccc0484f328407381d58ec81f..5f832a684067f4770ade1f24a29047f0 } @Override -@@ -284,12 +354,12 @@ public class PalettedContainer implements PaletteResize, PalettedContainer +@@ -285,12 +355,12 @@ public class PalettedContainer implements PaletteResize, PalettedContainer } public PalettedContainer copy() { @@ -1469,8 +1450,8 @@ index cd82985b0aa821dccc0484f328407381d58ec81f..5f832a684067f4770ade1f24a29047f0 } @Override -@@ -333,9 +403,18 @@ public class PalettedContainer implements PaletteResize, PalettedContainer - return 1 + this.palette.getSerializedSize() + FriendlyByteBuf.getVarIntSize(this.storage.getSize()) + this.storage.getRaw().length * 8; +@@ -334,9 +404,18 @@ public class PalettedContainer implements PaletteResize, PalettedContainer + return 1 + this.palette.getSerializedSize() + VarInt.getByteSize(this.storage.getRaw().length) + this.storage.getRaw().length * 8; } - public void write(FriendlyByteBuf buf) { @@ -1482,7 +1463,7 @@ index cd82985b0aa821dccc0484f328407381d58ec81f..5f832a684067f4770ade1f24a29047f0 + if (chunkPacketInfo != null) { + chunkPacketInfo.setBits(chunkSectionIndex, this.configuration.bits()); + chunkPacketInfo.setPalette(chunkSectionIndex, this.palette); -+ chunkPacketInfo.setIndex(chunkSectionIndex, buf.writerIndex() + FriendlyByteBuf.getVarIntSize(this.storage.getRaw().length)); ++ chunkPacketInfo.setIndex(chunkSectionIndex, buf.writerIndex() + VarInt.getByteSize(this.storage.getRaw().length)); + } + // Paper end + @@ -1506,7 +1487,7 @@ index 9a2bf744abd8916d492e901be889223591bac3fd..1dd415c96d17eff8e7555c33d3c52e57 int getSerializedSize(); diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java -index 0d8cfc0808a8f204d57cec40929b489099eca815..dec862552b08e6b9f9ad1f88db1e07dcc43d7fa3 100644 +index 982fb3ef071d6a66f16744717e8e146bef6d9e8c..02beedb84a8bec001270116c6ce496db012e6b8a 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java @@ -71,7 +71,7 @@ import org.slf4j.Logger; @@ -1560,10 +1541,10 @@ index 0d8cfc0808a8f204d57cec40929b489099eca815..dec862552b08e6b9f9ad1f88db1e07dc // CraftBukkit end diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java -index b738e1f7debac7d70910d5ac908ca9d4f60640d5..269ebe8e8826a0c89e471cb59b503900d7ebe0fa 100644 +index d10dcf5b9c987bbd4761470c16c9d4693ccf896d..adee86c79f9db0a93691ec338791d7c75ab2dd4b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java -@@ -52,7 +52,7 @@ public class CraftChunk implements Chunk { +@@ -53,7 +53,7 @@ public class CraftChunk implements Chunk { private final ServerLevel worldServer; private final int x; private final int z; @@ -1573,10 +1554,10 @@ index b738e1f7debac7d70910d5ac908ca9d4f60640d5..269ebe8e8826a0c89e471cb59b503900 public CraftChunk(net.minecraft.world.level.chunk.LevelChunk chunk) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 535880a9dc3ccbf8d6f1b185a695011a347bdd88..06e0904b47838c4bed2ae85a8f329e3035543b5e 100644 +index fc1dcd6aae389d89ab2c0233448ea64b50c065a9..5b097b8cef1a2b71e83be6f23abf088af20195ba 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2275,7 +2275,7 @@ public final class CraftServer implements Server { +@@ -2277,7 +2277,7 @@ public final class CraftServer implements Server { public ChunkGenerator.ChunkData createChunkData(World world) { Preconditions.checkArgument(world != null, "World cannot be null"); ServerLevel handle = ((CraftWorld) world).getHandle(); @@ -1586,7 +1567,7 @@ index 535880a9dc3ccbf8d6f1b185a695011a347bdd88..06e0904b47838c4bed2ae85a8f329e30 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index f259f6609cd87a210451ddf4ea00a72718d1efd0..b34067a6bc3bf61ca94929bb8e9677deef686077 100644 +index 0a9cf69ce0983f167ce63dc58eace455561da8e7..83df374d5f471a9a40c670a7496a8a03970d10a3 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -418,11 +418,16 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0342-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0344-Bees-get-gravity-in-void.-Fixes-MC-167279.patch similarity index 100% rename from patches/server/0342-Bees-get-gravity-in-void.-Fixes-MC-167279.patch rename to patches/server/0344-Bees-get-gravity-in-void.-Fixes-MC-167279.patch diff --git a/patches/server/0343-Improve-Block-breakNaturally-API.patch b/patches/server/0345-Improve-Block-breakNaturally-API.patch similarity index 100% rename from patches/server/0343-Improve-Block-breakNaturally-API.patch rename to patches/server/0345-Improve-Block-breakNaturally-API.patch diff --git a/patches/server/0344-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0346-Optimise-getChunkAt-calls-for-loaded-chunks.patch similarity index 100% rename from patches/server/0344-Optimise-getChunkAt-calls-for-loaded-chunks.patch rename to patches/server/0346-Optimise-getChunkAt-calls-for-loaded-chunks.patch diff --git a/patches/server/0345-Add-debug-for-sync-chunk-loads.patch b/patches/server/0347-Add-debug-for-sync-chunk-loads.patch similarity index 99% rename from patches/server/0345-Add-debug-for-sync-chunk-loads.patch rename to patches/server/0347-Add-debug-for-sync-chunk-loads.patch index eccc8c5476d6..cecbe0930632 100644 --- a/patches/server/0345-Add-debug-for-sync-chunk-loads.patch +++ b/patches/server/0347-Add-debug-for-sync-chunk-loads.patch @@ -312,7 +312,7 @@ index 2d44b8a98216f879f2bc89fba1dad53cd5558ff9..7881a34e01dd6c8e31b55577bb9323a0 chunkproviderserver_b.managedBlock(completablefuture::isDone); io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.popChunkWait(); // Paper - async chunk debug // Paper - rewrite chunk system diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 35e2688f9252fbc12b69519e5e5fbaec5ff82e42..e7847e03b94fed1a76f8a57d6b61f5f01a87615b 100644 +index 041a6b20fa88852cd5b37438f2ddf30517b95820..88abc0df7f5b9e285b10f412b58422b326b0a99a 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -645,6 +645,13 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0346-Improve-java-version-check.patch b/patches/server/0348-Improve-java-version-check.patch similarity index 100% rename from patches/server/0346-Improve-java-version-check.patch rename to patches/server/0348-Improve-java-version-check.patch diff --git a/patches/server/0347-Add-ThrownEggHatchEvent.patch b/patches/server/0349-Add-ThrownEggHatchEvent.patch similarity index 100% rename from patches/server/0347-Add-ThrownEggHatchEvent.patch rename to patches/server/0349-Add-ThrownEggHatchEvent.patch diff --git a/patches/server/0348-Entity-Jump-API.patch b/patches/server/0350-Entity-Jump-API.patch similarity index 100% rename from patches/server/0348-Entity-Jump-API.patch rename to patches/server/0350-Entity-Jump-API.patch diff --git a/patches/server/0349-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0351-Add-option-to-nerf-pigmen-from-nether-portals.patch similarity index 100% rename from patches/server/0349-Add-option-to-nerf-pigmen-from-nether-portals.patch rename to patches/server/0351-Add-option-to-nerf-pigmen-from-nether-portals.patch diff --git a/patches/server/0350-Make-the-GUI-graph-fancier.patch b/patches/server/0352-Make-the-GUI-graph-fancier.patch similarity index 100% rename from patches/server/0350-Make-the-GUI-graph-fancier.patch rename to patches/server/0352-Make-the-GUI-graph-fancier.patch diff --git a/patches/server/0351-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0353-add-hand-to-BlockMultiPlaceEvent.patch similarity index 100% rename from patches/server/0351-add-hand-to-BlockMultiPlaceEvent.patch rename to patches/server/0353-add-hand-to-BlockMultiPlaceEvent.patch diff --git a/patches/server/0352-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0354-Validate-tripwire-hook-placement-before-update.patch similarity index 100% rename from patches/server/0352-Validate-tripwire-hook-placement-before-update.patch rename to patches/server/0354-Validate-tripwire-hook-placement-before-update.patch diff --git a/patches/server/0353-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0355-Add-option-to-allow-iron-golems-to-spawn-in-air.patch similarity index 100% rename from patches/server/0353-Add-option-to-allow-iron-golems-to-spawn-in-air.patch rename to patches/server/0355-Add-option-to-allow-iron-golems-to-spawn-in-air.patch diff --git a/patches/server/0354-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0356-Configurable-chance-of-villager-zombie-infection.patch similarity index 100% rename from patches/server/0354-Configurable-chance-of-villager-zombie-infection.patch rename to patches/server/0356-Configurable-chance-of-villager-zombie-infection.patch diff --git a/patches/server/0355-Optimise-Chunk-getFluid.patch b/patches/server/0357-Optimise-Chunk-getFluid.patch similarity index 92% rename from patches/server/0355-Optimise-Chunk-getFluid.patch rename to patches/server/0357-Optimise-Chunk-getFluid.patch index 6411c144ec9a..62bf1a4c2a00 100644 --- a/patches/server/0355-Optimise-Chunk-getFluid.patch +++ b/patches/server/0357-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 cf910b466a4b75c0b9219abef5c9bff30793d7bf..7d85d805bdc7bb67dae2cab8bcd38368f519a85c 100644 +index 1bb82df6602bddd3f5785c800124d2a3096c0f8d..95531e115f69f52cb6ec55c6e4bc34fb109758c4 100644 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java @@ -380,18 +380,20 @@ public class LevelChunk extends ChunkAccess { @@ -47,10 +47,10 @@ index cf910b466a4b75c0b9219abef5c9bff30793d7bf..7d85d805bdc7bb67dae2cab8bcd38368 // 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 2c3ea88bac229df67bd742e16d2106d80bcc8889..789664d53584c7d958572c63db22f904fb411a58 100644 +index 4eeb719b40ff1c18a7cdda7ecc6b135dbedd626e..b8fee4f8a0cfe32b9ef7f3f3cf818cbaec0d3fca 100644 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java -@@ -43,7 +43,7 @@ public class LevelChunkSection { +@@ -46,7 +46,7 @@ public class LevelChunkSection { } public FluidState getFluidState(int x, int y, int z) { diff --git a/patches/server/0356-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0358-Set-spigots-verbose-world-setting-to-false-by-def.patch similarity index 100% rename from patches/server/0356-Set-spigots-verbose-world-setting-to-false-by-def.patch rename to patches/server/0358-Set-spigots-verbose-world-setting-to-false-by-def.patch diff --git a/patches/server/0357-Add-tick-times-API-and-mspt-command.patch b/patches/server/0359-Add-tick-times-API-and-mspt-command.patch similarity index 98% rename from patches/server/0357-Add-tick-times-API-and-mspt-command.patch rename to patches/server/0359-Add-tick-times-API-and-mspt-command.patch index ab2086b3d8ef..45ee89b97090 100644 --- a/patches/server/0357-Add-tick-times-API-and-mspt-command.patch +++ b/patches/server/0359-Add-tick-times-API-and-mspt-command.patch @@ -184,7 +184,7 @@ index 4d3cd4a5dbf7adb482e60dc88ededdaccf558061..951e283d38cb7601049ac6f24385acde + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index fc1dcd6aae389d89ab2c0233448ea64b50c065a9..6e986a657af35ce6175c30abd7c68e3e3a878b83 100644 +index 5b097b8cef1a2b71e83be6f23abf088af20195ba..6c213d609972ac2fd9052057c07add57596d41b0 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2532,6 +2532,16 @@ public final class CraftServer implements Server { diff --git a/patches/server/0358-Expose-MinecraftServer-isRunning.patch b/patches/server/0360-Expose-MinecraftServer-isRunning.patch similarity index 90% rename from patches/server/0358-Expose-MinecraftServer-isRunning.patch rename to patches/server/0360-Expose-MinecraftServer-isRunning.patch index fb8eae4b4984..f85fdde8fd04 100644 --- a/patches/server/0358-Expose-MinecraftServer-isRunning.patch +++ b/patches/server/0360-Expose-MinecraftServer-isRunning.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Expose MinecraftServer#isRunning This allows for plugins to detect if the server is actually turning off in onDisable rather than just plugins reloading. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 6e986a657af35ce6175c30abd7c68e3e3a878b83..79839c8e98e0489391579960b08aef055da931e4 100644 +index 6c213d609972ac2fd9052057c07add57596d41b0..9a63b95ee80da386c1055976ffed8e032b67c903 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2763,5 +2763,10 @@ public final class CraftServer implements Server { diff --git a/patches/server/0359-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0361-Add-Raw-Byte-ItemStack-Serialization.patch similarity index 100% rename from patches/server/0359-Add-Raw-Byte-ItemStack-Serialization.patch rename to patches/server/0361-Add-Raw-Byte-ItemStack-Serialization.patch diff --git a/patches/server/0360-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0362-Pillager-patrol-spawn-settings-and-per-player-option.patch similarity index 100% rename from patches/server/0360-Pillager-patrol-spawn-settings-and-per-player-option.patch rename to patches/server/0362-Pillager-patrol-spawn-settings-and-per-player-option.patch diff --git a/patches/server/0361-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0363-Remote-Connections-shouldn-t-hold-up-shutdown.patch similarity index 100% rename from patches/server/0361-Remote-Connections-shouldn-t-hold-up-shutdown.patch rename to patches/server/0363-Remote-Connections-shouldn-t-hold-up-shutdown.patch diff --git a/patches/server/0362-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0364-Do-not-allow-bees-to-load-chunks-for-beehives.patch similarity index 100% rename from patches/server/0362-Do-not-allow-bees-to-load-chunks-for-beehives.patch rename to patches/server/0364-Do-not-allow-bees-to-load-chunks-for-beehives.patch diff --git a/patches/server/0363-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0365-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch similarity index 96% rename from patches/server/0363-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch rename to patches/server/0365-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch index dbfb02d9ce37..a9d149d2a688 100644 --- a/patches/server/0363-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch +++ b/patches/server/0365-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch @@ -25,7 +25,7 @@ index 1f30d06781cea0855be26784c239e71ed1a2f6c3..91373583904a22bc28c82cf3dfec9f60 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 e7847e03b94fed1a76f8a57d6b61f5f01a87615b..282d94ab6da3cefa68a7caee88d726ffa2f73b83 100644 +index 88abc0df7f5b9e285b10f412b58422b326b0a99a..19e7424d3098625b967e9fabb9681ffd9f09d16c 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -2466,7 +2466,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0364-Don-t-tick-dead-players.patch b/patches/server/0366-Don-t-tick-dead-players.patch similarity index 100% rename from patches/server/0364-Don-t-tick-dead-players.patch rename to patches/server/0366-Don-t-tick-dead-players.patch diff --git a/patches/server/0365-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0367-Dead-Player-s-shouldn-t-be-able-to-move.patch similarity index 100% rename from patches/server/0365-Dead-Player-s-shouldn-t-be-able-to-move.patch rename to patches/server/0367-Dead-Player-s-shouldn-t-be-able-to-move.patch diff --git a/patches/server/0366-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0368-Optimize-Collision-to-not-load-chunks.patch similarity index 100% rename from patches/server/0366-Optimize-Collision-to-not-load-chunks.patch rename to patches/server/0368-Optimize-Collision-to-not-load-chunks.patch diff --git a/patches/server/0367-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0369-Don-t-move-existing-players-to-world-spawn.patch similarity index 100% rename from patches/server/0367-Don-t-move-existing-players-to-world-spawn.patch rename to patches/server/0369-Don-t-move-existing-players-to-world-spawn.patch diff --git a/patches/server/0368-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0370-Optimize-GoalSelector-Goal.Flag-Set-operations.patch similarity index 100% rename from patches/server/0368-Optimize-GoalSelector-Goal.Flag-Set-operations.patch rename to patches/server/0370-Optimize-GoalSelector-Goal.Flag-Set-operations.patch diff --git a/patches/server/0369-Improved-Watchdog-Support.patch b/patches/server/0371-Improved-Watchdog-Support.patch similarity index 99% rename from patches/server/0369-Improved-Watchdog-Support.patch rename to patches/server/0371-Improved-Watchdog-Support.patch index 8568213430c8..1e1f1ae1f270 100644 --- a/patches/server/0369-Improved-Watchdog-Support.patch +++ b/patches/server/0371-Improved-Watchdog-Support.patch @@ -296,10 +296,10 @@ index f5829ae484d93b547a5437b85a9621346384a11b..83701fbfaa56a232593ee8f11a3afb89 } diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 9a6ed3aa55f988ed30669fab2a2513741eda399b..a9a4e27178a1d83812720f0d4d695b0d32badaf7 100644 +index 7a1886585bd00dc8213ce22130b8b6fea52c5cf6..52a44510d0499df56d2ebef0963fe8164eda7301 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java -@@ -901,6 +901,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -904,6 +904,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { try { tickConsumer.accept(entity); } catch (Throwable throwable) { @@ -308,7 +308,7 @@ index 9a6ed3aa55f988ed30669fab2a2513741eda399b..a9a4e27178a1d83812720f0d4d695b0d final String msg = String.format("Entity threw exception at %s:%s,%s,%s", entity.level().getWorld().getName(), entity.getX(), entity.getY(), entity.getZ()); MinecraftServer.LOGGER.error(msg, throwable); 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 7d85d805bdc7bb67dae2cab8bcd38368f519a85c..793077e38a0bced4f78d41c0555487cd955f45e9 100644 +index 95531e115f69f52cb6ec55c6e4bc34fb109758c4..cd725cdfe37eb53eea78f110d5d3ca00342781c5 100644 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java @@ -1180,6 +1180,7 @@ public class LevelChunk extends ChunkAccess { diff --git a/patches/server/0370-Optimize-Pathfinding.patch b/patches/server/0372-Optimize-Pathfinding.patch similarity index 100% rename from patches/server/0370-Optimize-Pathfinding.patch rename to patches/server/0372-Optimize-Pathfinding.patch diff --git a/patches/server/0371-Reduce-Either-Optional-allocation.patch b/patches/server/0373-Reduce-Either-Optional-allocation.patch similarity index 100% rename from patches/server/0371-Reduce-Either-Optional-allocation.patch rename to patches/server/0373-Reduce-Either-Optional-allocation.patch diff --git a/patches/server/0372-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/server/0374-Reduce-memory-footprint-of-NBTTagCompound.patch similarity index 100% rename from patches/server/0372-Reduce-memory-footprint-of-NBTTagCompound.patch rename to patches/server/0374-Reduce-memory-footprint-of-NBTTagCompound.patch diff --git a/patches/server/0373-Prevent-opening-inventories-when-frozen.patch b/patches/server/0375-Prevent-opening-inventories-when-frozen.patch similarity index 100% rename from patches/server/0373-Prevent-opening-inventories-when-frozen.patch rename to patches/server/0375-Prevent-opening-inventories-when-frozen.patch diff --git a/patches/server/0374-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0376-Don-t-run-entity-collision-code-if-not-needed.patch similarity index 100% rename from patches/server/0374-Don-t-run-entity-collision-code-if-not-needed.patch rename to patches/server/0376-Don-t-run-entity-collision-code-if-not-needed.patch diff --git a/patches/server/0375-Implement-Player-Client-Options-API.patch b/patches/server/0377-Implement-Player-Client-Options-API.patch similarity index 100% rename from patches/server/0375-Implement-Player-Client-Options-API.patch rename to patches/server/0377-Implement-Player-Client-Options-API.patch diff --git a/patches/server/0376-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0378-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch similarity index 100% rename from patches/server/0376-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch rename to patches/server/0378-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch diff --git a/patches/server/0377-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/server/0379-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch similarity index 100% rename from patches/server/0377-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch rename to patches/server/0379-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch diff --git a/patches/server/0378-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0380-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch similarity index 100% rename from patches/server/0378-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch rename to patches/server/0380-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch diff --git a/patches/server/0379-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0381-Add-PlayerAttackEntityCooldownResetEvent.patch similarity index 100% rename from patches/server/0379-Add-PlayerAttackEntityCooldownResetEvent.patch rename to patches/server/0381-Add-PlayerAttackEntityCooldownResetEvent.patch diff --git a/patches/server/0380-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0382-Don-t-fire-BlockFade-on-worldgen-threads.patch similarity index 100% rename from patches/server/0380-Don-t-fire-BlockFade-on-worldgen-threads.patch rename to patches/server/0382-Don-t-fire-BlockFade-on-worldgen-threads.patch diff --git a/patches/server/0381-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0383-Add-phantom-creative-and-insomniac-controls.patch similarity index 100% rename from patches/server/0381-Add-phantom-creative-and-insomniac-controls.patch rename to patches/server/0383-Add-phantom-creative-and-insomniac-controls.patch diff --git a/patches/server/0382-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/server/0384-Fix-numerous-item-duplication-issues-and-teleport-is.patch similarity index 100% rename from patches/server/0382-Fix-numerous-item-duplication-issues-and-teleport-is.patch rename to patches/server/0384-Fix-numerous-item-duplication-issues-and-teleport-is.patch diff --git a/patches/server/0383-Villager-Restocks-API.patch b/patches/server/0385-Villager-Restocks-API.patch similarity index 100% rename from patches/server/0383-Villager-Restocks-API.patch rename to patches/server/0385-Villager-Restocks-API.patch diff --git a/patches/server/0384-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0386-Validate-PickItem-Packet-and-kick-for-invalid.patch similarity index 100% rename from patches/server/0384-Validate-PickItem-Packet-and-kick-for-invalid.patch rename to patches/server/0386-Validate-PickItem-Packet-and-kick-for-invalid.patch diff --git a/patches/server/0385-Expose-game-version.patch b/patches/server/0387-Expose-game-version.patch similarity index 89% rename from patches/server/0385-Expose-game-version.patch rename to patches/server/0387-Expose-game-version.patch index 7cd7a4ea6061..1ae7f7b7467b 100644 --- a/patches/server/0385-Expose-game-version.patch +++ b/patches/server/0387-Expose-game-version.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Expose game version diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 79839c8e98e0489391579960b08aef055da931e4..eb74938bd7429e19d675557626fe8fe3f1f691a3 100644 +index 9a63b95ee80da386c1055976ffed8e032b67c903..c4c0e55920f0e833f5a8c77ce199cbb271dd3313 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -584,6 +584,13 @@ public final class CraftServer implements Server { diff --git a/patches/server/0386-Optimize-Voxel-Shape-Merging.patch b/patches/server/0388-Optimize-Voxel-Shape-Merging.patch similarity index 100% rename from patches/server/0386-Optimize-Voxel-Shape-Merging.patch rename to patches/server/0388-Optimize-Voxel-Shape-Merging.patch diff --git a/patches/server/0387-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0389-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch similarity index 100% rename from patches/server/0387-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch rename to patches/server/0389-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch diff --git a/patches/server/0388-misc-debugging-dumps.patch b/patches/server/0390-misc-debugging-dumps.patch similarity index 98% rename from patches/server/0388-misc-debugging-dumps.patch rename to patches/server/0390-misc-debugging-dumps.patch index 59ca3ab1b41c..037edf800c2e 100644 --- a/patches/server/0388-misc-debugging-dumps.patch +++ b/patches/server/0390-misc-debugging-dumps.patch @@ -74,7 +74,7 @@ index ed80d9551cd7cc1ec26a5d5fd7bc185b38fddd78..77e19f345bf68d12686a65e669cd597c this.connection.disconnect(ServerConfigurationPacketListenerImpl.DISCONNECT_REASON_INVALID_DATA); } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index eb74938bd7429e19d675557626fe8fe3f1f691a3..e0adcbfb44284602c60bd140b5232a6e1c3b9c8f 100644 +index c4c0e55920f0e833f5a8c77ce199cbb271dd3313..633cd70f8390c4aa9a9b52054f8b58106ae079e6 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1008,6 +1008,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0389-Prevent-teleporting-dead-entities.patch b/patches/server/0391-Prevent-teleporting-dead-entities.patch similarity index 100% rename from patches/server/0389-Prevent-teleporting-dead-entities.patch rename to patches/server/0391-Prevent-teleporting-dead-entities.patch diff --git a/patches/server/0390-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0392-Deobfuscate-stacktraces-in-log-messages-crash-report.patch similarity index 99% rename from patches/server/0390-Deobfuscate-stacktraces-in-log-messages-crash-report.patch rename to patches/server/0392-Deobfuscate-stacktraces-in-log-messages-crash-report.patch index 1bc586732d77..a0f9fd4934d8 100644 --- a/patches/server/0390-Deobfuscate-stacktraces-in-log-messages-crash-report.patch +++ b/patches/server/0392-Deobfuscate-stacktraces-in-log-messages-crash-report.patch @@ -536,7 +536,7 @@ index f43e5a83b9220eb23a777fa7490b49aac440bea0..1f8dcc331505890ba72777b5d0cda242 paperConfigurations.initializeWorldDefaultsConfiguration(); org.spigotmc.WatchdogThread.doStart(org.spigotmc.SpigotConfig.timeoutTime, org.spigotmc.SpigotConfig.restartOnCrash); diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 282d94ab6da3cefa68a7caee88d726ffa2f73b83..5efd4d512f0a5ea90ff0f3131a91271310da8be0 100644 +index 19e7424d3098625b967e9fabb9681ffd9f09d16c..8467ea174dd48010b94b3f3c84ce097ecbb2ef14 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -221,7 +221,9 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -612,7 +612,7 @@ index 5db27d7bcaaa2eeaeeb08401513d8d23f6cb63c7..ce43cb0152ba07c6c21e08142d65813d } } 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 793077e38a0bced4f78d41c0555487cd955f45e9..7fccb874ca2de82cc652a440bd250d0d1295397d 100644 +index cd725cdfe37eb53eea78f110d5d3ca00342781c5..c4d2036d51fe16b640605ae26a2b71323758cc26 100644 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java @@ -603,7 +603,7 @@ public class LevelChunk extends ChunkAccess { diff --git a/patches/server/0391-Implement-Mob-Goal-API.patch b/patches/server/0393-Implement-Mob-Goal-API.patch similarity index 99% rename from patches/server/0391-Implement-Mob-Goal-API.patch rename to patches/server/0393-Implement-Mob-Goal-API.patch index 487546a6c6a1..3d535930fefe 100644 --- a/patches/server/0391-Implement-Mob-Goal-API.patch +++ b/patches/server/0393-Implement-Mob-Goal-API.patch @@ -792,7 +792,7 @@ index 4379b9948f1eecfe6fd7dea98e298ad5f761019a..3f081183521603824430709886a9cc31 LOOK, JUMP, diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index e0adcbfb44284602c60bd140b5232a6e1c3b9c8f..f9672add712045eb53d46ff849ba9caf72149a02 100644 +index 633cd70f8390c4aa9a9b52054f8b58106ae079e6..83ff2373ba5ec4b862170e0c1ff2d84deb7df5eb 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2776,5 +2776,11 @@ public final class CraftServer implements Server { diff --git a/patches/server/0392-Add-villager-reputation-API.patch b/patches/server/0394-Add-villager-reputation-API.patch similarity index 100% rename from patches/server/0392-Add-villager-reputation-API.patch rename to patches/server/0394-Add-villager-reputation-API.patch diff --git a/patches/server/0393-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0395-Option-for-maximum-exp-value-when-merging-orbs.patch similarity index 100% rename from patches/server/0393-Option-for-maximum-exp-value-when-merging-orbs.patch rename to patches/server/0395-Option-for-maximum-exp-value-when-merging-orbs.patch diff --git a/patches/server/0394-ExperienceOrbMergeEvent.patch b/patches/server/0396-ExperienceOrbMergeEvent.patch similarity index 100% rename from patches/server/0394-ExperienceOrbMergeEvent.patch rename to patches/server/0396-ExperienceOrbMergeEvent.patch diff --git a/patches/server/0395-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0397-Fix-PotionEffect-ignores-icon-flag.patch similarity index 100% rename from patches/server/0395-Fix-PotionEffect-ignores-icon-flag.patch rename to patches/server/0397-Fix-PotionEffect-ignores-icon-flag.patch diff --git a/patches/server/0396-Optimize-brigadier-child-sorting-performance.patch b/patches/server/0398-Optimize-brigadier-child-sorting-performance.patch similarity index 100% rename from patches/server/0396-Optimize-brigadier-child-sorting-performance.patch rename to patches/server/0398-Optimize-brigadier-child-sorting-performance.patch diff --git a/patches/server/0397-Potential-bed-API.patch b/patches/server/0399-Potential-bed-API.patch similarity index 100% rename from patches/server/0397-Potential-bed-API.patch rename to patches/server/0399-Potential-bed-API.patch diff --git a/patches/server/0398-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0400-Wait-for-Async-Tasks-during-shutdown.patch similarity index 96% rename from patches/server/0398-Wait-for-Async-Tasks-during-shutdown.patch rename to patches/server/0400-Wait-for-Async-Tasks-during-shutdown.patch index f033ff0e3f2f..c1fdfb149e34 100644 --- a/patches/server/0398-Wait-for-Async-Tasks-during-shutdown.patch +++ b/patches/server/0400-Wait-for-Async-Tasks-during-shutdown.patch @@ -22,7 +22,7 @@ index a107751a13ccef2729068e9b9822509374d20187..e2b4e7fb68aeaa2a95f3d1dfdd045217 // CraftBukkit end this.getConnection().stop(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index f9672add712045eb53d46ff849ba9caf72149a02..858bad98e46a0eec5e9b2b34acf956728b2a0f6d 100644 +index 83ff2373ba5ec4b862170e0c1ff2d84deb7df5eb..ab4dc88090107b713051eb31d7dd425dd96cdc8e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1018,6 +1018,31 @@ public final class CraftServer implements Server { diff --git a/patches/server/0399-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0401-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch similarity index 100% rename from patches/server/0399-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch rename to patches/server/0401-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch diff --git a/patches/server/0400-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0402-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch similarity index 98% rename from patches/server/0400-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch rename to patches/server/0402-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch index 48db3a4242d4..7124d4bad5e5 100644 --- a/patches/server/0400-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch +++ b/patches/server/0402-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch @@ -34,10 +34,10 @@ index c0227cda09b9ca508c1de1fbe1e57afd743a9426..93529defa5d36bb9b4c69eedda9b7ac3 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 a9a4e27178a1d83812720f0d4d695b0d32badaf7..0a6fcbc876f787c71770e7244a15f342f1fd4670 100644 +index 52a44510d0499df56d2ebef0963fe8164eda7301..221a1e66814dda35feff9fa9ca0fe54feec335f9 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java -@@ -516,6 +516,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -518,6 +518,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable { public boolean setBlock(BlockPos pos, BlockState state, int flags, int maxUpdateDepth) { // CraftBukkit start - tree generation if (this.captureTreeGeneration) { diff --git a/patches/server/0401-Ensure-safe-gateway-teleport.patch b/patches/server/0403-Ensure-safe-gateway-teleport.patch similarity index 100% rename from patches/server/0401-Ensure-safe-gateway-teleport.patch rename to patches/server/0403-Ensure-safe-gateway-teleport.patch diff --git a/patches/server/0402-Add-option-for-console-having-all-permissions.patch b/patches/server/0404-Add-option-for-console-having-all-permissions.patch similarity index 100% rename from patches/server/0402-Add-option-for-console-having-all-permissions.patch rename to patches/server/0404-Add-option-for-console-having-all-permissions.patch diff --git a/patches/server/0403-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0405-Fix-villager-trading-demand-MC-163962.patch similarity index 100% rename from patches/server/0403-Fix-villager-trading-demand-MC-163962.patch rename to patches/server/0405-Fix-villager-trading-demand-MC-163962.patch diff --git a/patches/server/0404-Maps-shouldn-t-load-chunks.patch b/patches/server/0406-Maps-shouldn-t-load-chunks.patch similarity index 100% rename from patches/server/0404-Maps-shouldn-t-load-chunks.patch rename to patches/server/0406-Maps-shouldn-t-load-chunks.patch diff --git a/patches/server/0405-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0407-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch similarity index 100% rename from patches/server/0405-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch rename to patches/server/0407-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch diff --git a/patches/server/0406-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0408-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch similarity index 100% rename from patches/server/0406-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch rename to patches/server/0408-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch diff --git a/patches/server/0407-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0409-Fix-piston-physics-inconsistency-MC-188840.patch similarity index 100% rename from patches/server/0407-Fix-piston-physics-inconsistency-MC-188840.patch rename to patches/server/0409-Fix-piston-physics-inconsistency-MC-188840.patch diff --git a/patches/server/0408-Fix-sand-duping.patch b/patches/server/0410-Fix-sand-duping.patch similarity index 100% rename from patches/server/0408-Fix-sand-duping.patch rename to patches/server/0410-Fix-sand-duping.patch diff --git a/patches/server/0409-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0411-Fix-missing-chunks-due-to-integer-overflow.patch similarity index 100% rename from patches/server/0409-Fix-missing-chunks-due-to-integer-overflow.patch rename to patches/server/0411-Fix-missing-chunks-due-to-integer-overflow.patch diff --git a/patches/server/0410-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/server/0412-Prevent-position-desync-in-playerconnection-causing-.patch similarity index 100% rename from patches/server/0410-Prevent-position-desync-in-playerconnection-causing-.patch rename to patches/server/0412-Prevent-position-desync-in-playerconnection-causing-.patch diff --git a/patches/server/0411-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0413-Inventory-getHolder-method-without-block-snapshot.patch similarity index 100% rename from patches/server/0411-Inventory-getHolder-method-without-block-snapshot.patch rename to patches/server/0413-Inventory-getHolder-method-without-block-snapshot.patch diff --git a/patches/server/0412-Improve-Arrow-API.patch b/patches/server/0414-Improve-Arrow-API.patch similarity index 100% rename from patches/server/0412-Improve-Arrow-API.patch rename to patches/server/0414-Improve-Arrow-API.patch diff --git a/patches/server/0413-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0415-Add-and-implement-PlayerRecipeBookClickEvent.patch similarity index 100% rename from patches/server/0413-Add-and-implement-PlayerRecipeBookClickEvent.patch rename to patches/server/0415-Add-and-implement-PlayerRecipeBookClickEvent.patch diff --git a/patches/server/0414-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0416-Hide-sync-chunk-writes-behind-flag.patch similarity index 100% rename from patches/server/0414-Hide-sync-chunk-writes-behind-flag.patch rename to patches/server/0416-Hide-sync-chunk-writes-behind-flag.patch diff --git a/patches/server/0415-Add-permission-for-command-blocks.patch b/patches/server/0417-Add-permission-for-command-blocks.patch similarity index 97% rename from patches/server/0415-Add-permission-for-command-blocks.patch rename to patches/server/0417-Add-permission-for-command-blocks.patch index d07f72b79093..9c9308838bc2 100644 --- a/patches/server/0415-Add-permission-for-command-blocks.patch +++ b/patches/server/0417-Add-permission-for-command-blocks.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add permission for command blocks diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -index bdf11a98614c9c12d3112f437651be81d0d9872a..3622708c453feb6da3d5be192291d63abbe83068 100644 +index 58a1a54b676922ef0862dcab98e7aada5de80311..cf47536a2e37d53406fc9cb3f09095e034af8e15 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -@@ -402,7 +402,7 @@ public class ServerPlayerGameMode { +@@ -404,7 +404,7 @@ public class ServerPlayerGameMode { BlockEntity tileentity = this.level.getBlockEntity(pos); Block block = iblockdata.getBlock(); diff --git a/patches/server/0416-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0418-Ensure-Entity-AABB-s-are-never-invalid.patch similarity index 100% rename from patches/server/0416-Ensure-Entity-AABB-s-are-never-invalid.patch rename to patches/server/0418-Ensure-Entity-AABB-s-are-never-invalid.patch diff --git a/patches/server/0417-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0419-Fix-Per-World-Difficulty-Remembering-Difficulty.patch similarity index 97% rename from patches/server/0417-Fix-Per-World-Difficulty-Remembering-Difficulty.patch rename to patches/server/0419-Fix-Per-World-Difficulty-Remembering-Difficulty.patch index 6856f7d5aad8..d065dcce24a5 100644 --- a/patches/server/0417-Fix-Per-World-Difficulty-Remembering-Difficulty.patch +++ b/patches/server/0419-Fix-Per-World-Difficulty-Remembering-Difficulty.patch @@ -102,7 +102,7 @@ index b664a4ae7b10ce3ea83186a6112c0db0cbd6112a..c3844274b185decd92d021e7c7343adb } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 858bad98e46a0eec5e9b2b34acf956728b2a0f6d..882801984304b8570669bc0ff9388fbfc3846dcf 100644 +index ab4dc88090107b713051eb31d7dd425dd96cdc8e..500f903b6ef6fa352b51696bd5be0a650ae6d2f1 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -957,8 +957,8 @@ public final class CraftServer implements Server { @@ -117,10 +117,10 @@ index 858bad98e46a0eec5e9b2b34acf956728b2a0f6d..882801984304b8570669bc0ff9388fbf for (SpawnCategory spawnCategory : SpawnCategory.values()) { if (CraftSpawnCategory.isValidForLimits(spawnCategory)) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 0a9cf69ce0983f167ce63dc58eace455561da8e7..40a3a1e0bfb8c274b8de56d1ac3edca6c170296c 100644 +index 83df374d5f471a9a40c670a7496a8a03970d10a3..047f2e4ff74089ae6e99db4d622f4c109869717a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1145,7 +1145,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -1150,7 +1150,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { @Override public void setDifficulty(Difficulty difficulty) { diff --git a/patches/server/0418-Paper-dumpitem-command.patch b/patches/server/0420-Paper-dumpitem-command.patch similarity index 100% rename from patches/server/0418-Paper-dumpitem-command.patch rename to patches/server/0420-Paper-dumpitem-command.patch diff --git a/patches/server/0419-Improve-Legacy-Component-serialization-size.patch b/patches/server/0421-Improve-Legacy-Component-serialization-size.patch similarity index 100% rename from patches/server/0419-Improve-Legacy-Component-serialization-size.patch rename to patches/server/0421-Improve-Legacy-Component-serialization-size.patch diff --git a/patches/server/0420-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0422-Optimize-Bit-Operations-by-inlining.patch similarity index 100% rename from patches/server/0420-Optimize-Bit-Operations-by-inlining.patch rename to patches/server/0422-Optimize-Bit-Operations-by-inlining.patch diff --git a/patches/server/0421-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0423-Add-Plugin-Tickets-to-API-Chunk-Methods.patch similarity index 94% rename from patches/server/0421-Add-Plugin-Tickets-to-API-Chunk-Methods.patch rename to patches/server/0423-Add-Plugin-Tickets-to-API-Chunk-Methods.patch index c84336bf3786..7424225e4b24 100644 --- a/patches/server/0421-Add-Plugin-Tickets-to-API-Chunk-Methods.patch +++ b/patches/server/0423-Add-Plugin-Tickets-to-API-Chunk-Methods.patch @@ -22,7 +22,7 @@ wants it to collect even faster, they can restore that setting back to 1 instead Not adding it to .getType() though to keep behavior consistent with vanilla for performance reasons. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 882801984304b8570669bc0ff9388fbfc3846dcf..aa8b58a51792b1e4e6d18e13f06f697e3e2ebe72 100644 +index 500f903b6ef6fa352b51696bd5be0a650ae6d2f1..c0871d8a7ab38a881a03c5d1f18d8d8ca9e5b993 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -384,7 +384,7 @@ public final class CraftServer implements Server { @@ -44,7 +44,7 @@ index 882801984304b8570669bc0ff9388fbfc3846dcf..aa8b58a51792b1e4e6d18e13f06f697e this.printSaveWarning = false; console.autosavePeriod = this.configuration.getInt("ticks-per.autosave"); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 40a3a1e0bfb8c274b8de56d1ac3edca6c170296c..53d4f1687527f383841ecc35ffc16d8bf8eefb78 100644 +index 047f2e4ff74089ae6e99db4d622f4c109869717a..8cd35efe17cd6cf06fa77cc0e3b018f3437ef71f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -279,7 +279,13 @@ public class CraftWorld extends CraftRegionAccessor implements World { @@ -84,7 +84,7 @@ index 40a3a1e0bfb8c274b8de56d1ac3edca6c170296c..53d4f1687527f383841ecc35ffc16d8b } return true; -@@ -439,9 +451,12 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -444,9 +456,12 @@ public class CraftWorld extends CraftRegionAccessor implements World { org.spigotmc.AsyncCatcher.catchOp("chunk load"); // Spigot // Paper start - Optimize this method ChunkPos chunkPos = new ChunkPos(x, z); @@ -98,7 +98,7 @@ index 40a3a1e0bfb8c274b8de56d1ac3edca6c170296c..53d4f1687527f383841ecc35ffc16d8b if (immediate == null) { immediate = world.getChunkSource().chunkMap.getUnloadingChunk(x, z); } -@@ -449,7 +464,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -454,7 +469,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { if (!(immediate instanceof ImposterProtoChunk) && !(immediate instanceof net.minecraft.world.level.chunk.LevelChunk)) { return false; // not full status } @@ -107,7 +107,7 @@ index 40a3a1e0bfb8c274b8de56d1ac3edca6c170296c..53d4f1687527f383841ecc35ffc16d8b world.getChunk(x, z); // make sure we're at ticket level 32 or lower return true; } -@@ -475,7 +490,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -480,7 +495,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { // we do this so we do not re-read the chunk data on disk } @@ -116,7 +116,7 @@ index 40a3a1e0bfb8c274b8de56d1ac3edca6c170296c..53d4f1687527f383841ecc35ffc16d8b world.getChunkSource().getChunk(x, z, ChunkStatus.FULL, true); return true; // Paper end -@@ -2203,6 +2218,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -2208,6 +2223,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { io.papermc.paper.chunk.system.ChunkSystem.scheduleChunkLoad(this.getHandle(), x, z, gen, ChunkStatus.FULL, true, priority, (c) -> { net.minecraft.server.MinecraftServer.getServer().scheduleOnMain(() -> { net.minecraft.world.level.chunk.LevelChunk chunk = (net.minecraft.world.level.chunk.LevelChunk)c; diff --git a/patches/server/0422-incremental-chunk-and-player-saving.patch b/patches/server/0424-incremental-chunk-and-player-saving.patch similarity index 98% rename from patches/server/0422-incremental-chunk-and-player-saving.patch rename to patches/server/0424-incremental-chunk-and-player-saving.patch index 0811e5a9c84c..b68fc8af5748 100644 --- a/patches/server/0422-incremental-chunk-and-player-saving.patch +++ b/patches/server/0424-incremental-chunk-and-player-saving.patch @@ -73,7 +73,7 @@ index 7881a34e01dd6c8e31b55577bb9323a0171d24bf..7b5851cd4f5a91bf7609464d7d6c4bb5 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 5efd4d512f0a5ea90ff0f3131a91271310da8be0..6bb89597035894f9aedc52469a38f87f2be91893 100644 +index 8467ea174dd48010b94b3f3c84ce097ecbb2ef14..5826536978724b54080d7d4ee61aa79800d57800 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1283,6 +1283,37 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0423-Support-old-UUID-format-for-NBT.patch b/patches/server/0425-Support-old-UUID-format-for-NBT.patch similarity index 100% rename from patches/server/0423-Support-old-UUID-format-for-NBT.patch rename to patches/server/0425-Support-old-UUID-format-for-NBT.patch diff --git a/patches/server/0424-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0426-Convert-legacy-attributes-in-Item-Meta.patch similarity index 100% rename from patches/server/0424-Convert-legacy-attributes-in-Item-Meta.patch rename to patches/server/0426-Convert-legacy-attributes-in-Item-Meta.patch diff --git a/patches/server/0425-Remove-some-streams-from-structures.patch b/patches/server/0427-Remove-some-streams-from-structures.patch similarity index 100% rename from patches/server/0425-Remove-some-streams-from-structures.patch rename to patches/server/0427-Remove-some-streams-from-structures.patch diff --git a/patches/server/0426-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0428-Remove-streams-from-classes-related-villager-gossip.patch similarity index 100% rename from patches/server/0426-Remove-streams-from-classes-related-villager-gossip.patch rename to patches/server/0428-Remove-streams-from-classes-related-villager-gossip.patch diff --git a/patches/server/0427-Support-components-in-ItemMeta.patch b/patches/server/0429-Support-components-in-ItemMeta.patch similarity index 100% rename from patches/server/0427-Support-components-in-ItemMeta.patch rename to patches/server/0429-Support-components-in-ItemMeta.patch diff --git a/patches/server/0428-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/server/0430-Improve-fix-EntityTargetLivingEntityEvent.patch similarity index 100% rename from patches/server/0428-Improve-fix-EntityTargetLivingEntityEvent.patch rename to patches/server/0430-Improve-fix-EntityTargetLivingEntityEvent.patch diff --git a/patches/server/0429-Add-entity-liquid-API.patch b/patches/server/0431-Add-entity-liquid-API.patch similarity index 100% rename from patches/server/0429-Add-entity-liquid-API.patch rename to patches/server/0431-Add-entity-liquid-API.patch diff --git a/patches/server/0430-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0432-Update-itemstack-legacy-name-and-lore.patch similarity index 100% rename from patches/server/0430-Update-itemstack-legacy-name-and-lore.patch rename to patches/server/0432-Update-itemstack-legacy-name-and-lore.patch diff --git a/patches/server/0431-Spawn-player-in-correct-world-on-login.patch b/patches/server/0433-Spawn-player-in-correct-world-on-login.patch similarity index 100% rename from patches/server/0431-Spawn-player-in-correct-world-on-login.patch rename to patches/server/0433-Spawn-player-in-correct-world-on-login.patch diff --git a/patches/server/0432-Add-PrepareResultEvent.patch b/patches/server/0434-Add-PrepareResultEvent.patch similarity index 100% rename from patches/server/0432-Add-PrepareResultEvent.patch rename to patches/server/0434-Add-PrepareResultEvent.patch diff --git a/patches/server/0433-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0435-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch similarity index 100% rename from patches/server/0433-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch rename to patches/server/0435-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch diff --git a/patches/server/0434-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0436-Fix-arrows-never-despawning-MC-125757.patch similarity index 100% rename from patches/server/0434-Fix-arrows-never-despawning-MC-125757.patch rename to patches/server/0436-Fix-arrows-never-despawning-MC-125757.patch diff --git a/patches/server/0435-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0437-Thread-Safe-Vanilla-Command-permission-checking.patch similarity index 100% rename from patches/server/0435-Thread-Safe-Vanilla-Command-permission-checking.patch rename to patches/server/0437-Thread-Safe-Vanilla-Command-permission-checking.patch diff --git a/patches/server/0436-Fix-SPIGOT-5989.patch b/patches/server/0438-Fix-SPIGOT-5989.patch similarity index 100% rename from patches/server/0436-Fix-SPIGOT-5989.patch rename to patches/server/0438-Fix-SPIGOT-5989.patch diff --git a/patches/server/0437-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0439-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch similarity index 100% rename from patches/server/0437-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch rename to patches/server/0439-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch diff --git a/patches/server/0438-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0440-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch similarity index 100% rename from patches/server/0438-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch rename to patches/server/0440-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch diff --git a/patches/server/0439-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0441-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch similarity index 100% rename from patches/server/0439-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch rename to patches/server/0441-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch diff --git a/patches/server/0440-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0442-Optimize-NetworkManager-Exception-Handling.patch similarity index 100% rename from patches/server/0440-Optimize-NetworkManager-Exception-Handling.patch rename to patches/server/0442-Optimize-NetworkManager-Exception-Handling.patch diff --git a/patches/server/0441-Fix-some-rails-connecting-improperly.patch b/patches/server/0443-Fix-some-rails-connecting-improperly.patch similarity index 100% rename from patches/server/0441-Fix-some-rails-connecting-improperly.patch rename to patches/server/0443-Fix-some-rails-connecting-improperly.patch diff --git a/patches/server/0442-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0444-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch similarity index 100% rename from patches/server/0442-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch rename to patches/server/0444-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch diff --git a/patches/server/0443-Brand-support.patch b/patches/server/0445-Brand-support.patch similarity index 100% rename from patches/server/0443-Brand-support.patch rename to patches/server/0445-Brand-support.patch diff --git a/patches/server/0444-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0446-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from patches/server/0444-Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/server/0446-Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/patches/server/0445-Don-t-require-FACING-data.patch b/patches/server/0447-Don-t-require-FACING-data.patch similarity index 100% rename from patches/server/0445-Don-t-require-FACING-data.patch rename to patches/server/0447-Don-t-require-FACING-data.patch diff --git a/patches/server/0446-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0448-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch similarity index 93% rename from patches/server/0446-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch rename to patches/server/0448-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch index 05ea1c1cfd85..ffc73c72a845 100644 --- a/patches/server/0446-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch +++ b/patches/server/0448-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 6bb89597035894f9aedc52469a38f87f2be91893..2e2c85e58d311bff6fb65d7757987e42d1537ffe 100644 +index 5826536978724b54080d7d4ee61aa79800d57800..197ef343cb2d7a072852dc36964d54d5b9e72529 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1996,9 +1996,11 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -21,7 +21,7 @@ index 6bb89597035894f9aedc52469a38f87f2be91893..2e2c85e58d311bff6fb65d7757987e42 // if this keepSpawnInMemory is false a plugin has already removed our tickets, do not re-add this.removeTicketsForSpawn(this.paperConfig().spawn.keepSpawnLoadedRange * 16, prevSpawn); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 53d4f1687527f383841ecc35ffc16d8bf8eefb78..0f448e2652eb1d334bf9b8d6343e680365cc9e0b 100644 +index 8cd35efe17cd6cf06fa77cc0e3b018f3437ef71f..54c7316ff9d9f9352a1cf01bd508830130988a05 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -259,12 +259,14 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0447-Add-moon-phase-API.patch b/patches/server/0449-Add-moon-phase-API.patch similarity index 100% rename from patches/server/0447-Add-moon-phase-API.patch rename to patches/server/0449-Add-moon-phase-API.patch diff --git a/patches/server/0448-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0450-Do-not-let-the-server-load-chunks-from-newer-version.patch similarity index 95% rename from patches/server/0448-Do-not-let-the-server-load-chunks-from-newer-version.patch rename to patches/server/0450-Do-not-let-the-server-load-chunks-from-newer-version.patch index 2d4f5a549cf9..977fecbd78ee 100644 --- a/patches/server/0448-Do-not-let-the-server-load-chunks-from-newer-version.patch +++ b/patches/server/0450-Do-not-let-the-server-load-chunks-from-newer-version.patch @@ -9,7 +9,7 @@ the game, immediately stop the server to prevent data corruption. You can override this functionality at your own peril. diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java -index 982fb3ef071d6a66f16744717e8e146bef6d9e8c..9a4fa3e034108528197cca3d040d210fa819af8b 100644 +index 02beedb84a8bec001270116c6ce496db012e6b8a..19b35d1c07c75b27cef9a53258a68ec5d9f721d5 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java @@ -124,8 +124,20 @@ public class ChunkSerializer { diff --git a/patches/server/0449-Prevent-headless-pistons-from-being-created.patch b/patches/server/0451-Prevent-headless-pistons-from-being-created.patch similarity index 100% rename from patches/server/0449-Prevent-headless-pistons-from-being-created.patch rename to patches/server/0451-Prevent-headless-pistons-from-being-created.patch diff --git a/patches/server/0450-Add-BellRingEvent.patch b/patches/server/0452-Add-BellRingEvent.patch similarity index 100% rename from patches/server/0450-Add-BellRingEvent.patch rename to patches/server/0452-Add-BellRingEvent.patch diff --git a/patches/server/0451-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0453-Add-zombie-targets-turtle-egg-config.patch similarity index 100% rename from patches/server/0451-Add-zombie-targets-turtle-egg-config.patch rename to patches/server/0453-Add-zombie-targets-turtle-egg-config.patch diff --git a/patches/server/0452-Buffer-joins-to-world.patch b/patches/server/0454-Buffer-joins-to-world.patch similarity index 100% rename from patches/server/0452-Buffer-joins-to-world.patch rename to patches/server/0454-Buffer-joins-to-world.patch diff --git a/patches/server/0453-Eigencraft-redstone-implementation.patch b/patches/server/0455-Eigencraft-redstone-implementation.patch similarity index 100% rename from patches/server/0453-Eigencraft-redstone-implementation.patch rename to patches/server/0455-Eigencraft-redstone-implementation.patch diff --git a/patches/server/0454-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0456-Fix-hex-colors-not-working-in-some-kick-messages.patch similarity index 100% rename from patches/server/0454-Fix-hex-colors-not-working-in-some-kick-messages.patch rename to patches/server/0456-Fix-hex-colors-not-working-in-some-kick-messages.patch diff --git a/patches/server/0455-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0457-PortalCreateEvent-needs-to-know-its-entity.patch similarity index 100% rename from patches/server/0455-PortalCreateEvent-needs-to-know-its-entity.patch rename to patches/server/0457-PortalCreateEvent-needs-to-know-its-entity.patch diff --git a/patches/server/0456-Add-more-Evoker-API.patch b/patches/server/0458-Add-more-Evoker-API.patch similarity index 100% rename from patches/server/0456-Add-more-Evoker-API.patch rename to patches/server/0458-Add-more-Evoker-API.patch diff --git a/patches/server/0457-Add-methods-to-get-translation-keys.patch b/patches/server/0459-Add-methods-to-get-translation-keys.patch similarity index 100% rename from patches/server/0457-Add-methods-to-get-translation-keys.patch rename to patches/server/0459-Add-methods-to-get-translation-keys.patch diff --git a/patches/server/0458-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0460-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from patches/server/0458-Create-HoverEvent-from-ItemStack-Entity.patch rename to patches/server/0460-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/patches/server/0459-Cache-block-data-strings.patch b/patches/server/0461-Cache-block-data-strings.patch similarity index 100% rename from patches/server/0459-Cache-block-data-strings.patch rename to patches/server/0461-Cache-block-data-strings.patch diff --git a/patches/server/0460-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0462-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch similarity index 100% rename from patches/server/0460-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch rename to patches/server/0462-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch diff --git a/patches/server/0461-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0463-Add-additional-open-container-api-to-HumanEntity.patch similarity index 100% rename from patches/server/0461-Add-additional-open-container-api-to-HumanEntity.patch rename to patches/server/0463-Add-additional-open-container-api-to-HumanEntity.patch diff --git a/patches/server/0462-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0464-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch similarity index 100% rename from patches/server/0462-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch rename to patches/server/0464-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch diff --git a/patches/server/0463-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0465-Extend-block-drop-capture-to-capture-all-items-added.patch similarity index 91% rename from patches/server/0463-Extend-block-drop-capture-to-capture-all-items-added.patch rename to patches/server/0465-Extend-block-drop-capture-to-capture-all-items-added.patch index 1098391a7766..374003b163ae 100644 --- a/patches/server/0463-Extend-block-drop-capture-to-capture-all-items-added.patch +++ b/patches/server/0465-Extend-block-drop-capture-to-capture-all-items-added.patch @@ -6,7 +6,7 @@ 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 2e2c85e58d311bff6fb65d7757987e42d1537ffe..c5a005352e540f004dd92ff4b867f427e4e3b701 100644 +index 197ef343cb2d7a072852dc36964d54d5b9e72529..4ad4faf17dcedefc7add11af180d744a5c2f31a8 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1509,6 +1509,12 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -23,10 +23,10 @@ index 2e2c85e58d311bff6fb65d7757987e42d1537ffe..c5a005352e540f004dd92ff4b867f427 if (spawnReason != null && !CraftEventFactory.doEntityAddEventCalling(this, entity, spawnReason)) { return false; diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -index 3622708c453feb6da3d5be192291d63abbe83068..89f0c3d6e4dc9701f02fa7ed5331c3969de81ffc 100644 +index cf47536a2e37d53406fc9cb3f09095e034af8e15..c256423e9dc9d1837b847da44fb2920c58842c8b 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -@@ -434,10 +434,12 @@ public class ServerPlayerGameMode { +@@ -436,10 +436,12 @@ public class ServerPlayerGameMode { // return true; // CraftBukkit } // CraftBukkit start diff --git a/patches/server/0464-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0466-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch similarity index 100% rename from patches/server/0464-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch rename to patches/server/0466-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch diff --git a/patches/server/0465-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0467-Lazily-track-plugin-scoreboards-by-default.patch similarity index 100% rename from patches/server/0465-Lazily-track-plugin-scoreboards-by-default.patch rename to patches/server/0467-Lazily-track-plugin-scoreboards-by-default.patch diff --git a/patches/server/0466-Entity-isTicking.patch b/patches/server/0468-Entity-isTicking.patch similarity index 100% rename from patches/server/0466-Entity-isTicking.patch rename to patches/server/0468-Entity-isTicking.patch diff --git a/patches/server/0467-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0469-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch similarity index 100% rename from patches/server/0467-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch rename to patches/server/0469-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch diff --git a/patches/server/0468-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0470-Fix-Concurrency-issue-in-ShufflingList.patch similarity index 100% rename from patches/server/0468-Fix-Concurrency-issue-in-ShufflingList.patch rename to patches/server/0470-Fix-Concurrency-issue-in-ShufflingList.patch diff --git a/patches/server/0469-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0471-Reset-Ender-Crystals-on-Dragon-Spawn.patch similarity index 100% rename from patches/server/0469-Reset-Ender-Crystals-on-Dragon-Spawn.patch rename to patches/server/0471-Reset-Ender-Crystals-on-Dragon-Spawn.patch diff --git a/patches/server/0470-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0472-Fix-for-large-move-vectors-crashing-server.patch similarity index 100% rename from patches/server/0470-Fix-for-large-move-vectors-crashing-server.patch rename to patches/server/0472-Fix-for-large-move-vectors-crashing-server.patch diff --git a/patches/server/0471-Optimise-getType-calls.patch b/patches/server/0473-Optimise-getType-calls.patch similarity index 100% rename from patches/server/0471-Optimise-getType-calls.patch rename to patches/server/0473-Optimise-getType-calls.patch diff --git a/patches/server/0472-Villager-resetOffers.patch b/patches/server/0474-Villager-resetOffers.patch similarity index 100% rename from patches/server/0472-Villager-resetOffers.patch rename to patches/server/0474-Villager-resetOffers.patch diff --git a/patches/server/0473-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0475-Retain-block-place-order-when-capturing-blockstates.patch similarity index 93% rename from patches/server/0473-Retain-block-place-order-when-capturing-blockstates.patch rename to patches/server/0475-Retain-block-place-order-when-capturing-blockstates.patch index e579499e65f2..d825fe5c79d4 100644 --- a/patches/server/0473-Retain-block-place-order-when-capturing-blockstates.patch +++ b/patches/server/0475-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 0a6fcbc876f787c71770e7244a15f342f1fd4670..4596373017fd5786d85d7e5563366074dc119075 100644 +index 221a1e66814dda35feff9fa9ca0fe54feec335f9..1577b7317b85708d39d4171321df785a8107bdb2 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -157,7 +157,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0474-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0476-Reduce-blockpos-allocation-from-pathfinding.patch similarity index 100% rename from patches/server/0474-Reduce-blockpos-allocation-from-pathfinding.patch rename to patches/server/0476-Reduce-blockpos-allocation-from-pathfinding.patch diff --git a/patches/server/0475-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0477-Fix-item-locations-dropped-from-campfires.patch similarity index 100% rename from patches/server/0475-Fix-item-locations-dropped-from-campfires.patch rename to patches/server/0477-Fix-item-locations-dropped-from-campfires.patch diff --git a/patches/server/0476-Player-elytra-boost-API.patch b/patches/server/0478-Player-elytra-boost-API.patch similarity index 100% rename from patches/server/0476-Player-elytra-boost-API.patch rename to patches/server/0478-Player-elytra-boost-API.patch diff --git a/patches/server/0477-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0479-Fixed-TileEntityBell-memory-leak.patch similarity index 100% rename from patches/server/0477-Fixed-TileEntityBell-memory-leak.patch rename to patches/server/0479-Fixed-TileEntityBell-memory-leak.patch diff --git a/patches/server/0478-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0480-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch similarity index 100% rename from patches/server/0478-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch rename to patches/server/0480-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch diff --git a/patches/server/0479-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0481-Add-getOfflinePlayerIfCached-String.patch similarity index 93% rename from patches/server/0479-Add-getOfflinePlayerIfCached-String.patch rename to patches/server/0481-Add-getOfflinePlayerIfCached-String.patch index 4485061e1404..88b45ac5e824 100644 --- a/patches/server/0479-Add-getOfflinePlayerIfCached-String.patch +++ b/patches/server/0481-Add-getOfflinePlayerIfCached-String.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add getOfflinePlayerIfCached(String) diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index aa8b58a51792b1e4e6d18e13f06f697e3e2ebe72..2f04af83701777cddc1d5287b67921914779381f 100644 +index c0871d8a7ab38a881a03c5d1f18d8d8ca9e5b993..bf8c4dc4b9b9945087a0ab49e039a9808a39c696 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1813,6 +1813,28 @@ public final class CraftServer implements Server { diff --git a/patches/server/0480-Add-ignore-discounts-API.patch b/patches/server/0482-Add-ignore-discounts-API.patch similarity index 100% rename from patches/server/0480-Add-ignore-discounts-API.patch rename to patches/server/0482-Add-ignore-discounts-API.patch diff --git a/patches/server/0481-Toggle-for-removing-existing-dragon.patch b/patches/server/0483-Toggle-for-removing-existing-dragon.patch similarity index 100% rename from patches/server/0481-Toggle-for-removing-existing-dragon.patch rename to patches/server/0483-Toggle-for-removing-existing-dragon.patch diff --git a/patches/server/0482-Fix-client-lag-on-advancement-loading.patch b/patches/server/0484-Fix-client-lag-on-advancement-loading.patch similarity index 100% rename from patches/server/0482-Fix-client-lag-on-advancement-loading.patch rename to patches/server/0484-Fix-client-lag-on-advancement-loading.patch diff --git a/patches/server/0483-Item-no-age-no-player-pickup.patch b/patches/server/0485-Item-no-age-no-player-pickup.patch similarity index 100% rename from patches/server/0483-Item-no-age-no-player-pickup.patch rename to patches/server/0485-Item-no-age-no-player-pickup.patch diff --git a/patches/server/0484-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0486-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch similarity index 100% rename from patches/server/0484-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch rename to patches/server/0486-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch diff --git a/patches/server/0485-Beacon-API-custom-effect-ranges.patch b/patches/server/0487-Beacon-API-custom-effect-ranges.patch similarity index 100% rename from patches/server/0485-Beacon-API-custom-effect-ranges.patch rename to patches/server/0487-Beacon-API-custom-effect-ranges.patch diff --git a/patches/server/0486-Add-API-for-quit-reason.patch b/patches/server/0488-Add-API-for-quit-reason.patch similarity index 100% rename from patches/server/0486-Add-API-for-quit-reason.patch rename to patches/server/0488-Add-API-for-quit-reason.patch diff --git a/patches/server/0487-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0489-Add-Wandering-Trader-spawn-rate-config-options.patch similarity index 100% rename from patches/server/0487-Add-Wandering-Trader-spawn-rate-config-options.patch rename to patches/server/0489-Add-Wandering-Trader-spawn-rate-config-options.patch diff --git a/patches/server/0488-Expose-world-spawn-angle.patch b/patches/server/0490-Expose-world-spawn-angle.patch similarity index 100% rename from patches/server/0488-Expose-world-spawn-angle.patch rename to patches/server/0490-Expose-world-spawn-angle.patch diff --git a/patches/server/0489-Add-Destroy-Speed-API.patch b/patches/server/0491-Add-Destroy-Speed-API.patch similarity index 100% rename from patches/server/0489-Add-Destroy-Speed-API.patch rename to patches/server/0491-Add-Destroy-Speed-API.patch diff --git a/patches/server/0490-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0492-Fix-Player-spawnParticle-x-y-z-precision-loss.patch similarity index 100% rename from patches/server/0490-Fix-Player-spawnParticle-x-y-z-precision-loss.patch rename to patches/server/0492-Fix-Player-spawnParticle-x-y-z-precision-loss.patch diff --git a/patches/server/0491-Add-LivingEntity-clearActiveItem.patch b/patches/server/0493-Add-LivingEntity-clearActiveItem.patch similarity index 100% rename from patches/server/0491-Add-LivingEntity-clearActiveItem.patch rename to patches/server/0493-Add-LivingEntity-clearActiveItem.patch diff --git a/patches/server/0492-Add-PlayerItemCooldownEvent.patch b/patches/server/0494-Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/server/0492-Add-PlayerItemCooldownEvent.patch rename to patches/server/0494-Add-PlayerItemCooldownEvent.patch diff --git a/patches/server/0493-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0495-Significantly-improve-performance-of-the-end-generat.patch similarity index 100% rename from patches/server/0493-Significantly-improve-performance-of-the-end-generat.patch rename to patches/server/0495-Significantly-improve-performance-of-the-end-generat.patch diff --git a/patches/server/0494-More-lightning-API.patch b/patches/server/0496-More-lightning-API.patch similarity index 100% rename from patches/server/0494-More-lightning-API.patch rename to patches/server/0496-More-lightning-API.patch diff --git a/patches/server/0495-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0497-Climbing-should-not-bypass-cramming-gamerule.patch similarity index 100% rename from patches/server/0495-Climbing-should-not-bypass-cramming-gamerule.patch rename to patches/server/0497-Climbing-should-not-bypass-cramming-gamerule.patch diff --git a/patches/server/0496-Added-missing-default-perms-for-commands.patch b/patches/server/0498-Added-missing-default-perms-for-commands.patch similarity index 100% rename from patches/server/0496-Added-missing-default-perms-for-commands.patch rename to patches/server/0498-Added-missing-default-perms-for-commands.patch diff --git a/patches/server/0497-Add-PlayerShearBlockEvent.patch b/patches/server/0499-Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/server/0497-Add-PlayerShearBlockEvent.patch rename to patches/server/0499-Add-PlayerShearBlockEvent.patch diff --git a/patches/server/0498-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0500-Fix-curing-zombie-villager-discount-exploit.patch similarity index 100% rename from patches/server/0498-Fix-curing-zombie-villager-discount-exploit.patch rename to patches/server/0500-Fix-curing-zombie-villager-discount-exploit.patch diff --git a/patches/server/0499-Limit-recipe-packets.patch b/patches/server/0501-Limit-recipe-packets.patch similarity index 100% rename from patches/server/0499-Limit-recipe-packets.patch rename to patches/server/0501-Limit-recipe-packets.patch diff --git a/patches/server/0500-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0502-Fix-CraftSound-backwards-compatibility.patch similarity index 100% rename from patches/server/0500-Fix-CraftSound-backwards-compatibility.patch rename to patches/server/0502-Fix-CraftSound-backwards-compatibility.patch diff --git a/patches/server/0501-Player-Chunk-Load-Unload-Events.patch b/patches/server/0503-Player-Chunk-Load-Unload-Events.patch similarity index 75% rename from patches/server/0501-Player-Chunk-Load-Unload-Events.patch rename to patches/server/0503-Player-Chunk-Load-Unload-Events.patch index 3afc56b4091b..504b607773ff 100644 --- a/patches/server/0501-Player-Chunk-Load-Unload-Events.patch +++ b/patches/server/0503-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/network/PlayerChunkSender.java b/src/main/java/net/minecraft/server/network/PlayerChunkSender.java -index 5de5209e04d631bd6a50e28e8d3abebf148252c1..f8924bc2f82e7563419ce98153f9fb87d4ed2547 100644 +index 19b3f4fa7678a038bf25efc2a8b46ddad0193fde..cfeb85b89a7f3dbc856fe7ebdf0bd6a9f3761f1c 100644 --- a/src/main/java/net/minecraft/server/network/PlayerChunkSender.java +++ b/src/main/java/net/minecraft/server/network/PlayerChunkSender.java @@ -46,6 +46,11 @@ public class PlayerChunkSender { @@ -20,15 +20,15 @@ index 5de5209e04d631bd6a50e28e8d3abebf148252c1..f8924bc2f82e7563419ce98153f9fb87 } // Paper end - rewrite player chunk loader -@@ -86,6 +91,11 @@ public class PlayerChunkSender { - public static void sendChunk(ServerGamePacketListenerImpl handler, ServerLevel world, LevelChunk chunk) { // Paper - rewrite chunk loader - public - handler.player.serverLevel().chunkSource.chunkMap.getVisibleChunkIfPresent(chunk.getPos().toLong()).addPlayer(handler.player); - handler.send(new ClientboundLevelChunkWithLightPacket(chunk, world.getLightEngine(), (BitSet)null, (BitSet)null)); -+ // Paper start +@@ -89,6 +94,11 @@ public class PlayerChunkSender { + final boolean shouldModify = world.chunkPacketBlockController.shouldModify(handler.player, chunk); + handler.send(new ClientboundLevelChunkWithLightPacket(chunk, world.getLightEngine(), (BitSet)null, (BitSet)null, shouldModify)); + // Paper end - Anti-Xray ++ // Paper start - PlayerChunkLoadEvent + if (io.papermc.paper.event.packet.PlayerChunkLoadEvent.getHandlerList().getRegisteredListeners().length > 0) { + new io.papermc.paper.event.packet.PlayerChunkLoadEvent(new org.bukkit.craftbukkit.CraftChunk(chunk), handler.getPlayer().getBukkitEntity()).callEvent(); + } -+ // Paper end ++ // Paper end - PlayerChunkLoadEvent ChunkPos chunkPos = chunk.getPos(); DebugPackets.sendPoiPacketsForChunk(world, chunkPos); } diff --git a/patches/server/0502-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0504-Optimize-Dynamic-get-Missing-Keys.patch similarity index 100% rename from patches/server/0502-Optimize-Dynamic-get-Missing-Keys.patch rename to patches/server/0504-Optimize-Dynamic-get-Missing-Keys.patch diff --git a/patches/server/0503-Expose-LivingEntity-hurt-direction.patch b/patches/server/0505-Expose-LivingEntity-hurt-direction.patch similarity index 100% rename from patches/server/0503-Expose-LivingEntity-hurt-direction.patch rename to patches/server/0505-Expose-LivingEntity-hurt-direction.patch diff --git a/patches/server/0504-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0506-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from patches/server/0504-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/server/0506-Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/patches/server/0505-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0507-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch similarity index 100% rename from patches/server/0505-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch rename to patches/server/0507-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch diff --git a/patches/server/0506-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0508-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch similarity index 100% rename from patches/server/0506-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch rename to patches/server/0508-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch diff --git a/patches/server/0507-Implement-TargetHitEvent.patch b/patches/server/0509-Implement-TargetHitEvent.patch similarity index 100% rename from patches/server/0507-Implement-TargetHitEvent.patch rename to patches/server/0509-Implement-TargetHitEvent.patch diff --git a/patches/server/0508-MC-4-Fix-item-position-desync.patch b/patches/server/0510-MC-4-Fix-item-position-desync.patch similarity index 100% rename from patches/server/0508-MC-4-Fix-item-position-desync.patch rename to patches/server/0510-MC-4-Fix-item-position-desync.patch diff --git a/patches/server/0509-Additional-Block-Material-API-s.patch b/patches/server/0511-Additional-Block-Material-API-s.patch similarity index 100% rename from patches/server/0509-Additional-Block-Material-API-s.patch rename to patches/server/0511-Additional-Block-Material-API-s.patch diff --git a/patches/server/0510-Fix-harming-potion-dupe.patch b/patches/server/0512-Fix-harming-potion-dupe.patch similarity index 100% rename from patches/server/0510-Fix-harming-potion-dupe.patch rename to patches/server/0512-Fix-harming-potion-dupe.patch diff --git a/patches/server/0511-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0513-Implement-API-to-get-Material-from-Boats-and-Minecar.patch similarity index 100% rename from patches/server/0511-Implement-API-to-get-Material-from-Boats-and-Minecar.patch rename to patches/server/0513-Implement-API-to-get-Material-from-Boats-and-Minecar.patch diff --git a/patches/server/0512-Cache-burn-durations.patch b/patches/server/0514-Cache-burn-durations.patch similarity index 100% rename from patches/server/0512-Cache-burn-durations.patch rename to patches/server/0514-Cache-burn-durations.patch diff --git a/patches/server/0513-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0515-Allow-disabling-mob-spawner-spawn-egg-transformation.patch similarity index 100% rename from patches/server/0513-Allow-disabling-mob-spawner-spawn-egg-transformation.patch rename to patches/server/0515-Allow-disabling-mob-spawner-spawn-egg-transformation.patch diff --git a/patches/server/0514-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0516-Fix-Not-a-string-Map-Conversion-spam.patch similarity index 100% rename from patches/server/0514-Fix-Not-a-string-Map-Conversion-spam.patch rename to patches/server/0516-Fix-Not-a-string-Map-Conversion-spam.patch diff --git a/patches/server/0515-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0517-Implement-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/server/0515-Implement-PlayerFlowerPotManipulateEvent.patch rename to patches/server/0517-Implement-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/server/0516-Fix-interact-event-not-being-called-sometimes.patch b/patches/server/0518-Fix-interact-event-not-being-called-sometimes.patch similarity index 100% rename from patches/server/0516-Fix-interact-event-not-being-called-sometimes.patch rename to patches/server/0518-Fix-interact-event-not-being-called-sometimes.patch diff --git a/patches/server/0517-Zombie-API-breaking-doors.patch b/patches/server/0519-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/server/0517-Zombie-API-breaking-doors.patch rename to patches/server/0519-Zombie-API-breaking-doors.patch diff --git a/patches/server/0518-Fix-nerfed-slime-when-splitting.patch b/patches/server/0520-Fix-nerfed-slime-when-splitting.patch similarity index 100% rename from patches/server/0518-Fix-nerfed-slime-when-splitting.patch rename to patches/server/0520-Fix-nerfed-slime-when-splitting.patch diff --git a/patches/server/0519-Add-EntityLoadCrossbowEvent.patch b/patches/server/0521-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/server/0519-Add-EntityLoadCrossbowEvent.patch rename to patches/server/0521-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/server/0520-Added-WorldGameRuleChangeEvent.patch b/patches/server/0522-Added-WorldGameRuleChangeEvent.patch similarity index 96% rename from patches/server/0520-Added-WorldGameRuleChangeEvent.patch rename to patches/server/0522-Added-WorldGameRuleChangeEvent.patch index 79640a941984..a611a4fd3d94 100644 --- a/patches/server/0520-Added-WorldGameRuleChangeEvent.patch +++ b/patches/server/0522-Added-WorldGameRuleChangeEvent.patch @@ -64,10 +64,10 @@ index 6a1001cb708a7f779a801428d2b00fbcde888bc1..2e240ad721928a9a68370114ba61c218 public int get() { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 0f448e2652eb1d334bf9b8d6343e680365cc9e0b..9df709acc93157ffd86793c259e608bd3c0ff722 100644 +index 54c7316ff9d9f9352a1cf01bd508830130988a05..013d7f6107230e3e530ff86cc9219ca0a6681ec6 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1840,8 +1840,13 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -1845,8 +1845,13 @@ public class CraftWorld extends CraftRegionAccessor implements World { if (!this.isGameRule(rule)) return false; @@ -82,7 +82,7 @@ index 0f448e2652eb1d334bf9b8d6343e680365cc9e0b..9df709acc93157ffd86793c259e608bd handle.onChanged(this.getHandle().getServer()); return true; } -@@ -1877,8 +1882,12 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -1882,8 +1887,12 @@ public class CraftWorld extends CraftRegionAccessor implements World { if (!this.isGameRule(rule.getName())) return false; diff --git a/patches/server/0521-Added-ServerResourcesReloadedEvent.patch b/patches/server/0523-Added-ServerResourcesReloadedEvent.patch similarity index 100% rename from patches/server/0521-Added-ServerResourcesReloadedEvent.patch rename to patches/server/0523-Added-ServerResourcesReloadedEvent.patch diff --git a/patches/server/0522-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0524-Added-world-settings-for-mobs-picking-up-loot.patch similarity index 100% rename from patches/server/0522-Added-world-settings-for-mobs-picking-up-loot.patch rename to patches/server/0524-Added-world-settings-for-mobs-picking-up-loot.patch diff --git a/patches/server/0523-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0525-Implemented-BlockFailedDispenseEvent.patch similarity index 100% rename from patches/server/0523-Implemented-BlockFailedDispenseEvent.patch rename to patches/server/0525-Implemented-BlockFailedDispenseEvent.patch diff --git a/patches/server/0524-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0526-Added-PlayerLecternPageChangeEvent.patch similarity index 100% rename from patches/server/0524-Added-PlayerLecternPageChangeEvent.patch rename to patches/server/0526-Added-PlayerLecternPageChangeEvent.patch diff --git a/patches/server/0525-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0527-Added-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from patches/server/0525-Added-PlayerLoomPatternSelectEvent.patch rename to patches/server/0527-Added-PlayerLoomPatternSelectEvent.patch diff --git a/patches/server/0526-Configurable-door-breaking-difficulty.patch b/patches/server/0528-Configurable-door-breaking-difficulty.patch similarity index 100% rename from patches/server/0526-Configurable-door-breaking-difficulty.patch rename to patches/server/0528-Configurable-door-breaking-difficulty.patch diff --git a/patches/server/0527-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0529-Empty-commands-shall-not-be-dispatched.patch similarity index 100% rename from patches/server/0527-Empty-commands-shall-not-be-dispatched.patch rename to patches/server/0529-Empty-commands-shall-not-be-dispatched.patch diff --git a/patches/server/0528-Remove-stale-POIs.patch b/patches/server/0530-Remove-stale-POIs.patch similarity index 91% rename from patches/server/0528-Remove-stale-POIs.patch rename to patches/server/0530-Remove-stale-POIs.patch index 46d23d529b2a..c89bd2b74aac 100644 --- a/patches/server/0528-Remove-stale-POIs.patch +++ b/patches/server/0530-Remove-stale-POIs.patch @@ -5,7 +5,7 @@ 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 c5a005352e540f004dd92ff4b867f427e4e3b701..5bad3a21d4a520d7d0ea4e4483a1226da00699e3 100644 +index 4ad4faf17dcedefc7add11af180d744a5c2f31a8..18a69ab85de7f23f5ff468307bf2669544eba8af 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -2065,6 +2065,11 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0529-Fix-villager-boat-exploit.patch b/patches/server/0531-Fix-villager-boat-exploit.patch similarity index 100% rename from patches/server/0529-Fix-villager-boat-exploit.patch rename to patches/server/0531-Fix-villager-boat-exploit.patch diff --git a/patches/server/0530-Add-sendOpLevel-API.patch b/patches/server/0532-Add-sendOpLevel-API.patch similarity index 100% rename from patches/server/0530-Add-sendOpLevel-API.patch rename to patches/server/0532-Add-sendOpLevel-API.patch diff --git a/patches/server/0531-TODO-Registry-Modification-API.patch b/patches/server/0533-TODO-Registry-Modification-API.patch similarity index 100% rename from patches/server/0531-TODO-Registry-Modification-API.patch rename to patches/server/0533-TODO-Registry-Modification-API.patch diff --git a/patches/server/0532-Add-StructuresLocateEvent.patch b/patches/server/0534-Add-StructuresLocateEvent.patch similarity index 100% rename from patches/server/0532-Add-StructuresLocateEvent.patch rename to patches/server/0534-Add-StructuresLocateEvent.patch diff --git a/patches/server/0533-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0535-Collision-option-for-requiring-a-player-participant.patch similarity index 100% rename from patches/server/0533-Collision-option-for-requiring-a-player-participant.patch rename to patches/server/0535-Collision-option-for-requiring-a-player-participant.patch diff --git a/patches/server/0534-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0536-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch similarity index 100% rename from patches/server/0534-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch rename to patches/server/0536-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch diff --git a/patches/server/0535-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0537-Return-chat-component-with-empty-text-instead-of-thr.patch similarity index 100% rename from patches/server/0535-Return-chat-component-with-empty-text-instead-of-thr.patch rename to patches/server/0537-Return-chat-component-with-empty-text-instead-of-thr.patch diff --git a/patches/server/0536-Make-schedule-command-per-world.patch b/patches/server/0538-Make-schedule-command-per-world.patch similarity index 100% rename from patches/server/0536-Make-schedule-command-per-world.patch rename to patches/server/0538-Make-schedule-command-per-world.patch diff --git a/patches/server/0537-Configurable-max-leash-distance.patch b/patches/server/0539-Configurable-max-leash-distance.patch similarity index 100% rename from patches/server/0537-Configurable-max-leash-distance.patch rename to patches/server/0539-Configurable-max-leash-distance.patch diff --git a/patches/server/0538-Implement-BlockPreDispenseEvent.patch b/patches/server/0540-Implement-BlockPreDispenseEvent.patch similarity index 100% rename from patches/server/0538-Implement-BlockPreDispenseEvent.patch rename to patches/server/0540-Implement-BlockPreDispenseEvent.patch diff --git a/patches/server/0539-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0541-Added-firing-of-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/server/0539-Added-firing-of-PlayerChangeBeaconEffectEvent.patch rename to patches/server/0541-Added-firing-of-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/server/0540-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0542-Add-toggle-for-always-placing-the-dragon-egg.patch similarity index 100% rename from patches/server/0540-Add-toggle-for-always-placing-the-dragon-egg.patch rename to patches/server/0542-Add-toggle-for-always-placing-the-dragon-egg.patch diff --git a/patches/server/0541-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0543-Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/server/0541-Added-PlayerStonecutterRecipeSelectEvent.patch rename to patches/server/0543-Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/server/0542-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0544-Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 100% rename from patches/server/0542-Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to patches/server/0544-Add-dropLeash-variable-to-EntityUnleashEvent.patch diff --git a/patches/server/0543-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0545-Reset-shield-blocking-on-dimension-change.patch similarity index 100% rename from patches/server/0543-Reset-shield-blocking-on-dimension-change.patch rename to patches/server/0545-Reset-shield-blocking-on-dimension-change.patch diff --git a/patches/server/0544-add-DragonEggFormEvent.patch b/patches/server/0546-add-DragonEggFormEvent.patch similarity index 100% rename from patches/server/0544-add-DragonEggFormEvent.patch rename to patches/server/0546-add-DragonEggFormEvent.patch diff --git a/patches/server/0545-EntityMoveEvent.patch b/patches/server/0547-EntityMoveEvent.patch similarity index 97% rename from patches/server/0545-EntityMoveEvent.patch rename to patches/server/0547-EntityMoveEvent.patch index d216e8751fe5..8965a0f608b8 100644 --- a/patches/server/0545-EntityMoveEvent.patch +++ b/patches/server/0547-EntityMoveEvent.patch @@ -17,7 +17,7 @@ index 6301152b4b3297e6f764f8bccf7394986fc6c76f..e4a9d99e08d5ed033f20a916f791b9f9 this.profiler.push(() -> { return worldserver + " " + worldserver.dimension().location(); diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 5bad3a21d4a520d7d0ea4e4483a1226da00699e3..edf9c5d78f64604e75e6eb5b039edd99c8d48cc2 100644 +index 18a69ab85de7f23f5ff468307bf2669544eba8af..e0a94d75ddf5cc0988876e7438fbcc449c608d37 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -220,6 +220,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0546-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0548-added-option-to-disable-pathfinding-updates-on-block.patch similarity index 91% rename from patches/server/0546-added-option-to-disable-pathfinding-updates-on-block.patch rename to patches/server/0548-added-option-to-disable-pathfinding-updates-on-block.patch index fd380243ca58..db56e9f1a68d 100644 --- a/patches/server/0546-added-option-to-disable-pathfinding-updates-on-block.patch +++ b/patches/server/0548-added-option-to-disable-pathfinding-updates-on-block.patch @@ -5,7 +5,7 @@ Subject: [PATCH] added option to disable pathfinding updates on block changes diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index edf9c5d78f64604e75e6eb5b039edd99c8d48cc2..01fd020f9539a59f924b96dfb95a43ae2274a720 100644 +index e0a94d75ddf5cc0988876e7438fbcc449c608d37..0f59f5da41f3ab18148a7b44b0872632f03ad078 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1654,6 +1654,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0547-Inline-shift-direction-fields.patch b/patches/server/0549-Inline-shift-direction-fields.patch similarity index 100% rename from patches/server/0547-Inline-shift-direction-fields.patch rename to patches/server/0549-Inline-shift-direction-fields.patch diff --git a/patches/server/0548-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0550-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/server/0548-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/server/0550-Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/server/0549-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0551-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/server/0549-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/server/0551-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/server/0550-living-entity-allow-attribute-registration.patch b/patches/server/0552-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/server/0550-living-entity-allow-attribute-registration.patch rename to patches/server/0552-living-entity-allow-attribute-registration.patch diff --git a/patches/server/0551-fix-dead-slime-setSize-invincibility.patch b/patches/server/0553-fix-dead-slime-setSize-invincibility.patch similarity index 100% rename from patches/server/0551-fix-dead-slime-setSize-invincibility.patch rename to patches/server/0553-fix-dead-slime-setSize-invincibility.patch diff --git a/patches/server/0552-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0554-Merchant-getRecipes-should-return-an-immutable-list.patch similarity index 100% rename from patches/server/0552-Merchant-getRecipes-should-return-an-immutable-list.patch rename to patches/server/0554-Merchant-getRecipes-should-return-an-immutable-list.patch diff --git a/patches/server/0553-Expose-Tracked-Players.patch b/patches/server/0555-Expose-Tracked-Players.patch similarity index 100% rename from patches/server/0553-Expose-Tracked-Players.patch rename to patches/server/0555-Expose-Tracked-Players.patch diff --git a/patches/server/0554-Remove-streams-from-SensorNearest.patch b/patches/server/0556-Remove-streams-from-SensorNearest.patch similarity index 100% rename from patches/server/0554-Remove-streams-from-SensorNearest.patch rename to patches/server/0556-Remove-streams-from-SensorNearest.patch diff --git a/patches/server/0555-Improve-ServerGUI.patch b/patches/server/0557-Improve-ServerGUI.patch similarity index 100% rename from patches/server/0555-Improve-ServerGUI.patch rename to patches/server/0557-Improve-ServerGUI.patch diff --git a/patches/server/0556-fix-converting-txt-to-json-file.patch b/patches/server/0558-fix-converting-txt-to-json-file.patch similarity index 100% rename from patches/server/0556-fix-converting-txt-to-json-file.patch rename to patches/server/0558-fix-converting-txt-to-json-file.patch diff --git a/patches/server/0557-Add-worldborder-events.patch b/patches/server/0559-Add-worldborder-events.patch similarity index 100% rename from patches/server/0557-Add-worldborder-events.patch rename to patches/server/0559-Add-worldborder-events.patch diff --git a/patches/server/0558-added-PlayerNameEntityEvent.patch b/patches/server/0560-added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/server/0558-added-PlayerNameEntityEvent.patch rename to patches/server/0560-added-PlayerNameEntityEvent.patch diff --git a/patches/server/0559-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0561-Prevent-grindstones-from-overstacking-items.patch similarity index 100% rename from patches/server/0559-Prevent-grindstones-from-overstacking-items.patch rename to patches/server/0561-Prevent-grindstones-from-overstacking-items.patch diff --git a/patches/server/0560-Add-recipe-to-cook-events.patch b/patches/server/0562-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/server/0560-Add-recipe-to-cook-events.patch rename to patches/server/0562-Add-recipe-to-cook-events.patch diff --git a/patches/server/0561-Add-Block-isValidTool.patch b/patches/server/0563-Add-Block-isValidTool.patch similarity index 100% rename from patches/server/0561-Add-Block-isValidTool.patch rename to patches/server/0563-Add-Block-isValidTool.patch diff --git a/patches/server/0562-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0564-Allow-using-signs-inside-spawn-protection.patch similarity index 100% rename from patches/server/0562-Allow-using-signs-inside-spawn-protection.patch rename to patches/server/0564-Allow-using-signs-inside-spawn-protection.patch diff --git a/patches/server/0563-Expand-world-key-API.patch b/patches/server/0565-Expand-world-key-API.patch similarity index 97% rename from patches/server/0563-Expand-world-key-API.patch rename to patches/server/0565-Expand-world-key-API.patch index c1ab64bc8fc3..f255b7a5d08a 100644 --- a/patches/server/0563-Expand-world-key-API.patch +++ b/patches/server/0565-Expand-world-key-API.patch @@ -20,7 +20,7 @@ index 93f44ca0c8388935baaa41f9b0ebb6de2f6906bb..53b62be779bbb31723c4953221d8b5f2 // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 2f04af83701777cddc1d5287b67921914779381f..ca03eb363438d97de71b1fe4b07304e4f8d3f422 100644 +index bf8c4dc4b9b9945087a0ab49e039a9808a39c696..378be7b791a2d600c094ae39b1fb091fc6124557 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1139,9 +1139,15 @@ public final class CraftServer implements Server { diff --git a/patches/server/0564-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0566-Add-fast-alternative-constructor-for-Rotations.patch similarity index 100% rename from patches/server/0564-Add-fast-alternative-constructor-for-Rotations.patch rename to patches/server/0566-Add-fast-alternative-constructor-for-Rotations.patch diff --git a/patches/server/0565-Item-Rarity-API.patch b/patches/server/0567-Item-Rarity-API.patch similarity index 100% rename from patches/server/0565-Item-Rarity-API.patch rename to patches/server/0567-Item-Rarity-API.patch diff --git a/patches/server/0566-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0568-Drop-carried-item-when-player-has-disconnected.patch similarity index 100% rename from patches/server/0566-Drop-carried-item-when-player-has-disconnected.patch rename to patches/server/0568-Drop-carried-item-when-player-has-disconnected.patch diff --git a/patches/server/0567-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0569-forced-whitelist-use-configurable-kick-message.patch similarity index 100% rename from patches/server/0567-forced-whitelist-use-configurable-kick-message.patch rename to patches/server/0569-forced-whitelist-use-configurable-kick-message.patch diff --git a/patches/server/0568-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0570-Don-t-ignore-result-of-PlayerEditBookEvent.patch similarity index 100% rename from patches/server/0568-Don-t-ignore-result-of-PlayerEditBookEvent.patch rename to patches/server/0570-Don-t-ignore-result-of-PlayerEditBookEvent.patch diff --git a/patches/server/0569-Expose-protocol-version.patch b/patches/server/0571-Expose-protocol-version.patch similarity index 100% rename from patches/server/0569-Expose-protocol-version.patch rename to patches/server/0571-Expose-protocol-version.patch diff --git a/patches/server/0570-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0572-Enhance-console-tab-completions-for-brigadier-comman.patch similarity index 100% rename from patches/server/0570-Enhance-console-tab-completions-for-brigadier-comman.patch rename to patches/server/0572-Enhance-console-tab-completions-for-brigadier-comman.patch diff --git a/patches/server/0571-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0573-Fix-PlayerItemConsumeEvent-cancelling-properly.patch similarity index 100% rename from patches/server/0571-Fix-PlayerItemConsumeEvent-cancelling-properly.patch rename to patches/server/0573-Fix-PlayerItemConsumeEvent-cancelling-properly.patch diff --git a/patches/server/0572-Add-bypass-host-check.patch b/patches/server/0574-Add-bypass-host-check.patch similarity index 100% rename from patches/server/0572-Add-bypass-host-check.patch rename to patches/server/0574-Add-bypass-host-check.patch diff --git a/patches/server/0573-Set-area-affect-cloud-rotation.patch b/patches/server/0575-Set-area-affect-cloud-rotation.patch similarity index 100% rename from patches/server/0573-Set-area-affect-cloud-rotation.patch rename to patches/server/0575-Set-area-affect-cloud-rotation.patch diff --git a/patches/server/0574-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0576-add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/server/0574-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/server/0576-add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/server/0575-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0577-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/server/0575-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/server/0577-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/server/0576-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0578-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/server/0576-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/server/0578-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/server/0577-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0579-fix-PigZombieAngerEvent-cancellation.patch similarity index 100% rename from patches/server/0577-fix-PigZombieAngerEvent-cancellation.patch rename to patches/server/0579-fix-PigZombieAngerEvent-cancellation.patch diff --git a/patches/server/0578-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0580-fix-PlayerItemHeldEvent-firing-twice.patch similarity index 100% rename from patches/server/0578-fix-PlayerItemHeldEvent-firing-twice.patch rename to patches/server/0580-fix-PlayerItemHeldEvent-firing-twice.patch diff --git a/patches/server/0579-Added-PlayerDeepSleepEvent.patch b/patches/server/0581-Added-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/server/0579-Added-PlayerDeepSleepEvent.patch rename to patches/server/0581-Added-PlayerDeepSleepEvent.patch diff --git a/patches/server/0580-More-World-API.patch b/patches/server/0582-More-World-API.patch similarity index 96% rename from patches/server/0580-More-World-API.patch rename to patches/server/0582-More-World-API.patch index a49876d9be8e..6f53185a0336 100644 --- a/patches/server/0580-More-World-API.patch +++ b/patches/server/0582-More-World-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] More World API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 9df709acc93157ffd86793c259e608bd3c0ff722..245464d5e805fa1a31c3a6ebe94e6705567ef5d5 100644 +index 013d7f6107230e3e530ff86cc9219ca0a6681ec6..085faebd53c0d620fe4e9aa5f0fc88b0e96d0b10 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -2083,6 +2083,69 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -2088,6 +2088,69 @@ public class CraftWorld extends CraftRegionAccessor implements World { return new CraftStructureSearchResult(CraftStructure.minecraftToBukkit(found.getSecond().value(), this.getHandle().registryAccess()), CraftLocation.toBukkit(found.getFirst(), this)); } diff --git a/patches/server/0581-Added-PlayerBedFailEnterEvent.patch b/patches/server/0583-Added-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/server/0581-Added-PlayerBedFailEnterEvent.patch rename to patches/server/0583-Added-PlayerBedFailEnterEvent.patch diff --git a/patches/server/0582-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0584-Implement-methods-to-convert-between-Component-and-B.patch similarity index 100% rename from patches/server/0582-Implement-methods-to-convert-between-Component-and-B.patch rename to patches/server/0584-Implement-methods-to-convert-between-Component-and-B.patch diff --git a/patches/server/0583-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0585-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch similarity index 100% rename from patches/server/0583-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch rename to patches/server/0585-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch diff --git a/patches/server/0584-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0586-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/server/0584-Introduce-beacon-activation-deactivation-events.patch rename to patches/server/0586-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/server/0585-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0587-add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 100% rename from patches/server/0585-add-RespawnFlags-to-PlayerRespawnEvent.patch rename to patches/server/0587-add-RespawnFlags-to-PlayerRespawnEvent.patch diff --git a/patches/server/0586-Add-Channel-initialization-listeners.patch b/patches/server/0588-Add-Channel-initialization-listeners.patch similarity index 100% rename from patches/server/0586-Add-Channel-initialization-listeners.patch rename to patches/server/0588-Add-Channel-initialization-listeners.patch diff --git a/patches/server/0587-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0589-Send-empty-commands-if-tab-completion-is-disabled.patch similarity index 100% rename from patches/server/0587-Send-empty-commands-if-tab-completion-is-disabled.patch rename to patches/server/0589-Send-empty-commands-if-tab-completion-is-disabled.patch diff --git a/patches/server/0588-Add-more-WanderingTrader-API.patch b/patches/server/0590-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/server/0588-Add-more-WanderingTrader-API.patch rename to patches/server/0590-Add-more-WanderingTrader-API.patch diff --git a/patches/server/0589-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0591-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/server/0589-Add-EntityBlockStorage-clearEntities.patch rename to patches/server/0591-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/server/0590-Entity-load-save-limit-per-chunk.patch b/patches/server/0592-Entity-load-save-limit-per-chunk.patch similarity index 100% rename from patches/server/0590-Entity-load-save-limit-per-chunk.patch rename to patches/server/0592-Entity-load-save-limit-per-chunk.patch diff --git a/patches/server/0591-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0593-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/server/0591-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/server/0593-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/server/0592-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0594-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0592-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch rename to patches/server/0594-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0593-Inventory-close.patch b/patches/server/0595-Inventory-close.patch similarity index 100% rename from patches/server/0593-Inventory-close.patch rename to patches/server/0595-Inventory-close.patch diff --git a/patches/server/0594-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0596-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/server/0594-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/server/0596-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/server/0595-Fix-CraftPotionBrewer-cache.patch b/patches/server/0597-Fix-CraftPotionBrewer-cache.patch similarity index 100% rename from patches/server/0595-Fix-CraftPotionBrewer-cache.patch rename to patches/server/0597-Fix-CraftPotionBrewer-cache.patch diff --git a/patches/server/0596-Add-basic-Datapack-API.patch b/patches/server/0598-Add-basic-Datapack-API.patch similarity index 98% rename from patches/server/0596-Add-basic-Datapack-API.patch rename to patches/server/0598-Add-basic-Datapack-API.patch index f4b6915d3901..f2f796dfe61d 100644 --- a/patches/server/0596-Add-basic-Datapack-API.patch +++ b/patches/server/0598-Add-basic-Datapack-API.patch @@ -92,7 +92,7 @@ index 0000000000000000000000000000000000000000..cf4374493c11057451a62a655514415c + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index ca03eb363438d97de71b1fe4b07304e4f8d3f422..3e505c1b680e1f384c5148ba309b6cf6b3da1e45 100644 +index 378be7b791a2d600c094ae39b1fb091fc6124557..44011ea91590e26fb39ee149eac06811ea47eb02 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -303,6 +303,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0597-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0599-Add-environment-variable-to-disable-server-gui.patch similarity index 100% rename from patches/server/0597-Add-environment-variable-to-disable-server-gui.patch rename to patches/server/0599-Add-environment-variable-to-disable-server-gui.patch diff --git a/patches/server/0598-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0600-additions-to-PlayerGameModeChangeEvent.patch similarity index 99% rename from patches/server/0598-additions-to-PlayerGameModeChangeEvent.patch rename to patches/server/0600-additions-to-PlayerGameModeChangeEvent.patch index 2bb04a477bd5..ae25cb733689 100644 --- a/patches/server/0598-additions-to-PlayerGameModeChangeEvent.patch +++ b/patches/server/0600-additions-to-PlayerGameModeChangeEvent.patch @@ -94,7 +94,7 @@ index cb2f86e0ad0edc54711826215df4406c5725f29c..0abc9dfd73b3cb16b29bdbcc40f0d0ea } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -index 89f0c3d6e4dc9701f02fa7ed5331c3969de81ffc..0a15cda0919c0adf5009a023c17b3e25cc365623 100644 +index c256423e9dc9d1837b847da44fb2920c58842c8b..0cb9803e30702de1cc530c1205fe9bbb4dcb2c08 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java @@ -73,21 +73,28 @@ public class ServerPlayerGameMode { diff --git a/patches/server/0599-ItemStack-repair-check-API.patch b/patches/server/0601-ItemStack-repair-check-API.patch similarity index 100% rename from patches/server/0599-ItemStack-repair-check-API.patch rename to patches/server/0601-ItemStack-repair-check-API.patch diff --git a/patches/server/0600-More-Enchantment-API.patch b/patches/server/0602-More-Enchantment-API.patch similarity index 100% rename from patches/server/0600-More-Enchantment-API.patch rename to patches/server/0602-More-Enchantment-API.patch diff --git a/patches/server/0601-Move-range-check-for-block-placing-up.patch b/patches/server/0603-Move-range-check-for-block-placing-up.patch similarity index 100% rename from patches/server/0601-Move-range-check-for-block-placing-up.patch rename to patches/server/0603-Move-range-check-for-block-placing-up.patch diff --git a/patches/server/0602-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0604-Fix-and-optimise-world-force-upgrading.patch similarity index 98% rename from patches/server/0602-Fix-and-optimise-world-force-upgrading.patch rename to patches/server/0604-Fix-and-optimise-world-force-upgrading.patch index 453b9cca80e6..c2f07910f79b 100644 --- a/patches/server/0602-Fix-and-optimise-world-force-upgrading.patch +++ b/patches/server/0604-Fix-and-optimise-world-force-upgrading.patch @@ -306,10 +306,10 @@ index 6fbe95fea9faa830cde4ff8a8031d148223023e5..171ee674689042ec571c15bfde529bed 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 4596373017fd5786d85d7e5563366074dc119075..1ed9fbe7885fdc4f8b02364068519e833866aff9 100644 +index 1577b7317b85708d39d4171321df785a8107bdb2..51dc136b9a5006382de4b12275a9c2f299d5d1f9 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java -@@ -183,6 +183,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -184,6 +184,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable { public final Map explosionDensityCache = new HashMap<>(); // Paper - Optimize explosions public java.util.ArrayDeque redstoneUpdateInfos; // Paper - Move from Map in BlockRedstoneTorch to here @@ -360,7 +360,7 @@ index b850dba2b0fa5bc762b170ed7083cf8904761f17..7dee0f7d49f3492c92fceff7750e6962 return this.regionCache.getAndMoveToFirst(ChunkPos.asLong(chunkcoordintpair.getRegionX(), chunkcoordintpair.getRegionZ())); } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 3e505c1b680e1f384c5148ba309b6cf6b3da1e45..a2eb6d59fca4ed219ee4215e46758c4c20d6e893 100644 +index 44011ea91590e26fb39ee149eac06811ea47eb02..a5b77644dc64e646de0d542dfd7b7f68df823eb1 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1216,9 +1216,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0603-Add-Mob-lookAt-API.patch b/patches/server/0605-Add-Mob-lookAt-API.patch similarity index 100% rename from patches/server/0603-Add-Mob-lookAt-API.patch rename to patches/server/0605-Add-Mob-lookAt-API.patch diff --git a/patches/server/0604-Add-Unix-domain-socket-support.patch b/patches/server/0606-Add-Unix-domain-socket-support.patch similarity index 100% rename from patches/server/0604-Add-Unix-domain-socket-support.patch rename to patches/server/0606-Add-Unix-domain-socket-support.patch diff --git a/patches/server/0605-Add-EntityInsideBlockEvent.patch b/patches/server/0607-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/server/0605-Add-EntityInsideBlockEvent.patch rename to patches/server/0607-Add-EntityInsideBlockEvent.patch diff --git a/patches/server/0606-Attributes-API-for-item-defaults.patch b/patches/server/0608-Attributes-API-for-item-defaults.patch similarity index 100% rename from patches/server/0606-Attributes-API-for-item-defaults.patch rename to patches/server/0608-Attributes-API-for-item-defaults.patch diff --git a/patches/server/0607-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0609-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 95% rename from patches/server/0607-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/server/0609-Add-cause-to-Weather-ThunderChangeEvents.patch index b04130b99ef4..4106a33db3d8 100644 --- a/patches/server/0607-Add-cause-to-Weather-ThunderChangeEvents.patch +++ b/patches/server/0609-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 01fd020f9539a59f924b96dfb95a43ae2274a720..0f6743717f1c219598692cce884cdfcea4cd1ae8 100644 +index 0f59f5da41f3ab18148a7b44b0872632f03ad078..508b18f5e7dd6240a680e73be639d0cf9e4e5d07 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -666,8 +666,8 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -95,10 +95,10 @@ index 14b8011c8874e05647eb1636ee1eed5d90da8200..7bfc5bbfcf67e5bbf57e99e648ff5bed if (weather.isCancelled()) { return; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 245464d5e805fa1a31c3a6ebe94e6705567ef5d5..180bf822d361fbae7247c78e7cc3ae412a5a7e48 100644 +index 085faebd53c0d620fe4e9aa5f0fc88b0e96d0b10..065ae3bea7dfe8f360ad9ac97d503880a41e9dd0 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1181,7 +1181,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -1186,7 +1186,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { @Override public void setStorm(boolean hasStorm) { @@ -107,7 +107,7 @@ index 245464d5e805fa1a31c3a6ebe94e6705567ef5d5..180bf822d361fbae7247c78e7cc3ae41 this.setWeatherDuration(0); // Reset weather duration (legacy behaviour) this.setClearWeatherDuration(0); // Reset clear weather duration (reset "/weather clear" commands) } -@@ -1203,7 +1203,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -1208,7 +1208,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { @Override public void setThundering(boolean thundering) { diff --git a/patches/server/0608-More-Lidded-Block-API.patch b/patches/server/0610-More-Lidded-Block-API.patch similarity index 100% rename from patches/server/0608-More-Lidded-Block-API.patch rename to patches/server/0610-More-Lidded-Block-API.patch diff --git a/patches/server/0609-Limit-item-frame-cursors-on-maps.patch b/patches/server/0611-Limit-item-frame-cursors-on-maps.patch similarity index 100% rename from patches/server/0609-Limit-item-frame-cursors-on-maps.patch rename to patches/server/0611-Limit-item-frame-cursors-on-maps.patch diff --git a/patches/server/0610-Add-PlayerKickEvent-causes.patch b/patches/server/0612-Add-PlayerKickEvent-causes.patch similarity index 100% rename from patches/server/0610-Add-PlayerKickEvent-causes.patch rename to patches/server/0612-Add-PlayerKickEvent-causes.patch diff --git a/patches/server/0611-Add-PufferFishStateChangeEvent.patch b/patches/server/0613-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/server/0611-Add-PufferFishStateChangeEvent.patch rename to patches/server/0613-Add-PufferFishStateChangeEvent.patch diff --git a/patches/server/0612-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0614-Fix-PlayerBucketEmptyEvent-result-itemstack.patch similarity index 100% rename from patches/server/0612-Fix-PlayerBucketEmptyEvent-result-itemstack.patch rename to patches/server/0614-Fix-PlayerBucketEmptyEvent-result-itemstack.patch diff --git a/patches/server/0613-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0615-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch similarity index 71% rename from patches/server/0613-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch rename to patches/server/0615-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch index 4a44dd7ad087..e8ae16c85163 100644 --- a/patches/server/0613-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch +++ b/patches/server/0615-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch @@ -14,11 +14,11 @@ 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 1219200cd915d6239a32a2bd09d325cd8fa9b346..dfae0918079425df92d958b04275be8ae60d4b60 100644 +index 98e720a21432fff7fce8653095a56e2ef56f1d30..27122a06e172c8d54104c115dfda668a52ff1cde 100644 --- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java +++ b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java -@@ -32,14 +32,14 @@ public class PalettedContainer implements PaletteResize, PalettedContainer - public final IdMap registry; +@@ -33,14 +33,14 @@ public class PalettedContainer implements PaletteResize, PalettedContainer + private final T @org.jetbrains.annotations.Nullable [] presetValues; // Paper - Anti-Xray - Add preset values private volatile PalettedContainer.Data data; private final PalettedContainer.Strategy strategy; - private final ThreadingDetector threadingDetector = new ThreadingDetector("PalettedContainer"); @@ -34,17 +34,17 @@ index 1219200cd915d6239a32a2bd09d325cd8fa9b346..dfae0918079425df92d958b04275be8a + // this.threadingDetector.checkAndUnlock(); // Paper - disable this } - public static Codec> codecRW(IdMap idList, Codec entryCodec, PalettedContainer.Strategy paletteProvider, T defaultValue) { -@@ -91,7 +91,7 @@ public class PalettedContainer implements PaletteResize, PalettedContainer + // Paper start - Anti-Xray - Add preset values +@@ -130,7 +130,7 @@ public class PalettedContainer implements PaletteResize, PalettedContainer } @Override - public int onResize(int newBits, T object) { + public synchronized int onResize(int newBits, T object) { // Paper - synchronize PalettedContainer.Data data = this.data; - PalettedContainer.Data data2 = this.createOrReuseData(data, newBits); - data2.copyFrom(data.palette, data.storage); -@@ -116,7 +116,7 @@ public class PalettedContainer implements PaletteResize, PalettedContainer + + // Paper start - Anti-Xray - Add preset values +@@ -177,7 +177,7 @@ public class PalettedContainer implements PaletteResize, PalettedContainer return this.getAndSet(this.strategy.getIndex(x, y, z), value); } @@ -53,7 +53,7 @@ index 1219200cd915d6239a32a2bd09d325cd8fa9b346..dfae0918079425df92d958b04275be8a int i = this.data.palette.idFor(value); int j = this.data.storage.getAndSet(index, i); return this.data.palette.valueFor(j); -@@ -133,7 +133,7 @@ public class PalettedContainer implements PaletteResize, PalettedContainer +@@ -194,7 +194,7 @@ public class PalettedContainer implements PaletteResize, PalettedContainer } @@ -62,7 +62,7 @@ index 1219200cd915d6239a32a2bd09d325cd8fa9b346..dfae0918079425df92d958b04275be8a int i = this.data.palette.idFor(value); this.data.storage.set(index, i); } -@@ -158,7 +158,7 @@ public class PalettedContainer implements PaletteResize, PalettedContainer +@@ -219,7 +219,7 @@ public class PalettedContainer implements PaletteResize, PalettedContainer }); } @@ -71,16 +71,16 @@ index 1219200cd915d6239a32a2bd09d325cd8fa9b346..dfae0918079425df92d958b04275be8a this.acquire(); try { -@@ -174,7 +174,7 @@ public class PalettedContainer implements PaletteResize, PalettedContainer - } - +@@ -239,7 +239,7 @@ public class PalettedContainer implements PaletteResize, PalettedContainer + @Override + @Deprecated @io.papermc.paper.annotation.DoNotUse public void write(FriendlyByteBuf buf) { this.write(buf, null, 0); } @Override -- public void write(FriendlyByteBuf buf) { -+ public synchronized void write(FriendlyByteBuf buf) { // Paper - synchronize +- public void write(FriendlyByteBuf buf, @Nullable com.destroystokyo.paper.antixray.ChunkPacketInfo chunkPacketInfo, int chunkSectionIndex) { ++ public synchronized void write(FriendlyByteBuf buf, @Nullable com.destroystokyo.paper.antixray.ChunkPacketInfo chunkPacketInfo, int chunkSectionIndex) { // Paper - synchronize this.acquire(); try { -@@ -229,7 +229,7 @@ public class PalettedContainer implements PaletteResize, PalettedContainer +@@ -299,7 +299,7 @@ public class PalettedContainer implements PaletteResize, PalettedContainer } @Override diff --git a/patches/server/0614-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0616-Add-option-to-fix-items-merging-through-walls.patch similarity index 100% rename from patches/server/0614-Add-option-to-fix-items-merging-through-walls.patch rename to patches/server/0616-Add-option-to-fix-items-merging-through-walls.patch diff --git a/patches/server/0615-Add-BellRevealRaiderEvent.patch b/patches/server/0617-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/server/0615-Add-BellRevealRaiderEvent.patch rename to patches/server/0617-Add-BellRevealRaiderEvent.patch diff --git a/patches/server/0616-Fix-invulnerable-end-crystals.patch b/patches/server/0618-Fix-invulnerable-end-crystals.patch similarity index 100% rename from patches/server/0616-Fix-invulnerable-end-crystals.patch rename to patches/server/0618-Fix-invulnerable-end-crystals.patch diff --git a/patches/server/0617-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0619-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/server/0617-Add-ElderGuardianAppearanceEvent.patch rename to patches/server/0619-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/server/0618-Fix-dangerous-end-portal-logic.patch b/patches/server/0620-Fix-dangerous-end-portal-logic.patch similarity index 100% rename from patches/server/0618-Fix-dangerous-end-portal-logic.patch rename to patches/server/0620-Fix-dangerous-end-portal-logic.patch diff --git a/patches/server/0619-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0621-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch similarity index 100% rename from patches/server/0619-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch rename to patches/server/0621-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch diff --git a/patches/server/0620-Make-item-validations-configurable.patch b/patches/server/0622-Make-item-validations-configurable.patch similarity index 100% rename from patches/server/0620-Make-item-validations-configurable.patch rename to patches/server/0622-Make-item-validations-configurable.patch diff --git a/patches/server/0621-Line-Of-Sight-Changes.patch b/patches/server/0623-Line-Of-Sight-Changes.patch similarity index 100% rename from patches/server/0621-Line-Of-Sight-Changes.patch rename to patches/server/0623-Line-Of-Sight-Changes.patch diff --git a/patches/server/0622-add-per-world-spawn-limits.patch b/patches/server/0624-add-per-world-spawn-limits.patch similarity index 91% rename from patches/server/0622-add-per-world-spawn-limits.patch rename to patches/server/0624-add-per-world-spawn-limits.patch index 5c4088d46b63..b8c0fcecb3f3 100644 --- a/patches/server/0622-add-per-world-spawn-limits.patch +++ b/patches/server/0624-add-per-world-spawn-limits.patch @@ -6,7 +6,7 @@ Subject: [PATCH] add per world spawn limits Taken from #2982. Credit to Chasewhip8 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 180bf822d361fbae7247c78e7cc3ae412a5a7e48..975b7c20f3755e463c1d65d8de7d63f26bfaf56b 100644 +index 065ae3bea7dfe8f360ad9ac97d503880a41e9dd0..1f8e6b2a293848e61bcfcda4be4afd5c4ac0a91f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -212,6 +212,13 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0623-Fix-potions-splash-events.patch b/patches/server/0625-Fix-potions-splash-events.patch similarity index 100% rename from patches/server/0623-Fix-potions-splash-events.patch rename to patches/server/0625-Fix-potions-splash-events.patch diff --git a/patches/server/0624-Add-more-LimitedRegion-API.patch b/patches/server/0626-Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/server/0624-Add-more-LimitedRegion-API.patch rename to patches/server/0626-Add-more-LimitedRegion-API.patch diff --git a/patches/server/0625-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0627-Fix-PlayerDropItemEvent-using-wrong-item.patch similarity index 100% rename from patches/server/0625-Fix-PlayerDropItemEvent-using-wrong-item.patch rename to patches/server/0627-Fix-PlayerDropItemEvent-using-wrong-item.patch diff --git a/patches/server/0626-Missing-Entity-API.patch b/patches/server/0628-Missing-Entity-API.patch similarity index 100% rename from patches/server/0626-Missing-Entity-API.patch rename to patches/server/0628-Missing-Entity-API.patch diff --git a/patches/server/0627-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0629-Ensure-disconnect-for-book-edit-is-called-on-main.patch similarity index 100% rename from patches/server/0627-Ensure-disconnect-for-book-edit-is-called-on-main.patch rename to patches/server/0629-Ensure-disconnect-for-book-edit-is-called-on-main.patch diff --git a/patches/server/0628-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0630-Fix-return-value-of-Block-applyBoneMeal-always-being.patch similarity index 100% rename from patches/server/0628-Fix-return-value-of-Block-applyBoneMeal-always-being.patch rename to patches/server/0630-Fix-return-value-of-Block-applyBoneMeal-always-being.patch diff --git a/patches/server/0629-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0631-Use-getChunkIfLoadedImmediately-in-places.patch similarity index 88% rename from patches/server/0629-Use-getChunkIfLoadedImmediately-in-places.patch rename to patches/server/0631-Use-getChunkIfLoadedImmediately-in-places.patch index 5b9b5191fefa..f9e82eef3288 100644 --- a/patches/server/0629-Use-getChunkIfLoadedImmediately-in-places.patch +++ b/patches/server/0631-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/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 0f6743717f1c219598692cce884cdfcea4cd1ae8..b71e404acd353757cb64489cfe3804988db70409 100644 +index 508b18f5e7dd6240a680e73be639d0cf9e4e5d07..31d30840ec0acfd0d666163f77c8deb0efced922 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -228,7 +228,7 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -21,10 +21,10 @@ index 0f6743717f1c219598692cce884cdfcea4cd1ae8..b71e404acd353757cb64489cfe380498 @Override diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 1ed9fbe7885fdc4f8b02364068519e833866aff9..cab4dd0f87bd6e497416b67835b62b4f40539153 100644 +index 51dc136b9a5006382de4b12275a9c2f299d5d1f9..7113fdf06bc526af62d08313f8c47e14a2f4b652 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java -@@ -200,6 +200,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -201,6 +201,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable { return (CraftServer) Bukkit.getServer(); } @@ -37,7 +37,7 @@ index 1ed9fbe7885fdc4f8b02364068519e833866aff9..cab4dd0f87bd6e497416b67835b62b4f + public abstract ResourceKey getTypeKey(); - protected Level(WritableLevelData worlddatamutable, ResourceKey resourcekey, RegistryAccess iregistrycustom, Holder holder, Supplier supplier, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.function.Function paperWorldConfigCreator) { // Paper + protected Level(WritableLevelData worlddatamutable, ResourceKey resourcekey, RegistryAccess iregistrycustom, Holder holder, Supplier supplier, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.function.Function paperWorldConfigCreator, java.util.concurrent.Executor executor) { // Paper - Async-Anti-Xray - Pass executor diff --git a/src/main/java/net/minecraft/world/level/gameevent/GameEventDispatcher.java b/src/main/java/net/minecraft/world/level/gameevent/GameEventDispatcher.java index 0d5ae91a9b43df7b412968ab5faf5498c09169f9..744160405680babbb83c99abcbe2dc89bf312398 100644 --- a/src/main/java/net/minecraft/world/level/gameevent/GameEventDispatcher.java diff --git a/patches/server/0630-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0632-Fix-commands-from-signs-not-firing-command-events.patch similarity index 100% rename from patches/server/0630-Fix-commands-from-signs-not-firing-command-events.patch rename to patches/server/0632-Fix-commands-from-signs-not-firing-command-events.patch diff --git a/patches/server/0631-Adds-PlayerArmSwingEvent.patch b/patches/server/0633-Adds-PlayerArmSwingEvent.patch similarity index 100% rename from patches/server/0631-Adds-PlayerArmSwingEvent.patch rename to patches/server/0633-Adds-PlayerArmSwingEvent.patch diff --git a/patches/server/0632-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0634-Fixes-kick-event-leave-message-not-being-sent.patch similarity index 100% rename from patches/server/0632-Fixes-kick-event-leave-message-not-being-sent.patch rename to patches/server/0634-Fixes-kick-event-leave-message-not-being-sent.patch diff --git a/patches/server/0633-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0635-Add-config-for-mobs-immune-to-default-effects.patch similarity index 100% rename from patches/server/0633-Add-config-for-mobs-immune-to-default-effects.patch rename to patches/server/0635-Add-config-for-mobs-immune-to-default-effects.patch diff --git a/patches/server/0634-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0636-Fix-incorrect-message-for-outdated-client.patch similarity index 100% rename from patches/server/0634-Fix-incorrect-message-for-outdated-client.patch rename to patches/server/0636-Fix-incorrect-message-for-outdated-client.patch diff --git a/patches/server/0635-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0637-Don-t-apply-cramming-damage-to-players.patch similarity index 100% rename from patches/server/0635-Don-t-apply-cramming-damage-to-players.patch rename to patches/server/0637-Don-t-apply-cramming-damage-to-players.patch diff --git a/patches/server/0636-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0638-Rate-options-and-timings-for-sensors-and-behaviors.patch similarity index 100% rename from patches/server/0636-Rate-options-and-timings-for-sensors-and-behaviors.patch rename to patches/server/0638-Rate-options-and-timings-for-sensors-and-behaviors.patch diff --git a/patches/server/0637-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0639-Add-a-bunch-of-missing-forceDrop-toggles.patch similarity index 100% rename from patches/server/0637-Add-a-bunch-of-missing-forceDrop-toggles.patch rename to patches/server/0639-Add-a-bunch-of-missing-forceDrop-toggles.patch diff --git a/patches/server/0638-Stinger-API.patch b/patches/server/0640-Stinger-API.patch similarity index 100% rename from patches/server/0638-Stinger-API.patch rename to patches/server/0640-Stinger-API.patch diff --git a/patches/server/0639-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0641-Fix-incosistency-issue-with-empty-map-items-in-CB.patch similarity index 100% rename from patches/server/0639-Fix-incosistency-issue-with-empty-map-items-in-CB.patch rename to patches/server/0641-Fix-incosistency-issue-with-empty-map-items-in-CB.patch diff --git a/patches/server/0640-Add-System.out-err-catcher.patch b/patches/server/0642-Add-System.out-err-catcher.patch similarity index 98% rename from patches/server/0640-Add-System.out-err-catcher.patch rename to patches/server/0642-Add-System.out-err-catcher.patch index f191c334a6ab..8fdf8da1bfed 100644 --- a/patches/server/0640-Add-System.out-err-catcher.patch +++ b/patches/server/0642-Add-System.out-err-catcher.patch @@ -105,7 +105,7 @@ index 0000000000000000000000000000000000000000..a8e813ca89b033f061e695288b3383bd + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index a2eb6d59fca4ed219ee4215e46758c4c20d6e893..3253875b3001befebc8ff63a237bfa491fcd42f0 100644 +index a5b77644dc64e646de0d542dfd7b7f68df823eb1..8d174306f50f40235754773ee8299115eb0d8917 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -305,6 +305,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0641-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0643-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/server/0641-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/server/0643-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/server/0642-Improve-boat-collision-performance.patch b/patches/server/0644-Improve-boat-collision-performance.patch similarity index 100% rename from patches/server/0642-Improve-boat-collision-performance.patch rename to patches/server/0644-Improve-boat-collision-performance.patch diff --git a/patches/server/0643-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0645-Prevent-AFK-kick-while-watching-end-credits.patch similarity index 100% rename from patches/server/0643-Prevent-AFK-kick-while-watching-end-credits.patch rename to patches/server/0645-Prevent-AFK-kick-while-watching-end-credits.patch diff --git a/patches/server/0644-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0646-Allow-skipping-writing-of-comments-to-server.propert.patch similarity index 100% rename from patches/server/0644-Allow-skipping-writing-of-comments-to-server.propert.patch rename to patches/server/0646-Allow-skipping-writing-of-comments-to-server.propert.patch diff --git a/patches/server/0645-Add-PlayerSetSpawnEvent.patch b/patches/server/0647-Add-PlayerSetSpawnEvent.patch similarity index 100% rename from patches/server/0645-Add-PlayerSetSpawnEvent.patch rename to patches/server/0647-Add-PlayerSetSpawnEvent.patch diff --git a/patches/server/0646-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0648-Make-hoppers-respect-inventory-max-stack-size.patch similarity index 100% rename from patches/server/0646-Make-hoppers-respect-inventory-max-stack-size.patch rename to patches/server/0648-Make-hoppers-respect-inventory-max-stack-size.patch diff --git a/patches/server/0647-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0649-Optimize-entity-tracker-passenger-checks.patch similarity index 100% rename from patches/server/0647-Optimize-entity-tracker-passenger-checks.patch rename to patches/server/0649-Optimize-entity-tracker-passenger-checks.patch diff --git a/patches/server/0648-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0650-Config-option-for-Piglins-guarding-chests.patch similarity index 100% rename from patches/server/0648-Config-option-for-Piglins-guarding-chests.patch rename to patches/server/0650-Config-option-for-Piglins-guarding-chests.patch diff --git a/patches/server/0649-Added-EntityDamageItemEvent.patch b/patches/server/0651-Added-EntityDamageItemEvent.patch similarity index 100% rename from patches/server/0649-Added-EntityDamageItemEvent.patch rename to patches/server/0651-Added-EntityDamageItemEvent.patch diff --git a/patches/server/0650-Optimize-indirect-passenger-iteration.patch b/patches/server/0652-Optimize-indirect-passenger-iteration.patch similarity index 100% rename from patches/server/0650-Optimize-indirect-passenger-iteration.patch rename to patches/server/0652-Optimize-indirect-passenger-iteration.patch diff --git a/patches/server/0651-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0653-Configurable-item-frame-map-cursor-update-interval.patch similarity index 100% rename from patches/server/0651-Configurable-item-frame-map-cursor-update-interval.patch rename to patches/server/0653-Configurable-item-frame-map-cursor-update-interval.patch diff --git a/patches/server/0652-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0654-Make-EntityUnleashEvent-cancellable.patch similarity index 100% rename from patches/server/0652-Make-EntityUnleashEvent-cancellable.patch rename to patches/server/0654-Make-EntityUnleashEvent-cancellable.patch diff --git a/patches/server/0653-Clear-bucket-NBT-after-dispense.patch b/patches/server/0655-Clear-bucket-NBT-after-dispense.patch similarity index 100% rename from patches/server/0653-Clear-bucket-NBT-after-dispense.patch rename to patches/server/0655-Clear-bucket-NBT-after-dispense.patch diff --git a/patches/server/0654-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0656-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/server/0654-Change-EnderEye-target-without-changing-other-things.patch rename to patches/server/0656-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/server/0655-Add-BlockBreakBlockEvent.patch b/patches/server/0657-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/server/0655-Add-BlockBreakBlockEvent.patch rename to patches/server/0657-Add-BlockBreakBlockEvent.patch diff --git a/patches/server/0656-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0658-Option-to-prevent-NBT-copy-in-smithing-recipes.patch similarity index 100% rename from patches/server/0656-Option-to-prevent-NBT-copy-in-smithing-recipes.patch rename to patches/server/0658-Option-to-prevent-NBT-copy-in-smithing-recipes.patch diff --git a/patches/server/0657-More-CommandBlock-API.patch b/patches/server/0659-More-CommandBlock-API.patch similarity index 100% rename from patches/server/0657-More-CommandBlock-API.patch rename to patches/server/0659-More-CommandBlock-API.patch diff --git a/patches/server/0658-Add-missing-team-sidebar-display-slots.patch b/patches/server/0660-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/server/0658-Add-missing-team-sidebar-display-slots.patch rename to patches/server/0660-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/server/0659-Add-back-EntityPortalExitEvent.patch b/patches/server/0661-Add-back-EntityPortalExitEvent.patch similarity index 100% rename from patches/server/0659-Add-back-EntityPortalExitEvent.patch rename to patches/server/0661-Add-back-EntityPortalExitEvent.patch diff --git a/patches/server/0660-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0662-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 91% rename from patches/server/0660-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/server/0662-Add-methods-to-find-targets-for-lightning-strikes.patch index f6cee6d23fd7..c6cef5bec2a4 100644 --- a/patches/server/0660-Add-methods-to-find-targets-for-lightning-strikes.patch +++ b/patches/server/0662-Add-methods-to-find-targets-for-lightning-strikes.patch @@ -7,7 +7,7 @@ Subject: [PATCH] Add methods to find targets for lightning strikes public net.minecraft.server.level.ServerLevel findLightningRod(Lnet/minecraft/core/BlockPos;)Ljava/util/Optional; diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index b71e404acd353757cb64489cfe3804988db70409..257eedb5413521e1e3ce6a6a6376e0c8175c8c5e 100644 +index 31d30840ec0acfd0d666163f77c8deb0efced922..a11bd2d9f5b2fb248cc322ea61886050fa2e73a9 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -976,6 +976,11 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -31,10 +31,10 @@ index b71e404acd353757cb64489cfe3804988db70409..257eedb5413521e1e3ce6a6a6376e0c8 blockposition1 = blockposition1.above(2); } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 975b7c20f3755e463c1d65d8de7d63f26bfaf56b..e4eb19d37ec3128a0f0c96e154605fccc8ba822a 100644 +index 1f8e6b2a293848e61bcfcda4be4afd5c4ac0a91f..31b3314bd2e155be8e4f82431dce8b5e3f3934ef 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -693,6 +693,23 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -698,6 +698,23 @@ public class CraftWorld extends CraftRegionAccessor implements World { return (LightningStrike) lightning.getBukkitEntity(); } diff --git a/patches/server/0661-Get-entity-default-attributes.patch b/patches/server/0663-Get-entity-default-attributes.patch similarity index 100% rename from patches/server/0661-Get-entity-default-attributes.patch rename to patches/server/0663-Get-entity-default-attributes.patch diff --git a/patches/server/0662-Left-handed-API.patch b/patches/server/0664-Left-handed-API.patch similarity index 100% rename from patches/server/0662-Left-handed-API.patch rename to patches/server/0664-Left-handed-API.patch diff --git a/patches/server/0663-Add-more-advancement-API.patch b/patches/server/0665-Add-more-advancement-API.patch similarity index 100% rename from patches/server/0663-Add-more-advancement-API.patch rename to patches/server/0665-Add-more-advancement-API.patch diff --git a/patches/server/0664-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0666-Add-ItemFactory-getSpawnEgg-API.patch similarity index 100% rename from patches/server/0664-Add-ItemFactory-getSpawnEgg-API.patch rename to patches/server/0666-Add-ItemFactory-getSpawnEgg-API.patch diff --git a/patches/server/0665-Add-critical-damage-API.patch b/patches/server/0667-Add-critical-damage-API.patch similarity index 100% rename from patches/server/0665-Add-critical-damage-API.patch rename to patches/server/0667-Add-critical-damage-API.patch diff --git a/patches/server/0666-Fix-issues-with-mob-conversion.patch b/patches/server/0668-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/server/0666-Fix-issues-with-mob-conversion.patch rename to patches/server/0668-Fix-issues-with-mob-conversion.patch diff --git a/patches/server/0667-Add-isCollidable-methods-to-various-places.patch b/patches/server/0669-Add-isCollidable-methods-to-various-places.patch similarity index 100% rename from patches/server/0667-Add-isCollidable-methods-to-various-places.patch rename to patches/server/0669-Add-isCollidable-methods-to-various-places.patch diff --git a/patches/server/0668-Goat-ram-API.patch b/patches/server/0670-Goat-ram-API.patch similarity index 100% rename from patches/server/0668-Goat-ram-API.patch rename to patches/server/0670-Goat-ram-API.patch diff --git a/patches/server/0669-Add-API-for-resetting-a-single-score.patch b/patches/server/0671-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/server/0669-Add-API-for-resetting-a-single-score.patch rename to patches/server/0671-Add-API-for-resetting-a-single-score.patch diff --git a/patches/server/0670-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0672-Add-Raw-Byte-Entity-Serialization.patch similarity index 100% rename from patches/server/0670-Add-Raw-Byte-Entity-Serialization.patch rename to patches/server/0672-Add-Raw-Byte-Entity-Serialization.patch diff --git a/patches/server/0671-Vanilla-command-permission-fixes.patch b/patches/server/0673-Vanilla-command-permission-fixes.patch similarity index 100% rename from patches/server/0671-Vanilla-command-permission-fixes.patch rename to patches/server/0673-Vanilla-command-permission-fixes.patch diff --git a/patches/server/0672-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0674-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch similarity index 97% rename from patches/server/0672-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch rename to patches/server/0674-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch index 346f6ac14526..d728967204f8 100644 --- a/patches/server/0672-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch +++ b/patches/server/0674-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch @@ -9,7 +9,7 @@ chunk through it. This should also be OK from a leak prevention/ state desync POV because the TE is getting unloaded anyways. diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 257eedb5413521e1e3ce6a6a6376e0c8175c8c5e..f0f8d10140f0d06cba292f039d1e32ae26b940e4 100644 +index a11bd2d9f5b2fb248cc322ea61886050fa2e73a9..80f2a1204bee79daf0cae9310ce8d552c59e66fe 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1555,9 +1555,13 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0673-Fix-GameProfileCache-concurrency.patch b/patches/server/0675-Fix-GameProfileCache-concurrency.patch similarity index 100% rename from patches/server/0673-Fix-GameProfileCache-concurrency.patch rename to patches/server/0675-Fix-GameProfileCache-concurrency.patch diff --git a/patches/server/0674-Improve-and-expand-AsyncCatcher.patch b/patches/server/0676-Improve-and-expand-AsyncCatcher.patch similarity index 100% rename from patches/server/0674-Improve-and-expand-AsyncCatcher.patch rename to patches/server/0676-Improve-and-expand-AsyncCatcher.patch diff --git a/patches/server/0675-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0677-Add-paper-mobcaps-and-paper-playermobcaps.patch similarity index 98% rename from patches/server/0675-Add-paper-mobcaps-and-paper-playermobcaps.patch rename to patches/server/0677-Add-paper-mobcaps-and-paper-playermobcaps.patch index 3dfdeead726f..23f5ec3c9190 100644 --- a/patches/server/0675-Add-paper-mobcaps-and-paper-playermobcaps.patch +++ b/patches/server/0677-Add-paper-mobcaps-and-paper-playermobcaps.patch @@ -278,7 +278,7 @@ index 7983f9a21251cec4857529ad1180a62668ea5037..e1c4cf4b60b810837526c888ec82acbf // Paper start - add parameters and int ret type spawnCategoryForChunk(group, world, chunk, checker, runner, Integer.MAX_VALUE, null); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 3253875b3001befebc8ff63a237bfa491fcd42f0..854980b4d52403a22847167b89b89cf3dda1793c 100644 +index 8d174306f50f40235754773ee8299115eb0d8917..9d1a5979b59bbd1efe03d39b12fc726836637614 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2183,6 +2183,11 @@ public final class CraftServer implements Server { @@ -294,10 +294,10 @@ index 3253875b3001befebc8ff63a237bfa491fcd42f0..854980b4d52403a22847167b89b89cf3 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index e4eb19d37ec3128a0f0c96e154605fccc8ba822a..99f075d23484301259daabbab0569fc780e02b5b 100644 +index 31b3314bd2e155be8e4f82431dce8b5e3f3934ef..a96a8878c7b1f1e39d07187e8bee8321305acdef 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1699,9 +1699,14 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -1704,9 +1704,14 @@ public class CraftWorld extends CraftRegionAccessor implements World { Preconditions.checkArgument(spawnCategory != null, "SpawnCategory cannot be null"); Preconditions.checkArgument(CraftSpawnCategory.isValidForLimits(spawnCategory), "SpawnCategory.%s are not supported", spawnCategory); diff --git a/patches/server/0676-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0678-Sanitize-ResourceLocation-error-logging.patch similarity index 100% rename from patches/server/0676-Sanitize-ResourceLocation-error-logging.patch rename to patches/server/0678-Sanitize-ResourceLocation-error-logging.patch diff --git a/patches/server/0677-Optimise-general-POI-access.patch b/patches/server/0679-Optimise-general-POI-access.patch similarity index 100% rename from patches/server/0677-Optimise-general-POI-access.patch rename to patches/server/0679-Optimise-general-POI-access.patch diff --git a/patches/server/0678-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0680-Custom-table-implementation-for-blockstate-state-loo.patch similarity index 100% rename from patches/server/0678-Custom-table-implementation-for-blockstate-state-loo.patch rename to patches/server/0680-Custom-table-implementation-for-blockstate-state-loo.patch diff --git a/patches/server/0679-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0681-Manually-inline-methods-in-BlockPosition.patch similarity index 100% rename from patches/server/0679-Manually-inline-methods-in-BlockPosition.patch rename to patches/server/0681-Manually-inline-methods-in-BlockPosition.patch diff --git a/patches/server/0680-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0682-Name-craft-scheduler-threads-according-to-the-plugin.patch similarity index 100% rename from patches/server/0680-Name-craft-scheduler-threads-according-to-the-plugin.patch rename to patches/server/0682-Name-craft-scheduler-threads-according-to-the-plugin.patch diff --git a/patches/server/0681-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0683-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch similarity index 90% rename from patches/server/0681-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch rename to patches/server/0683-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch index f5667e4d2133..ad81d5020587 100644 --- a/patches/server/0681-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch +++ b/patches/server/0683-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch @@ -13,10 +13,10 @@ Paper recently reverted this optimisation, so it's been reintroduced here. diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index cab4dd0f87bd6e497416b67835b62b4f40539153..4cdf476a1f3c5b255b7b4ff4793b6015387879d2 100644 +index 7113fdf06bc526af62d08313f8c47e14a2f4b652..0f16a962082cf8a213cb348b87683692f818c80a 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java -@@ -453,6 +453,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -455,6 +455,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable { @Override public final LevelChunk getChunk(int chunkX, int chunkZ) { // Paper - final to help inline diff --git a/patches/server/0682-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0684-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch similarity index 100% rename from patches/server/0682-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch rename to patches/server/0684-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch diff --git a/patches/server/0683-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0685-Don-t-lookup-fluid-state-when-raytracing.patch similarity index 100% rename from patches/server/0683-Don-t-lookup-fluid-state-when-raytracing.patch rename to patches/server/0685-Don-t-lookup-fluid-state-when-raytracing.patch diff --git a/patches/server/0684-Time-scoreboard-search.patch b/patches/server/0686-Time-scoreboard-search.patch similarity index 100% rename from patches/server/0684-Time-scoreboard-search.patch rename to patches/server/0686-Time-scoreboard-search.patch diff --git a/patches/server/0685-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0687-Send-full-pos-packets-for-hard-colliding-entities.patch similarity index 100% rename from patches/server/0685-Send-full-pos-packets-for-hard-colliding-entities.patch rename to patches/server/0687-Send-full-pos-packets-for-hard-colliding-entities.patch diff --git a/patches/server/0686-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0688-Do-not-run-raytrace-logic-for-AIR.patch similarity index 100% rename from patches/server/0686-Do-not-run-raytrace-logic-for-AIR.patch rename to patches/server/0688-Do-not-run-raytrace-logic-for-AIR.patch diff --git a/patches/server/0687-Execute-chunk-tasks-mid-tick.patch b/patches/server/0689-Execute-chunk-tasks-mid-tick.patch similarity index 96% rename from patches/server/0687-Execute-chunk-tasks-mid-tick.patch rename to patches/server/0689-Execute-chunk-tasks-mid-tick.patch index e275849487a7..f7213f054939 100644 --- a/patches/server/0687-Execute-chunk-tasks-mid-tick.patch +++ b/patches/server/0689-Execute-chunk-tasks-mid-tick.patch @@ -126,7 +126,7 @@ index 7b5851cd4f5a91bf7609464d7d6c4bb5a3da14bf..50da1f746edeff63f723776b8e30b041 } } diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index f0f8d10140f0d06cba292f039d1e32ae26b940e4..1397c7d2b3706a3d58d9304627d504eb28ae3b82 100644 +index 80f2a1204bee79daf0cae9310ce8d552c59e66fe..5c39bf8a3975e632a4f41938306d9b2eb77f335d 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -215,6 +215,7 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -154,10 +154,10 @@ index f0f8d10140f0d06cba292f039d1e32ae26b940e4..1397c7d2b3706a3d58d9304627d504eb } diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 4cdf476a1f3c5b255b7b4ff4793b6015387879d2..a9318df42efbc8dd454a487afbd02332290e6f42 100644 +index 0f16a962082cf8a213cb348b87683692f818c80a..a21b2a100503b1fcceb700da11bef5866f3d178b 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java -@@ -915,6 +915,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -918,6 +918,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable { // Spigot end } else if (this.shouldTickBlocksAt(tickingblockentity.getPos())) { tickingblockentity.tick(); @@ -169,7 +169,7 @@ index 4cdf476a1f3c5b255b7b4ff4793b6015387879d2..a9318df42efbc8dd454a487afbd02332 } } this.blockEntityTickers.removeAll(toRemove); -@@ -929,6 +934,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -932,6 +937,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { public void guardEntityTick(Consumer tickConsumer, T entity) { try { tickConsumer.accept(entity); diff --git a/patches/server/0688-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0690-Oprimise-map-impl-for-tracked-players.patch similarity index 100% rename from patches/server/0688-Oprimise-map-impl-for-tracked-players.patch rename to patches/server/0690-Oprimise-map-impl-for-tracked-players.patch diff --git a/patches/server/0689-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0691-Optimise-BlockSoil-nearby-water-lookup.patch similarity index 100% rename from patches/server/0689-Optimise-BlockSoil-nearby-water-lookup.patch rename to patches/server/0691-Optimise-BlockSoil-nearby-water-lookup.patch diff --git a/patches/server/0690-Optimise-random-block-ticking.patch b/patches/server/0692-Optimise-random-block-ticking.patch similarity index 96% rename from patches/server/0690-Optimise-random-block-ticking.patch rename to patches/server/0692-Optimise-random-block-ticking.patch index 203cc8d65fb3..9e99f2000515 100644 --- a/patches/server/0690-Optimise-random-block-ticking.patch +++ b/patches/server/0692-Optimise-random-block-ticking.patch @@ -90,7 +90,7 @@ index 0000000000000000000000000000000000000000..7d93652c1abbb6aee6eb7c26cf35d4d0 + } +} diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 1397c7d2b3706a3d58d9304627d504eb28ae3b82..7074c1e7d7d33dafc0e69f5ab2630e47b7ad1795 100644 +index 5c39bf8a3975e632a4f41938306d9b2eb77f335d..5478b17a00c34c927455dddf804c4d4fbba7e7a9 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -839,6 +839,10 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -318,10 +318,10 @@ index 652a8150f7343050b6da6c01f4e73a755138d491..5f57f13d50e051c621e401b63c0b55b3 public BlockPos getHomePos() { diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index a9318df42efbc8dd454a487afbd02332290e6f42..57403c09141ece41a882c6574a593be391b34782 100644 +index a21b2a100503b1fcceb700da11bef5866f3d178b..270ce3995229aa79074e981bb45e5480a5e924d4 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java -@@ -1377,10 +1377,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -1380,10 +1380,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable { public abstract RecipeManager getRecipeManager(); public BlockPos getBlockRandomPos(int x, int y, int z, int l) { @@ -342,7 +342,7 @@ index a9318df42efbc8dd454a487afbd02332290e6f42..57403c09141ece41a882c6574a593be3 public boolean noSave() { 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 789664d53584c7d958572c63db22f904fb411a58..5d53b09e19b664fad337ea5098bf9cf41a7168f8 100644 +index b8fee4f8a0cfe32b9ef7f3f3cf818cbaec0d3fca..12edaf88cca54540c617239ac31b2263dfa0ecd7 100644 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java @@ -25,6 +25,7 @@ public class LevelChunkSection { @@ -353,7 +353,7 @@ index 789664d53584c7d958572c63db22f904fb411a58..5d53b09e19b664fad337ea5098bf9cf4 public LevelChunkSection(PalettedContainer datapaletteblock, PalettedContainer> palettedcontainerro) { // CraftBukkit end -@@ -74,6 +75,9 @@ public class LevelChunkSection { +@@ -77,6 +78,9 @@ public class LevelChunkSection { --this.nonEmptyBlockCount; if (iblockdata1.isRandomlyTicking()) { --this.tickingBlockCount; @@ -363,7 +363,7 @@ index 789664d53584c7d958572c63db22f904fb411a58..5d53b09e19b664fad337ea5098bf9cf4 } } -@@ -85,6 +89,9 @@ public class LevelChunkSection { +@@ -88,6 +92,9 @@ public class LevelChunkSection { ++this.nonEmptyBlockCount; if (state.isRandomlyTicking()) { ++this.tickingBlockCount; @@ -373,7 +373,7 @@ index 789664d53584c7d958572c63db22f904fb411a58..5d53b09e19b664fad337ea5098bf9cf4 } } -@@ -112,40 +119,31 @@ public class LevelChunkSection { +@@ -115,40 +122,31 @@ public class LevelChunkSection { } public void recalcBlockCounts() { @@ -422,9 +422,9 @@ index 789664d53584c7d958572c63db22f904fb411a58..5d53b09e19b664fad337ea5098bf9cf4 - } - } -- -- a a0 = new a(); +- a a0 = new a(); +- - this.states.count(a0); - this.nonEmptyBlockCount = (short) a0.nonEmptyBlockCount; - this.tickingBlockCount = (short) a0.tickingBlockCount; @@ -435,10 +435,10 @@ index 789664d53584c7d958572c63db22f904fb411a58..5d53b09e19b664fad337ea5098bf9cf4 public PalettedContainer getStates() { 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 dfae0918079425df92d958b04275be8ae60d4b60..79d4f2104fe941f28156355c22837bb4c3605863 100644 +index 27122a06e172c8d54104c115dfda668a52ff1cde..16fbc633de3a1d9e5e8c65ae107397a6f0e50811 100644 --- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java +++ b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java -@@ -316,6 +316,14 @@ public class PalettedContainer implements PaletteResize, PalettedContainer +@@ -386,6 +386,14 @@ public class PalettedContainer implements PaletteResize, PalettedContainer } } diff --git a/patches/server/0691-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0693-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch similarity index 99% rename from patches/server/0691-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch rename to patches/server/0693-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch index dc6a27403eba..0a7c36c9772e 100644 --- a/patches/server/0691-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch +++ b/patches/server/0693-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch @@ -10,7 +10,7 @@ hoping that at least then we don't swap chunks, and maybe recover them all. diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java -index 9a4fa3e034108528197cca3d040d210fa819af8b..954b846d25f83f220e6585664c71e347192b3c71 100644 +index 19b35d1c07c75b27cef9a53258a68ec5d9f721d5..e1ad2152bbd55435495bdad57a0984842e55fcb8 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java @@ -70,6 +70,18 @@ import net.minecraft.world.ticks.ProtoChunkTicks; @@ -30,9 +30,9 @@ index 9a4fa3e034108528197cca3d040d210fa819af8b..954b846d25f83f220e6585664c71e347 + } + // Paper end - public static final Codec> BLOCK_STATE_CODEC = PalettedContainer.codecRW(Block.BLOCK_STATE_REGISTRY, BlockState.CODEC, PalettedContainer.Strategy.SECTION_STATES, Blocks.AIR.defaultBlockState()); + public static final Codec> BLOCK_STATE_CODEC = PalettedContainer.codecRW(Block.BLOCK_STATE_REGISTRY, BlockState.CODEC, PalettedContainer.Strategy.SECTION_STATES, Blocks.AIR.defaultBlockState(), null); // Paper - Anti-Xray - Add preset block states private static final Logger LOGGER = LogUtils.getLogger(); -@@ -446,7 +458,7 @@ public class ChunkSerializer { +@@ -450,7 +462,7 @@ public class ChunkSerializer { nbttagcompound.putInt("xPos", chunkcoordintpair.x); nbttagcompound.putInt("yPos", chunk.getMinSection()); nbttagcompound.putInt("zPos", chunkcoordintpair.z); diff --git a/patches/server/0692-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0694-Use-Velocity-compression-and-cipher-natives.patch similarity index 100% rename from patches/server/0692-Use-Velocity-compression-and-cipher-natives.patch rename to patches/server/0694-Use-Velocity-compression-and-cipher-natives.patch diff --git a/patches/server/0693-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0695-Detail-more-information-in-watchdog-dumps.patch similarity index 99% rename from patches/server/0693-Detail-more-information-in-watchdog-dumps.patch rename to patches/server/0695-Detail-more-information-in-watchdog-dumps.patch index 7305bb4eb27b..885d71197d3c 100644 --- a/patches/server/0693-Detail-more-information-in-watchdog-dumps.patch +++ b/patches/server/0695-Detail-more-information-in-watchdog-dumps.patch @@ -76,7 +76,7 @@ index 047fc7206131e0f36ab45d04e98b7a235431e342..6ac03dee902051a26493dba468d6a2f5 }); throw RunningOnDifferentThreadException.RUNNING_ON_DIFFERENT_THREAD; diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 7074c1e7d7d33dafc0e69f5ab2630e47b7ad1795..cbebd94026be140f4d0d913596e5a6d4e03ee154 100644 +index 5478b17a00c34c927455dddf804c4d4fbba7e7a9..bf0a263ca5cde88479b475fc3e8377a72b1834d9 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1215,7 +1215,26 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0694-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0696-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch similarity index 100% rename from patches/server/0694-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch rename to patches/server/0696-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch diff --git a/patches/server/0695-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0697-Fix-Bukkit-NamespacedKey-shenanigans.patch similarity index 100% rename from patches/server/0695-Fix-Bukkit-NamespacedKey-shenanigans.patch rename to patches/server/0697-Fix-Bukkit-NamespacedKey-shenanigans.patch diff --git a/patches/server/0696-Distance-manager-tick-timings.patch b/patches/server/0698-Distance-manager-tick-timings.patch similarity index 100% rename from patches/server/0696-Distance-manager-tick-timings.patch rename to patches/server/0698-Distance-manager-tick-timings.patch diff --git a/patches/server/0697-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0699-Fix-merchant-inventory-not-closing-on-entity-removal.patch similarity index 94% rename from patches/server/0697-Fix-merchant-inventory-not-closing-on-entity-removal.patch rename to patches/server/0699-Fix-merchant-inventory-not-closing-on-entity-removal.patch index 0bf986c613b5..4859ad5e4848 100644 --- a/patches/server/0697-Fix-merchant-inventory-not-closing-on-entity-removal.patch +++ b/patches/server/0699-Fix-merchant-inventory-not-closing-on-entity-removal.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix merchant inventory not closing on entity removal diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index cbebd94026be140f4d0d913596e5a6d4e03ee154..37ad191dc777869bbaf5de33c43b5dfb41a4df27 100644 +index bf0a263ca5cde88479b475fc3e8377a72b1834d9..0b069e495d9f0523ee2ce5f2124d9f9ffd436625 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -2641,6 +2641,11 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0698-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0700-Check-requirement-before-suggesting-root-nodes.patch similarity index 100% rename from patches/server/0698-Check-requirement-before-suggesting-root-nodes.patch rename to patches/server/0700-Check-requirement-before-suggesting-root-nodes.patch diff --git a/patches/server/0699-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0701-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch similarity index 100% rename from patches/server/0699-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch rename to patches/server/0701-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch diff --git a/patches/server/0700-Add-packet-limiter-config.patch b/patches/server/0702-Add-packet-limiter-config.patch similarity index 100% rename from patches/server/0700-Add-packet-limiter-config.patch rename to patches/server/0702-Add-packet-limiter-config.patch diff --git a/patches/server/0701-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0703-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch similarity index 100% rename from patches/server/0701-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch rename to patches/server/0703-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch diff --git a/patches/server/0702-Ensure-valid-vehicle-status.patch b/patches/server/0704-Ensure-valid-vehicle-status.patch similarity index 100% rename from patches/server/0702-Ensure-valid-vehicle-status.patch rename to patches/server/0704-Ensure-valid-vehicle-status.patch diff --git a/patches/server/0703-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0705-Prevent-softlocked-end-exit-portal-generation.patch similarity index 100% rename from patches/server/0703-Prevent-softlocked-end-exit-portal-generation.patch rename to patches/server/0705-Prevent-softlocked-end-exit-portal-generation.patch diff --git a/patches/server/0704-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0706-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch similarity index 100% rename from patches/server/0704-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch rename to patches/server/0706-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch diff --git a/patches/server/0705-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0707-Don-t-log-debug-logging-being-disabled.patch similarity index 100% rename from patches/server/0705-Don-t-log-debug-logging-being-disabled.patch rename to patches/server/0707-Don-t-log-debug-logging-being-disabled.patch diff --git a/patches/server/0706-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0708-fix-various-menus-with-empty-level-accesses.patch similarity index 100% rename from patches/server/0706-fix-various-menus-with-empty-level-accesses.patch rename to patches/server/0708-fix-various-menus-with-empty-level-accesses.patch diff --git a/patches/server/0707-Preserve-overstacked-loot.patch b/patches/server/0709-Preserve-overstacked-loot.patch similarity index 100% rename from patches/server/0707-Preserve-overstacked-loot.patch rename to patches/server/0709-Preserve-overstacked-loot.patch diff --git a/patches/server/0708-Update-head-rotation-in-missing-places.patch b/patches/server/0710-Update-head-rotation-in-missing-places.patch similarity index 100% rename from patches/server/0708-Update-head-rotation-in-missing-places.patch rename to patches/server/0710-Update-head-rotation-in-missing-places.patch diff --git a/patches/server/0709-prevent-unintended-light-block-manipulation.patch b/patches/server/0711-prevent-unintended-light-block-manipulation.patch similarity index 100% rename from patches/server/0709-prevent-unintended-light-block-manipulation.patch rename to patches/server/0711-prevent-unintended-light-block-manipulation.patch diff --git a/patches/server/0710-Fix-CraftCriteria-defaults-map.patch b/patches/server/0712-Fix-CraftCriteria-defaults-map.patch similarity index 100% rename from patches/server/0710-Fix-CraftCriteria-defaults-map.patch rename to patches/server/0712-Fix-CraftCriteria-defaults-map.patch diff --git a/patches/server/0711-Fix-upstreams-block-state-factories.patch b/patches/server/0713-Fix-upstreams-block-state-factories.patch similarity index 100% rename from patches/server/0711-Fix-upstreams-block-state-factories.patch rename to patches/server/0713-Fix-upstreams-block-state-factories.patch diff --git a/patches/server/0712-Configurable-feature-seeds.patch b/patches/server/0714-Configurable-feature-seeds.patch similarity index 100% rename from patches/server/0712-Configurable-feature-seeds.patch rename to patches/server/0714-Configurable-feature-seeds.patch diff --git a/patches/server/0713-Add-root-admin-user-detection.patch b/patches/server/0715-Add-root-admin-user-detection.patch similarity index 100% rename from patches/server/0713-Add-root-admin-user-detection.patch rename to patches/server/0715-Add-root-admin-user-detection.patch diff --git a/patches/server/0714-Always-allow-item-changing-in-Fireball.patch b/patches/server/0716-Always-allow-item-changing-in-Fireball.patch similarity index 100% rename from patches/server/0714-Always-allow-item-changing-in-Fireball.patch rename to patches/server/0716-Always-allow-item-changing-in-Fireball.patch diff --git a/patches/server/0715-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0717-don-t-attempt-to-teleport-dead-entities.patch similarity index 100% rename from patches/server/0715-don-t-attempt-to-teleport-dead-entities.patch rename to patches/server/0717-don-t-attempt-to-teleport-dead-entities.patch diff --git a/patches/server/0716-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0718-Prevent-excessive-velocity-through-repeated-crits.patch similarity index 100% rename from patches/server/0716-Prevent-excessive-velocity-through-repeated-crits.patch rename to patches/server/0718-Prevent-excessive-velocity-through-repeated-crits.patch diff --git a/patches/server/0717-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0719-Remove-client-side-code-using-deprecated-for-removal.patch similarity index 100% rename from patches/server/0717-Remove-client-side-code-using-deprecated-for-removal.patch rename to patches/server/0719-Remove-client-side-code-using-deprecated-for-removal.patch diff --git a/patches/server/0718-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0720-Fix-removing-recipes-from-RecipeIterator.patch similarity index 100% rename from patches/server/0718-Fix-removing-recipes-from-RecipeIterator.patch rename to patches/server/0720-Fix-removing-recipes-from-RecipeIterator.patch diff --git a/patches/server/0719-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0721-Prevent-sending-oversized-item-data-in-equipment-and.patch similarity index 100% rename from patches/server/0719-Prevent-sending-oversized-item-data-in-equipment-and.patch rename to patches/server/0721-Prevent-sending-oversized-item-data-in-equipment-and.patch diff --git a/patches/server/0720-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0722-Hide-unnecessary-itemmeta-from-clients.patch similarity index 100% rename from patches/server/0720-Hide-unnecessary-itemmeta-from-clients.patch rename to patches/server/0722-Hide-unnecessary-itemmeta-from-clients.patch diff --git a/patches/server/0721-Fix-Spigot-growth-modifiers.patch b/patches/server/0723-Fix-Spigot-growth-modifiers.patch similarity index 100% rename from patches/server/0721-Fix-Spigot-growth-modifiers.patch rename to patches/server/0723-Fix-Spigot-growth-modifiers.patch diff --git a/patches/server/0722-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0724-Prevent-ContainerOpenersCounter-openCount-from-going.patch similarity index 100% rename from patches/server/0722-Prevent-ContainerOpenersCounter-openCount-from-going.patch rename to patches/server/0724-Prevent-ContainerOpenersCounter-openCount-from-going.patch diff --git a/patches/server/0723-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0725-Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/server/0723-Add-PlayerItemFrameChangeEvent.patch rename to patches/server/0725-Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/server/0724-Optimize-HashMapPalette.patch b/patches/server/0726-Optimize-HashMapPalette.patch similarity index 100% rename from patches/server/0724-Optimize-HashMapPalette.patch rename to patches/server/0726-Optimize-HashMapPalette.patch diff --git a/patches/server/0725-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0727-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 95% rename from patches/server/0725-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/server/0727-Allow-delegation-to-vanilla-chunk-gen.patch index 1c3a82d35b6b..78cf9a0a139f 100644 --- a/patches/server/0725-Allow-delegation-to-vanilla-chunk-gen.patch +++ b/patches/server/0727-Allow-delegation-to-vanilla-chunk-gen.patch @@ -5,11 +5,11 @@ Subject: [PATCH] Allow delegation to vanilla chunk gen diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 854980b4d52403a22847167b89b89cf3dda1793c..a68374e527a9d8f29863baf8e18fbd09d45e4185 100644 +index 9d1a5979b59bbd1efe03d39b12fc726836637614..c5635cec189653b6a5559e99f48ca9149925e338 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2363,6 +2363,88 @@ public final class CraftServer implements Server { - return new OldCraftChunkData(world.getMinHeight(), world.getMaxHeight(), handle.registryAccess().registryOrThrow(Registries.BIOME)); + return new OldCraftChunkData(world.getMinHeight(), world.getMaxHeight(), handle.registryAccess().registryOrThrow(Registries.BIOME), world); // Paper - Anti-Xray - Add parameters } + // Paper start @@ -98,7 +98,7 @@ index 854980b4d52403a22847167b89b89cf3dda1793c..a68374e527a9d8f29863baf8e18fbd09 public BossBar createBossBar(String title, BarColor color, BarStyle style, BarFlag... flags) { return new CraftBossBar(title, color, style, flags); diff --git a/src/main/java/org/bukkit/craftbukkit/generator/OldCraftChunkData.java b/src/main/java/org/bukkit/craftbukkit/generator/OldCraftChunkData.java -index c23ce88cb9693291fec81a99e3a5bcb2615bb897..189a584b4b81bbc28d4c47b901b5aa6f85fb7932 100644 +index a9700b750f124b5367c91ac071ee5194e9f7f8d8..1a363ceeefbf69618e5f17f67b6f6a2660579ba5 100644 --- a/src/main/java/org/bukkit/craftbukkit/generator/OldCraftChunkData.java +++ b/src/main/java/org/bukkit/craftbukkit/generator/OldCraftChunkData.java @@ -23,7 +23,7 @@ import org.bukkit.material.MaterialData; @@ -110,7 +110,7 @@ index c23ce88cb9693291fec81a99e3a5bcb2615bb897..189a584b4b81bbc28d4c47b901b5aa6f private final Registry biomes; private Set tiles; private final Set lights = new HashSet<>(); -@@ -189,7 +189,13 @@ public final class OldCraftChunkData implements ChunkGenerator.ChunkData { +@@ -194,7 +194,13 @@ public final class OldCraftChunkData implements ChunkGenerator.ChunkData { return this.tiles; } diff --git a/patches/server/0726-Collision-optimisations.patch b/patches/server/0728-Collision-optimisations.patch similarity index 99% rename from patches/server/0726-Collision-optimisations.patch rename to patches/server/0728-Collision-optimisations.patch index d98ebe6efdaf..c35df096fda4 100644 --- a/patches/server/0726-Collision-optimisations.patch +++ b/patches/server/0728-Collision-optimisations.patch @@ -2629,13 +2629,13 @@ index a25497eec004add7408a63b1a0f09e3fa443b324..9f892de55ab03367daed4c30cc44c9dd // Paper start diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 57403c09141ece41a882c6574a593be391b34782..580aa991de9a617efd6e9e3b60923742c5e3346b 100644 +index 270ce3995229aa79074e981bb45e5480a5e924d4..627758e4f55283c5dcf23d494efb92bfa9f6b005 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java -@@ -295,6 +295,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable { - this.keepSpawnInMemory = this.paperConfig().spawn.keepSpawnLoaded; // Paper +@@ -297,6 +297,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable { this.entityLimiter = new org.spigotmc.TickLimiter(spigotConfig.entityMaxTickTime); this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime); + this.chunkPacketBlockController = this.paperConfig().anticheat.antiXray.enabled ? new com.destroystokyo.paper.antixray.ChunkPacketBlockControllerAntiXray(this, executor) : com.destroystokyo.paper.antixray.ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray + // Paper start - optimise collisions + this.minSection = io.papermc.paper.util.WorldUtil.getMinSection(this); + this.maxSection = io.papermc.paper.util.WorldUtil.getMaxSection(this); @@ -2643,7 +2643,7 @@ index 57403c09141ece41a882c6574a593be391b34782..580aa991de9a617efd6e9e3b60923742 } // Paper start -@@ -336,6 +340,370 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -338,6 +342,370 @@ public abstract class Level implements LevelAccessor, AutoCloseable { return true; } // Paper end @@ -3014,7 +3014,7 @@ index 57403c09141ece41a882c6574a593be391b34782..580aa991de9a617efd6e9e3b60923742 @Override public boolean isClientSide() { return this.isClientSide; -@@ -949,7 +1317,17 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -952,7 +1320,17 @@ public abstract class Level implements LevelAccessor, AutoCloseable { @Override public boolean noCollision(@Nullable Entity entity, AABB box) { if (entity instanceof net.minecraft.world.entity.decoration.ArmorStand && !entity.level().paperConfig().entities.armorStands.doCollisionEntityLookups) return false; @@ -3155,7 +3155,7 @@ index 96bdf69c8788aa0b1dff64789e6f13c856ee99ff..fc28bca0d31b01287f38405f795da577 public Block getBlock() { 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 5d53b09e19b664fad337ea5098bf9cf41a7168f8..4158a699d775e1a69974b1a638714ffcadafaa46 100644 +index 12edaf88cca54540c617239ac31b2263dfa0ecd7..b39fea80fcb83873b7e7085eaaf935e712f0ede7 100644 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java @@ -26,6 +26,22 @@ public class LevelChunkSection { @@ -3181,7 +3181,7 @@ index 5d53b09e19b664fad337ea5098bf9cf41a7168f8..4158a699d775e1a69974b1a638714ffc public LevelChunkSection(PalettedContainer datapaletteblock, PalettedContainer> palettedcontainerro) { // CraftBukkit end -@@ -59,8 +75,8 @@ public class LevelChunkSection { +@@ -62,8 +78,8 @@ public class LevelChunkSection { return this.setBlockState(x, y, z, state, true); } @@ -3192,7 +3192,7 @@ index 5d53b09e19b664fad337ea5098bf9cf41a7168f8..4158a699d775e1a69974b1a638714ffc if (lock) { iblockdata1 = (BlockState) this.states.getAndSet(x, y, z, state); -@@ -99,6 +115,7 @@ public class LevelChunkSection { +@@ -102,6 +118,7 @@ public class LevelChunkSection { ++this.tickingFluidCount; } @@ -3200,7 +3200,7 @@ index 5d53b09e19b664fad337ea5098bf9cf41a7168f8..4158a699d775e1a69974b1a638714ffc return iblockdata1; } -@@ -142,6 +159,12 @@ public class LevelChunkSection { +@@ -145,6 +162,12 @@ public class LevelChunkSection { } } diff --git a/patches/server/0727-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0729-Optimise-collision-checking-in-player-move-packet-ha.patch similarity index 100% rename from patches/server/0727-Optimise-collision-checking-in-player-move-packet-ha.patch rename to patches/server/0729-Optimise-collision-checking-in-player-move-packet-ha.patch diff --git a/patches/server/0728-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0730-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch similarity index 96% rename from patches/server/0728-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch rename to patches/server/0730-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch index 1f09d15414ec..10679d3a5cdb 100644 --- a/patches/server/0728-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch +++ b/patches/server/0730-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix ChunkSnapshot#isSectionEmpty(int) and optimize diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java -index d10dcf5b9c987bbd4761470c16c9d4693ccf896d..3a5fbdd0915ae19fc0bb717bc117792d71e73af8 100644 +index adee86c79f9db0a93691ec338791d7c75ab2dd4b..2b138ee73efb8365aa362e08bfb785e3c1aedabb 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java @@ -290,13 +290,17 @@ public class CraftChunk implements Chunk { diff --git a/patches/server/0729-Add-more-Campfire-API.patch b/patches/server/0731-Add-more-Campfire-API.patch similarity index 100% rename from patches/server/0729-Add-more-Campfire-API.patch rename to patches/server/0731-Add-more-Campfire-API.patch diff --git a/patches/server/0730-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0732-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch similarity index 100% rename from patches/server/0730-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch rename to patches/server/0732-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch diff --git a/patches/server/0731-Fix-tripwire-state-inconsistency.patch b/patches/server/0733-Fix-tripwire-state-inconsistency.patch similarity index 100% rename from patches/server/0731-Fix-tripwire-state-inconsistency.patch rename to patches/server/0733-Fix-tripwire-state-inconsistency.patch diff --git a/patches/server/0732-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0734-Forward-CraftEntity-in-teleport-command.patch similarity index 100% rename from patches/server/0732-Forward-CraftEntity-in-teleport-command.patch rename to patches/server/0734-Forward-CraftEntity-in-teleport-command.patch diff --git a/patches/server/0733-Improve-scoreboard-entries.patch b/patches/server/0735-Improve-scoreboard-entries.patch similarity index 100% rename from patches/server/0733-Improve-scoreboard-entries.patch rename to patches/server/0735-Improve-scoreboard-entries.patch diff --git a/patches/server/0734-Entity-powdered-snow-API.patch b/patches/server/0736-Entity-powdered-snow-API.patch similarity index 100% rename from patches/server/0734-Entity-powdered-snow-API.patch rename to patches/server/0736-Entity-powdered-snow-API.patch diff --git a/patches/server/0735-Add-API-for-item-entity-health.patch b/patches/server/0737-Add-API-for-item-entity-health.patch similarity index 100% rename from patches/server/0735-Add-API-for-item-entity-health.patch rename to patches/server/0737-Add-API-for-item-entity-health.patch diff --git a/patches/server/0736-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0738-Fix-entity-type-tags-suggestions-in-selectors.patch similarity index 100% rename from patches/server/0736-Fix-entity-type-tags-suggestions-in-selectors.patch rename to patches/server/0738-Fix-entity-type-tags-suggestions-in-selectors.patch diff --git a/patches/server/0737-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0739-Configurable-max-block-light-for-monster-spawning.patch similarity index 100% rename from patches/server/0737-Configurable-max-block-light-for-monster-spawning.patch rename to patches/server/0739-Configurable-max-block-light-for-monster-spawning.patch diff --git a/patches/server/0738-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0740-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch similarity index 100% rename from patches/server/0738-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch rename to patches/server/0740-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch diff --git a/patches/server/0739-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0741-Load-effect-amplifiers-greater-than-127-correctly.patch similarity index 100% rename from patches/server/0739-Load-effect-amplifiers-greater-than-127-correctly.patch rename to patches/server/0741-Load-effect-amplifiers-greater-than-127-correctly.patch diff --git a/patches/server/0740-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0742-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/server/0740-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/server/0742-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/server/0741-Fix-bees-aging-inside-hives.patch b/patches/server/0743-Fix-bees-aging-inside-hives.patch similarity index 100% rename from patches/server/0741-Fix-bees-aging-inside-hives.patch rename to patches/server/0743-Fix-bees-aging-inside-hives.patch diff --git a/patches/server/0742-Bucketable-API.patch b/patches/server/0744-Bucketable-API.patch similarity index 100% rename from patches/server/0742-Bucketable-API.patch rename to patches/server/0744-Bucketable-API.patch diff --git a/patches/server/0743-Validate-usernames.patch b/patches/server/0745-Validate-usernames.patch similarity index 100% rename from patches/server/0743-Validate-usernames.patch rename to patches/server/0745-Validate-usernames.patch diff --git a/patches/server/0744-Make-water-animal-spawn-height-configurable.patch b/patches/server/0746-Make-water-animal-spawn-height-configurable.patch similarity index 100% rename from patches/server/0744-Make-water-animal-spawn-height-configurable.patch rename to patches/server/0746-Make-water-animal-spawn-height-configurable.patch diff --git a/patches/server/0745-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0747-Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 97% rename from patches/server/0745-Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/server/0747-Expose-vanilla-BiomeProvider-from-WorldInfo.patch index 52d08aef3354..952a08efa844 100644 --- a/patches/server/0745-Expose-vanilla-BiomeProvider-from-WorldInfo.patch +++ b/patches/server/0747-Expose-vanilla-BiomeProvider-from-WorldInfo.patch @@ -18,7 +18,7 @@ index 6c02d5233c782b0e5049afdf84250687ae71dcde..2503e2b2436a6e07fa22c0e55ad1539b biomeProvider = gen.getDefaultBiomeProvider(worldInfo); } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index a68374e527a9d8f29863baf8e18fbd09d45e4185..02faa85848ab286c7219f09e0b2048fdad0cd005 100644 +index c5635cec189653b6a5559e99f48ca9149925e338..1ebdf0d7f45ecaa996c96a9b0c34e44b3386ff16 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1223,7 +1223,7 @@ public final class CraftServer implements Server { @@ -31,7 +31,7 @@ index a68374e527a9d8f29863baf8e18fbd09d45e4185..02faa85848ab286c7219f09e0b2048fd biomeProvider = generator.getDefaultBiomeProvider(worldInfo); } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 99f075d23484301259daabbab0569fc780e02b5b..e138428fe35c075cfffcc931b53f836129307154 100644 +index a96a8878c7b1f1e39d07187e8bee8321305acdef..9eb41e93dc9d15efc7950eca113ae1a99812ddbb 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -202,6 +202,29 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0746-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0748-Add-config-option-for-worlds-affected-by-time-cmd.patch similarity index 100% rename from patches/server/0746-Add-config-option-for-worlds-affected-by-time-cmd.patch rename to patches/server/0748-Add-config-option-for-worlds-affected-by-time-cmd.patch diff --git a/patches/server/0747-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0749-Add-new-overload-to-PersistentDataContainer-has.patch similarity index 100% rename from patches/server/0747-Add-new-overload-to-PersistentDataContainer-has.patch rename to patches/server/0749-Add-new-overload-to-PersistentDataContainer-has.patch diff --git a/patches/server/0748-Multiple-Entries-with-Scoreboards.patch b/patches/server/0750-Multiple-Entries-with-Scoreboards.patch similarity index 100% rename from patches/server/0748-Multiple-Entries-with-Scoreboards.patch rename to patches/server/0750-Multiple-Entries-with-Scoreboards.patch diff --git a/patches/server/0749-Reset-placed-block-on-exception.patch b/patches/server/0751-Reset-placed-block-on-exception.patch similarity index 100% rename from patches/server/0749-Reset-placed-block-on-exception.patch rename to patches/server/0751-Reset-placed-block-on-exception.patch diff --git a/patches/server/0750-Add-configurable-height-for-slime-spawn.patch b/patches/server/0752-Add-configurable-height-for-slime-spawn.patch similarity index 100% rename from patches/server/0750-Add-configurable-height-for-slime-spawn.patch rename to patches/server/0752-Add-configurable-height-for-slime-spawn.patch diff --git a/patches/server/0751-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0753-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0751-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch rename to patches/server/0753-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0752-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0754-Fix-xp-reward-for-baby-zombies.patch similarity index 100% rename from patches/server/0752-Fix-xp-reward-for-baby-zombies.patch rename to patches/server/0754-Fix-xp-reward-for-baby-zombies.patch diff --git a/patches/server/0753-Kick-on-main-for-illegal-chat.patch b/patches/server/0755-Kick-on-main-for-illegal-chat.patch similarity index 100% rename from patches/server/0753-Kick-on-main-for-illegal-chat.patch rename to patches/server/0755-Kick-on-main-for-illegal-chat.patch diff --git a/patches/server/0754-Multi-Block-Change-API-Implementation.patch b/patches/server/0756-Multi-Block-Change-API-Implementation.patch similarity index 100% rename from patches/server/0754-Multi-Block-Change-API-Implementation.patch rename to patches/server/0756-Multi-Block-Change-API-Implementation.patch diff --git a/patches/server/0755-Fix-NotePlayEvent.patch b/patches/server/0757-Fix-NotePlayEvent.patch similarity index 100% rename from patches/server/0755-Fix-NotePlayEvent.patch rename to patches/server/0757-Fix-NotePlayEvent.patch diff --git a/patches/server/0756-Freeze-Tick-Lock-API.patch b/patches/server/0758-Freeze-Tick-Lock-API.patch similarity index 100% rename from patches/server/0756-Freeze-Tick-Lock-API.patch rename to patches/server/0758-Freeze-Tick-Lock-API.patch diff --git a/patches/server/0757-Dolphin-API.patch b/patches/server/0759-Dolphin-API.patch similarity index 100% rename from patches/server/0757-Dolphin-API.patch rename to patches/server/0759-Dolphin-API.patch diff --git a/patches/server/0758-More-PotionEffectType-API.patch b/patches/server/0760-More-PotionEffectType-API.patch similarity index 100% rename from patches/server/0758-More-PotionEffectType-API.patch rename to patches/server/0760-More-PotionEffectType-API.patch diff --git a/patches/server/0759-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0761-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch similarity index 100% rename from patches/server/0759-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch rename to patches/server/0761-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch diff --git a/patches/server/0760-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0762-API-for-creating-command-sender-which-forwards-feedb.patch similarity index 98% rename from patches/server/0760-API-for-creating-command-sender-which-forwards-feedb.patch rename to patches/server/0762-API-for-creating-command-sender-which-forwards-feedb.patch index 4761ed8ae45c..bf13487de249 100644 --- a/patches/server/0760-API-for-creating-command-sender-which-forwards-feedb.patch +++ b/patches/server/0762-API-for-creating-command-sender-which-forwards-feedb.patch @@ -122,7 +122,7 @@ index 0000000000000000000000000000000000000000..e3a5f1ec376319bdfda87fa27ae217bf + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 02faa85848ab286c7219f09e0b2048fdad0cd005..d68b4ee993b2b239900f60ab08da4bfba121892a 100644 +index 1ebdf0d7f45ecaa996c96a9b0c34e44b3386ff16..c9d8126334d3854fdfb49e405cbcf20c46a5cef5 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2014,6 +2014,13 @@ public final class CraftServer implements Server { diff --git a/patches/server/0761-Add-missing-structure-set-seed-configs.patch b/patches/server/0763-Add-missing-structure-set-seed-configs.patch similarity index 100% rename from patches/server/0761-Add-missing-structure-set-seed-configs.patch rename to patches/server/0763-Add-missing-structure-set-seed-configs.patch diff --git a/patches/server/0762-Implement-regenerateChunk.patch b/patches/server/0764-Implement-regenerateChunk.patch similarity index 98% rename from patches/server/0762-Implement-regenerateChunk.patch rename to patches/server/0764-Implement-regenerateChunk.patch index f8c44cd0207d..c2fe3ca190ba 100644 --- a/patches/server/0762-Implement-regenerateChunk.patch +++ b/patches/server/0764-Implement-regenerateChunk.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Implement regenerateChunk Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com> diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index e138428fe35c075cfffcc931b53f836129307154..8e382e4affddd416d12fa8687056ea8545b8f5e4 100644 +index 9eb41e93dc9d15efc7950eca113ae1a99812ddbb..261eb8e2a5b161ca566dda46e9c54593e17d6125 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -141,6 +141,7 @@ import org.jetbrains.annotations.NotNull; diff --git a/patches/server/0763-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0765-Fix-cancelled-powdered-snow-bucket-placement.patch similarity index 100% rename from patches/server/0763-Fix-cancelled-powdered-snow-bucket-placement.patch rename to patches/server/0765-Fix-cancelled-powdered-snow-bucket-placement.patch diff --git a/patches/server/0764-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0766-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch similarity index 92% rename from patches/server/0764-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch rename to patches/server/0766-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch index 5c0b4acf11d7..5dfaf5801cd7 100644 --- a/patches/server/0764-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch +++ b/patches/server/0766-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add missing Validate calls to CraftServer#getSpawnLimit Copies appropriate checks from CraftWorld#getSpawnLimit diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index d68b4ee993b2b239900f60ab08da4bfba121892a..26dad89a499aeb4d789bdc02a844e47d87510654 100644 +index c9d8126334d3854fdfb49e405cbcf20c46a5cef5..d221bba043586ecec6923d57aebe4316c7bfbb83 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2191,6 +2191,8 @@ public final class CraftServer implements Server { diff --git a/patches/server/0765-Add-GameEvent-tags.patch b/patches/server/0767-Add-GameEvent-tags.patch similarity index 97% rename from patches/server/0765-Add-GameEvent-tags.patch rename to patches/server/0767-Add-GameEvent-tags.patch index b11fa8dab144..2a116e8b6aac 100644 --- a/patches/server/0765-Add-GameEvent-tags.patch +++ b/patches/server/0767-Add-GameEvent-tags.patch @@ -46,7 +46,7 @@ index 0000000000000000000000000000000000000000..e7d9fd2702a1ce96596580fff8f5ee4f + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 26dad89a499aeb4d789bdc02a844e47d87510654..127870bd5c3d180921fd011e64a480a36b1ca672 100644 +index d221bba043586ecec6923d57aebe4316c7bfbb83..1322b3b2a10a9580ed03fe4160757717eb1bc20f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2612,6 +2612,15 @@ public final class CraftServer implements Server { diff --git a/patches/server/0766-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0768-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch similarity index 100% rename from patches/server/0766-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch rename to patches/server/0768-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch diff --git a/patches/server/0767-Furnace-RecipesUsed-API.patch b/patches/server/0769-Furnace-RecipesUsed-API.patch similarity index 100% rename from patches/server/0767-Furnace-RecipesUsed-API.patch rename to patches/server/0769-Furnace-RecipesUsed-API.patch diff --git a/patches/server/0768-Configurable-sculk-sensor-listener-range.patch b/patches/server/0770-Configurable-sculk-sensor-listener-range.patch similarity index 100% rename from patches/server/0768-Configurable-sculk-sensor-listener-range.patch rename to patches/server/0770-Configurable-sculk-sensor-listener-range.patch diff --git a/patches/server/0769-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0771-Add-missing-block-data-mins-and-maxes.patch similarity index 100% rename from patches/server/0769-Add-missing-block-data-mins-and-maxes.patch rename to patches/server/0771-Add-missing-block-data-mins-and-maxes.patch diff --git a/patches/server/0770-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0772-Option-to-have-default-CustomSpawners-in-custom-worl.patch similarity index 100% rename from patches/server/0770-Option-to-have-default-CustomSpawners-in-custom-worl.patch rename to patches/server/0772-Option-to-have-default-CustomSpawners-in-custom-worl.patch diff --git a/patches/server/0771-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0773-Put-world-into-worldlist-before-initing-the-world.patch similarity index 95% rename from patches/server/0771-Put-world-into-worldlist-before-initing-the-world.patch rename to patches/server/0773-Put-world-into-worldlist-before-initing-the-world.patch index 30bab8b67d81..3b210b76bc0b 100644 --- a/patches/server/0771-Put-world-into-worldlist-before-initing-the-world.patch +++ b/patches/server/0773-Put-world-into-worldlist-before-initing-the-world.patch @@ -23,7 +23,7 @@ index 7d944606f7e136aa60a0ea376ef325887bd4e6a8..e7bd891260ad4c95c6161542e6d1412c if (worlddata.getCustomBossEvents() != null) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 127870bd5c3d180921fd011e64a480a36b1ca672..bce73a95b57e4285756b2bc9a557760ae2b976e6 100644 +index 1322b3b2a10a9580ed03fe4160757717eb1bc20f..91e6f315aa9044ee3df93f4b38f521ff0ddfe23f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1252,10 +1252,11 @@ public final class CraftServer implements Server { diff --git a/patches/server/0772-Fix-Entity-Position-Desync.patch b/patches/server/0774-Fix-Entity-Position-Desync.patch similarity index 100% rename from patches/server/0772-Fix-Entity-Position-Desync.patch rename to patches/server/0774-Fix-Entity-Position-Desync.patch diff --git a/patches/server/0773-Custom-Potion-Mixes.patch b/patches/server/0775-Custom-Potion-Mixes.patch similarity index 99% rename from patches/server/0773-Custom-Potion-Mixes.patch rename to patches/server/0775-Custom-Potion-Mixes.patch index feb6090e70ee..88e706515933 100644 --- a/patches/server/0773-Custom-Potion-Mixes.patch +++ b/patches/server/0775-Custom-Potion-Mixes.patch @@ -164,7 +164,7 @@ index 424406d2692856cfd82b6f3b7b6228fa3bd20c2f..c57efcb9a79337ec791e4e8f6671612f @Override diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index bce73a95b57e4285756b2bc9a557760ae2b976e6..fc02629cc39e0207bbb2ebbe829eb9829f9246b4 100644 +index 91e6f315aa9044ee3df93f4b38f521ff0ddfe23f..d79e96c2950ed1976affa7cda7f0571010d4dc75 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -306,6 +306,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0774-Force-close-world-loading-screen.patch b/patches/server/0776-Force-close-world-loading-screen.patch similarity index 100% rename from patches/server/0774-Force-close-world-loading-screen.patch rename to patches/server/0776-Force-close-world-loading-screen.patch diff --git a/patches/server/0775-Fix-falling-block-spawn-methods.patch b/patches/server/0777-Fix-falling-block-spawn-methods.patch similarity index 93% rename from patches/server/0775-Fix-falling-block-spawn-methods.patch rename to patches/server/0777-Fix-falling-block-spawn-methods.patch index 93652a8e6f1c..12fe1ece6b59 100644 --- a/patches/server/0775-Fix-falling-block-spawn-methods.patch +++ b/patches/server/0777-Fix-falling-block-spawn-methods.patch @@ -24,10 +24,10 @@ index c0186224fd64d70770a0e16752d17c0870121d8f..30a893f7f63961b752e043b81dda20d9 if (Snowball.class.isAssignableFrom(clazz)) { entity = new net.minecraft.world.entity.projectile.Snowball(world, x, y, z); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 8e382e4affddd416d12fa8687056ea8545b8f5e4..6993a7ec68ee0807ffb1d07667af1323a20b0bf7 100644 +index 261eb8e2a5b161ca566dda46e9c54593e17d6125..a4c6dc704dc5c72261dc069f1cfdb6f4db9542be 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1391,7 +1391,12 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -1396,7 +1396,12 @@ public class CraftWorld extends CraftRegionAccessor implements World { Preconditions.checkArgument(material != null, "Material cannot be null"); Preconditions.checkArgument(material.isBlock(), "Material.%s must be a block", material); @@ -41,7 +41,7 @@ index 8e382e4affddd416d12fa8687056ea8545b8f5e4..6993a7ec68ee0807ffb1d07667af1323 return (FallingBlock) entity.getBukkitEntity(); } -@@ -1400,7 +1405,12 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -1405,7 +1410,12 @@ public class CraftWorld extends CraftRegionAccessor implements World { Preconditions.checkArgument(location != null, "Location cannot be null"); Preconditions.checkArgument(data != null, "BlockData cannot be null"); diff --git a/patches/server/0776-Expose-furnace-minecart-push-values.patch b/patches/server/0778-Expose-furnace-minecart-push-values.patch similarity index 100% rename from patches/server/0776-Expose-furnace-minecart-push-values.patch rename to patches/server/0778-Expose-furnace-minecart-push-values.patch diff --git a/patches/server/0777-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0779-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch similarity index 100% rename from patches/server/0777-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch rename to patches/server/0779-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch diff --git a/patches/server/0778-More-Projectile-API.patch b/patches/server/0780-More-Projectile-API.patch similarity index 100% rename from patches/server/0778-More-Projectile-API.patch rename to patches/server/0780-More-Projectile-API.patch diff --git a/patches/server/0779-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0781-Fix-swamp-hut-cat-generation-deadlock.patch similarity index 100% rename from patches/server/0779-Fix-swamp-hut-cat-generation-deadlock.patch rename to patches/server/0781-Fix-swamp-hut-cat-generation-deadlock.patch diff --git a/patches/server/0780-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0782-Don-t-allow-vehicle-movement-from-players-while-tele.patch similarity index 100% rename from patches/server/0780-Don-t-allow-vehicle-movement-from-players-while-tele.patch rename to patches/server/0782-Don-t-allow-vehicle-movement-from-players-while-tele.patch diff --git a/patches/server/0781-Implement-getComputedBiome-API.patch b/patches/server/0783-Implement-getComputedBiome-API.patch similarity index 100% rename from patches/server/0781-Implement-getComputedBiome-API.patch rename to patches/server/0783-Implement-getComputedBiome-API.patch diff --git a/patches/server/0782-Make-some-itemstacks-nonnull.patch b/patches/server/0784-Make-some-itemstacks-nonnull.patch similarity index 100% rename from patches/server/0782-Make-some-itemstacks-nonnull.patch rename to patches/server/0784-Make-some-itemstacks-nonnull.patch diff --git a/patches/server/0783-Implement-enchantWithLevels-API.patch b/patches/server/0785-Implement-enchantWithLevels-API.patch similarity index 100% rename from patches/server/0783-Implement-enchantWithLevels-API.patch rename to patches/server/0785-Implement-enchantWithLevels-API.patch diff --git a/patches/server/0784-Fix-saving-in-unloadWorld.patch b/patches/server/0786-Fix-saving-in-unloadWorld.patch similarity index 90% rename from patches/server/0784-Fix-saving-in-unloadWorld.patch rename to patches/server/0786-Fix-saving-in-unloadWorld.patch index d0978c07dd24..cc92085e95fd 100644 --- a/patches/server/0784-Fix-saving-in-unloadWorld.patch +++ b/patches/server/0786-Fix-saving-in-unloadWorld.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix saving in unloadWorld Change savingDisabled to false to ensure ServerLevel's saving logic gets called when unloadWorld is called with save = true diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index fc02629cc39e0207bbb2ebbe829eb9829f9246b4..734e558bf61ca04b51fd3ae7f71cd5a9c1192725 100644 +index d79e96c2950ed1976affa7cda7f0571010d4dc75..f624df3d9b08abfe43a38ca41c452ccbb8ffc76c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1300,7 +1300,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0785-Buffer-OOB-setBlock-calls.patch b/patches/server/0787-Buffer-OOB-setBlock-calls.patch similarity index 100% rename from patches/server/0785-Buffer-OOB-setBlock-calls.patch rename to patches/server/0787-Buffer-OOB-setBlock-calls.patch diff --git a/patches/server/0786-Add-TameableDeathMessageEvent.patch b/patches/server/0788-Add-TameableDeathMessageEvent.patch similarity index 100% rename from patches/server/0786-Add-TameableDeathMessageEvent.patch rename to patches/server/0788-Add-TameableDeathMessageEvent.patch diff --git a/patches/server/0787-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0789-Fix-new-block-data-for-EntityChangeBlockEvent.patch similarity index 100% rename from patches/server/0787-Fix-new-block-data-for-EntityChangeBlockEvent.patch rename to patches/server/0789-Fix-new-block-data-for-EntityChangeBlockEvent.patch diff --git a/patches/server/0788-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0790-fix-player-loottables-running-when-mob-loot-gamerule.patch similarity index 100% rename from patches/server/0788-fix-player-loottables-running-when-mob-loot-gamerule.patch rename to patches/server/0790-fix-player-loottables-running-when-mob-loot-gamerule.patch diff --git a/patches/server/0789-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0791-Ensure-entity-passenger-world-matches-ridden-entity.patch similarity index 100% rename from patches/server/0789-Ensure-entity-passenger-world-matches-ridden-entity.patch rename to patches/server/0791-Ensure-entity-passenger-world-matches-ridden-entity.patch diff --git a/patches/server/0790-Guard-against-invalid-entity-positions.patch b/patches/server/0792-Guard-against-invalid-entity-positions.patch similarity index 100% rename from patches/server/0790-Guard-against-invalid-entity-positions.patch rename to patches/server/0792-Guard-against-invalid-entity-positions.patch diff --git a/patches/server/0791-cache-resource-keys.patch b/patches/server/0793-cache-resource-keys.patch similarity index 100% rename from patches/server/0791-cache-resource-keys.patch rename to patches/server/0793-cache-resource-keys.patch diff --git a/patches/server/0792-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0794-Allow-to-change-the-podium-for-the-EnderDragon.patch similarity index 100% rename from patches/server/0792-Allow-to-change-the-podium-for-the-EnderDragon.patch rename to patches/server/0794-Allow-to-change-the-podium-for-the-EnderDragon.patch diff --git a/patches/server/0793-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0795-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch similarity index 100% rename from patches/server/0793-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch rename to patches/server/0795-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch diff --git a/patches/server/0794-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0796-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch similarity index 100% rename from patches/server/0794-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch rename to patches/server/0796-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch diff --git a/patches/server/0795-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0797-Prevent-tile-entity-copies-loading-chunks.patch similarity index 100% rename from patches/server/0795-Prevent-tile-entity-copies-loading-chunks.patch rename to patches/server/0797-Prevent-tile-entity-copies-loading-chunks.patch diff --git a/patches/server/0796-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0798-Use-username-instead-of-display-name-in-PlayerList-g.patch similarity index 100% rename from patches/server/0796-Use-username-instead-of-display-name-in-PlayerList-g.patch rename to patches/server/0798-Use-username-instead-of-display-name-in-PlayerList-g.patch diff --git a/patches/server/0797-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0799-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch similarity index 100% rename from patches/server/0797-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch rename to patches/server/0799-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch diff --git a/patches/server/0798-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0800-Pass-ServerLevel-for-gamerule-callbacks.patch similarity index 98% rename from patches/server/0798-Pass-ServerLevel-for-gamerule-callbacks.patch rename to patches/server/0800-Pass-ServerLevel-for-gamerule-callbacks.patch index a58d230a06fd..f1f2e81c5cd8 100644 --- a/patches/server/0798-Pass-ServerLevel-for-gamerule-callbacks.patch +++ b/patches/server/0800-Pass-ServerLevel-for-gamerule-callbacks.patch @@ -167,10 +167,10 @@ index 2e240ad721928a9a68370114ba61c21884ef1472..1a72fc5368731be617f9cab72e9e756d this.onChanged(server); } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 6993a7ec68ee0807ffb1d07667af1323a20b0bf7..a36fb1cf5970eaf7b9aaea9bee5de7f6bad1494c 100644 +index a4c6dc704dc5c72261dc069f1cfdb6f4db9542be..514349eabb6939e54f4f98a6a4ad0d8831af9b2a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1944,7 +1944,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -1949,7 +1949,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { // Paper end GameRules.Value handle = this.getHandle().getGameRules().getRule(CraftWorld.getGameRulesNMS().get(rule)); handle.deserialize(event.getValue()); // Paper @@ -179,7 +179,7 @@ index 6993a7ec68ee0807ffb1d07667af1323a20b0bf7..a36fb1cf5970eaf7b9aaea9bee5de7f6 return true; } -@@ -1985,7 +1985,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -1990,7 +1990,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { // Paper end GameRules.Value handle = this.getHandle().getGameRules().getRule(CraftWorld.getGameRulesNMS().get(rule.getName())); handle.deserialize(event.getValue()); // Paper diff --git a/patches/server/0799-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0801-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch similarity index 100% rename from patches/server/0799-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch rename to patches/server/0801-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch diff --git a/patches/server/0800-WorldCreator-keepSpawnLoaded.patch b/patches/server/0802-WorldCreator-keepSpawnLoaded.patch similarity index 91% rename from patches/server/0800-WorldCreator-keepSpawnLoaded.patch rename to patches/server/0802-WorldCreator-keepSpawnLoaded.patch index 866f96bd2f0d..37b243e28ab0 100644 --- a/patches/server/0800-WorldCreator-keepSpawnLoaded.patch +++ b/patches/server/0802-WorldCreator-keepSpawnLoaded.patch @@ -5,7 +5,7 @@ Subject: [PATCH] WorldCreator#keepSpawnLoaded diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 734e558bf61ca04b51fd3ae7f71cd5a9c1192725..5649690f26ffdb5ae9b3bd7a94840896bb24f339 100644 +index f624df3d9b08abfe43a38ca41c452ccbb8ffc76c..93cc7a4246b4c6b1449ff6a165f87bfaa63192c0 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1259,6 +1259,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0801-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/server/0803-Fix-CME-in-CraftPersistentDataTypeRegistry.patch similarity index 100% rename from patches/server/0801-Fix-CME-in-CraftPersistentDataTypeRegistry.patch rename to patches/server/0803-Fix-CME-in-CraftPersistentDataTypeRegistry.patch diff --git a/patches/server/0802-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0804-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch similarity index 93% rename from patches/server/0802-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch rename to patches/server/0804-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch index 55c36ad21aff..0a52efe49e2d 100644 --- a/patches/server/0802-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch +++ b/patches/server/0804-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Trigger bee_nest_destroyed trigger in the correct place diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -index 0a15cda0919c0adf5009a023c17b3e25cc365623..f968dee743f58fe71935097701866800c0f382a1 100644 +index 0cb9803e30702de1cc530c1205fe9bbb4dcb2c08..96fde7b84ce4d195d0c54deff71df9fcf8447979 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -@@ -426,12 +426,16 @@ public class ServerPlayerGameMode { +@@ -428,12 +428,16 @@ public class ServerPlayerGameMode { block.destroy(this.level, pos, iblockdata); } @@ -25,7 +25,7 @@ index 0a15cda0919c0adf5009a023c17b3e25cc365623..f968dee743f58fe71935097701866800 itemstack.mineBlock(this.level, iblockdata, pos, this.player); if (flag && flag1 && event.isDropItems()) { // CraftBukkit - Check if block should drop items -@@ -452,6 +456,13 @@ public class ServerPlayerGameMode { +@@ -454,6 +458,13 @@ public class ServerPlayerGameMode { if (flag && event != null) { iblockdata.getBlock().popExperience(this.level, pos, event.getExpToDrop(), this.player); // Paper } diff --git a/patches/server/0803-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0805-Add-EntityDyeEvent-and-CollarColorable-interface.patch similarity index 100% rename from patches/server/0803-Add-EntityDyeEvent-and-CollarColorable-interface.patch rename to patches/server/0805-Add-EntityDyeEvent-and-CollarColorable-interface.patch diff --git a/patches/server/0804-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0806-Fire-CauldronLevelChange-on-initial-fill.patch similarity index 100% rename from patches/server/0804-Fire-CauldronLevelChange-on-initial-fill.patch rename to patches/server/0806-Fire-CauldronLevelChange-on-initial-fill.patch diff --git a/patches/server/0805-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0807-fix-powder-snow-cauldrons-not-turning-to-water.patch similarity index 100% rename from patches/server/0805-fix-powder-snow-cauldrons-not-turning-to-water.patch rename to patches/server/0807-fix-powder-snow-cauldrons-not-turning-to-water.patch diff --git a/patches/server/0806-Add-PlayerStopUsingItemEvent.patch b/patches/server/0808-Add-PlayerStopUsingItemEvent.patch similarity index 100% rename from patches/server/0806-Add-PlayerStopUsingItemEvent.patch rename to patches/server/0808-Add-PlayerStopUsingItemEvent.patch diff --git a/patches/server/0807-FallingBlock-auto-expire-setting.patch b/patches/server/0809-FallingBlock-auto-expire-setting.patch similarity index 100% rename from patches/server/0807-FallingBlock-auto-expire-setting.patch rename to patches/server/0809-FallingBlock-auto-expire-setting.patch diff --git a/patches/server/0808-Don-t-tick-markers.patch b/patches/server/0810-Don-t-tick-markers.patch similarity index 97% rename from patches/server/0808-Don-t-tick-markers.patch rename to patches/server/0810-Don-t-tick-markers.patch index 33e7370975d2..5a9d38f4e4f7 100644 --- a/patches/server/0808-Don-t-tick-markers.patch +++ b/patches/server/0810-Don-t-tick-markers.patch @@ -23,7 +23,7 @@ index ff99336e0b8131ae161cfa5c4fc83c6905e3dbc8..5f43aedc6596e2b1ac7af97115157147 } }); diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 37ad191dc777869bbaf5de33c43b5dfb41a4df27..6dcb9ee306326c3f3d0a23be4f12b56ffe78e3d7 100644 +index 0b069e495d9f0523ee2ce5f2124d9f9ffd436625..da003497b56a729cfed1ff58c0d00987ce0ebd16 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -2551,6 +2551,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0809-Do-not-accept-invalid-client-settings.patch b/patches/server/0811-Do-not-accept-invalid-client-settings.patch similarity index 100% rename from patches/server/0809-Do-not-accept-invalid-client-settings.patch rename to patches/server/0811-Do-not-accept-invalid-client-settings.patch diff --git a/patches/server/0810-Add-support-for-Proxy-Protocol.patch b/patches/server/0812-Add-support-for-Proxy-Protocol.patch similarity index 100% rename from patches/server/0810-Add-support-for-Proxy-Protocol.patch rename to patches/server/0812-Add-support-for-Proxy-Protocol.patch diff --git a/patches/server/0811-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0813-Fix-OfflinePlayer-getBedSpawnLocation.patch similarity index 100% rename from patches/server/0811-Fix-OfflinePlayer-getBedSpawnLocation.patch rename to patches/server/0813-Fix-OfflinePlayer-getBedSpawnLocation.patch diff --git a/patches/server/0812-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0814-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch similarity index 100% rename from patches/server/0812-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch rename to patches/server/0814-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch diff --git a/patches/server/0813-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0815-Sanitize-Sent-BlockEntity-NBT.patch similarity index 94% rename from patches/server/0813-Sanitize-Sent-BlockEntity-NBT.patch rename to patches/server/0815-Sanitize-Sent-BlockEntity-NBT.patch index fb3ede3e8295..b3404362f952 100644 --- a/patches/server/0813-Sanitize-Sent-BlockEntity-NBT.patch +++ b/patches/server/0815-Sanitize-Sent-BlockEntity-NBT.patch @@ -18,10 +18,10 @@ index d79284a790569141c2ac8178d6ecc20b17cdd0d3..3944852921335c78a04a9dc301882ab5 public static ClientboundBlockEntityDataPacket create(BlockEntity blockEntity) { diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java -index f47eeb70661661610ef1a96dd9da67785825c126..89e3163b0301f8414c9400a6e00cdd85841fe2e8 100644 +index bf6cdc08367fc26716e7904162a21e63fecab3ed..51e24105facfe71ce9f2757c6c881a21b58dacfd 100644 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundLevelChunkPacketData.java -@@ -152,6 +152,7 @@ public class ClientboundLevelChunkPacketData { +@@ -186,6 +186,7 @@ public class ClientboundLevelChunkPacketData { CompoundTag compoundTag = blockEntity.getUpdateTag(); BlockPos blockPos = blockEntity.getBlockPos(); int i = SectionPos.sectionRelative(blockPos.getX()) << 4 | SectionPos.sectionRelative(blockPos.getZ()); diff --git a/patches/server/0814-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0816-Disable-component-selector-resolving-in-books-by-def.patch similarity index 100% rename from patches/server/0814-Disable-component-selector-resolving-in-books-by-def.patch rename to patches/server/0816-Disable-component-selector-resolving-in-books-by-def.patch diff --git a/patches/server/0815-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0817-Prevent-entity-loading-causing-async-lookups.patch similarity index 100% rename from patches/server/0815-Prevent-entity-loading-causing-async-lookups.patch rename to patches/server/0817-Prevent-entity-loading-causing-async-lookups.patch diff --git a/patches/server/0816-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0818-Throw-exception-on-world-create-while-being-ticked.patch similarity index 97% rename from patches/server/0816-Throw-exception-on-world-create-while-being-ticked.patch rename to patches/server/0818-Throw-exception-on-world-create-while-being-ticked.patch index a5c75ad33ced..a6e3a9e1894b 100644 --- a/patches/server/0816-Throw-exception-on-world-create-while-being-ticked.patch +++ b/patches/server/0818-Throw-exception-on-world-create-while-being-ticked.patch @@ -45,7 +45,7 @@ index a197fa2864382363860b4a3db8160ed64f928df7..dd05048c5c9c37002708f0eee4e4fa0f this.profiler.popPush("connection"); MinecraftTimings.connectionTimer.startTiming(); // Spigot diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 5649690f26ffdb5ae9b3bd7a94840896bb24f339..b578cc60ae18fde838876dfe515f2d0f60948d46 100644 +index 93cc7a4246b4c6b1449ff6a165f87bfaa63192c0..bd532e3ba13471ed6f5193d6e05740f405283809 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -876,6 +876,11 @@ public final class CraftServer implements Server { diff --git a/patches/server/0817-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0819-Add-Alternate-Current-redstone-implementation.patch similarity index 99% rename from patches/server/0817-Add-Alternate-Current-redstone-implementation.patch rename to patches/server/0819-Add-Alternate-Current-redstone-implementation.patch index 9d3374585ec6..98229a381499 100644 --- a/patches/server/0817-Add-Alternate-Current-redstone-implementation.patch +++ b/patches/server/0819-Add-Alternate-Current-redstone-implementation.patch @@ -2008,7 +2008,7 @@ index 0000000000000000000000000000000000000000..33cd90c30c22200a4e1ae64f40a0bf78 + } +} diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 6dcb9ee306326c3f3d0a23be4f12b56ffe78e3d7..4b1e55503e0ca813bc893a3a8258af8ab9a13f18 100644 +index da003497b56a729cfed1ff58c0d00987ce0ebd16..e70d6a446f33c266e6117467c69bc404fd23304b 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -222,6 +222,7 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -2034,10 +2034,10 @@ index 6dcb9ee306326c3f3d0a23be4f12b56ffe78e3d7..4b1e55503e0ca813bc893a3a8258af8a EntityCallbacks() {} diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 580aa991de9a617efd6e9e3b60923742c5e3346b..7e898e34490a47b1c505a67f8d0266384f4e37ff 100644 +index 627758e4f55283c5dcf23d494efb92bfa9f6b005..ba5ad3372b3f3f2110841100729ea3b4c06ecc75 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java -@@ -1853,4 +1853,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -1856,4 +1856,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable { return ret; } // Paper end diff --git a/patches/server/0818-Dont-resent-entity-on-art-update.patch b/patches/server/0820-Dont-resent-entity-on-art-update.patch similarity index 100% rename from patches/server/0818-Dont-resent-entity-on-art-update.patch rename to patches/server/0820-Dont-resent-entity-on-art-update.patch diff --git a/patches/server/0819-Add-WardenAngerChangeEvent.patch b/patches/server/0821-Add-WardenAngerChangeEvent.patch similarity index 100% rename from patches/server/0819-Add-WardenAngerChangeEvent.patch rename to patches/server/0821-Add-WardenAngerChangeEvent.patch diff --git a/patches/server/0820-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0822-Add-option-for-strict-advancement-dimension-checks.patch similarity index 100% rename from patches/server/0820-Add-option-for-strict-advancement-dimension-checks.patch rename to patches/server/0822-Add-option-for-strict-advancement-dimension-checks.patch diff --git a/patches/server/0821-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0823-Add-missing-important-BlockStateListPopulator-method.patch similarity index 100% rename from patches/server/0821-Add-missing-important-BlockStateListPopulator-method.patch rename to patches/server/0823-Add-missing-important-BlockStateListPopulator-method.patch diff --git a/patches/server/0822-Nameable-Banner-API.patch b/patches/server/0824-Nameable-Banner-API.patch similarity index 100% rename from patches/server/0822-Nameable-Banner-API.patch rename to patches/server/0824-Nameable-Banner-API.patch diff --git a/patches/server/0823-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0825-Don-t-broadcast-messages-to-command-blocks.patch similarity index 95% rename from patches/server/0823-Don-t-broadcast-messages-to-command-blocks.patch rename to patches/server/0825-Don-t-broadcast-messages-to-command-blocks.patch index 5fba7c158e0a..fc3f56a00643 100644 --- a/patches/server/0823-Don-t-broadcast-messages-to-command-blocks.patch +++ b/patches/server/0825-Don-t-broadcast-messages-to-command-blocks.patch @@ -20,7 +20,7 @@ index e05eb08a9c229b371887676da510df948b896a85..ceeedbd88c56c08ec8b047c9ca2f14cc Date date = new Date(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index b578cc60ae18fde838876dfe515f2d0f60948d46..9cb82440c037e67b5fa5bb9cd6d584b4bfe20cb0 100644 +index bd532e3ba13471ed6f5193d6e05740f405283809..2260c2144c956e77eab83f7fdbf1e8ba85d1d941 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1776,7 +1776,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0824-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0826-Prevent-empty-items-from-being-added-to-world.patch similarity index 93% rename from patches/server/0824-Prevent-empty-items-from-being-added-to-world.patch rename to patches/server/0826-Prevent-empty-items-from-being-added-to-world.patch index 0e17a2f7d04f..f76e2fbf12d9 100644 --- a/patches/server/0824-Prevent-empty-items-from-being-added-to-world.patch +++ b/patches/server/0826-Prevent-empty-items-from-being-added-to-world.patch @@ -7,7 +7,7 @@ The previous solution caused a bunch of bandaid fixes inorder to resolve edge ca Just simply prevent them from being added to the world instead. diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 4b1e55503e0ca813bc893a3a8258af8ab9a13f18..540fe85572003cb78dda7d996215d26a572651f0 100644 +index e70d6a446f33c266e6117467c69bc404fd23304b..ca28be4a2f11a04cbc6555dc7e2eb8ef7aeb8f4e 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1558,6 +1558,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0825-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0827-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch similarity index 100% rename from patches/server/0825-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch rename to patches/server/0827-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch diff --git a/patches/server/0826-Add-Player-getFishHook.patch b/patches/server/0828-Add-Player-getFishHook.patch similarity index 100% rename from patches/server/0826-Add-Player-getFishHook.patch rename to patches/server/0828-Add-Player-getFishHook.patch diff --git a/patches/server/0827-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0829-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch similarity index 100% rename from patches/server/0827-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch rename to patches/server/0829-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch diff --git a/patches/server/0828-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0830-Add-various-missing-EntityDropItemEvent-calls.patch similarity index 100% rename from patches/server/0828-Add-various-missing-EntityDropItemEvent-calls.patch rename to patches/server/0830-Add-various-missing-EntityDropItemEvent-calls.patch diff --git a/patches/server/0829-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0831-Add-some-minimal-debug-information-to-chat-packet-er.patch similarity index 100% rename from patches/server/0829-Add-some-minimal-debug-information-to-chat-packet-er.patch rename to patches/server/0831-Add-some-minimal-debug-information-to-chat-packet-er.patch diff --git a/patches/server/0830-Fix-Bee-flower-NPE.patch b/patches/server/0832-Fix-Bee-flower-NPE.patch similarity index 100% rename from patches/server/0830-Fix-Bee-flower-NPE.patch rename to patches/server/0832-Fix-Bee-flower-NPE.patch diff --git a/patches/server/0831-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0833-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch similarity index 100% rename from patches/server/0831-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch rename to patches/server/0833-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch diff --git a/patches/server/0832-More-Teleport-API.patch b/patches/server/0834-More-Teleport-API.patch similarity index 100% rename from patches/server/0832-More-Teleport-API.patch rename to patches/server/0834-More-Teleport-API.patch diff --git a/patches/server/0833-Add-EntityPortalReadyEvent.patch b/patches/server/0835-Add-EntityPortalReadyEvent.patch similarity index 100% rename from patches/server/0833-Add-EntityPortalReadyEvent.patch rename to patches/server/0835-Add-EntityPortalReadyEvent.patch diff --git a/patches/server/0834-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0836-Don-t-use-level-random-in-entity-constructors.patch similarity index 100% rename from patches/server/0834-Don-t-use-level-random-in-entity-constructors.patch rename to patches/server/0836-Don-t-use-level-random-in-entity-constructors.patch diff --git a/patches/server/0835-Send-block-entities-after-destroy-prediction.patch b/patches/server/0837-Send-block-entities-after-destroy-prediction.patch similarity index 97% rename from patches/server/0835-Send-block-entities-after-destroy-prediction.patch rename to patches/server/0837-Send-block-entities-after-destroy-prediction.patch index d4a239aa4250..6014c369d6e7 100644 --- a/patches/server/0835-Send-block-entities-after-destroy-prediction.patch +++ b/patches/server/0837-Send-block-entities-after-destroy-prediction.patch @@ -7,7 +7,7 @@ Minecraft's prediction system does not handle block entities, so if we are manua block breaking we need to set it after the prediction is finished. This fixes block entities not showing when cancelling the BlockBreakEvent. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -index f968dee743f58fe71935097701866800c0f382a1..73e2948210139e40e234b5e2107f9008f3094964 100644 +index 96fde7b84ce4d195d0c54deff71df9fcf8447979..6cc9c28032cafd15d884223a01208ce6f027c151 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java @@ -62,6 +62,8 @@ public class ServerPlayerGameMode { @@ -43,7 +43,7 @@ index f968dee743f58fe71935097701866800c0f382a1..73e2948210139e40e234b5e2107f9008 return; } // CraftBukkit end -@@ -392,10 +388,12 @@ public class ServerPlayerGameMode { +@@ -394,10 +390,12 @@ public class ServerPlayerGameMode { } // Update any tile entity data for this block diff --git a/patches/server/0836-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0838-Warn-on-plugins-accessing-faraway-chunks.patch similarity index 89% rename from patches/server/0836-Warn-on-plugins-accessing-faraway-chunks.patch rename to patches/server/0838-Warn-on-plugins-accessing-faraway-chunks.patch index 6a827aa08f58..193d0a06e350 100644 --- a/patches/server/0836-Warn-on-plugins-accessing-faraway-chunks.patch +++ b/patches/server/0838-Warn-on-plugins-accessing-faraway-chunks.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Warn on plugins accessing faraway chunks diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 7e898e34490a47b1c505a67f8d0266384f4e37ff..1531809d6bb80ae1fd50a08a541578f44d624fd8 100644 +index ba5ad3372b3f3f2110841100729ea3b4c06ecc75..07a5bbdcada2d2cdb1c3d245379217fe19a48b75 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java -@@ -808,7 +808,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -810,7 +810,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { } private static boolean isInWorldBoundsHorizontal(BlockPos pos) { @@ -18,7 +18,7 @@ index 7e898e34490a47b1c505a67f8d0266384f4e37ff..1531809d6bb80ae1fd50a08a541578f4 private static boolean isOutsideSpawnableHeight(int y) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index a36fb1cf5970eaf7b9aaea9bee5de7f6bad1494c..efefb334aba5a7dc03fbe210b9528109d31ad3fa 100644 +index 514349eabb6939e54f4f98a6a4ad0d8831af9b2a..a4926ad61958301c16a6156abe418a268b10823a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -309,9 +309,24 @@ public class CraftWorld extends CraftRegionAccessor implements World { @@ -54,7 +54,7 @@ index a36fb1cf5970eaf7b9aaea9bee5de7f6bad1494c..efefb334aba5a7dc03fbe210b9528109 // Paper start - implement regenerateChunk method final ServerLevel serverLevel = this.world; final net.minecraft.server.level.ServerChunkCache serverChunkCache = serverLevel.getChunkSource(); -@@ -516,6 +532,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -521,6 +537,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { @Override public boolean loadChunk(int x, int z, boolean generate) { org.spigotmc.AsyncCatcher.catchOp("chunk load"); // Spigot @@ -62,7 +62,7 @@ index a36fb1cf5970eaf7b9aaea9bee5de7f6bad1494c..efefb334aba5a7dc03fbe210b9528109 // Paper start - Optimize this method ChunkPos chunkPos = new ChunkPos(x, z); ChunkAccess immediate = world.getChunkSource().getChunkAtIfLoadedImmediately(x, z); // Paper -@@ -579,6 +596,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -584,6 +601,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { @Override public boolean addPluginChunkTicket(int x, int z, Plugin plugin) { @@ -70,7 +70,7 @@ index a36fb1cf5970eaf7b9aaea9bee5de7f6bad1494c..efefb334aba5a7dc03fbe210b9528109 Preconditions.checkArgument(plugin != null, "null plugin"); Preconditions.checkArgument(plugin.isEnabled(), "plugin is not enabled"); -@@ -647,6 +665,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -652,6 +670,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { @Override public void setChunkForceLoaded(int x, int z, boolean forced) { @@ -78,7 +78,7 @@ index a36fb1cf5970eaf7b9aaea9bee5de7f6bad1494c..efefb334aba5a7dc03fbe210b9528109 this.getHandle().setChunkForced(x, z, forced); } -@@ -959,6 +978,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -964,6 +983,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { @Override public int getHighestBlockYAt(int x, int z, org.bukkit.HeightMap heightMap) { @@ -86,7 +86,7 @@ index a36fb1cf5970eaf7b9aaea9bee5de7f6bad1494c..efefb334aba5a7dc03fbe210b9528109 // Transient load for this tick return this.world.getChunk(x >> 4, z >> 4).getHeight(CraftHeightMap.toNMS(heightMap), x, z); } -@@ -2370,6 +2390,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -2375,6 +2395,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { // Spigot end // Paper start public java.util.concurrent.CompletableFuture getChunkAtAsync(int x, int z, boolean gen, boolean urgent) { diff --git a/patches/server/0837-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0839-Custom-Chat-Completion-Suggestions-API.patch similarity index 100% rename from patches/server/0837-Custom-Chat-Completion-Suggestions-API.patch rename to patches/server/0839-Custom-Chat-Completion-Suggestions-API.patch diff --git a/patches/server/0838-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0840-Add-and-fix-missing-BlockFadeEvents.patch similarity index 100% rename from patches/server/0838-Add-and-fix-missing-BlockFadeEvents.patch rename to patches/server/0840-Add-and-fix-missing-BlockFadeEvents.patch diff --git a/patches/server/0839-Collision-API.patch b/patches/server/0841-Collision-API.patch similarity index 100% rename from patches/server/0839-Collision-API.patch rename to patches/server/0841-Collision-API.patch diff --git a/patches/server/0840-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0842-Fix-suggest-command-message-for-brigadier-syntax-exc.patch similarity index 100% rename from patches/server/0840-Fix-suggest-command-message-for-brigadier-syntax-exc.patch rename to patches/server/0842-Fix-suggest-command-message-for-brigadier-syntax-exc.patch diff --git a/patches/server/0841-Block-Ticking-API.patch b/patches/server/0843-Block-Ticking-API.patch similarity index 100% rename from patches/server/0841-Block-Ticking-API.patch rename to patches/server/0843-Block-Ticking-API.patch diff --git a/patches/server/0842-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0844-Add-Velocity-IP-Forwarding-Support.patch similarity index 99% rename from patches/server/0842-Add-Velocity-IP-Forwarding-Support.patch rename to patches/server/0844-Add-Velocity-IP-Forwarding-Support.patch index 865dde2ada7e..05f3adaa197b 100644 --- a/patches/server/0842-Add-Velocity-IP-Forwarding-Support.patch +++ b/patches/server/0844-Add-Velocity-IP-Forwarding-Support.patch @@ -215,7 +215,7 @@ index f7ad9f51d4fb45d41c718a97c1fad72504d0c0ad..78810048fde7fd6299cdc99634ba6467 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 9cb82440c037e67b5fa5bb9cd6d584b4bfe20cb0..3b264f630a28416f0faacafba91e047bfb0f5190 100644 +index 2260c2144c956e77eab83f7fdbf1e8ba85d1d941..332344f220335ab309079a022a0b590339f34560 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -805,7 +805,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0843-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0845-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch similarity index 100% rename from patches/server/0843-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch rename to patches/server/0845-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch diff --git a/patches/server/0844-Add-NamespacedKey-biome-methods.patch b/patches/server/0846-Add-NamespacedKey-biome-methods.patch similarity index 100% rename from patches/server/0844-Add-NamespacedKey-biome-methods.patch rename to patches/server/0846-Add-NamespacedKey-biome-methods.patch diff --git a/patches/server/0845-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0847-Fix-plugin-loggers-on-server-shutdown.patch similarity index 100% rename from patches/server/0845-Fix-plugin-loggers-on-server-shutdown.patch rename to patches/server/0847-Fix-plugin-loggers-on-server-shutdown.patch diff --git a/patches/server/0846-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0848-Stop-large-look-changes-from-crashing-the-server.patch similarity index 100% rename from patches/server/0846-Stop-large-look-changes-from-crashing-the-server.patch rename to patches/server/0848-Stop-large-look-changes-from-crashing-the-server.patch diff --git a/patches/server/0847-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0849-Fire-EntityChangeBlockEvent-in-more-places.patch similarity index 100% rename from patches/server/0847-Fire-EntityChangeBlockEvent-in-more-places.patch rename to patches/server/0849-Fire-EntityChangeBlockEvent-in-more-places.patch diff --git a/patches/server/0848-Missing-eating-regain-reason.patch b/patches/server/0850-Missing-eating-regain-reason.patch similarity index 100% rename from patches/server/0848-Missing-eating-regain-reason.patch rename to patches/server/0850-Missing-eating-regain-reason.patch diff --git a/patches/server/0849-Missing-effect-cause.patch b/patches/server/0851-Missing-effect-cause.patch similarity index 100% rename from patches/server/0849-Missing-effect-cause.patch rename to patches/server/0851-Missing-effect-cause.patch diff --git a/patches/server/0850-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0852-Added-byte-array-serialization-deserialization-for-P.patch similarity index 100% rename from patches/server/0850-Added-byte-array-serialization-deserialization-for-P.patch rename to patches/server/0852-Added-byte-array-serialization-deserialization-for-P.patch diff --git a/patches/server/0851-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0853-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch similarity index 100% rename from patches/server/0851-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch rename to patches/server/0853-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch diff --git a/patches/server/0852-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0854-Call-BlockPhysicsEvent-more-often.patch similarity index 100% rename from patches/server/0852-Call-BlockPhysicsEvent-more-often.patch rename to patches/server/0854-Call-BlockPhysicsEvent-more-often.patch diff --git a/patches/server/0853-Configurable-chat-thread-limit.patch b/patches/server/0855-Configurable-chat-thread-limit.patch similarity index 100% rename from patches/server/0853-Configurable-chat-thread-limit.patch rename to patches/server/0855-Configurable-chat-thread-limit.patch diff --git a/patches/server/0854-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0856-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch similarity index 100% rename from patches/server/0854-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch rename to patches/server/0856-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch diff --git a/patches/server/0855-fix-Jigsaw-block-kicking-user.patch b/patches/server/0857-fix-Jigsaw-block-kicking-user.patch similarity index 100% rename from patches/server/0855-fix-Jigsaw-block-kicking-user.patch rename to patches/server/0857-fix-Jigsaw-block-kicking-user.patch diff --git a/patches/server/0856-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0858-use-BlockFormEvent-for-mud-converting-into-clay.patch similarity index 100% rename from patches/server/0856-use-BlockFormEvent-for-mud-converting-into-clay.patch rename to patches/server/0858-use-BlockFormEvent-for-mud-converting-into-clay.patch diff --git a/patches/server/0857-Add-getDrops-to-BlockState.patch b/patches/server/0859-Add-getDrops-to-BlockState.patch similarity index 100% rename from patches/server/0857-Add-getDrops-to-BlockState.patch rename to patches/server/0859-Add-getDrops-to-BlockState.patch diff --git a/patches/server/0858-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0860-Fix-a-bunch-of-vanilla-bugs.patch similarity index 99% rename from patches/server/0858-Fix-a-bunch-of-vanilla-bugs.patch rename to patches/server/0860-Fix-a-bunch-of-vanilla-bugs.patch index e5aa87e01124..8794f7518f53 100644 --- a/patches/server/0858-Fix-a-bunch-of-vanilla-bugs.patch +++ b/patches/server/0860-Fix-a-bunch-of-vanilla-bugs.patch @@ -124,7 +124,7 @@ index 93a2dfca4484d1bdfa00dfb2cf8d94314123aeb8..8cda789284a30dab012bfda8f97409bd return this.anyPlayerCloseEnoughForSpawning(pos, false); } diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 540fe85572003cb78dda7d996215d26a572651f0..57ae7df11ce3159a014b73eca322136665660bd5 100644 +index ca28be4a2f11a04cbc6555dc7e2eb8ef7aeb8f4e..4686600b3fea6c7800c7746fa47acab6c90540a2 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1004,7 +1004,7 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -137,7 +137,7 @@ index 540fe85572003cb78dda7d996215d26a572651f0..57ae7df11ce3159a014b73eca3221366 if (!list.isEmpty()) { diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -index 73e2948210139e40e234b5e2107f9008f3094964..fb7a401269a2ebfc998c14e1957dfd580d444c06 100644 +index 6cc9c28032cafd15d884223a01208ce6f027c151..14bbc86bbaad49b2af16f3b171eb667c28eda702 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java @@ -92,7 +92,7 @@ public class ServerPlayerGameMode { diff --git a/patches/server/0859-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0861-Remove-unnecessary-onTrackingStart-during-navigation.patch similarity index 94% rename from patches/server/0859-Remove-unnecessary-onTrackingStart-during-navigation.patch rename to patches/server/0861-Remove-unnecessary-onTrackingStart-during-navigation.patch index 7e34979e0870..5e8db8e7b700 100644 --- a/patches/server/0859-Remove-unnecessary-onTrackingStart-during-navigation.patch +++ b/patches/server/0861-Remove-unnecessary-onTrackingStart-during-navigation.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Remove unnecessary onTrackingStart during navigation warning diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 57ae7df11ce3159a014b73eca322136665660bd5..1324b69f5ac1571652f287d4542031dfdf35b36d 100644 +index 4686600b3fea6c7800c7746fa47acab6c90540a2..26888d5bdfe16a8c69d757b134d9e4e1978cc7ba 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -2587,7 +2587,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0860-Fix-custom-piglin-loved-items.patch b/patches/server/0862-Fix-custom-piglin-loved-items.patch similarity index 100% rename from patches/server/0860-Fix-custom-piglin-loved-items.patch rename to patches/server/0862-Fix-custom-piglin-loved-items.patch diff --git a/patches/server/0861-EntityPickupItemEvent-fixes.patch b/patches/server/0863-EntityPickupItemEvent-fixes.patch similarity index 100% rename from patches/server/0861-EntityPickupItemEvent-fixes.patch rename to patches/server/0863-EntityPickupItemEvent-fixes.patch diff --git a/patches/server/0862-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0864-Correctly-handle-interactions-with-items-on-cooldown.patch similarity index 94% rename from patches/server/0862-Correctly-handle-interactions-with-items-on-cooldown.patch rename to patches/server/0864-Correctly-handle-interactions-with-items-on-cooldown.patch index 8e624ce97fb5..13e208e234bf 100644 --- a/patches/server/0862-Correctly-handle-interactions-with-items-on-cooldown.patch +++ b/patches/server/0864-Correctly-handle-interactions-with-items-on-cooldown.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Correctly handle interactions with items on cooldown diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -index fb7a401269a2ebfc998c14e1957dfd580d444c06..482e6b217c073ceff30c238c3a8cd8ea526bb07c 100644 +index 14bbc86bbaad49b2af16f3b171eb667c28eda702..34ecfb89372f459117db99d57a7edd6f681bbe8a 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -@@ -519,6 +519,7 @@ public class ServerPlayerGameMode { +@@ -521,6 +521,7 @@ public class ServerPlayerGameMode { BlockState iblockdata = world.getBlockState(blockposition); InteractionResult enuminteractionresult = InteractionResult.PASS; boolean cancelledBlock = false; @@ -16,7 +16,7 @@ index fb7a401269a2ebfc998c14e1957dfd580d444c06..482e6b217c073ceff30c238c3a8cd8ea if (!iblockdata.getBlock().isEnabled(world.enabledFeatures())) { return InteractionResult.FAIL; -@@ -528,10 +529,10 @@ public class ServerPlayerGameMode { +@@ -530,10 +531,10 @@ public class ServerPlayerGameMode { } if (player.getCooldowns().isOnCooldown(stack.getItem())) { diff --git a/patches/server/0863-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0865-Add-PlayerInventorySlotChangeEvent.patch similarity index 100% rename from patches/server/0863-Add-PlayerInventorySlotChangeEvent.patch rename to patches/server/0865-Add-PlayerInventorySlotChangeEvent.patch diff --git a/patches/server/0864-Elder-Guardian-appearance-API.patch b/patches/server/0866-Elder-Guardian-appearance-API.patch similarity index 100% rename from patches/server/0864-Elder-Guardian-appearance-API.patch rename to patches/server/0866-Elder-Guardian-appearance-API.patch diff --git a/patches/server/0865-Allow-changing-bed-s-occupied-property.patch b/patches/server/0867-Allow-changing-bed-s-occupied-property.patch similarity index 100% rename from patches/server/0865-Allow-changing-bed-s-occupied-property.patch rename to patches/server/0867-Allow-changing-bed-s-occupied-property.patch diff --git a/patches/server/0866-Add-entity-knockback-API.patch b/patches/server/0868-Add-entity-knockback-API.patch similarity index 100% rename from patches/server/0866-Add-entity-knockback-API.patch rename to patches/server/0868-Add-entity-knockback-API.patch diff --git a/patches/server/0867-Detect-headless-JREs.patch b/patches/server/0869-Detect-headless-JREs.patch similarity index 100% rename from patches/server/0867-Detect-headless-JREs.patch rename to patches/server/0869-Detect-headless-JREs.patch diff --git a/patches/server/0868-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0870-fixed-entity-vehicle-collision-event-not-called.patch similarity index 100% rename from patches/server/0868-fixed-entity-vehicle-collision-event-not-called.patch rename to patches/server/0870-fixed-entity-vehicle-collision-event-not-called.patch diff --git a/patches/server/0869-optimized-dirt-and-snow-spreading.patch b/patches/server/0871-optimized-dirt-and-snow-spreading.patch similarity index 100% rename from patches/server/0869-optimized-dirt-and-snow-spreading.patch rename to patches/server/0871-optimized-dirt-and-snow-spreading.patch diff --git a/patches/server/0870-Added-EntityToggleSitEvent.patch b/patches/server/0872-Added-EntityToggleSitEvent.patch similarity index 100% rename from patches/server/0870-Added-EntityToggleSitEvent.patch rename to patches/server/0872-Added-EntityToggleSitEvent.patch diff --git a/patches/server/0871-Add-fire-tick-delay-option.patch b/patches/server/0873-Add-fire-tick-delay-option.patch similarity index 100% rename from patches/server/0871-Add-fire-tick-delay-option.patch rename to patches/server/0873-Add-fire-tick-delay-option.patch diff --git a/patches/server/0872-Add-Moving-Piston-API.patch b/patches/server/0874-Add-Moving-Piston-API.patch similarity index 100% rename from patches/server/0872-Add-Moving-Piston-API.patch rename to patches/server/0874-Add-Moving-Piston-API.patch diff --git a/patches/server/0873-Ignore-impossible-spawn-tick.patch b/patches/server/0875-Ignore-impossible-spawn-tick.patch similarity index 100% rename from patches/server/0873-Ignore-impossible-spawn-tick.patch rename to patches/server/0875-Ignore-impossible-spawn-tick.patch diff --git a/patches/server/0874-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0876-Track-projectile-source-for-fireworks-from-dispenser.patch similarity index 100% rename from patches/server/0874-Track-projectile-source-for-fireworks-from-dispenser.patch rename to patches/server/0876-Track-projectile-source-for-fireworks-from-dispenser.patch diff --git a/patches/server/0875-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0877-Fix-EntityArgument-suggestion-permissions-to-align-w.patch similarity index 100% rename from patches/server/0875-Fix-EntityArgument-suggestion-permissions-to-align-w.patch rename to patches/server/0877-Fix-EntityArgument-suggestion-permissions-to-align-w.patch diff --git a/patches/server/0876-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0878-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch similarity index 100% rename from patches/server/0876-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch rename to patches/server/0878-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch diff --git a/patches/server/0877-Prevent-compass-from-loading-chunks.patch b/patches/server/0879-Prevent-compass-from-loading-chunks.patch similarity index 100% rename from patches/server/0877-Prevent-compass-from-loading-chunks.patch rename to patches/server/0879-Prevent-compass-from-loading-chunks.patch diff --git a/patches/server/0878-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0880-Add-PrePlayerAttackEntityEvent.patch similarity index 100% rename from patches/server/0878-Add-PrePlayerAttackEntityEvent.patch rename to patches/server/0880-Add-PrePlayerAttackEntityEvent.patch diff --git a/patches/server/0879-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0881-ensure-reset-EnderDragon-boss-event-name.patch similarity index 100% rename from patches/server/0879-ensure-reset-EnderDragon-boss-event-name.patch rename to patches/server/0881-ensure-reset-EnderDragon-boss-event-name.patch diff --git a/patches/server/0880-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0882-fix-MC-252817-green-map-markers-do-not-disappear.patch similarity index 100% rename from patches/server/0880-fix-MC-252817-green-map-markers-do-not-disappear.patch rename to patches/server/0882-fix-MC-252817-green-map-markers-do-not-disappear.patch diff --git a/patches/server/0881-Add-Player-Warden-Warning-API.patch b/patches/server/0883-Add-Player-Warden-Warning-API.patch similarity index 100% rename from patches/server/0881-Add-Player-Warden-Warning-API.patch rename to patches/server/0883-Add-Player-Warden-Warning-API.patch diff --git a/patches/server/0882-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0884-More-vanilla-friendly-methods-to-update-trades.patch similarity index 100% rename from patches/server/0882-More-vanilla-friendly-methods-to-update-trades.patch rename to patches/server/0884-More-vanilla-friendly-methods-to-update-trades.patch diff --git a/patches/server/0883-Add-paper-dumplisteners-command.patch b/patches/server/0885-Add-paper-dumplisteners-command.patch similarity index 100% rename from patches/server/0883-Add-paper-dumplisteners-command.patch rename to patches/server/0885-Add-paper-dumplisteners-command.patch diff --git a/patches/server/0884-check-global-player-list-where-appropriate.patch b/patches/server/0886-check-global-player-list-where-appropriate.patch similarity index 97% rename from patches/server/0884-check-global-player-list-where-appropriate.patch rename to patches/server/0886-check-global-player-list-where-appropriate.patch index e351d456fc9d..1d14dfd3dad5 100644 --- a/patches/server/0884-check-global-player-list-where-appropriate.patch +++ b/patches/server/0886-check-global-player-list-where-appropriate.patch @@ -7,7 +7,7 @@ Makes certain entities check all players when searching for a player instead of just checking players in their world. diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 1324b69f5ac1571652f287d4542031dfdf35b36d..a0e61d3a61861cedaef87e8116a40113cf1f9891 100644 +index 26888d5bdfe16a8c69d757b134d9e4e1978cc7ba..eae08569a3e338641740bf1ca8e92bc8e8455cdd 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -2709,4 +2709,12 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0885-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0887-Fix-async-entity-add-due-to-fungus-trees.patch similarity index 100% rename from patches/server/0885-Fix-async-entity-add-due-to-fungus-trees.patch rename to patches/server/0887-Fix-async-entity-add-due-to-fungus-trees.patch diff --git a/patches/server/0886-ItemStack-damage-API.patch b/patches/server/0888-ItemStack-damage-API.patch similarity index 100% rename from patches/server/0886-ItemStack-damage-API.patch rename to patches/server/0888-ItemStack-damage-API.patch diff --git a/patches/server/0887-Friction-API.patch b/patches/server/0889-Friction-API.patch similarity index 100% rename from patches/server/0887-Friction-API.patch rename to patches/server/0889-Friction-API.patch diff --git a/patches/server/0888-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0890-Ability-to-control-player-s-insomnia-and-phantoms.patch similarity index 100% rename from patches/server/0888-Ability-to-control-player-s-insomnia-and-phantoms.patch rename to patches/server/0890-Ability-to-control-player-s-insomnia-and-phantoms.patch diff --git a/patches/server/0889-Fix-player-kick-on-shutdown.patch b/patches/server/0891-Fix-player-kick-on-shutdown.patch similarity index 100% rename from patches/server/0889-Fix-player-kick-on-shutdown.patch rename to patches/server/0891-Fix-player-kick-on-shutdown.patch diff --git a/patches/server/0890-Sync-offhand-slot-in-menus.patch b/patches/server/0892-Sync-offhand-slot-in-menus.patch similarity index 100% rename from patches/server/0890-Sync-offhand-slot-in-menus.patch rename to patches/server/0892-Sync-offhand-slot-in-menus.patch diff --git a/patches/server/0891-Player-Entity-Tracking-Events.patch b/patches/server/0893-Player-Entity-Tracking-Events.patch similarity index 100% rename from patches/server/0891-Player-Entity-Tracking-Events.patch rename to patches/server/0893-Player-Entity-Tracking-Events.patch diff --git a/patches/server/0892-Limit-pet-look-distance.patch b/patches/server/0894-Limit-pet-look-distance.patch similarity index 100% rename from patches/server/0892-Limit-pet-look-distance.patch rename to patches/server/0894-Limit-pet-look-distance.patch diff --git a/patches/server/0893-Properly-resend-entities.patch b/patches/server/0895-Properly-resend-entities.patch similarity index 100% rename from patches/server/0893-Properly-resend-entities.patch rename to patches/server/0895-Properly-resend-entities.patch diff --git a/patches/server/0894-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0896-Fixes-and-additions-to-the-SpawnReason-API.patch similarity index 100% rename from patches/server/0894-Fixes-and-additions-to-the-SpawnReason-API.patch rename to patches/server/0896-Fixes-and-additions-to-the-SpawnReason-API.patch diff --git a/patches/server/0895-fix-Instruments.patch b/patches/server/0897-fix-Instruments.patch similarity index 100% rename from patches/server/0895-fix-Instruments.patch rename to patches/server/0897-fix-Instruments.patch diff --git a/patches/server/0896-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0898-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch similarity index 100% rename from patches/server/0896-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch rename to patches/server/0898-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch diff --git a/patches/server/0897-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0899-Fix-inconsistencies-in-dispense-events-regarding-sta.patch similarity index 100% rename from patches/server/0897-Fix-inconsistencies-in-dispense-events-regarding-sta.patch rename to patches/server/0899-Fix-inconsistencies-in-dispense-events-regarding-sta.patch diff --git a/patches/server/0898-Add-BlockLockCheckEvent.patch b/patches/server/0900-Add-BlockLockCheckEvent.patch similarity index 100% rename from patches/server/0898-Add-BlockLockCheckEvent.patch rename to patches/server/0900-Add-BlockLockCheckEvent.patch diff --git a/patches/server/0899-Add-Sneaking-API-for-Entities.patch b/patches/server/0901-Add-Sneaking-API-for-Entities.patch similarity index 100% rename from patches/server/0899-Add-Sneaking-API-for-Entities.patch rename to patches/server/0901-Add-Sneaking-API-for-Entities.patch diff --git a/patches/server/0900-Improve-logging-and-errors.patch b/patches/server/0902-Improve-logging-and-errors.patch similarity index 100% rename from patches/server/0900-Improve-logging-and-errors.patch rename to patches/server/0902-Improve-logging-and-errors.patch diff --git a/patches/server/0901-Improve-PortalEvents.patch b/patches/server/0903-Improve-PortalEvents.patch similarity index 100% rename from patches/server/0901-Improve-PortalEvents.patch rename to patches/server/0903-Improve-PortalEvents.patch diff --git a/patches/server/0902-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0904-Add-config-option-for-spider-worldborder-climbing.patch similarity index 100% rename from patches/server/0902-Add-config-option-for-spider-worldborder-climbing.patch rename to patches/server/0904-Add-config-option-for-spider-worldborder-climbing.patch diff --git a/patches/server/0903-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0905-Add-missing-SpigotConfig-logCommands-check.patch similarity index 100% rename from patches/server/0903-Add-missing-SpigotConfig-logCommands-check.patch rename to patches/server/0905-Add-missing-SpigotConfig-logCommands-check.patch diff --git a/patches/server/0904-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0906-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch similarity index 100% rename from patches/server/0904-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch rename to patches/server/0906-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch diff --git a/patches/server/0905-Flying-Fall-Damage.patch b/patches/server/0907-Flying-Fall-Damage.patch similarity index 100% rename from patches/server/0905-Flying-Fall-Damage.patch rename to patches/server/0907-Flying-Fall-Damage.patch diff --git a/patches/server/0906-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/server/0908-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch similarity index 100% rename from patches/server/0906-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch rename to patches/server/0908-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch diff --git a/patches/server/0907-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0909-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch similarity index 100% rename from patches/server/0907-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch rename to patches/server/0909-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch diff --git a/patches/server/0908-config-for-disabling-entity-tag-tags.patch b/patches/server/0910-config-for-disabling-entity-tag-tags.patch similarity index 100% rename from patches/server/0908-config-for-disabling-entity-tag-tags.patch rename to patches/server/0910-config-for-disabling-entity-tag-tags.patch diff --git a/patches/server/0909-Use-single-player-info-update-packet-on-join.patch b/patches/server/0911-Use-single-player-info-update-packet-on-join.patch similarity index 100% rename from patches/server/0909-Use-single-player-info-update-packet-on-join.patch rename to patches/server/0911-Use-single-player-info-update-packet-on-join.patch diff --git a/patches/server/0910-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0912-Correctly-shrink-items-during-EntityResurrectEvent.patch similarity index 100% rename from patches/server/0910-Correctly-shrink-items-during-EntityResurrectEvent.patch rename to patches/server/0912-Correctly-shrink-items-during-EntityResurrectEvent.patch diff --git a/patches/server/0911-Win-Screen-API.patch b/patches/server/0913-Win-Screen-API.patch similarity index 100% rename from patches/server/0911-Win-Screen-API.patch rename to patches/server/0913-Win-Screen-API.patch diff --git a/patches/server/0912-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0914-Remove-CraftItemStack-setAmount-null-assignment.patch similarity index 100% rename from patches/server/0912-Remove-CraftItemStack-setAmount-null-assignment.patch rename to patches/server/0914-Remove-CraftItemStack-setAmount-null-assignment.patch diff --git a/patches/server/0913-Fix-force-opening-enchantment-tables.patch b/patches/server/0915-Fix-force-opening-enchantment-tables.patch similarity index 100% rename from patches/server/0913-Fix-force-opening-enchantment-tables.patch rename to patches/server/0915-Fix-force-opening-enchantment-tables.patch diff --git a/patches/server/0914-Add-Entity-Body-Yaw-API.patch b/patches/server/0916-Add-Entity-Body-Yaw-API.patch similarity index 100% rename from patches/server/0914-Add-Entity-Body-Yaw-API.patch rename to patches/server/0916-Add-Entity-Body-Yaw-API.patch diff --git a/patches/server/0915-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0917-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch similarity index 100% rename from patches/server/0915-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch rename to patches/server/0917-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch diff --git a/patches/server/0916-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0918-Update-the-flag-when-a-captured-block-state-is-outda.patch similarity index 83% rename from patches/server/0916-Update-the-flag-when-a-captured-block-state-is-outda.patch rename to patches/server/0918-Update-the-flag-when-a-captured-block-state-is-outda.patch index 0f8b90a4845f..599ae035d55f 100644 --- a/patches/server/0916-Update-the-flag-when-a-captured-block-state-is-outda.patch +++ b/patches/server/0918-Update-the-flag-when-a-captured-block-state-is-outda.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Update the flag when a captured block state is outdated diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 1531809d6bb80ae1fd50a08a541578f44d624fd8..d5308b66d7fd9b230862503acfa84dac2ddc2582 100644 +index 07a5bbdcada2d2cdb1c3d245379217fe19a48b75..487a25ca0f6719742a88648fbbebfc3e29e105f5 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java -@@ -918,6 +918,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -920,6 +920,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { blockstate = CapturedBlockState.getTreeBlockState(this, pos, flags); this.capturedBlockStates.put(pos.immutable(), blockstate); } diff --git a/patches/server/0917-Add-EntityFertilizeEggEvent.patch b/patches/server/0919-Add-EntityFertilizeEggEvent.patch similarity index 100% rename from patches/server/0917-Add-EntityFertilizeEggEvent.patch rename to patches/server/0919-Add-EntityFertilizeEggEvent.patch diff --git a/patches/server/0918-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0920-Fix-HumanEntity-drop-not-updating-the-client-inv.patch similarity index 100% rename from patches/server/0918-Fix-HumanEntity-drop-not-updating-the-client-inv.patch rename to patches/server/0920-Fix-HumanEntity-drop-not-updating-the-client-inv.patch diff --git a/patches/server/0919-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0921-Add-CompostItemEvent-and-EntityCompostItemEvent.patch similarity index 100% rename from patches/server/0919-Add-CompostItemEvent-and-EntityCompostItemEvent.patch rename to patches/server/0921-Add-CompostItemEvent-and-EntityCompostItemEvent.patch diff --git a/patches/server/0920-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0922-Correctly-handle-ArmorStand-invisibility.patch similarity index 100% rename from patches/server/0920-Correctly-handle-ArmorStand-invisibility.patch rename to patches/server/0922-Correctly-handle-ArmorStand-invisibility.patch diff --git a/patches/server/0921-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0923-Fix-advancement-triggers-for-entity-damage.patch similarity index 100% rename from patches/server/0921-Fix-advancement-triggers-for-entity-damage.patch rename to patches/server/0923-Fix-advancement-triggers-for-entity-damage.patch diff --git a/patches/server/0922-Fix-text-display-error-on-spawn.patch b/patches/server/0924-Fix-text-display-error-on-spawn.patch similarity index 100% rename from patches/server/0922-Fix-text-display-error-on-spawn.patch rename to patches/server/0924-Fix-text-display-error-on-spawn.patch diff --git a/patches/server/0923-Fix-certain-inventories-returning-null-Locations.patch b/patches/server/0925-Fix-certain-inventories-returning-null-Locations.patch similarity index 100% rename from patches/server/0923-Fix-certain-inventories-returning-null-Locations.patch rename to patches/server/0925-Fix-certain-inventories-returning-null-Locations.patch diff --git a/patches/server/0924-Add-Shearable-API.patch b/patches/server/0926-Add-Shearable-API.patch similarity index 100% rename from patches/server/0924-Add-Shearable-API.patch rename to patches/server/0926-Add-Shearable-API.patch diff --git a/patches/server/0925-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0927-Fix-SpawnEggMeta-get-setSpawnedType.patch similarity index 100% rename from patches/server/0925-Fix-SpawnEggMeta-get-setSpawnedType.patch rename to patches/server/0927-Fix-SpawnEggMeta-get-setSpawnedType.patch diff --git a/patches/server/0926-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch b/patches/server/0928-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch similarity index 100% rename from patches/server/0926-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch rename to patches/server/0928-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch diff --git a/patches/server/0927-Optimize-Hoppers.patch b/patches/server/0929-Optimize-Hoppers.patch similarity index 100% rename from patches/server/0927-Optimize-Hoppers.patch rename to patches/server/0929-Optimize-Hoppers.patch diff --git a/patches/server/0928-Fix-beehives-generating-from-using-bonemeal.patch b/patches/server/0930-Fix-beehives-generating-from-using-bonemeal.patch similarity index 100% rename from patches/server/0928-Fix-beehives-generating-from-using-bonemeal.patch rename to patches/server/0930-Fix-beehives-generating-from-using-bonemeal.patch diff --git a/patches/server/0929-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0931-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch similarity index 100% rename from patches/server/0929-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch rename to patches/server/0931-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch diff --git a/patches/server/0930-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0932-Treat-sequence-violations-like-they-should-be.patch similarity index 100% rename from patches/server/0930-Treat-sequence-violations-like-they-should-be.patch rename to patches/server/0932-Treat-sequence-violations-like-they-should-be.patch diff --git a/patches/server/0931-remove-duplicate-animate-packet-for-records.patch b/patches/server/0933-remove-duplicate-animate-packet-for-records.patch similarity index 100% rename from patches/server/0931-remove-duplicate-animate-packet-for-records.patch rename to patches/server/0933-remove-duplicate-animate-packet-for-records.patch diff --git a/patches/server/0932-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0934-Prevent-causing-expired-keys-from-impacting-new-join.patch similarity index 100% rename from patches/server/0932-Prevent-causing-expired-keys-from-impacting-new-join.patch rename to patches/server/0934-Prevent-causing-expired-keys-from-impacting-new-join.patch diff --git a/patches/server/0933-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0935-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch similarity index 90% rename from patches/server/0933-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch rename to patches/server/0935-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch index 06cbfe418cf4..a89525492303 100644 --- a/patches/server/0933-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch +++ b/patches/server/0935-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent GameEvents being fired from unloaded chunks diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index a0e61d3a61861cedaef87e8116a40113cf1f9891..8cb1299d9110adc8f11e9be984ed8a4326a330cf 100644 +index eae08569a3e338641740bf1ca8e92bc8e8455cdd..a35b98e92a8afaa1d61e86a614466e64ef6e948f 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1695,6 +1695,11 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0934-Use-array-for-gamerule-storage.patch b/patches/server/0936-Use-array-for-gamerule-storage.patch similarity index 100% rename from patches/server/0934-Use-array-for-gamerule-storage.patch rename to patches/server/0936-Use-array-for-gamerule-storage.patch diff --git a/patches/server/0935-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0937-Fix-a-couple-of-upstream-bed-issues.patch similarity index 100% rename from patches/server/0935-Fix-a-couple-of-upstream-bed-issues.patch rename to patches/server/0937-Fix-a-couple-of-upstream-bed-issues.patch diff --git a/patches/server/0936-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0938-Fix-demo-flag-not-enabling-demo-mode.patch similarity index 100% rename from patches/server/0936-Fix-demo-flag-not-enabling-demo-mode.patch rename to patches/server/0938-Fix-demo-flag-not-enabling-demo-mode.patch diff --git a/patches/server/0937-Add-Mob-Experience-reward-API.patch b/patches/server/0939-Add-Mob-Experience-reward-API.patch similarity index 100% rename from patches/server/0937-Add-Mob-Experience-reward-API.patch rename to patches/server/0939-Add-Mob-Experience-reward-API.patch diff --git a/patches/server/0938-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0940-Break-redstone-on-top-of-trap-doors-early.patch similarity index 100% rename from patches/server/0938-Break-redstone-on-top-of-trap-doors-early.patch rename to patches/server/0940-Break-redstone-on-top-of-trap-doors-early.patch diff --git a/patches/server/0939-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0941-Fix-DamageCause-for-Falling-Blocks.patch similarity index 100% rename from patches/server/0939-Fix-DamageCause-for-Falling-Blocks.patch rename to patches/server/0941-Fix-DamageCause-for-Falling-Blocks.patch diff --git a/patches/server/0940-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0942-Avoid-Lazy-Initialization-for-Enum-Fields.patch similarity index 100% rename from patches/server/0940-Avoid-Lazy-Initialization-for-Enum-Fields.patch rename to patches/server/0942-Avoid-Lazy-Initialization-for-Enum-Fields.patch diff --git a/patches/server/0941-More-accurate-isInOpenWater-impl.patch b/patches/server/0943-More-accurate-isInOpenWater-impl.patch similarity index 100% rename from patches/server/0941-More-accurate-isInOpenWater-impl.patch rename to patches/server/0943-More-accurate-isInOpenWater-impl.patch diff --git a/patches/server/0942-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0944-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch similarity index 100% rename from patches/server/0942-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch rename to patches/server/0944-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch diff --git a/patches/server/0943-Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/server/0945-Optimise-recalcBlockCounts-for-empty-sections.patch similarity index 89% rename from patches/server/0943-Optimise-recalcBlockCounts-for-empty-sections.patch rename to patches/server/0945-Optimise-recalcBlockCounts-for-empty-sections.patch index 8bc27450a666..0e23a9a1236a 100644 --- a/patches/server/0943-Optimise-recalcBlockCounts-for-empty-sections.patch +++ b/patches/server/0945-Optimise-recalcBlockCounts-for-empty-sections.patch @@ -16,10 +16,10 @@ sections with a ZeroBitStorage data to to take ~20% of the process, now it takes <1%. 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 4158a699d775e1a69974b1a638714ffcadafaa46..93f0f55d986c2ae838f1cae10dc80ab31a7eaec4 100644 +index b39fea80fcb83873b7e7085eaaf935e712f0ede7..f0de72afad4bb571153436399386a6a8a70582a6 100644 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java -@@ -141,6 +141,7 @@ public class LevelChunkSection { +@@ -144,6 +144,7 @@ public class LevelChunkSection { this.nonEmptyBlockCount = 0; this.tickingBlockCount = 0; this.tickingFluidCount = 0; @@ -27,7 +27,7 @@ index 4158a699d775e1a69974b1a638714ffcadafaa46..93f0f55d986c2ae838f1cae10dc80ab3 this.states.forEachLocation((BlockState iblockdata, int i) -> { FluidState fluid = iblockdata.getFluidState(); -@@ -166,6 +167,7 @@ public class LevelChunkSection { +@@ -169,6 +170,7 @@ public class LevelChunkSection { // Paper end - optimise collisions }); diff --git a/patches/server/0944-Expand-PlayerItemMendEvent.patch b/patches/server/0946-Expand-PlayerItemMendEvent.patch similarity index 100% rename from patches/server/0944-Expand-PlayerItemMendEvent.patch rename to patches/server/0946-Expand-PlayerItemMendEvent.patch diff --git a/patches/server/0945-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0947-Refresh-ProjectileSource-for-projectiles.patch similarity index 100% rename from patches/server/0945-Refresh-ProjectileSource-for-projectiles.patch rename to patches/server/0947-Refresh-ProjectileSource-for-projectiles.patch diff --git a/patches/server/0946-Add-transient-modifier-API.patch b/patches/server/0948-Add-transient-modifier-API.patch similarity index 100% rename from patches/server/0946-Add-transient-modifier-API.patch rename to patches/server/0948-Add-transient-modifier-API.patch diff --git a/patches/server/0947-Fix-block-place-logic.patch b/patches/server/0949-Fix-block-place-logic.patch similarity index 96% rename from patches/server/0947-Fix-block-place-logic.patch rename to patches/server/0949-Fix-block-place-logic.patch index 238f5d84c9f2..6dbde327806f 100644 --- a/patches/server/0947-Fix-block-place-logic.patch +++ b/patches/server/0949-Fix-block-place-logic.patch @@ -41,10 +41,10 @@ index 08464c7f114a04169c9ddeceef936749952770e6..62fc1b110ec319bb91aa0639b18aa354 } diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index d5308b66d7fd9b230862503acfa84dac2ddc2582..8f08f39a6ebd16e0cadb9a405035d995caf9f333 100644 +index 487a25ca0f6719742a88648fbbebfc3e29e105f5..2dbc5898338a2ee5e2ca7f05fd6de77033be4eb7 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java -@@ -1032,17 +1032,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -1035,17 +1035,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable { // CraftBukkit start iblockdata1.updateIndirectNeighbourShapes(this, blockposition, k, j - 1); // Don't call an event for the old block to limit event spam CraftWorld world = ((ServerLevel) this).getWorld(); diff --git a/patches/server/0948-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0950-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch similarity index 100% rename from patches/server/0948-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch rename to patches/server/0950-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch diff --git a/patches/server/0949-Ignore-inline-definitions-of-trim-material-pattern.patch b/patches/server/0951-Ignore-inline-definitions-of-trim-material-pattern.patch similarity index 100% rename from patches/server/0949-Ignore-inline-definitions-of-trim-material-pattern.patch rename to patches/server/0951-Ignore-inline-definitions-of-trim-material-pattern.patch diff --git a/patches/server/0950-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0952-Call-BlockGrowEvent-for-missing-blocks.patch similarity index 100% rename from patches/server/0950-Call-BlockGrowEvent-for-missing-blocks.patch rename to patches/server/0952-Call-BlockGrowEvent-for-missing-blocks.patch diff --git a/patches/server/0951-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0953-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch similarity index 94% rename from patches/server/0951-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch rename to patches/server/0953-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch index 2d866dedaa40..fed61064831e 100644 --- a/patches/server/0951-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch +++ b/patches/server/0953-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't enforce icanhasbukkit default if alias block exists diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 3b264f630a28416f0faacafba91e047bfb0f5190..652730486f93ea829865f7e140823b600ce3bb64 100644 +index 332344f220335ab309079a022a0b590339f34560..f8465d3e8fd2ad877d8f5614a815d6e528cc4fa0 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -359,7 +359,11 @@ public final class CraftServer implements Server { diff --git a/patches/server/0952-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0954-fix-MapLike-spam-for-missing-key-selector.patch similarity index 100% rename from patches/server/0952-fix-MapLike-spam-for-missing-key-selector.patch rename to patches/server/0954-fix-MapLike-spam-for-missing-key-selector.patch diff --git a/patches/server/0953-Fix-sniffer-removeExploredLocation.patch b/patches/server/0955-Fix-sniffer-removeExploredLocation.patch similarity index 100% rename from patches/server/0953-Fix-sniffer-removeExploredLocation.patch rename to patches/server/0955-Fix-sniffer-removeExploredLocation.patch diff --git a/patches/server/0954-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0956-Add-method-to-remove-all-active-potion-effects.patch similarity index 100% rename from patches/server/0954-Add-method-to-remove-all-active-potion-effects.patch rename to patches/server/0956-Add-method-to-remove-all-active-potion-effects.patch diff --git a/patches/server/0955-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch b/patches/server/0957-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch similarity index 100% rename from patches/server/0955-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch rename to patches/server/0957-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch diff --git a/patches/server/0956-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0958-Fix-incorrect-crafting-result-amount-for-fireworks.patch similarity index 100% rename from patches/server/0956-Fix-incorrect-crafting-result-amount-for-fireworks.patch rename to patches/server/0958-Fix-incorrect-crafting-result-amount-for-fireworks.patch diff --git a/patches/server/0957-Properly-Cancel-Usable-Items.patch b/patches/server/0959-Properly-Cancel-Usable-Items.patch similarity index 94% rename from patches/server/0957-Properly-Cancel-Usable-Items.patch rename to patches/server/0959-Properly-Cancel-Usable-Items.patch index 7c7f67233c8e..e28aa6028743 100644 --- a/patches/server/0957-Properly-Cancel-Usable-Items.patch +++ b/patches/server/0959-Properly-Cancel-Usable-Items.patch @@ -10,10 +10,10 @@ The underlying issue of this is that the client modifies their synced data value them in order for the client to reset their using item state. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -index 482e6b217c073ceff30c238c3a8cd8ea526bb07c..034960c1d321e159b3881a900f823ba546cff7ff 100644 +index 34ecfb89372f459117db99d57a7edd6f681bbe8a..baf3e79489e310f443788bc917c553ae7ea86c89 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -@@ -560,6 +560,7 @@ public class ServerPlayerGameMode { +@@ -562,6 +562,7 @@ public class ServerPlayerGameMode { } // Paper end - extend Player Interact cancellation player.getBukkitEntity().updateInventory(); // SPIGOT-2867 @@ -21,7 +21,7 @@ index 482e6b217c073ceff30c238c3a8cd8ea526bb07c..034960c1d321e159b3881a900f823ba5 enuminteractionresult = (event.useItemInHand() != Event.Result.ALLOW) ? InteractionResult.SUCCESS : InteractionResult.PASS; } else if (this.gameModeForPlayer == GameType.SPECTATOR) { MenuProvider itileinventory = iblockdata.getMenuProvider(world, blockposition); -@@ -603,6 +604,11 @@ public class ServerPlayerGameMode { +@@ -605,6 +606,11 @@ public class ServerPlayerGameMode { return enuminteractionresult1; } diff --git a/patches/server/0958-Add-event-for-player-editing-sign.patch b/patches/server/0960-Add-event-for-player-editing-sign.patch similarity index 100% rename from patches/server/0958-Add-event-for-player-editing-sign.patch rename to patches/server/0960-Add-event-for-player-editing-sign.patch diff --git a/patches/server/0959-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0961-Only-tick-item-frames-if-players-can-see-it.patch similarity index 100% rename from patches/server/0959-Only-tick-item-frames-if-players-can-see-it.patch rename to patches/server/0961-Only-tick-item-frames-if-players-can-see-it.patch diff --git a/patches/server/0960-Improve-command-function-perm-level-checks.patch b/patches/server/0962-Improve-command-function-perm-level-checks.patch similarity index 100% rename from patches/server/0960-Improve-command-function-perm-level-checks.patch rename to patches/server/0962-Improve-command-function-perm-level-checks.patch diff --git a/patches/server/0961-Add-option-to-disable-block-updates.patch b/patches/server/0963-Add-option-to-disable-block-updates.patch similarity index 100% rename from patches/server/0961-Add-option-to-disable-block-updates.patch rename to patches/server/0963-Add-option-to-disable-block-updates.patch diff --git a/patches/server/0962-Call-missing-BlockDispenseEvent.patch b/patches/server/0964-Call-missing-BlockDispenseEvent.patch similarity index 100% rename from patches/server/0962-Call-missing-BlockDispenseEvent.patch rename to patches/server/0964-Call-missing-BlockDispenseEvent.patch diff --git a/patches/server/0963-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0965-Don-t-load-chunks-for-supporting-block-checks.patch similarity index 100% rename from patches/server/0963-Don-t-load-chunks-for-supporting-block-checks.patch rename to patches/server/0965-Don-t-load-chunks-for-supporting-block-checks.patch diff --git a/patches/server/0964-Optimize-player-lookups-for-beacons.patch b/patches/server/0966-Optimize-player-lookups-for-beacons.patch similarity index 100% rename from patches/server/0964-Optimize-player-lookups-for-beacons.patch rename to patches/server/0966-Optimize-player-lookups-for-beacons.patch diff --git a/patches/server/0965-Add-Sign-getInteractableSideFor.patch b/patches/server/0967-Add-Sign-getInteractableSideFor.patch similarity index 100% rename from patches/server/0965-Add-Sign-getInteractableSideFor.patch rename to patches/server/0967-Add-Sign-getInteractableSideFor.patch diff --git a/patches/server/0966-Array-backed-synched-entity-data.patch b/patches/server/0968-Array-backed-synched-entity-data.patch similarity index 100% rename from patches/server/0966-Array-backed-synched-entity-data.patch rename to patches/server/0968-Array-backed-synched-entity-data.patch diff --git a/patches/server/0967-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0969-fix-item-meta-for-tadpole-buckets.patch similarity index 100% rename from patches/server/0967-fix-item-meta-for-tadpole-buckets.patch rename to patches/server/0969-fix-item-meta-for-tadpole-buckets.patch diff --git a/patches/server/0968-Suppress-Item-Meta-Validation-Checks.patch b/patches/server/0970-Suppress-Item-Meta-Validation-Checks.patch similarity index 100% rename from patches/server/0968-Suppress-Item-Meta-Validation-Checks.patch rename to patches/server/0970-Suppress-Item-Meta-Validation-Checks.patch diff --git a/patches/server/0969-Fix-BanList-API.patch b/patches/server/0971-Fix-BanList-API.patch similarity index 100% rename from patches/server/0969-Fix-BanList-API.patch rename to patches/server/0971-Fix-BanList-API.patch diff --git a/patches/server/0970-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0972-Determine-lava-and-water-fluid-explosion-resistance-.patch similarity index 100% rename from patches/server/0970-Determine-lava-and-water-fluid-explosion-resistance-.patch rename to patches/server/0972-Determine-lava-and-water-fluid-explosion-resistance-.patch diff --git a/patches/server/0971-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0973-Fix-possible-NPE-on-painting-creation.patch similarity index 100% rename from patches/server/0971-Fix-possible-NPE-on-painting-creation.patch rename to patches/server/0973-Fix-possible-NPE-on-painting-creation.patch diff --git a/patches/server/0972-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0974-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch similarity index 100% rename from patches/server/0972-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch rename to patches/server/0974-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch diff --git a/patches/server/0973-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0975-ExperienceOrb-should-call-EntitySpawnEvent.patch similarity index 100% rename from patches/server/0973-ExperienceOrb-should-call-EntitySpawnEvent.patch rename to patches/server/0975-ExperienceOrb-should-call-EntitySpawnEvent.patch diff --git a/patches/server/0974-Don-t-tick-signs.patch b/patches/server/0976-Don-t-tick-signs.patch similarity index 100% rename from patches/server/0974-Don-t-tick-signs.patch rename to patches/server/0976-Don-t-tick-signs.patch diff --git a/patches/server/0975-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0977-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch similarity index 100% rename from patches/server/0975-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch rename to patches/server/0977-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch diff --git a/patches/server/0976-Add-whitelist-events.patch b/patches/server/0978-Add-whitelist-events.patch similarity index 100% rename from patches/server/0976-Add-whitelist-events.patch rename to patches/server/0978-Add-whitelist-events.patch diff --git a/patches/server/0977-Implement-PlayerFailMoveEvent.patch b/patches/server/0979-Implement-PlayerFailMoveEvent.patch similarity index 100% rename from patches/server/0977-Implement-PlayerFailMoveEvent.patch rename to patches/server/0979-Implement-PlayerFailMoveEvent.patch diff --git a/patches/server/0978-Folia-scheduler-and-owned-region-API.patch b/patches/server/0980-Folia-scheduler-and-owned-region-API.patch similarity index 99% rename from patches/server/0978-Folia-scheduler-and-owned-region-API.patch rename to patches/server/0980-Folia-scheduler-and-owned-region-API.patch index f2b064b8214a..43f21453d03e 100644 --- a/patches/server/0978-Folia-scheduler-and-owned-region-API.patch +++ b/patches/server/0980-Folia-scheduler-and-owned-region-API.patch @@ -1224,7 +1224,7 @@ index ac7f1f317782a6c6ad41614fbe6c25498da63010..426023af3cbed9c17048e669c87a1c66 public void setLevelCallback(EntityInLevelCallback changeListener) { this.levelCallback = changeListener; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 652730486f93ea829865f7e140823b600ce3bb64..3c5ae22e97a0dc7307161b6a96140dae2be25995 100644 +index f8465d3e8fd2ad877d8f5614a815d6e528cc4fa0..f1ae1718e8ccfe7098740a2f3ec038bd9bff063d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -308,6 +308,76 @@ public final class CraftServer implements Server { diff --git a/patches/server/0979-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0981-Only-erase-allay-memory-on-non-item-targets.patch similarity index 100% rename from patches/server/0979-Only-erase-allay-memory-on-non-item-targets.patch rename to patches/server/0981-Only-erase-allay-memory-on-non-item-targets.patch diff --git a/patches/server/0980-API-for-updating-recipes-on-clients.patch b/patches/server/0982-API-for-updating-recipes-on-clients.patch similarity index 97% rename from patches/server/0980-API-for-updating-recipes-on-clients.patch rename to patches/server/0982-API-for-updating-recipes-on-clients.patch index b6d9838ada54..b5437c77a3dd 100644 --- a/patches/server/0980-API-for-updating-recipes-on-clients.patch +++ b/patches/server/0982-API-for-updating-recipes-on-clients.patch @@ -39,7 +39,7 @@ index 723a87701a44e379c80e6def91c5340e37c87ba1..986ab7dd2135b4cb871923b20e3dc83e Iterator iterator1 = this.players.iterator(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 3c5ae22e97a0dc7307161b6a96140dae2be25995..a3d1d4d259014f55feda56dc97c2cfd48891de12 100644 +index f1ae1718e8ccfe7098740a2f3ec038bd9bff063d..b5965be96f09a6cac86b494a98a7193334c5888e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1131,6 +1131,18 @@ public final class CraftServer implements Server { diff --git a/patches/server/0981-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0983-Fix-rotation-when-spawning-display-entities.patch similarity index 100% rename from patches/server/0981-Fix-rotation-when-spawning-display-entities.patch rename to patches/server/0983-Fix-rotation-when-spawning-display-entities.patch diff --git a/patches/server/0982-Only-capture-actual-tree-growth.patch b/patches/server/0984-Only-capture-actual-tree-growth.patch similarity index 96% rename from patches/server/0982-Only-capture-actual-tree-growth.patch rename to patches/server/0984-Only-capture-actual-tree-growth.patch index 146e0f5cad06..2880ab70b900 100644 --- a/patches/server/0982-Only-capture-actual-tree-growth.patch +++ b/patches/server/0984-Only-capture-actual-tree-growth.patch @@ -29,10 +29,10 @@ index 7bb47643e748f57a51c613d0a2ee8d05e1fe1798..16f087adbf94b8fd6726ffd300b103dd } entityhuman.awardStat(Stats.ITEM_USED.get(item)); // SPIGOT-7236 - award stat diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 8f08f39a6ebd16e0cadb9a405035d995caf9f333..1746159398a2bee2a86d82d5be035d68c1c3261a 100644 +index 2dbc5898338a2ee5e2ca7f05fd6de77033be4eb7..87cae8ed22a2428a1dda8f2a4510e45fbc31eab5 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java -@@ -1865,4 +1865,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -1868,4 +1868,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable { return null; } // Paper end - optimize redstone (Alternate Current) diff --git a/patches/server/0983-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0985-Use-correct-source-for-mushroom-block-spread-event.patch similarity index 100% rename from patches/server/0983-Use-correct-source-for-mushroom-block-spread-event.patch rename to patches/server/0985-Use-correct-source-for-mushroom-block-spread-event.patch diff --git a/patches/server/0984-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0986-Respect-randomizeData-on-more-entities-when-spawning.patch similarity index 100% rename from patches/server/0984-Respect-randomizeData-on-more-entities-when-spawning.patch rename to patches/server/0986-Respect-randomizeData-on-more-entities-when-spawning.patch diff --git a/patches/server/0985-Use-correct-seed-on-api-world-load.patch b/patches/server/0987-Use-correct-seed-on-api-world-load.patch similarity index 90% rename from patches/server/0985-Use-correct-seed-on-api-world-load.patch rename to patches/server/0987-Use-correct-seed-on-api-world-load.patch index f518b6abe5da..fecdbb79e7cb 100644 --- a/patches/server/0985-Use-correct-seed-on-api-world-load.patch +++ b/patches/server/0987-Use-correct-seed-on-api-world-load.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Use correct seed on api world load diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index a3d1d4d259014f55feda56dc97c2cfd48891de12..23c66510e877670e194b74a0935f1a810ce762b5 100644 +index b5965be96f09a6cac86b494a98a7193334c5888e..c5c15e7aeadbd084c7ab3f1ace6b7305f739a75b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1312,7 +1312,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0986-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0988-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch similarity index 100% rename from patches/server/0986-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch rename to patches/server/0988-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch diff --git a/patches/server/0987-Cache-map-ids-on-item-frames.patch b/patches/server/0989-Cache-map-ids-on-item-frames.patch similarity index 100% rename from patches/server/0987-Cache-map-ids-on-item-frames.patch rename to patches/server/0989-Cache-map-ids-on-item-frames.patch diff --git a/patches/server/0988-Fix-custom-statistic-criteria-creation.patch b/patches/server/0990-Fix-custom-statistic-criteria-creation.patch similarity index 100% rename from patches/server/0988-Fix-custom-statistic-criteria-creation.patch rename to patches/server/0990-Fix-custom-statistic-criteria-creation.patch diff --git a/patches/server/0989-Bandaid-fix-for-Effect.patch b/patches/server/0991-Bandaid-fix-for-Effect.patch similarity index 97% rename from patches/server/0989-Bandaid-fix-for-Effect.patch rename to patches/server/0991-Bandaid-fix-for-Effect.patch index fcaf0489aaee..2baa7f96fce5 100644 --- a/patches/server/0989-Bandaid-fix-for-Effect.patch +++ b/patches/server/0991-Bandaid-fix-for-Effect.patch @@ -45,10 +45,10 @@ index 5a5a8945c786e16ff0df62494ddd1ac85c42b53f..63f9735d356dafd579cee4423d3037eb case COMPOSTER_FILL_ATTEMPT: datavalue = ((Boolean) data) ? 1 : 0; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index efefb334aba5a7dc03fbe210b9528109d31ad3fa..7aef2714791674086246ab4b5b92c8965dbfdae0 100644 +index a4926ad61958301c16a6156abe418a268b10823a..0e670de77a7f9926e295e1dd63d909bed1a959ca 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1368,7 +1368,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -1373,7 +1373,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { public void playEffect(Location loc, Effect effect, T data, int radius) { if (data != null) { Preconditions.checkArgument(effect.getData() != null, "Effect.%s does not have a valid Data", effect); diff --git a/patches/server/0990-SculkCatalyst-bloom-API.patch b/patches/server/0992-SculkCatalyst-bloom-API.patch similarity index 100% rename from patches/server/0990-SculkCatalyst-bloom-API.patch rename to patches/server/0992-SculkCatalyst-bloom-API.patch diff --git a/patches/server/0991-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0993-API-for-an-entity-s-scoreboard-name.patch similarity index 100% rename from patches/server/0991-API-for-an-entity-s-scoreboard-name.patch rename to patches/server/0993-API-for-an-entity-s-scoreboard-name.patch diff --git a/patches/server/0992-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/0994-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch similarity index 100% rename from patches/server/0992-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch rename to patches/server/0994-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch diff --git a/patches/server/0993-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0995-Deprecate-and-replace-methods-with-old-StructureType.patch similarity index 96% rename from patches/server/0993-Deprecate-and-replace-methods-with-old-StructureType.patch rename to patches/server/0995-Deprecate-and-replace-methods-with-old-StructureType.patch index 9a940e820897..ee2a07e0d96d 100644 --- a/patches/server/0993-Deprecate-and-replace-methods-with-old-StructureType.patch +++ b/patches/server/0995-Deprecate-and-replace-methods-with-old-StructureType.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Deprecate and replace methods with old StructureType diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 23c66510e877670e194b74a0935f1a810ce762b5..7e38dd8b7015f8f648c551ab0a83c4822bfa37a0 100644 +index c5c15e7aeadbd084c7ab3f1ace6b7305f739a75b..fcd5096d64edfaf6bce3ecce8c9b9afb84462786 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1854,6 +1854,11 @@ public final class CraftServer implements Server { diff --git a/patches/server/0994-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0996-Don-t-tab-complete-namespaced-commands-if-send-names.patch similarity index 100% rename from patches/server/0994-Don-t-tab-complete-namespaced-commands-if-send-names.patch rename to patches/server/0996-Don-t-tab-complete-namespaced-commands-if-send-names.patch diff --git a/patches/server/0995-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0997-Properly-handle-BlockBreakEvent-isDropItems.patch similarity index 98% rename from patches/server/0995-Properly-handle-BlockBreakEvent-isDropItems.patch rename to patches/server/0997-Properly-handle-BlockBreakEvent-isDropItems.patch index 69850785614c..3da98df3dc77 100644 --- a/patches/server/0995-Properly-handle-BlockBreakEvent-isDropItems.patch +++ b/patches/server/0997-Properly-handle-BlockBreakEvent-isDropItems.patch @@ -9,10 +9,10 @@ food consumption, turtle egg count decreases, ice to water conversions and beehive releases diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -index 034960c1d321e159b3881a900f823ba546cff7ff..0435c8262480bf5d83fd4306205f32b979911811 100644 +index baf3e79489e310f443788bc917c553ae7ea86c89..9a17193c9fe26c9c0390906b4c1f9d619ccba249 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -@@ -436,8 +436,8 @@ public class ServerPlayerGameMode { +@@ -438,8 +438,8 @@ public class ServerPlayerGameMode { isCorrectTool = flag1; // Paper itemstack.mineBlock(this.level, iblockdata, pos, this.player); diff --git a/patches/server/0996-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0998-Fire-entity-death-event-for-ender-dragon.patch similarity index 100% rename from patches/server/0996-Fire-entity-death-event-for-ender-dragon.patch rename to patches/server/0998-Fire-entity-death-event-for-ender-dragon.patch diff --git a/patches/server/0997-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0999-Configurable-entity-tracking-range-by-Y-coordinate.patch similarity index 100% rename from patches/server/0997-Configurable-entity-tracking-range-by-Y-coordinate.patch rename to patches/server/0999-Configurable-entity-tracking-range-by-Y-coordinate.patch diff --git a/patches/server/0998-Add-Listing-API-for-Player.patch b/patches/server/1000-Add-Listing-API-for-Player.patch similarity index 100% rename from patches/server/0998-Add-Listing-API-for-Player.patch rename to patches/server/1000-Add-Listing-API-for-Player.patch diff --git a/patches/server/0999-Configurable-Region-Compression-Format.patch b/patches/server/1001-Configurable-Region-Compression-Format.patch similarity index 100% rename from patches/server/0999-Configurable-Region-Compression-Format.patch rename to patches/server/1001-Configurable-Region-Compression-Format.patch diff --git a/patches/server/1000-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/server/1002-Expose-clicked-BlockFace-during-BlockDamageEvent.patch similarity index 96% rename from patches/server/1000-Expose-clicked-BlockFace-during-BlockDamageEvent.patch rename to patches/server/1002-Expose-clicked-BlockFace-during-BlockDamageEvent.patch index 566e62b5de85..8ba4e79d8fd6 100644 --- a/patches/server/1000-Expose-clicked-BlockFace-during-BlockDamageEvent.patch +++ b/patches/server/1002-Expose-clicked-BlockFace-during-BlockDamageEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Expose clicked BlockFace during BlockDamageEvent diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -index 0435c8262480bf5d83fd4306205f32b979911811..1b0302df0ed420fd7f9d6803d796abf7d3192ceb 100644 +index 9a17193c9fe26c9c0390906b4c1f9d619ccba249..618ab9a2903f6d4139acd4aaa2e6db0a26e88ba9 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java @@ -258,7 +258,7 @@ public class ServerPlayerGameMode { diff --git a/patches/server/1001-Fix-NPE-on-Boat-getStatus.patch b/patches/server/1003-Fix-NPE-on-Boat-getStatus.patch similarity index 100% rename from patches/server/1001-Fix-NPE-on-Boat-getStatus.patch rename to patches/server/1003-Fix-NPE-on-Boat-getStatus.patch diff --git a/patches/server/1002-Expand-Pose-API.patch b/patches/server/1004-Expand-Pose-API.patch similarity index 100% rename from patches/server/1002-Expand-Pose-API.patch rename to patches/server/1004-Expand-Pose-API.patch diff --git a/patches/server/1003-More-DragonBattle-API.patch b/patches/server/1005-More-DragonBattle-API.patch similarity index 100% rename from patches/server/1003-More-DragonBattle-API.patch rename to patches/server/1005-More-DragonBattle-API.patch diff --git a/patches/server/1004-Deep-clone-unhandled-nbt-tags.patch b/patches/server/1006-Deep-clone-unhandled-nbt-tags.patch similarity index 100% rename from patches/server/1004-Deep-clone-unhandled-nbt-tags.patch rename to patches/server/1006-Deep-clone-unhandled-nbt-tags.patch diff --git a/patches/server/1005-Add-PlayerPickItemEvent.patch b/patches/server/1007-Add-PlayerPickItemEvent.patch similarity index 100% rename from patches/server/1005-Add-PlayerPickItemEvent.patch rename to patches/server/1007-Add-PlayerPickItemEvent.patch diff --git a/patches/server/1006-Improve-performance-of-mass-crafts.patch b/patches/server/1008-Improve-performance-of-mass-crafts.patch similarity index 100% rename from patches/server/1006-Improve-performance-of-mass-crafts.patch rename to patches/server/1008-Improve-performance-of-mass-crafts.patch diff --git a/patches/server/1007-Allow-trident-custom-damage.patch b/patches/server/1009-Allow-trident-custom-damage.patch similarity index 100% rename from patches/server/1007-Allow-trident-custom-damage.patch rename to patches/server/1009-Allow-trident-custom-damage.patch diff --git a/patches/server/1008-Expose-hand-during-BlockCanBuildEvent.patch b/patches/server/1010-Expose-hand-during-BlockCanBuildEvent.patch similarity index 100% rename from patches/server/1008-Expose-hand-during-BlockCanBuildEvent.patch rename to patches/server/1010-Expose-hand-during-BlockCanBuildEvent.patch diff --git a/patches/server/1009-Optimize-nearest-structure-border-iteration.patch b/patches/server/1011-Optimize-nearest-structure-border-iteration.patch similarity index 100% rename from patches/server/1009-Optimize-nearest-structure-border-iteration.patch rename to patches/server/1011-Optimize-nearest-structure-border-iteration.patch diff --git a/patches/server/1010-Implement-OfflinePlayer-isConnected.patch b/patches/server/1012-Implement-OfflinePlayer-isConnected.patch similarity index 100% rename from patches/server/1010-Implement-OfflinePlayer-isConnected.patch rename to patches/server/1012-Implement-OfflinePlayer-isConnected.patch diff --git a/patches/server/1011-Fix-inventory-desync.patch b/patches/server/1013-Fix-inventory-desync.patch similarity index 100% rename from patches/server/1011-Fix-inventory-desync.patch rename to patches/server/1013-Fix-inventory-desync.patch diff --git a/patches/server/1012-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/1014-Add-titleOverride-to-InventoryOpenEvent.patch similarity index 100% rename from patches/server/1012-Add-titleOverride-to-InventoryOpenEvent.patch rename to patches/server/1014-Add-titleOverride-to-InventoryOpenEvent.patch diff --git a/patches/server/1013-Configure-sniffer-egg-hatch-time.patch b/patches/server/1015-Configure-sniffer-egg-hatch-time.patch similarity index 100% rename from patches/server/1013-Configure-sniffer-egg-hatch-time.patch rename to patches/server/1015-Configure-sniffer-egg-hatch-time.patch diff --git a/patches/server/1014-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/1016-Do-crystal-portal-proximity-check-before-entity-look.patch similarity index 100% rename from patches/server/1014-Do-crystal-portal-proximity-check-before-entity-look.patch rename to patches/server/1016-Do-crystal-portal-proximity-check-before-entity-look.patch diff --git a/patches/server/1015-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/1017-Skip-POI-finding-if-stuck-in-vehicle.patch similarity index 100% rename from patches/server/1015-Skip-POI-finding-if-stuck-in-vehicle.patch rename to patches/server/1017-Skip-POI-finding-if-stuck-in-vehicle.patch diff --git a/patches/server/1016-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/1018-Add-slot-sanity-checks-in-container-clicks.patch similarity index 100% rename from patches/server/1016-Add-slot-sanity-checks-in-container-clicks.patch rename to patches/server/1018-Add-slot-sanity-checks-in-container-clicks.patch diff --git a/patches/server/1017-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/1019-Call-BlockRedstoneEvents-for-lecterns.patch similarity index 100% rename from patches/server/1017-Call-BlockRedstoneEvents-for-lecterns.patch rename to patches/server/1019-Call-BlockRedstoneEvents-for-lecterns.patch diff --git a/patches/server/1018-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/1020-Allow-proper-checking-of-empty-item-stacks.patch similarity index 100% rename from patches/server/1018-Allow-proper-checking-of-empty-item-stacks.patch rename to patches/server/1020-Allow-proper-checking-of-empty-item-stacks.patch diff --git a/patches/server/1019-Fix-silent-equipment-change-for-mobs.patch b/patches/server/1021-Fix-silent-equipment-change-for-mobs.patch similarity index 97% rename from patches/server/1019-Fix-silent-equipment-change-for-mobs.patch rename to patches/server/1021-Fix-silent-equipment-change-for-mobs.patch index 41149b28166b..8009ea79acc7 100644 --- a/patches/server/1019-Fix-silent-equipment-change-for-mobs.patch +++ b/patches/server/1021-Fix-silent-equipment-change-for-mobs.patch @@ -47,10 +47,10 @@ index 8e9469fec42f7b6a132cf173f6f5a95777a29b3b..b319021b22c5dceba6199ed27814b2dc this.reassessWeaponGoal(); } diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 1746159398a2bee2a86d82d5be035d68c1c3261a..ce422c31385d9518e798c7a3456fad747b09ea61 100644 +index 87cae8ed22a2428a1dda8f2a4510e45fbc31eab5..ea8a0961190e9aafda4fed6fecd85097c141040a 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java -@@ -1867,7 +1867,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -1870,7 +1870,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable { // Paper end - optimize redstone (Alternate Current) // Paper start - notify observers even if grow failed public void checkCapturedTreeStateForObserverNotify(final BlockPos pos, final CraftBlockState craftBlockState) { diff --git a/patches/server/1020-Fix-spigot-s-Forced-Stats.patch b/patches/server/1022-Fix-spigot-s-Forced-Stats.patch similarity index 100% rename from patches/server/1020-Fix-spigot-s-Forced-Stats.patch rename to patches/server/1022-Fix-spigot-s-Forced-Stats.patch diff --git a/patches/server/1021-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/1023-Add-missing-InventoryHolders-to-inventories.patch similarity index 100% rename from patches/server/1021-Add-missing-InventoryHolders-to-inventories.patch rename to patches/server/1023-Add-missing-InventoryHolders-to-inventories.patch diff --git a/patches/server/1022-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/1024-Do-not-read-tile-entities-in-chunks-that-are-positio.patch similarity index 93% rename from patches/server/1022-Do-not-read-tile-entities-in-chunks-that-are-positio.patch rename to patches/server/1024-Do-not-read-tile-entities-in-chunks-that-are-positio.patch index 64e601ee8f6d..738c4d488615 100644 --- a/patches/server/1022-Do-not-read-tile-entities-in-chunks-that-are-positio.patch +++ b/patches/server/1024-Do-not-read-tile-entities-in-chunks-that-are-positio.patch @@ -10,10 +10,10 @@ which would cause a crash on Folia but would appear to function fine on Paper. diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java -index 954b846d25f83f220e6585664c71e347192b3c71..5b2c23ae3234c7660c5c34b993825b63d9f1b258 100644 +index e1ad2152bbd55435495bdad57a0984842e55fcb8..1379084a80ce25644f13736b4a5ee5fabbd9ec1f 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java -@@ -377,6 +377,13 @@ public class ChunkSerializer { +@@ -381,6 +381,13 @@ public class ChunkSerializer { for (int k1 = 0; k1 < nbttaglist3.size(); ++k1) { CompoundTag nbttagcompound4 = nbttaglist3.getCompound(k1); @@ -27,7 +27,7 @@ index 954b846d25f83f220e6585664c71e347192b3c71..5b2c23ae3234c7660c5c34b993825b63 ((ChunkAccess) object1).setBlockEntityNbt(nbttagcompound4); } -@@ -675,10 +682,19 @@ public class ChunkSerializer { +@@ -679,10 +686,19 @@ public class ChunkSerializer { CompoundTag nbttagcompound1 = nbttaglist1.getCompound(i); boolean flag = nbttagcompound1.getBoolean("keepPacked"); diff --git a/patches/server/1023-Actually-optimise-explosions.patch b/patches/server/1025-Actually-optimise-explosions.patch similarity index 100% rename from patches/server/1023-Actually-optimise-explosions.patch rename to patches/server/1025-Actually-optimise-explosions.patch diff --git a/patches/server/1024-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/1026-Add-missing-logs-for-log-ips-config-option.patch similarity index 100% rename from patches/server/1024-Add-missing-logs-for-log-ips-config-option.patch rename to patches/server/1026-Add-missing-logs-for-log-ips-config-option.patch diff --git a/patches/server/1025-Remove-Spigot-Bug-Fix-for-MC-109346.patch b/patches/server/1027-Remove-Spigot-Bug-Fix-for-MC-109346.patch similarity index 100% rename from patches/server/1025-Remove-Spigot-Bug-Fix-for-MC-109346.patch rename to patches/server/1027-Remove-Spigot-Bug-Fix-for-MC-109346.patch diff --git a/patches/server/1026-Fix-SuspiciousStewMeta.patch b/patches/server/1028-Fix-SuspiciousStewMeta.patch similarity index 100% rename from patches/server/1026-Fix-SuspiciousStewMeta.patch rename to patches/server/1028-Fix-SuspiciousStewMeta.patch