diff --git a/patches/server/0014-Timings-v2.patch b/patches/server/0014-Timings-v2.patch index b6b43d7b5f..50e817b4fc 100644 --- a/patches/server/0014-Timings-v2.patch +++ b/patches/server/0014-Timings-v2.patch @@ -1031,7 +1031,7 @@ index 770f6a08c613093577172385549df8040ded627b..c1bb511cc25ca97282ee02d2b207e294 } diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index 7cacfceed5ef9276a19123a8a9079579423d03ac..d62f6ef628f591e4362c4aa7db9d38fa2304af4c 100644 +index 7cacfceed5ef9276a19123a8a9079579423d03ac..6c33eefffad236b8c43bad891b3a3ec09e2d083a 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java @@ -413,13 +413,15 @@ public class ServerChunkCache extends ChunkSource { @@ -1094,7 +1094,16 @@ index 7cacfceed5ef9276a19123a8a9079579423d03ac..d62f6ef628f591e4362c4aa7db9d38fa this.lastSpawnState = spawnercreature_d; gameprofilerfiller.popPush("spawnAndTick"); -@@ -728,13 +735,17 @@ public class ServerChunkCache extends ChunkSource { +@@ -719,22 +726,24 @@ public class ServerChunkCache extends ChunkSource { + } + + if (this.level.shouldTickBlocksAt(chunkcoordintpair.toLong())) { +- this.level.timings.doTickTiles.startTiming(); // Spigot + this.level.tickChunk(chunk1, l); +- this.level.timings.doTickTiles.stopTiming(); // Spigot + } + } + } gameprofilerfiller.popPush("customSpawners"); if (flag) { diff --git a/patches/server/0015-Rewrite-dataconverter-system.patch b/patches/server/0015-Rewrite-dataconverter-system.patch index d1024b0f48..b6da241a28 100644 --- a/patches/server/0015-Rewrite-dataconverter-system.patch +++ b/patches/server/0015-Rewrite-dataconverter-system.patch @@ -24896,10 +24896,18 @@ index e534dac9d69147174f6b9e8ce7f27fde536351ce..270fd52ec733c89bd91155c8222936fa } diff --git a/src/main/java/net/minecraft/world/level/storage/LevelStorageSource.java b/src/main/java/net/minecraft/world/level/storage/LevelStorageSource.java -index 836bcea1c6a9de29b4a248220331f3a8c697204d..ff33031e59db6f9a4a11c7877f97615ef00a5a27 100644 +index 836bcea1c6a9de29b4a248220331f3a8c697204d..423405e34fc052e6c068d616c1aaedd8ab72ba94 100644 --- a/src/main/java/net/minecraft/world/level/storage/LevelStorageSource.java +++ b/src/main/java/net/minecraft/world/level/storage/LevelStorageSource.java -@@ -290,10 +290,10 @@ public class LevelStorageSource { +@@ -5,6 +5,7 @@ import com.mojang.datafixers.DataFixer; + import com.mojang.logging.LogUtils; + import com.mojang.serialization.DataResult; + import com.mojang.serialization.Dynamic; ++import com.mojang.serialization.DynamicOps; + import com.mojang.serialization.Lifecycle; + import java.io.BufferedOutputStream; + import java.io.BufferedReader; +@@ -290,10 +291,10 @@ public class LevelStorageSource { static Dynamic readLevelDataTagFixed(Path path, DataFixer dataFixer) throws IOException { CompoundTag nbttagcompound = LevelStorageSource.readLevelDataTagRaw(path); CompoundTag nbttagcompound1 = nbttagcompound.getCompound("Data"); @@ -24908,10 +24916,23 @@ index 836bcea1c6a9de29b4a248220331f3a8c697204d..ff33031e59db6f9a4a11c7877f97615e Dynamic dynamic = DataFixTypes.LEVEL.updateToCurrentVersion(dataFixer, new Dynamic(NbtOps.INSTANCE, nbttagcompound1), i); Dynamic dynamic1 = dynamic.get("Player").orElseEmptyMap(); - Dynamic dynamic2 = DataFixTypes.PLAYER.updateToCurrentVersion(dataFixer, dynamic1, i); -+ Dynamic dynamic2 = ca.spottedleaf.dataconverter.minecraft.MCDataConverter.convertTag(ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry.PLAYER, dynamic1, version, SharedConstants.getCurrentVersion().getDataVersion().getVersion()); // Paper ++ Dynamic dynamic2 = LevelStorageSource.dank(dynamic1, version); // Paper dynamic = dynamic.set("Player", dynamic2); Dynamic dynamic3 = dynamic.get("WorldGenSettings").orElseEmptyMap(); +@@ -303,6 +304,12 @@ public class LevelStorageSource { + return dynamic; + } + ++ // Paper start ++ private static Dynamic dank(final Dynamic input, final int version) { ++ return new Dynamic<>(input.getOps(), (T) ca.spottedleaf.dataconverter.minecraft.MCDataConverter.convertTag(ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry.PLAYER, (CompoundTag)input.getValue(), version, net.minecraft.SharedConstants.getCurrentVersion().getDataVersion().getVersion())); ++ } ++ // Paper end ++ + private LevelSummary readLevelSummary(LevelStorageSource.LevelDirectory save, boolean locked) { + Path path = save.dataFile(); + diff --git a/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java b/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java index 8292978e1386c55d99241c3ee2ead3440b9e2570..3d74ffc6e38b0dbe7ca6d8d84a63f78d6b1908a7 100644 --- a/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java diff --git a/patches/server/0018-Rewrite-chunk-system.patch b/patches/server/0018-Rewrite-chunk-system.patch index a85049b52c..e272add598 100644 --- a/patches/server/0018-Rewrite-chunk-system.patch +++ b/patches/server/0018-Rewrite-chunk-system.patch @@ -19101,7 +19101,7 @@ index f3c9a3dbb6f0e6f825b7477c89ed72ed52845419..942042863f0105769c15b865d4d98a09 + */ // Paper - rewrite chunk system } diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index d62f6ef628f591e4362c4aa7db9d38fa2304af4c..fe4fc7792ac1bfcde0980884a6369d08e81a6b65 100644 +index 6c33eefffad236b8c43bad891b3a3ec09e2d083a..b4d36ff6b6ba72693c269929b84c5481949f13fd 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java @@ -139,108 +139,7 @@ public class ServerChunkCache extends ChunkSource { @@ -19498,7 +19498,7 @@ index d62f6ef628f591e4362c4aa7db9d38fa2304af4c..fe4fc7792ac1bfcde0980884a6369d08 this.tickChunks(); this.level.timings.chunks.stopTiming(); // Paper - timings this.chunkMap.tick(); -@@ -756,7 +603,12 @@ public class ServerChunkCache extends ChunkSource { +@@ -754,7 +601,12 @@ public class ServerChunkCache extends ChunkSource { ChunkHolder playerchunk = this.getVisibleChunkIfPresent(pos); if (playerchunk != null) { @@ -19512,7 +19512,7 @@ index d62f6ef628f591e4362c4aa7db9d38fa2304af4c..fe4fc7792ac1bfcde0980884a6369d08 } } -@@ -922,17 +774,10 @@ public class ServerChunkCache extends ChunkSource { +@@ -920,17 +772,10 @@ public class ServerChunkCache extends ChunkSource { @Override // CraftBukkit start - process pending Chunk loadCallback() and unloadCallback() after each run task public boolean pollTask() { @@ -19532,7 +19532,7 @@ index d62f6ef628f591e4362c4aa7db9d38fa2304af4c..fe4fc7792ac1bfcde0980884a6369d08 } diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index b698cdc4ef9e2bf824b9e5a4f985b6832c15f8f6..51f0705499003ea71274e1d5c8a77306fa868485 100644 +index b698cdc4ef9e2bf824b9e5a4f985b6832c15f8f6..2c9f52ad948f9ee5bb20f7f8eb4a541f0b596b26 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -196,7 +196,7 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -20102,6 +20102,15 @@ index b698cdc4ef9e2bf824b9e5a4f985b6832c15f8f6..51f0705499003ea71274e1d5c8a77306 } @Override +@@ -2080,7 +2329,7 @@ public class ServerLevel extends Level implements WorldGenLevel { + CrashReportCategory crashreportsystemdetails = super.fillReportDetails(report); + + crashreportsystemdetails.setDetail("Loaded entity count", () -> { +- return String.valueOf(this.entityManager.count()); ++ return String.valueOf(this.entityLookup.getAllCopy().length); // Paper + }); + return crashreportsystemdetails; + } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java index b403b7d585f474e2b6029404d19e756a40206f7f..b6939932a4b8800c8751125a4a6d4dcea39110c1 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java diff --git a/patches/server/0064-Complete-resource-pack-API.patch b/patches/server/0064-Complete-resource-pack-API.patch index 12b02b3c12..f335868ba3 100644 --- a/patches/server/0064-Complete-resource-pack-API.patch +++ b/patches/server/0064-Complete-resource-pack-API.patch @@ -22,7 +22,7 @@ index 0a6feccc657e62d7bad5e1461d5538a4c3a16b76..53833e155cf0d2328f2c2b3670297092 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index a58b0d10d73310587a05e40e072029ee258063e1..06c0f72a83de5866f4c734c0809d60446a736af6 100644 +index a58b0d10d73310587a05e40e072029ee258063e1..00b1f8c60aa2021bfae42fd7bfab3d5edb55a098 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -192,6 +192,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -58,7 +58,7 @@ index a58b0d10d73310587a05e40e072029ee258063e1..06c0f72a83de5866f4c734c0809d6044 + net.minecraft.network.chat.Component promptComponent = resourcePackPrompt != null ? + io.papermc.paper.adventure.PaperAdventure.asVanilla(resourcePackPrompt) : + null; -+ this.getHandle().connection.send(new ClientboundResourcePackPacket(url, hash, required, promptComponent)); ++ this.getHandle().connection.send(new ClientboundResourcePackPushPacket(UUID.randomUUID(), url, hash, required, promptComponent)); + } + + @Override diff --git a/patches/server/0088-Configurable-Player-Collision.patch b/patches/server/0088-Configurable-Player-Collision.patch index 20249f66eb..b969efc9b1 100644 --- a/patches/server/0088-Configurable-Player-Collision.patch +++ b/patches/server/0088-Configurable-Player-Collision.patch @@ -43,7 +43,7 @@ index 180bcaa2b5a74c527d8556301fb4a8161c76a64c..24f7ecc68c206346e4e2957bc27bf557 this.server.getPluginManager().callEvent(new ServerLoadEvent(ServerLoadEvent.LoadType.STARTUP)); this.connection.acceptConnections(); diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index b74689297ca20efee391fe1da80377082d1758e5..34b10814b94fb3fd22f96988c74be434e41058fb 100644 +index b74689297ca20efee391fe1da80377082d1758e5..828abde34c7d883831e81b7759a862db43cfe2c6 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -156,6 +156,7 @@ public abstract class PlayerList { @@ -91,7 +91,7 @@ index b74689297ca20efee391fe1da80377082d1758e5..34b10814b94fb3fd22f96988c74be434 + // Paper start - Remove collideRule team if it exists + if (this.collideRuleTeamName != null) { -+ final Scoreboard scoreboard = this.getServer().getLevel(Level.OVERWORLD).getScoreboard(); ++ final net.minecraft.world.scores.Scoreboard scoreboard = this.getServer().getLevel(Level.OVERWORLD).getScoreboard(); + final PlayerTeam team = scoreboard.getPlayersTeam(this.collideRuleTeamName); + if (team != null) scoreboard.removePlayerTeam(team); + } diff --git a/patches/server/0130-Properly-handle-async-calls-to-restart-the-server.patch b/patches/server/0129-Properly-handle-async-calls-to-restart-the-server.patch similarity index 99% rename from patches/server/0130-Properly-handle-async-calls-to-restart-the-server.patch rename to patches/server/0129-Properly-handle-async-calls-to-restart-the-server.patch index d590f3f220..52c33abc5f 100644 --- a/patches/server/0130-Properly-handle-async-calls-to-restart-the-server.patch +++ b/patches/server/0129-Properly-handle-async-calls-to-restart-the-server.patch @@ -64,7 +64,7 @@ index 77ea9b316f186243c74cc080cc7c382ab6666a21..e91dd35a84dceae1ad9c5ede0565591e if (waitForShutdown) { try { diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 2bbbe256df74726b27359a217c0f0b71c32e6e2b..2dbaf34170fd2c94cd288657a84e13084f4a89b9 100644 +index 6d4099d8c9d0c2ea20b98ea3f30ac44a697ff400..8550245a088be78359b55fa0cc582df35dbbebed 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -1175,8 +1175,15 @@ public abstract class PlayerList { diff --git a/patches/server/0131-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/patches/server/0130-Add-option-to-make-parrots-stay-on-shoulders-despite.patch similarity index 100% rename from patches/server/0131-Add-option-to-make-parrots-stay-on-shoulders-despite.patch rename to patches/server/0130-Add-option-to-make-parrots-stay-on-shoulders-despite.patch diff --git a/patches/server/0132-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/server/0131-Add-configuration-option-to-prevent-player-names-fro.patch similarity index 100% rename from patches/server/0132-Add-configuration-option-to-prevent-player-names-fro.patch rename to patches/server/0131-Add-configuration-option-to-prevent-player-names-fro.patch diff --git a/patches/server/0133-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/server/0132-Use-TerminalConsoleAppender-for-console-improvements.patch similarity index 99% rename from patches/server/0133-Use-TerminalConsoleAppender-for-console-improvements.patch rename to patches/server/0132-Use-TerminalConsoleAppender-for-console-improvements.patch index 46e3f01045..c687a9113c 100644 --- a/patches/server/0133-Use-TerminalConsoleAppender-for-console-improvements.patch +++ b/patches/server/0132-Use-TerminalConsoleAppender-for-console-improvements.patch @@ -375,7 +375,7 @@ index 75083eeb9b413e6dd5375007360dce6857a08fff..d292fdb165436f0b9b46b32110f5e09a if (!SwingUtilities.isEventDispatchThread()) { SwingUtilities.invokeLater(() -> { diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 2dbaf34170fd2c94cd288657a84e13084f4a89b9..486e9e3dca76c047753b87927735c98698d5ca5a 100644 +index 8550245a088be78359b55fa0cc582df35dbbebed..ea7effdb4274c7e2c19d737a74b1fc5847b9888c 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -160,8 +160,7 @@ public abstract class PlayerList { diff --git a/patches/server/0134-provide-a-configurable-option-to-disable-creeper-lin.patch b/patches/server/0133-provide-a-configurable-option-to-disable-creeper-lin.patch similarity index 100% rename from patches/server/0134-provide-a-configurable-option-to-disable-creeper-lin.patch rename to patches/server/0133-provide-a-configurable-option-to-disable-creeper-lin.patch diff --git a/patches/server/0135-Item-canEntityPickup.patch b/patches/server/0134-Item-canEntityPickup.patch similarity index 100% rename from patches/server/0135-Item-canEntityPickup.patch rename to patches/server/0134-Item-canEntityPickup.patch diff --git a/patches/server/0136-PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/server/0135-PlayerPickupItemEvent-setFlyAtPlayer.patch similarity index 100% rename from patches/server/0136-PlayerPickupItemEvent-setFlyAtPlayer.patch rename to patches/server/0135-PlayerPickupItemEvent-setFlyAtPlayer.patch diff --git a/patches/server/0137-PlayerAttemptPickupItemEvent.patch b/patches/server/0136-PlayerAttemptPickupItemEvent.patch similarity index 100% rename from patches/server/0137-PlayerAttemptPickupItemEvent.patch rename to patches/server/0136-PlayerAttemptPickupItemEvent.patch diff --git a/patches/server/0138-Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/server/0137-Do-not-submit-profile-lookups-to-worldgen-threads.patch similarity index 100% rename from patches/server/0138-Do-not-submit-profile-lookups-to-worldgen-threads.patch rename to patches/server/0137-Do-not-submit-profile-lookups-to-worldgen-threads.patch diff --git a/patches/server/0139-Basic-PlayerProfile-API.patch b/patches/server/0138-Basic-PlayerProfile-API.patch similarity index 100% rename from patches/server/0139-Basic-PlayerProfile-API.patch rename to patches/server/0138-Basic-PlayerProfile-API.patch diff --git a/patches/server/0140-Add-UnknownCommandEvent.patch b/patches/server/0139-Add-UnknownCommandEvent.patch similarity index 100% rename from patches/server/0140-Add-UnknownCommandEvent.patch rename to patches/server/0139-Add-UnknownCommandEvent.patch diff --git a/patches/server/0141-Shoulder-Entities-Release-API.patch b/patches/server/0140-Shoulder-Entities-Release-API.patch similarity index 100% rename from patches/server/0141-Shoulder-Entities-Release-API.patch rename to patches/server/0140-Shoulder-Entities-Release-API.patch diff --git a/patches/server/0142-Profile-Lookup-Events.patch b/patches/server/0141-Profile-Lookup-Events.patch similarity index 100% rename from patches/server/0142-Profile-Lookup-Events.patch rename to patches/server/0141-Profile-Lookup-Events.patch diff --git a/patches/server/0143-Block-player-logins-during-server-shutdown.patch b/patches/server/0142-Block-player-logins-during-server-shutdown.patch similarity index 100% rename from patches/server/0143-Block-player-logins-during-server-shutdown.patch rename to patches/server/0142-Block-player-logins-during-server-shutdown.patch diff --git a/patches/server/0144-Entity-fromMobSpawner.patch b/patches/server/0143-Entity-fromMobSpawner.patch similarity index 100% rename from patches/server/0144-Entity-fromMobSpawner.patch rename to patches/server/0143-Entity-fromMobSpawner.patch diff --git a/patches/server/0145-Improve-the-Saddle-API-for-Horses.patch b/patches/server/0144-Improve-the-Saddle-API-for-Horses.patch similarity index 100% rename from patches/server/0145-Improve-the-Saddle-API-for-Horses.patch rename to patches/server/0144-Improve-the-Saddle-API-for-Horses.patch diff --git a/patches/server/0146-Implement-ensureServerConversions-API.patch b/patches/server/0145-Implement-ensureServerConversions-API.patch similarity index 100% rename from patches/server/0146-Implement-ensureServerConversions-API.patch rename to patches/server/0145-Implement-ensureServerConversions-API.patch diff --git a/patches/server/0147-Implement-getI18NDisplayName.patch b/patches/server/0146-Implement-getI18NDisplayName.patch similarity index 100% rename from patches/server/0147-Implement-getI18NDisplayName.patch rename to patches/server/0146-Implement-getI18NDisplayName.patch diff --git a/patches/server/0148-ProfileWhitelistVerifyEvent.patch b/patches/server/0147-ProfileWhitelistVerifyEvent.patch similarity index 97% rename from patches/server/0148-ProfileWhitelistVerifyEvent.patch rename to patches/server/0147-ProfileWhitelistVerifyEvent.patch index a5420968c0..46edc414f4 100644 --- a/patches/server/0148-ProfileWhitelistVerifyEvent.patch +++ b/patches/server/0147-ProfileWhitelistVerifyEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] ProfileWhitelistVerifyEvent diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 486e9e3dca76c047753b87927735c98698d5ca5a..3564d97af63494ede27941b63a7255239fa8a126 100644 +index ea7effdb4274c7e2c19d737a74b1fc5847b9888c..6e0a21935f9d5f35cbce72b32e0a89bb636804e2 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -631,9 +631,9 @@ public abstract class PlayerList { diff --git a/patches/server/0149-Fix-this-stupid-bullshit.patch b/patches/server/0148-Fix-this-stupid-bullshit.patch similarity index 100% rename from patches/server/0149-Fix-this-stupid-bullshit.patch rename to patches/server/0148-Fix-this-stupid-bullshit.patch diff --git a/patches/server/0150-LivingEntity-setKiller.patch b/patches/server/0149-LivingEntity-setKiller.patch similarity index 100% rename from patches/server/0150-LivingEntity-setKiller.patch rename to patches/server/0149-LivingEntity-setKiller.patch diff --git a/patches/server/0151-Ocelot-despawns-should-honor-nametags-and-leash.patch b/patches/server/0150-Ocelot-despawns-should-honor-nametags-and-leash.patch similarity index 100% rename from patches/server/0151-Ocelot-despawns-should-honor-nametags-and-leash.patch rename to patches/server/0150-Ocelot-despawns-should-honor-nametags-and-leash.patch diff --git a/patches/server/0152-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/patches/server/0151-Reset-spawner-timer-when-spawner-event-is-cancelled.patch similarity index 100% rename from patches/server/0152-Reset-spawner-timer-when-spawner-event-is-cancelled.patch rename to patches/server/0151-Reset-spawner-timer-when-spawner-event-is-cancelled.patch diff --git a/patches/server/0153-Allow-specifying-a-custom-authentication-servers-dow.patch b/patches/server/0152-Allow-specifying-a-custom-authentication-servers-dow.patch similarity index 100% rename from patches/server/0153-Allow-specifying-a-custom-authentication-servers-dow.patch rename to patches/server/0152-Allow-specifying-a-custom-authentication-servers-dow.patch diff --git a/patches/server/0154-Handle-plugin-prefixes-using-Log4J-configuration.patch b/patches/server/0153-Handle-plugin-prefixes-using-Log4J-configuration.patch similarity index 100% rename from patches/server/0154-Handle-plugin-prefixes-using-Log4J-configuration.patch rename to patches/server/0153-Handle-plugin-prefixes-using-Log4J-configuration.patch diff --git a/patches/server/0155-Improve-Log4J-Configuration-Plugin-Loggers.patch b/patches/server/0154-Improve-Log4J-Configuration-Plugin-Loggers.patch similarity index 100% rename from patches/server/0155-Improve-Log4J-Configuration-Plugin-Loggers.patch rename to patches/server/0154-Improve-Log4J-Configuration-Plugin-Loggers.patch diff --git a/patches/server/0156-Add-PlayerJumpEvent.patch b/patches/server/0155-Add-PlayerJumpEvent.patch similarity index 100% rename from patches/server/0156-Add-PlayerJumpEvent.patch rename to patches/server/0155-Add-PlayerJumpEvent.patch diff --git a/patches/server/0157-handle-ServerboundKeepAlivePacket-async.patch b/patches/server/0156-handle-ServerboundKeepAlivePacket-async.patch similarity index 100% rename from patches/server/0157-handle-ServerboundKeepAlivePacket-async.patch rename to patches/server/0156-handle-ServerboundKeepAlivePacket-async.patch diff --git a/patches/server/0158-Expose-client-protocol-version-and-virtual-host.patch b/patches/server/0157-Expose-client-protocol-version-and-virtual-host.patch similarity index 97% rename from patches/server/0158-Expose-client-protocol-version-and-virtual-host.patch rename to patches/server/0157-Expose-client-protocol-version-and-virtual-host.patch index 9f39585da6..884208293a 100644 --- a/patches/server/0158-Expose-client-protocol-version-and-virtual-host.patch +++ b/patches/server/0157-Expose-client-protocol-version-and-virtual-host.patch @@ -90,7 +90,7 @@ index 0d9658b1c6b5912a34058c0ce53b8e7f8c28afac..203fc53142bb0c9b6e2d1876fe8dfbe3 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 6b8734cda9d1384d929795f69de36887acafd698..34d9f11430ac8502774458fe02118a5c5ca49b44 100644 +index 28f71ea4234e122e28d65ffa66c3684f3a2857b4..2c31e9052e3b18177660ad9befc6fcd24085da88 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -295,6 +295,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0159-revert-serverside-behavior-of-keepalives.patch b/patches/server/0158-revert-serverside-behavior-of-keepalives.patch similarity index 100% rename from patches/server/0159-revert-serverside-behavior-of-keepalives.patch rename to patches/server/0158-revert-serverside-behavior-of-keepalives.patch diff --git a/patches/server/0160-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/patches/server/0159-Send-attack-SoundEffects-only-to-players-who-can-see.patch similarity index 100% rename from patches/server/0160-Send-attack-SoundEffects-only-to-players-who-can-see.patch rename to patches/server/0159-Send-attack-SoundEffects-only-to-players-who-can-see.patch diff --git a/patches/server/0161-Add-PlayerArmorChangeEvent.patch b/patches/server/0160-Add-PlayerArmorChangeEvent.patch similarity index 100% rename from patches/server/0161-Add-PlayerArmorChangeEvent.patch rename to patches/server/0160-Add-PlayerArmorChangeEvent.patch diff --git a/patches/server/0162-Prevent-logins-from-being-processed-when-the-player-.patch b/patches/server/0161-Prevent-logins-from-being-processed-when-the-player-.patch similarity index 100% rename from patches/server/0162-Prevent-logins-from-being-processed-when-the-player-.patch rename to patches/server/0161-Prevent-logins-from-being-processed-when-the-player-.patch diff --git a/patches/server/0163-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/patches/server/0162-Fix-MC-117075-TE-Unload-Lag-Spike.patch similarity index 89% rename from patches/server/0163-Fix-MC-117075-TE-Unload-Lag-Spike.patch rename to patches/server/0162-Fix-MC-117075-TE-Unload-Lag-Spike.patch index 2339985ad6..ae8b94d731 100644 --- a/patches/server/0163-Fix-MC-117075-TE-Unload-Lag-Spike.patch +++ b/patches/server/0162-Fix-MC-117075-TE-Unload-Lag-Spike.patch @@ -5,14 +5,14 @@ Subject: [PATCH] Fix MC-117075: TE Unload Lag Spike diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index c6e56303ec8ee466a6de7e6bd76c4f6814e8db30..35b6e7a0cf8ec57763858fa8e4f287769271a85b 100644 +index c6e56303ec8ee466a6de7e6bd76c4f6814e8db30..2dad35f00a98be534db1da1a38a6865e41a1a94d 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -816,6 +816,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable { boolean flag = this.tickRateManager().runsNormally(); int tilesThisCycle = 0; -+ var toRemove = new it.unimi.dsi.fastutil.objects.ObjectOpenCustomHashSet(net.minecraft.Util.identityStrategy()); // Paper - use removeAll ++ var toRemove = new it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet(); // Paper - use removeAll + toRemove.add(null); for (tileTickPosition = 0; tileTickPosition < this.blockEntityTickers.size(); tileTickPosition++) { // Paper - Disable tick limiters this.tileTickPosition = (this.tileTickPosition < this.blockEntityTickers.size()) ? this.tileTickPosition : 0; diff --git a/patches/server/0164-use-CB-BlockState-implementations-for-captured-block.patch b/patches/server/0163-use-CB-BlockState-implementations-for-captured-block.patch similarity index 97% rename from patches/server/0164-use-CB-BlockState-implementations-for-captured-block.patch rename to patches/server/0163-use-CB-BlockState-implementations-for-captured-block.patch index cb57abd279..d24a7145b1 100644 --- a/patches/server/0164-use-CB-BlockState-implementations-for-captured-block.patch +++ b/patches/server/0163-use-CB-BlockState-implementations-for-captured-block.patch @@ -18,7 +18,7 @@ the blockstate that will be valid for restoration, as opposed to dropping information on restoration when the event is cancelled. diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 35b6e7a0cf8ec57763858fa8e4f287769271a85b..82cd225802ecc518c34426c010525192ef544f34 100644 +index 2dad35f00a98be534db1da1a38a6865e41a1a94d..eb9da7e3912430921219cd4ebdcc295c0e5162bb 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/0165-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/server/0164-API-to-get-a-BlockState-without-a-snapshot.patch similarity index 100% rename from patches/server/0165-API-to-get-a-BlockState-without-a-snapshot.patch rename to patches/server/0164-API-to-get-a-BlockState-without-a-snapshot.patch diff --git a/patches/server/0166-AsyncTabCompleteEvent.patch b/patches/server/0165-AsyncTabCompleteEvent.patch similarity index 100% rename from patches/server/0166-AsyncTabCompleteEvent.patch rename to patches/server/0165-AsyncTabCompleteEvent.patch diff --git a/patches/server/0167-PlayerPickupExperienceEvent.patch b/patches/server/0166-PlayerPickupExperienceEvent.patch similarity index 100% rename from patches/server/0167-PlayerPickupExperienceEvent.patch rename to patches/server/0166-PlayerPickupExperienceEvent.patch diff --git a/patches/server/0168-Ability-to-apply-mending-to-XP-API.patch b/patches/server/0167-Ability-to-apply-mending-to-XP-API.patch similarity index 96% rename from patches/server/0168-Ability-to-apply-mending-to-XP-API.patch rename to patches/server/0167-Ability-to-apply-mending-to-XP-API.patch index 5f8ecd7cf4..ffbf31c176 100644 --- a/patches/server/0168-Ability-to-apply-mending-to-XP-API.patch +++ b/patches/server/0167-Ability-to-apply-mending-to-XP-API.patch @@ -14,7 +14,7 @@ public net.minecraft.world.entity.ExperienceOrb durabilityToXp(I)I public net.minecraft.world.entity.ExperienceOrb xpToDurability(I)I diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 34d9f11430ac8502774458fe02118a5c5ca49b44..168c1d20320f23182ff2de519d28e8401f12b6b3 100644 +index 2c31e9052e3b18177660ad9befc6fcd24085da88..a5014c7a0cb6329edd919c7fafed8ec396b23c36 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1549,7 +1549,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0169-PlayerNaturallySpawnCreaturesEvent.patch b/patches/server/0168-PlayerNaturallySpawnCreaturesEvent.patch similarity index 98% rename from patches/server/0169-PlayerNaturallySpawnCreaturesEvent.patch rename to patches/server/0168-PlayerNaturallySpawnCreaturesEvent.patch index e2b32f2465..62678b648f 100644 --- a/patches/server/0169-PlayerNaturallySpawnCreaturesEvent.patch +++ b/patches/server/0168-PlayerNaturallySpawnCreaturesEvent.patch @@ -40,7 +40,7 @@ index e580df88baadfd943756b1e440c7253a287fa0e9..ea520b828378c268d05425096c6493ca return true; diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index fe4fc7792ac1bfcde0980884a6369d08e81a6b65..d30373d369049827b5b7611d35c8b7fc8fc08d23 100644 +index b4d36ff6b6ba72693c269929b84c5481949f13fd..058b4e79ac861e772e828b92aacffba7efe4bb7e 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java @@ -557,6 +557,15 @@ public class ServerChunkCache extends ChunkSource { diff --git a/patches/server/0170-Add-setPlayerProfile-API-for-Skulls.patch b/patches/server/0169-Add-setPlayerProfile-API-for-Skulls.patch similarity index 100% rename from patches/server/0170-Add-setPlayerProfile-API-for-Skulls.patch rename to patches/server/0169-Add-setPlayerProfile-API-for-Skulls.patch diff --git a/patches/server/0171-PreCreatureSpawnEvent.patch b/patches/server/0170-PreCreatureSpawnEvent.patch similarity index 100% rename from patches/server/0171-PreCreatureSpawnEvent.patch rename to patches/server/0170-PreCreatureSpawnEvent.patch diff --git a/patches/server/0172-Fill-Profile-Property-Events.patch b/patches/server/0171-Fill-Profile-Property-Events.patch similarity index 100% rename from patches/server/0172-Fill-Profile-Property-Events.patch rename to patches/server/0171-Fill-Profile-Property-Events.patch diff --git a/patches/server/0173-Add-PlayerAdvancementCriterionGrantEvent.patch b/patches/server/0172-Add-PlayerAdvancementCriterionGrantEvent.patch similarity index 100% rename from patches/server/0173-Add-PlayerAdvancementCriterionGrantEvent.patch rename to patches/server/0172-Add-PlayerAdvancementCriterionGrantEvent.patch diff --git a/patches/server/0174-Add-ArmorStand-Item-Meta.patch b/patches/server/0173-Add-ArmorStand-Item-Meta.patch similarity index 100% rename from patches/server/0174-Add-ArmorStand-Item-Meta.patch rename to patches/server/0173-Add-ArmorStand-Item-Meta.patch diff --git a/patches/server/0175-Extend-Player-Interact-cancellation.patch b/patches/server/0174-Extend-Player-Interact-cancellation.patch similarity index 100% rename from patches/server/0175-Extend-Player-Interact-cancellation.patch rename to patches/server/0174-Extend-Player-Interact-cancellation.patch diff --git a/patches/server/0176-Tameable-getOwnerUniqueId-API.patch b/patches/server/0175-Tameable-getOwnerUniqueId-API.patch similarity index 100% rename from patches/server/0176-Tameable-getOwnerUniqueId-API.patch rename to patches/server/0175-Tameable-getOwnerUniqueId-API.patch diff --git a/patches/server/0177-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/patches/server/0176-Toggleable-player-crits-helps-mitigate-hacked-client.patch similarity index 100% rename from patches/server/0177-Toggleable-player-crits-helps-mitigate-hacked-client.patch rename to patches/server/0176-Toggleable-player-crits-helps-mitigate-hacked-client.patch diff --git a/patches/server/0178-Disable-Explicit-Network-Manager-Flushing.patch b/patches/server/0177-Disable-Explicit-Network-Manager-Flushing.patch similarity index 100% rename from patches/server/0178-Disable-Explicit-Network-Manager-Flushing.patch rename to patches/server/0177-Disable-Explicit-Network-Manager-Flushing.patch diff --git a/patches/server/0179-Implement-extended-PaperServerListPingEvent.patch b/patches/server/0178-Implement-extended-PaperServerListPingEvent.patch similarity index 100% rename from patches/server/0179-Implement-extended-PaperServerListPingEvent.patch rename to patches/server/0178-Implement-extended-PaperServerListPingEvent.patch diff --git a/patches/server/0180-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/patches/server/0179-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch similarity index 100% rename from patches/server/0180-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch rename to patches/server/0179-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch diff --git a/patches/server/0181-Player.setPlayerProfile-API.patch b/patches/server/0180-Player.setPlayerProfile-API.patch similarity index 99% rename from patches/server/0181-Player.setPlayerProfile-API.patch rename to patches/server/0180-Player.setPlayerProfile-API.patch index ca2e3b54e0..ebd60a14f4 100644 --- a/patches/server/0181-Player.setPlayerProfile-API.patch +++ b/patches/server/0180-Player.setPlayerProfile-API.patch @@ -55,7 +55,7 @@ index 477d3245facb5ae59c786d4f696f64226cb540a6..e8490a58dd4d9bc39a5bb2f9fc109526 public Server getServer() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 168c1d20320f23182ff2de519d28e8401f12b6b3..22ed227ba141ffd232aed49ca673348f452d3983 100644 +index a5014c7a0cb6329edd919c7fafed8ec396b23c36..4e72258af26918dc9a9ab5afcb70acfaae4691a2 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -278,11 +278,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0182-getPlayerUniqueId-API.patch b/patches/server/0181-getPlayerUniqueId-API.patch similarity index 100% rename from patches/server/0182-getPlayerUniqueId-API.patch rename to patches/server/0181-getPlayerUniqueId-API.patch diff --git a/patches/server/0183-Improved-Async-Task-Scheduler.patch b/patches/server/0182-Improved-Async-Task-Scheduler.patch similarity index 100% rename from patches/server/0183-Improved-Async-Task-Scheduler.patch rename to patches/server/0182-Improved-Async-Task-Scheduler.patch diff --git a/patches/server/0184-Make-legacy-ping-handler-more-reliable.patch b/patches/server/0183-Make-legacy-ping-handler-more-reliable.patch similarity index 100% rename from patches/server/0184-Make-legacy-ping-handler-more-reliable.patch rename to patches/server/0183-Make-legacy-ping-handler-more-reliable.patch diff --git a/patches/server/0185-Call-PaperServerListPingEvent-for-legacy-pings.patch b/patches/server/0184-Call-PaperServerListPingEvent-for-legacy-pings.patch similarity index 100% rename from patches/server/0185-Call-PaperServerListPingEvent-for-legacy-pings.patch rename to patches/server/0184-Call-PaperServerListPingEvent-for-legacy-pings.patch diff --git a/patches/server/0186-Flag-to-disable-the-channel-limit.patch b/patches/server/0185-Flag-to-disable-the-channel-limit.patch similarity index 95% rename from patches/server/0186-Flag-to-disable-the-channel-limit.patch rename to patches/server/0185-Flag-to-disable-the-channel-limit.patch index 260e6457ef..10e85ccc7b 100644 --- a/patches/server/0186-Flag-to-disable-the-channel-limit.patch +++ b/patches/server/0185-Flag-to-disable-the-channel-limit.patch @@ -9,7 +9,7 @@ e.g. servers which allow and support the usage of mod packs. provide an optional flag to disable this check, at your own risk. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 22ed227ba141ffd232aed49ca673348f452d3983..f93e5812cc239ff69d22a53ac52be2c71203ad07 100644 +index 4e72258af26918dc9a9ab5afcb70acfaae4691a2..43e577dc39db6e9b373db0e67dc72e770150339b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -195,6 +195,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0187-Add-openSign-method-to-HumanEntity.patch b/patches/server/0186-Add-openSign-method-to-HumanEntity.patch similarity index 100% rename from patches/server/0187-Add-openSign-method-to-HumanEntity.patch rename to patches/server/0186-Add-openSign-method-to-HumanEntity.patch diff --git a/patches/server/0188-Configurable-sprint-interruption-on-attack.patch b/patches/server/0187-Configurable-sprint-interruption-on-attack.patch similarity index 100% rename from patches/server/0188-Configurable-sprint-interruption-on-attack.patch rename to patches/server/0187-Configurable-sprint-interruption-on-attack.patch diff --git a/patches/server/0189-EndermanEscapeEvent.patch b/patches/server/0188-EndermanEscapeEvent.patch similarity index 100% rename from patches/server/0189-EndermanEscapeEvent.patch rename to patches/server/0188-EndermanEscapeEvent.patch diff --git a/patches/server/0190-Enderman.teleportRandomly.patch b/patches/server/0189-Enderman.teleportRandomly.patch similarity index 100% rename from patches/server/0190-Enderman.teleportRandomly.patch rename to patches/server/0189-Enderman.teleportRandomly.patch diff --git a/patches/server/0191-Block-Enderpearl-Travel-Exploit.patch b/patches/server/0190-Block-Enderpearl-Travel-Exploit.patch similarity index 96% rename from patches/server/0191-Block-Enderpearl-Travel-Exploit.patch rename to patches/server/0190-Block-Enderpearl-Travel-Exploit.patch index cf528e73b5..0bd2ae8081 100644 --- a/patches/server/0191-Block-Enderpearl-Travel-Exploit.patch +++ b/patches/server/0190-Block-Enderpearl-Travel-Exploit.patch @@ -16,7 +16,7 @@ public net.minecraft.world.entity.projectile.Projectile cachedOwner public net.minecraft.world.entity.projectile.Projectile ownerUUID diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 98ea55455d365b8d25ecb998daacbcbb1b45e5a7..146320ce5e9de7e4b081afca54c0c8aa45e6cfe4 100644 +index 5f6bd432566c4e437d7580e465b52b49bdfc057d..6c03c96adfa68b1817423d012affa5b3952ade04 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -2356,6 +2356,12 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0192-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/server/0191-Expand-World.spawnParticle-API-and-add-Builder.patch similarity index 97% rename from patches/server/0192-Expand-World.spawnParticle-API-and-add-Builder.patch rename to patches/server/0191-Expand-World.spawnParticle-API-and-add-Builder.patch index aed841dd05..9539682876 100644 --- a/patches/server/0192-Expand-World.spawnParticle-API-and-add-Builder.patch +++ b/patches/server/0191-Expand-World.spawnParticle-API-and-add-Builder.patch @@ -10,7 +10,7 @@ Adds an option to control the force mode of the particle. This adds a new Builder API which is much friendlier to use. diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 146320ce5e9de7e4b081afca54c0c8aa45e6cfe4..ac331aef54f9e595129bded04ff6d9c7b8b7d5b0 100644 +index 6c03c96adfa68b1817423d012affa5b3952ade04..e024c296f471737764af260ca4cd7e9005e044ac 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1738,12 +1738,17 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0193-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/server/0192-Fix-exploit-that-allowed-colored-signs-to-be-created.patch similarity index 100% rename from patches/server/0193-Fix-exploit-that-allowed-colored-signs-to-be-created.patch rename to patches/server/0192-Fix-exploit-that-allowed-colored-signs-to-be-created.patch diff --git a/patches/server/0194-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/patches/server/0193-Prevent-Frosted-Ice-from-loading-holding-chunks.patch similarity index 100% rename from patches/server/0194-Prevent-Frosted-Ice-from-loading-holding-chunks.patch rename to patches/server/0193-Prevent-Frosted-Ice-from-loading-holding-chunks.patch diff --git a/patches/server/0195-EndermanAttackPlayerEvent.patch b/patches/server/0194-EndermanAttackPlayerEvent.patch similarity index 100% rename from patches/server/0195-EndermanAttackPlayerEvent.patch rename to patches/server/0194-EndermanAttackPlayerEvent.patch diff --git a/patches/server/0196-WitchConsumePotionEvent.patch b/patches/server/0195-WitchConsumePotionEvent.patch similarity index 100% rename from patches/server/0196-WitchConsumePotionEvent.patch rename to patches/server/0195-WitchConsumePotionEvent.patch diff --git a/patches/server/0197-WitchThrowPotionEvent.patch b/patches/server/0196-WitchThrowPotionEvent.patch similarity index 100% rename from patches/server/0197-WitchThrowPotionEvent.patch rename to patches/server/0196-WitchThrowPotionEvent.patch diff --git a/patches/server/0198-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/patches/server/0197-Allow-spawning-Item-entities-with-World.spawnEntity.patch similarity index 100% rename from patches/server/0198-Allow-spawning-Item-entities-with-World.spawnEntity.patch rename to patches/server/0197-Allow-spawning-Item-entities-with-World.spawnEntity.patch diff --git a/patches/server/0199-WitchReadyPotionEvent.patch b/patches/server/0198-WitchReadyPotionEvent.patch similarity index 100% rename from patches/server/0199-WitchReadyPotionEvent.patch rename to patches/server/0198-WitchReadyPotionEvent.patch diff --git a/patches/server/0200-ItemStack-getMaxItemUseDuration.patch b/patches/server/0199-ItemStack-getMaxItemUseDuration.patch similarity index 100% rename from patches/server/0200-ItemStack-getMaxItemUseDuration.patch rename to patches/server/0199-ItemStack-getMaxItemUseDuration.patch diff --git a/patches/server/0201-Implement-EntityTeleportEndGatewayEvent.patch b/patches/server/0200-Implement-EntityTeleportEndGatewayEvent.patch similarity index 100% rename from patches/server/0201-Implement-EntityTeleportEndGatewayEvent.patch rename to patches/server/0200-Implement-EntityTeleportEndGatewayEvent.patch diff --git a/patches/server/0202-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/patches/server/0201-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch similarity index 100% rename from patches/server/0202-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch rename to patches/server/0201-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch diff --git a/patches/server/0203-Fix-CraftEntity-hashCode.patch b/patches/server/0202-Fix-CraftEntity-hashCode.patch similarity index 100% rename from patches/server/0203-Fix-CraftEntity-hashCode.patch rename to patches/server/0202-Fix-CraftEntity-hashCode.patch diff --git a/patches/server/0204-Configurable-Alternative-LootPool-Luck-Formula.patch b/patches/server/0203-Configurable-Alternative-LootPool-Luck-Formula.patch similarity index 100% rename from patches/server/0204-Configurable-Alternative-LootPool-Luck-Formula.patch rename to patches/server/0203-Configurable-Alternative-LootPool-Luck-Formula.patch diff --git a/patches/server/0205-Print-Error-details-when-failing-to-save-player-data.patch b/patches/server/0204-Print-Error-details-when-failing-to-save-player-data.patch similarity index 100% rename from patches/server/0205-Print-Error-details-when-failing-to-save-player-data.patch rename to patches/server/0204-Print-Error-details-when-failing-to-save-player-data.patch diff --git a/patches/server/0206-Make-shield-blocking-delay-configurable.patch b/patches/server/0205-Make-shield-blocking-delay-configurable.patch similarity index 100% rename from patches/server/0206-Make-shield-blocking-delay-configurable.patch rename to patches/server/0205-Make-shield-blocking-delay-configurable.patch diff --git a/patches/server/0207-Improve-EntityShootBowEvent.patch b/patches/server/0206-Improve-EntityShootBowEvent.patch similarity index 100% rename from patches/server/0207-Improve-EntityShootBowEvent.patch rename to patches/server/0206-Improve-EntityShootBowEvent.patch diff --git a/patches/server/0208-PlayerReadyArrowEvent.patch b/patches/server/0207-PlayerReadyArrowEvent.patch similarity index 100% rename from patches/server/0208-PlayerReadyArrowEvent.patch rename to patches/server/0207-PlayerReadyArrowEvent.patch diff --git a/patches/server/0209-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch b/patches/server/0208-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch similarity index 99% rename from patches/server/0209-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch rename to patches/server/0208-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch index f3cbdab0fe..91f930c226 100644 --- a/patches/server/0209-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch +++ b/patches/server/0208-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch @@ -9,7 +9,7 @@ Co-authored-by: aerulion This event is called when an entity receives knockback by another entity. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index ba96a1c657d4e81076536d0d6432e4d6584bda2c..0141b58ed74234a63820b6557687a24611d463be 100644 +index 451ba2db54dc1682924fa65283bc88687157322e..d47ada5544478dcfcb49f6b437e634105397fdfe 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1907,8 +1907,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0210-Expand-Explosions-API.patch b/patches/server/0209-Expand-Explosions-API.patch similarity index 100% rename from patches/server/0210-Expand-Explosions-API.patch rename to patches/server/0209-Expand-Explosions-API.patch diff --git a/patches/server/0211-LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/server/0210-LivingEntity-Hand-Raised-Item-Use-API.patch similarity index 100% rename from patches/server/0211-LivingEntity-Hand-Raised-Item-Use-API.patch rename to patches/server/0210-LivingEntity-Hand-Raised-Item-Use-API.patch diff --git a/patches/server/0212-RangedEntity-API.patch b/patches/server/0211-RangedEntity-API.patch similarity index 100% rename from patches/server/0212-RangedEntity-API.patch rename to patches/server/0211-RangedEntity-API.patch diff --git a/patches/server/0213-Add-config-to-disable-ender-dragon-legacy-check.patch b/patches/server/0212-Add-config-to-disable-ender-dragon-legacy-check.patch similarity index 100% rename from patches/server/0213-Add-config-to-disable-ender-dragon-legacy-check.patch rename to patches/server/0212-Add-config-to-disable-ender-dragon-legacy-check.patch diff --git a/patches/server/0214-Implement-World.getEntity-UUID-API.patch b/patches/server/0213-Implement-World.getEntity-UUID-API.patch similarity index 100% rename from patches/server/0214-Implement-World.getEntity-UUID-API.patch rename to patches/server/0213-Implement-World.getEntity-UUID-API.patch diff --git a/patches/server/0215-InventoryCloseEvent-Reason-API.patch b/patches/server/0214-InventoryCloseEvent-Reason-API.patch similarity index 97% rename from patches/server/0215-InventoryCloseEvent-Reason-API.patch rename to patches/server/0214-InventoryCloseEvent-Reason-API.patch index e01984d3e8..bba729f36b 100644 --- a/patches/server/0215-InventoryCloseEvent-Reason-API.patch +++ b/patches/server/0214-InventoryCloseEvent-Reason-API.patch @@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers to "confirm" things based on if it was player triggered close or not. diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index ac331aef54f9e595129bded04ff6d9c7b8b7d5b0..2d3091e8ad3058952895b7fcf19b9f543f8e4935 100644 +index e024c296f471737764af260ca4cd7e9005e044ac..ac43aba1ae9420a2a02fd3d3e3d4426c04e76139 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1470,7 +1470,7 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -104,7 +104,7 @@ index 520de61cd21d71f8c77175977987091e3caa0be9..9c8d5ccc82aafe455ec39e61af60d8a6 this.player.doCloseContainer(); } diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 3564d97af63494ede27941b63a7255239fa8a126..577d427defdb82f5c6c1d8f766c51653f7b6de52 100644 +index 6e0a21935f9d5f35cbce72b32e0a89bb636804e2..5607616c933556de00bfb4218ba75ee477bb2201 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -518,7 +518,7 @@ public abstract class PlayerList { @@ -173,7 +173,7 @@ index 7d6301ae9ee2added007b0c68ffabe5d79f7be62..801dca6bbafd6e1825a1291fc128efc1 @Override public boolean isBlocking() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index f93e5812cc239ff69d22a53ac52be2c71203ad07..32ab12fb28f334258d1c612cddf25a82cebc27a7 100644 +index 43e577dc39db6e9b373db0e67dc72e770150339b..2f3365c2cc45ebc4cc27a04f2383d7e102637722 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1200,7 +1200,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0216-Vex-get-setSummoner-API.patch b/patches/server/0215-Vex-get-setSummoner-API.patch similarity index 100% rename from patches/server/0216-Vex-get-setSummoner-API.patch rename to patches/server/0215-Vex-get-setSummoner-API.patch diff --git a/patches/server/0217-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/server/0216-Refresh-player-inventory-when-cancelling-PlayerInter.patch similarity index 100% rename from patches/server/0217-Refresh-player-inventory-when-cancelling-PlayerInter.patch rename to patches/server/0216-Refresh-player-inventory-when-cancelling-PlayerInter.patch diff --git a/patches/server/0218-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/server/0217-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch similarity index 100% rename from patches/server/0218-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch rename to patches/server/0217-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch diff --git a/patches/server/0219-add-more-information-to-Entity.toString.patch b/patches/server/0218-add-more-information-to-Entity.toString.patch similarity index 95% rename from patches/server/0219-add-more-information-to-Entity.toString.patch rename to patches/server/0218-add-more-information-to-Entity.toString.patch index 1337854fde..1b5b3946c0 100644 --- a/patches/server/0219-add-more-information-to-Entity.toString.patch +++ b/patches/server/0218-add-more-information-to-Entity.toString.patch @@ -6,7 +6,7 @@ Subject: [PATCH] add more information to Entity.toString() UUID, ticks lived, valid, dead diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 0141b58ed74234a63820b6557687a24611d463be..5389230ffb27480012f86e882bf53cf24aa31686 100644 +index d47ada5544478dcfcb49f6b437e634105397fdfe..17cae197f76e02491791c55554bd57592a30aa1d 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3202,7 +3202,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0220-EnderDragon-Events.patch b/patches/server/0219-EnderDragon-Events.patch similarity index 100% rename from patches/server/0220-EnderDragon-Events.patch rename to patches/server/0219-EnderDragon-Events.patch diff --git a/patches/server/0221-PlayerElytraBoostEvent.patch b/patches/server/0220-PlayerElytraBoostEvent.patch similarity index 100% rename from patches/server/0221-PlayerElytraBoostEvent.patch rename to patches/server/0220-PlayerElytraBoostEvent.patch diff --git a/patches/server/0222-PlayerLaunchProjectileEvent.patch b/patches/server/0221-PlayerLaunchProjectileEvent.patch similarity index 100% rename from patches/server/0222-PlayerLaunchProjectileEvent.patch rename to patches/server/0221-PlayerLaunchProjectileEvent.patch diff --git a/patches/server/0223-Improve-BlockPosition-inlining.patch b/patches/server/0222-Improve-BlockPosition-inlining.patch similarity index 100% rename from patches/server/0223-Improve-BlockPosition-inlining.patch rename to patches/server/0222-Improve-BlockPosition-inlining.patch diff --git a/patches/server/0224-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/server/0223-Option-to-prevent-armor-stands-from-doing-entity-loo.patch similarity index 90% rename from patches/server/0224-Option-to-prevent-armor-stands-from-doing-entity-loo.patch rename to patches/server/0223-Option-to-prevent-armor-stands-from-doing-entity-loo.patch index a7ce4f354a..13732a28b5 100644 --- a/patches/server/0224-Option-to-prevent-armor-stands-from-doing-entity-loo.patch +++ b/patches/server/0223-Option-to-prevent-armor-stands-from-doing-entity-loo.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Option to prevent armor stands from doing entity lookups diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java -index c9c773cce59e795ed0d8449a6e70b4b968a4e5e8..eb4f8d3a0012f5732a2faa53d0b886da593ed43a 100644 +index d04d0b9cbf91beb57da7e37e72f8e7c98cf6cf4c..aff1b2195d2f187739394886d4c0bdbf0cb306b4 100644 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java @@ -337,6 +337,7 @@ public class ArmorStand extends LivingEntity { @@ -17,7 +17,7 @@ index c9c773cce59e795ed0d8449a6e70b4b968a4e5e8..eb4f8d3a0012f5732a2faa53d0b886da Iterator iterator = list.iterator(); diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 82cd225802ecc518c34426c010525192ef544f34..0dce77c1e773d2dd9c3471b2a71ba6aaa76f9054 100644 +index eb9da7e3912430921219cd4ebdcc295c0e5162bb..4751f83571688cf1e0aa669accc813942d85c60c 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -860,6 +860,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0225-Vanished-players-don-t-have-rights.patch b/patches/server/0224-Vanished-players-don-t-have-rights.patch similarity index 98% rename from patches/server/0225-Vanished-players-don-t-have-rights.patch rename to patches/server/0224-Vanished-players-don-t-have-rights.patch index 98d999d449..6814fedc44 100644 --- a/patches/server/0225-Vanished-players-don-t-have-rights.patch +++ b/patches/server/0224-Vanished-players-don-t-have-rights.patch @@ -39,7 +39,7 @@ index a6638e626600e4304a973497a39e3fac52203b16..e68b7a1b03783e4f9de24c5ae8773fc3 BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(context.getLevel(), context.getClickedPos()), player, CraftBlockData.fromData(state), defaultReturn); diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 0dce77c1e773d2dd9c3471b2a71ba6aaa76f9054..7181c3cf67e367cc8f2d0ef3bf8a74ff6c8ff2aa 100644 +index 4751f83571688cf1e0aa669accc813942d85c60c..4fb29ca40e1caba3f205afc13fb4d7a95fd81ce6 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -276,6 +276,45 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0226-Allow-disabling-armour-stand-ticking.patch b/patches/server/0225-Allow-disabling-armour-stand-ticking.patch similarity index 98% rename from patches/server/0226-Allow-disabling-armour-stand-ticking.patch rename to patches/server/0225-Allow-disabling-armour-stand-ticking.patch index 17570a8903..a8bcc90962 100644 --- a/patches/server/0226-Allow-disabling-armour-stand-ticking.patch +++ b/patches/server/0225-Allow-disabling-armour-stand-ticking.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow disabling armour stand ticking diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java -index eb4f8d3a0012f5732a2faa53d0b886da593ed43a..f542119628051b20afc0780a3bfa2125b68fdc58 100644 +index aff1b2195d2f187739394886d4c0bdbf0cb306b4..948ba97e318506dad96e59121297b5bf8340d2e6 100644 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java @@ -93,9 +93,16 @@ public class ArmorStand extends LivingEntity { diff --git a/patches/server/0227-SkeletonHorse-Additions.patch b/patches/server/0226-SkeletonHorse-Additions.patch similarity index 100% rename from patches/server/0227-SkeletonHorse-Additions.patch rename to patches/server/0226-SkeletonHorse-Additions.patch diff --git a/patches/server/0228-Don-t-call-getItemMeta-on-hasItemMeta.patch b/patches/server/0227-Don-t-call-getItemMeta-on-hasItemMeta.patch similarity index 100% rename from patches/server/0228-Don-t-call-getItemMeta-on-hasItemMeta.patch rename to patches/server/0227-Don-t-call-getItemMeta-on-hasItemMeta.patch diff --git a/patches/server/0229-Implement-Expanded-ArmorStand-API.patch b/patches/server/0228-Implement-Expanded-ArmorStand-API.patch similarity index 100% rename from patches/server/0229-Implement-Expanded-ArmorStand-API.patch rename to patches/server/0228-Implement-Expanded-ArmorStand-API.patch diff --git a/patches/server/0230-AnvilDamageEvent.patch b/patches/server/0229-AnvilDamageEvent.patch similarity index 100% rename from patches/server/0230-AnvilDamageEvent.patch rename to patches/server/0229-AnvilDamageEvent.patch diff --git a/patches/server/0231-Add-TNTPrimeEvent.patch b/patches/server/0230-Add-TNTPrimeEvent.patch similarity index 100% rename from patches/server/0231-Add-TNTPrimeEvent.patch rename to patches/server/0230-Add-TNTPrimeEvent.patch diff --git a/patches/server/0232-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/server/0231-Break-up-and-make-tab-spam-limits-configurable.patch similarity index 100% rename from patches/server/0232-Break-up-and-make-tab-spam-limits-configurable.patch rename to patches/server/0231-Break-up-and-make-tab-spam-limits-configurable.patch diff --git a/patches/server/0233-Fix-NBT-type-issues.patch b/patches/server/0232-Fix-NBT-type-issues.patch similarity index 100% rename from patches/server/0233-Fix-NBT-type-issues.patch rename to patches/server/0232-Fix-NBT-type-issues.patch diff --git a/patches/server/0234-Remove-unnecessary-itemmeta-handling.patch b/patches/server/0233-Remove-unnecessary-itemmeta-handling.patch similarity index 100% rename from patches/server/0234-Remove-unnecessary-itemmeta-handling.patch rename to patches/server/0233-Remove-unnecessary-itemmeta-handling.patch diff --git a/patches/server/0235-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/server/0234-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch similarity index 96% rename from patches/server/0235-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch rename to patches/server/0234-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch index fbe1df5298..913d9a8d08 100644 --- a/patches/server/0235-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch +++ b/patches/server/0234-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch @@ -29,7 +29,7 @@ index ea520b828378c268d05425096c6493ca1c7ad385..8d3a9f8210bf529484aeaf84ef9a55b5 protected void tick() { diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 2d3091e8ad3058952895b7fcf19b9f543f8e4935..08a1fdd0b6fb688897a7813e8c298265afedf02b 100644 +index ac43aba1ae9420a2a02fd3d3e3d4426c04e76139..5ad90a3c6917d7435f6a1c284fc8acb0365457e3 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -223,6 +223,9 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -72,7 +72,7 @@ index 2d3091e8ad3058952895b7fcf19b9f543f8e4935..08a1fdd0b6fb688897a7813e8c298265 return false; } else { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 5389230ffb27480012f86e882bf53cf24aa31686..c8e0d0126c1a6eaded7c4a37f2da8ce1bf9bfadd 100644 +index 17cae197f76e02491791c55554bd57592a30aa1d..7be66f8649d6f6cb67e3b42e8f4fe739f0ff9f9f 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -239,6 +239,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S @@ -85,7 +85,7 @@ index 5389230ffb27480012f86e882bf53cf24aa31686..c8e0d0126c1a6eaded7c4a37f2da8ce1 if (this.bukkitEntity == null) { this.bukkitEntity = CraftEntity.getEntity(this.level.getCraftServer(), this); diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 7181c3cf67e367cc8f2d0ef3bf8a74ff6c8ff2aa..eec83b6c00fee271fdeb12bd8b812439d1dc4d3b 100644 +index 4fb29ca40e1caba3f205afc13fb4d7a95fd81ce6..178509c545f2872174af501bdcec3314f703739c 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -153,6 +153,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0236-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/server/0235-Add-Early-Warning-Feature-to-WatchDog.patch similarity index 100% rename from patches/server/0236-Add-Early-Warning-Feature-to-WatchDog.patch rename to patches/server/0235-Add-Early-Warning-Feature-to-WatchDog.patch diff --git a/patches/server/0237-Use-ConcurrentHashMap-in-JsonList.patch b/patches/server/0236-Use-ConcurrentHashMap-in-JsonList.patch similarity index 98% rename from patches/server/0237-Use-ConcurrentHashMap-in-JsonList.patch rename to patches/server/0236-Use-ConcurrentHashMap-in-JsonList.patch index 036f0a2a21..25984880a5 100644 --- a/patches/server/0237-Use-ConcurrentHashMap-in-JsonList.patch +++ b/patches/server/0236-Use-ConcurrentHashMap-in-JsonList.patch @@ -23,7 +23,7 @@ Modified isEmpty to use the isEmpty() method instead of the slightly confusing s The point of this is readability, but does have a side-benefit of a small microptimization diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 577d427defdb82f5c6c1d8f766c51653f7b6de52..b76024a8dce1ef79f6cbff7403daffd214d7b850 100644 +index 5607616c933556de00bfb4218ba75ee477bb2201..27bfddd847175717697fb589b820ec5a81e08578 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -634,7 +634,7 @@ public abstract class PlayerList { diff --git a/patches/server/0238-Use-a-Queue-for-Queueing-Commands.patch b/patches/server/0237-Use-a-Queue-for-Queueing-Commands.patch similarity index 100% rename from patches/server/0238-Use-a-Queue-for-Queueing-Commands.patch rename to patches/server/0237-Use-a-Queue-for-Queueing-Commands.patch diff --git a/patches/server/0239-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/server/0238-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch similarity index 100% rename from patches/server/0239-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch rename to patches/server/0238-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch diff --git a/patches/server/0240-Optimize-BlockPosition-helper-methods.patch b/patches/server/0239-Optimize-BlockPosition-helper-methods.patch similarity index 100% rename from patches/server/0240-Optimize-BlockPosition-helper-methods.patch rename to patches/server/0239-Optimize-BlockPosition-helper-methods.patch diff --git a/patches/server/0241-Restore-vanilla-default-mob-spawn-range-and-water-an.patch b/patches/server/0240-Restore-vanilla-default-mob-spawn-range-and-water-an.patch similarity index 100% rename from patches/server/0241-Restore-vanilla-default-mob-spawn-range-and-water-an.patch rename to patches/server/0240-Restore-vanilla-default-mob-spawn-range-and-water-an.patch diff --git a/patches/server/0242-Slime-Pathfinder-Events.patch b/patches/server/0241-Slime-Pathfinder-Events.patch similarity index 100% rename from patches/server/0242-Slime-Pathfinder-Events.patch rename to patches/server/0241-Slime-Pathfinder-Events.patch diff --git a/patches/server/0243-Configurable-speed-for-water-flowing-over-lava.patch b/patches/server/0242-Configurable-speed-for-water-flowing-over-lava.patch similarity index 100% rename from patches/server/0243-Configurable-speed-for-water-flowing-over-lava.patch rename to patches/server/0242-Configurable-speed-for-water-flowing-over-lava.patch diff --git a/patches/server/0244-Optimize-CraftBlockData-Creation.patch b/patches/server/0243-Optimize-CraftBlockData-Creation.patch similarity index 100% rename from patches/server/0244-Optimize-CraftBlockData-Creation.patch rename to patches/server/0243-Optimize-CraftBlockData-Creation.patch diff --git a/patches/server/0245-Optimize-MappedRegistry.patch b/patches/server/0244-Optimize-MappedRegistry.patch similarity index 100% rename from patches/server/0245-Optimize-MappedRegistry.patch rename to patches/server/0244-Optimize-MappedRegistry.patch diff --git a/patches/server/0246-Add-PhantomPreSpawnEvent.patch b/patches/server/0245-Add-PhantomPreSpawnEvent.patch similarity index 100% rename from patches/server/0246-Add-PhantomPreSpawnEvent.patch rename to patches/server/0245-Add-PhantomPreSpawnEvent.patch diff --git a/patches/server/0247-Add-More-Creeper-API.patch b/patches/server/0246-Add-More-Creeper-API.patch similarity index 100% rename from patches/server/0247-Add-More-Creeper-API.patch rename to patches/server/0246-Add-More-Creeper-API.patch diff --git a/patches/server/0248-Inventory-removeItemAnySlot.patch b/patches/server/0247-Inventory-removeItemAnySlot.patch similarity index 100% rename from patches/server/0248-Inventory-removeItemAnySlot.patch rename to patches/server/0247-Inventory-removeItemAnySlot.patch diff --git a/patches/server/0249-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/patches/server/0248-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch similarity index 100% rename from patches/server/0249-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch rename to patches/server/0248-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch diff --git a/patches/server/0250-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/server/0249-Add-ray-tracing-methods-to-LivingEntity.patch similarity index 100% rename from patches/server/0250-Add-ray-tracing-methods-to-LivingEntity.patch rename to patches/server/0249-Add-ray-tracing-methods-to-LivingEntity.patch diff --git a/patches/server/0251-Expose-attack-cooldown-methods-for-Player.patch b/patches/server/0250-Expose-attack-cooldown-methods-for-Player.patch similarity index 92% rename from patches/server/0251-Expose-attack-cooldown-methods-for-Player.patch rename to patches/server/0250-Expose-attack-cooldown-methods-for-Player.patch index a461ae5c11..84edf05acb 100644 --- a/patches/server/0251-Expose-attack-cooldown-methods-for-Player.patch +++ b/patches/server/0250-Expose-attack-cooldown-methods-for-Player.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Expose attack cooldown methods for Player diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 32ab12fb28f334258d1c612cddf25a82cebc27a7..9712d22fb60d79acb0fbc0526a7f39946cde32d1 100644 +index 2f3365c2cc45ebc4cc27a04f2383d7e102637722..193a2634344f06fcdad47aea9e6924f0b839cfba 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2862,6 +2862,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0252-Improve-death-events.patch b/patches/server/0251-Improve-death-events.patch similarity index 99% rename from patches/server/0252-Improve-death-events.patch rename to patches/server/0251-Improve-death-events.patch index ab38225165..31768aadba 100644 --- a/patches/server/0252-Improve-death-events.patch +++ b/patches/server/0251-Improve-death-events.patch @@ -301,7 +301,7 @@ index bb399f775a5530a01f59332848c8ab9b8eceb2b5..14edfe103e61024b569f33de0b6608f3 public void addAdditionalSaveData(CompoundTag nbt) { super.addAdditionalSaveData(nbt); diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java -index f542119628051b20afc0780a3bfa2125b68fdc58..2512e7757fa9135bfaf436790f5fce815d43b9ee 100644 +index 948ba97e318506dad96e59121297b5bf8340d2e6..810bead2f19de70786027b190137f743a0c40ee7 100644 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java @@ -492,8 +492,10 @@ public class ArmorStand extends LivingEntity { @@ -392,7 +392,7 @@ index f542119628051b20afc0780a3bfa2125b68fdc58..2512e7757fa9135bfaf436790f5fce81 this.gameEvent(GameEvent.ENTITY_DIE); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 9712d22fb60d79acb0fbc0526a7f39946cde32d1..06e6db108a40ff7e59fbfe1895dae7dbc3a3f3ab 100644 +index 193a2634344f06fcdad47aea9e6924f0b839cfba..22b96810ad263112ddbc01d5081d56b5bd3fff2a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2360,7 +2360,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0253-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/server/0252-Allow-chests-to-be-placed-with-NBT-data.patch similarity index 100% rename from patches/server/0253-Allow-chests-to-be-placed-with-NBT-data.patch rename to patches/server/0252-Allow-chests-to-be-placed-with-NBT-data.patch diff --git a/patches/server/0254-Mob-Pathfinding-API.patch b/patches/server/0253-Mob-Pathfinding-API.patch similarity index 100% rename from patches/server/0254-Mob-Pathfinding-API.patch rename to patches/server/0253-Mob-Pathfinding-API.patch diff --git a/patches/server/0255-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/patches/server/0254-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch similarity index 100% rename from patches/server/0255-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch rename to patches/server/0254-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch diff --git a/patches/server/0256-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/patches/server/0255-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch similarity index 100% rename from patches/server/0256-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch rename to patches/server/0255-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch diff --git a/patches/server/0257-Prevent-mob-spawning-from-loading-generating-chunks.patch b/patches/server/0256-Prevent-mob-spawning-from-loading-generating-chunks.patch similarity index 100% rename from patches/server/0257-Prevent-mob-spawning-from-loading-generating-chunks.patch rename to patches/server/0256-Prevent-mob-spawning-from-loading-generating-chunks.patch diff --git a/patches/server/0258-Implement-furnace-cook-speed-multiplier-API.patch b/patches/server/0257-Implement-furnace-cook-speed-multiplier-API.patch similarity index 100% rename from patches/server/0258-Implement-furnace-cook-speed-multiplier-API.patch rename to patches/server/0257-Implement-furnace-cook-speed-multiplier-API.patch diff --git a/patches/server/0259-Honor-EntityAgeable.ageLock.patch b/patches/server/0258-Honor-EntityAgeable.ageLock.patch similarity index 100% rename from patches/server/0259-Honor-EntityAgeable.ageLock.patch rename to patches/server/0258-Honor-EntityAgeable.ageLock.patch diff --git a/patches/server/0260-Configurable-connection-throttle-kick-message.patch b/patches/server/0259-Configurable-connection-throttle-kick-message.patch similarity index 100% rename from patches/server/0260-Configurable-connection-throttle-kick-message.patch rename to patches/server/0259-Configurable-connection-throttle-kick-message.patch diff --git a/patches/server/0261-Prevent-chunk-loading-from-Fluid-Flowing.patch b/patches/server/0260-Prevent-chunk-loading-from-Fluid-Flowing.patch similarity index 100% rename from patches/server/0261-Prevent-chunk-loading-from-Fluid-Flowing.patch rename to patches/server/0260-Prevent-chunk-loading-from-Fluid-Flowing.patch diff --git a/patches/server/0262-Hook-into-CB-plugin-rewrites.patch b/patches/server/0261-Hook-into-CB-plugin-rewrites.patch similarity index 100% rename from patches/server/0262-Hook-into-CB-plugin-rewrites.patch rename to patches/server/0261-Hook-into-CB-plugin-rewrites.patch diff --git a/patches/server/0263-PreSpawnerSpawnEvent.patch b/patches/server/0262-PreSpawnerSpawnEvent.patch similarity index 100% rename from patches/server/0263-PreSpawnerSpawnEvent.patch rename to patches/server/0262-PreSpawnerSpawnEvent.patch diff --git a/patches/server/0264-Add-LivingEntity-getTargetEntity.patch b/patches/server/0263-Add-LivingEntity-getTargetEntity.patch similarity index 100% rename from patches/server/0264-Add-LivingEntity-getTargetEntity.patch rename to patches/server/0263-Add-LivingEntity-getTargetEntity.patch diff --git a/patches/server/0265-Add-sun-related-API.patch b/patches/server/0264-Add-sun-related-API.patch similarity index 100% rename from patches/server/0265-Add-sun-related-API.patch rename to patches/server/0264-Add-sun-related-API.patch diff --git a/patches/server/0266-Catch-JsonParseException-in-Entity-and-TE-names.patch b/patches/server/0265-Catch-JsonParseException-in-Entity-and-TE-names.patch similarity index 100% rename from patches/server/0266-Catch-JsonParseException-in-Entity-and-TE-names.patch rename to patches/server/0265-Catch-JsonParseException-in-Entity-and-TE-names.patch diff --git a/patches/server/0267-Turtle-API.patch b/patches/server/0266-Turtle-API.patch similarity index 100% rename from patches/server/0267-Turtle-API.patch rename to patches/server/0266-Turtle-API.patch diff --git a/patches/server/0268-Call-player-spectator-target-events-and-improve-impl.patch b/patches/server/0267-Call-player-spectator-target-events-and-improve-impl.patch similarity index 100% rename from patches/server/0268-Call-player-spectator-target-events-and-improve-impl.patch rename to patches/server/0267-Call-player-spectator-target-events-and-improve-impl.patch diff --git a/patches/server/0269-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/patches/server/0268-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch similarity index 100% rename from patches/server/0269-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch rename to patches/server/0268-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch diff --git a/patches/server/0270-Add-more-Witch-API.patch b/patches/server/0269-Add-more-Witch-API.patch similarity index 100% rename from patches/server/0270-Add-more-Witch-API.patch rename to patches/server/0269-Add-more-Witch-API.patch diff --git a/patches/server/0271-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/server/0270-Check-Drowned-for-Villager-Aggression-Config.patch similarity index 100% rename from patches/server/0271-Check-Drowned-for-Villager-Aggression-Config.patch rename to patches/server/0270-Check-Drowned-for-Villager-Aggression-Config.patch diff --git a/patches/server/0272-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/server/0271-Add-option-to-prevent-players-from-moving-into-unloa.patch similarity index 100% rename from patches/server/0272-Add-option-to-prevent-players-from-moving-into-unloa.patch rename to patches/server/0271-Add-option-to-prevent-players-from-moving-into-unloa.patch diff --git a/patches/server/0273-Reset-players-airTicks-on-respawn.patch b/patches/server/0272-Reset-players-airTicks-on-respawn.patch similarity index 100% rename from patches/server/0273-Reset-players-airTicks-on-respawn.patch rename to patches/server/0272-Reset-players-airTicks-on-respawn.patch diff --git a/patches/server/0274-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/server/0273-Don-t-sleep-after-profile-lookups-if-not-needed.patch similarity index 100% rename from patches/server/0274-Don-t-sleep-after-profile-lookups-if-not-needed.patch rename to patches/server/0273-Don-t-sleep-after-profile-lookups-if-not-needed.patch diff --git a/patches/server/0275-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/server/0274-Improve-Server-Thread-Pool-and-Thread-Priorities.patch similarity index 100% rename from patches/server/0275-Improve-Server-Thread-Pool-and-Thread-Priorities.patch rename to patches/server/0274-Improve-Server-Thread-Pool-and-Thread-Priorities.patch diff --git a/patches/server/0276-Optimize-World-Time-Updates.patch b/patches/server/0275-Optimize-World-Time-Updates.patch similarity index 100% rename from patches/server/0276-Optimize-World-Time-Updates.patch rename to patches/server/0275-Optimize-World-Time-Updates.patch diff --git a/patches/server/0277-Restore-custom-InventoryHolder-support.patch b/patches/server/0276-Restore-custom-InventoryHolder-support.patch similarity index 100% rename from patches/server/0277-Restore-custom-InventoryHolder-support.patch rename to patches/server/0276-Restore-custom-InventoryHolder-support.patch diff --git a/patches/server/0278-Use-Vanilla-Minecart-Speeds.patch b/patches/server/0277-Use-Vanilla-Minecart-Speeds.patch similarity index 100% rename from patches/server/0278-Use-Vanilla-Minecart-Speeds.patch rename to patches/server/0277-Use-Vanilla-Minecart-Speeds.patch diff --git a/patches/server/0279-Fix-SpongeAbsortEvent-handling.patch b/patches/server/0278-Fix-SpongeAbsortEvent-handling.patch similarity index 100% rename from patches/server/0279-Fix-SpongeAbsortEvent-handling.patch rename to patches/server/0278-Fix-SpongeAbsortEvent-handling.patch diff --git a/patches/server/0280-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/server/0279-Don-t-allow-digging-into-unloaded-chunks.patch similarity index 100% rename from patches/server/0280-Don-t-allow-digging-into-unloaded-chunks.patch rename to patches/server/0279-Don-t-allow-digging-into-unloaded-chunks.patch diff --git a/patches/server/0281-Make-the-default-permission-message-configurable.patch b/patches/server/0280-Make-the-default-permission-message-configurable.patch similarity index 100% rename from patches/server/0281-Make-the-default-permission-message-configurable.patch rename to patches/server/0280-Make-the-default-permission-message-configurable.patch diff --git a/patches/server/0282-Prevent-rayTrace-from-loading-chunks.patch b/patches/server/0281-Prevent-rayTrace-from-loading-chunks.patch similarity index 100% rename from patches/server/0282-Prevent-rayTrace-from-loading-chunks.patch rename to patches/server/0281-Prevent-rayTrace-from-loading-chunks.patch diff --git a/patches/server/0283-Handle-Large-Packets-disconnecting-client.patch b/patches/server/0282-Handle-Large-Packets-disconnecting-client.patch similarity index 100% rename from patches/server/0283-Handle-Large-Packets-disconnecting-client.patch rename to patches/server/0282-Handle-Large-Packets-disconnecting-client.patch diff --git a/patches/server/0284-force-entity-dismount-during-teleportation.patch b/patches/server/0283-force-entity-dismount-during-teleportation.patch similarity index 98% rename from patches/server/0284-force-entity-dismount-during-teleportation.patch rename to patches/server/0283-force-entity-dismount-during-teleportation.patch index 7b6588ede2..b49a068454 100644 --- a/patches/server/0284-force-entity-dismount-during-teleportation.patch +++ b/patches/server/0283-force-entity-dismount-during-teleportation.patch @@ -20,7 +20,7 @@ this is going to be the best soultion all around. Improvements/suggestions welcome! diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index c8e0d0126c1a6eaded7c4a37f2da8ce1bf9bfadd..760bb3bfa47ee1e4c6a6add7ab823a24ffd9e15e 100644 +index 7be66f8649d6f6cb67e3b42e8f4fe739f0ff9f9f..fa24d236ed330b417306f137d441bb08dc79a3f5 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2605,11 +2605,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0285-Add-more-Zombie-API.patch b/patches/server/0284-Add-more-Zombie-API.patch similarity index 100% rename from patches/server/0285-Add-more-Zombie-API.patch rename to patches/server/0284-Add-more-Zombie-API.patch diff --git a/patches/server/0286-Book-Size-Limits.patch b/patches/server/0285-Book-Size-Limits.patch similarity index 100% rename from patches/server/0286-Book-Size-Limits.patch rename to patches/server/0285-Book-Size-Limits.patch diff --git a/patches/server/0287-Add-PlayerConnectionCloseEvent.patch b/patches/server/0286-Add-PlayerConnectionCloseEvent.patch similarity index 100% rename from patches/server/0287-Add-PlayerConnectionCloseEvent.patch rename to patches/server/0286-Add-PlayerConnectionCloseEvent.patch diff --git a/patches/server/0288-Prevent-Enderman-from-loading-chunks.patch b/patches/server/0287-Prevent-Enderman-from-loading-chunks.patch similarity index 100% rename from patches/server/0288-Prevent-Enderman-from-loading-chunks.patch rename to patches/server/0287-Prevent-Enderman-from-loading-chunks.patch diff --git a/patches/server/0289-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/server/0288-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch similarity index 97% rename from patches/server/0289-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch rename to patches/server/0288-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch index 8681918ef8..e45d1aacbc 100644 --- a/patches/server/0289-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch +++ b/patches/server/0288-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch @@ -28,7 +28,7 @@ index 6e025c8fdb14e6dcb178055d51efd11112247808..268567dab735619171c2cdfd56679052 public boolean queueHealthUpdatePacket = false; public net.minecraft.network.protocol.game.ClientboundSetHealthPacket queuedHealthUpdatePacket; diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index b76024a8dce1ef79f6cbff7403daffd214d7b850..807b649ed6e5ddd4887bf9b5a028b02a58a75348 100644 +index 27bfddd847175717697fb589b820ec5a81e08578..4221a45fda5c3b40a1f6342aebe8d7b2e190fb9c 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -179,6 +179,7 @@ public abstract class PlayerList { @@ -106,7 +106,7 @@ index e8490a58dd4d9bc39a5bb2f9fc109526e031b971..5f590575f95eff8bf0cdcafde7dee0e3 public Location getLastDeathLocation() { if (this.getData().contains("LastDeathLocation", 10)) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 06e6db108a40ff7e59fbfe1895dae7dbc3a3f3ab..268814e3de4ee19c9e248080d77b20a7c2773bb0 100644 +index 22b96810ad263112ddbc01d5081d56b5bd3fff2a..3acd32648f85e71f456ed9ae5e384b504aff01c8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -196,6 +196,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0290-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/server/0289-Workaround-for-vehicle-tracking-issue-on-disconnect.patch similarity index 100% rename from patches/server/0290-Workaround-for-vehicle-tracking-issue-on-disconnect.patch rename to patches/server/0289-Workaround-for-vehicle-tracking-issue-on-disconnect.patch diff --git a/patches/server/0291-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch b/patches/server/0290-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch similarity index 92% rename from patches/server/0291-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch rename to patches/server/0290-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch index f1dea986e7..161f1eb4c7 100644 --- a/patches/server/0291-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch +++ b/patches/server/0290-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch @@ -8,7 +8,7 @@ We just add a check to ensure that the CraftPlayer's handle is a ServerPlayer diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 268814e3de4ee19c9e248080d77b20a7c2773bb0..629a3cdefd42c09bb2561a56a725357b40ef9ce2 100644 +index 3acd32648f85e71f456ed9ae5e384b504aff01c8..54dbe08e2ed589ad6d67d1940467255e2d3d1978 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -253,8 +253,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0292-BlockDestroyEvent.patch b/patches/server/0291-BlockDestroyEvent.patch similarity index 96% rename from patches/server/0292-BlockDestroyEvent.patch rename to patches/server/0291-BlockDestroyEvent.patch index 245647388e..6b5aa51c80 100644 --- a/patches/server/0292-BlockDestroyEvent.patch +++ b/patches/server/0291-BlockDestroyEvent.patch @@ -11,7 +11,7 @@ floating in the air. This can replace many uses of BlockPhysicsEvent diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index eec83b6c00fee271fdeb12bd8b812439d1dc4d3b..ec12d394df2c240994b614d1252b220c836d6c89 100644 +index 178509c545f2872174af501bdcec3314f703739c..d315a31f6b489ee88f81eb3d1b358c92e1e1619c 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -31,6 +31,7 @@ import net.minecraft.nbt.CompoundTag; diff --git a/patches/server/0293-Async-command-map-building.patch b/patches/server/0292-Async-command-map-building.patch similarity index 100% rename from patches/server/0293-Async-command-map-building.patch rename to patches/server/0292-Async-command-map-building.patch diff --git a/patches/server/0294-Implement-Brigadier-Mojang-API.patch b/patches/server/0293-Implement-Brigadier-Mojang-API.patch similarity index 100% rename from patches/server/0294-Implement-Brigadier-Mojang-API.patch rename to patches/server/0293-Implement-Brigadier-Mojang-API.patch diff --git a/patches/server/0295-Improve-exact-choice-recipe-ingredients.patch b/patches/server/0294-Improve-exact-choice-recipe-ingredients.patch similarity index 100% rename from patches/server/0295-Improve-exact-choice-recipe-ingredients.patch rename to patches/server/0294-Improve-exact-choice-recipe-ingredients.patch diff --git a/patches/server/0296-Limit-Client-Sign-length-more.patch b/patches/server/0295-Limit-Client-Sign-length-more.patch similarity index 100% rename from patches/server/0296-Limit-Client-Sign-length-more.patch rename to patches/server/0295-Limit-Client-Sign-length-more.patch diff --git a/patches/server/0297-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/server/0296-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch similarity index 88% rename from patches/server/0297-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch rename to patches/server/0296-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch index 50e12a75df..95dd0416b7 100644 --- a/patches/server/0297-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch +++ b/patches/server/0296-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Call WhitelistToggleEvent when whitelist is toggled diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 807b649ed6e5ddd4887bf9b5a028b02a58a75348..59fcb123cb1a49cca4072a62aa304e7382a07ccb 100644 +index 4221a45fda5c3b40a1f6342aebe8d7b2e190fb9c..3d13d3a219d10cb12bcdfe31eff9b54136629492 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -1151,6 +1151,7 @@ public abstract class PlayerList { diff --git a/patches/server/0298-Handle-Oversized-Tile-Entities-in-chunks.patch b/patches/server/0297-Handle-Oversized-Tile-Entities-in-chunks.patch similarity index 100% rename from patches/server/0298-Handle-Oversized-Tile-Entities-in-chunks.patch rename to patches/server/0297-Handle-Oversized-Tile-Entities-in-chunks.patch diff --git a/patches/server/0299-Entity-getEntitySpawnReason.patch b/patches/server/0298-Entity-getEntitySpawnReason.patch similarity index 97% rename from patches/server/0299-Entity-getEntitySpawnReason.patch rename to patches/server/0298-Entity-getEntitySpawnReason.patch index fa813b7589..3410c8b86d 100644 --- a/patches/server/0299-Entity-getEntitySpawnReason.patch +++ b/patches/server/0298-Entity-getEntitySpawnReason.patch @@ -22,7 +22,7 @@ index 2eddeb8d5239bbfeefbf4d3bd363f1ad083299b6..a7c89cdf20cb63792c76de81c1ff9f2c }); diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 08a1fdd0b6fb688897a7813e8c298265afedf02b..a26138470065a720045e3079e5e96d6c4fa765ce 100644 +index 5ad90a3c6917d7435f6a1c284fc8acb0365457e3..d70e6744edcac48322bfeb8a7df814e65c752af4 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1450,6 +1450,7 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -34,7 +34,7 @@ index 08a1fdd0b6fb688897a7813e8c298265afedf02b..a26138470065a720045e3079e5e96d6c // Paper start if (DEBUG_ENTITIES) { diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 59fcb123cb1a49cca4072a62aa304e7382a07ccb..f7e0364b4f5cf73d36f26ad169c93259b727082c 100644 +index 3d13d3a219d10cb12bcdfe31eff9b54136629492..f86dd0b58a13c7908961533c75e20ea73c0cb658 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -223,6 +223,11 @@ public abstract class PlayerList { diff --git a/patches/server/0300-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0299-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/0299-Optimize-Network-Manager-and-add-advanced-packet-sup.patch diff --git a/patches/server/0301-Fire-event-on-GS4-query.patch b/patches/server/0300-Fire-event-on-GS4-query.patch similarity index 100% rename from patches/server/0301-Fire-event-on-GS4-query.patch rename to patches/server/0300-Fire-event-on-GS4-query.patch diff --git a/patches/server/0302-Implement-PlayerPostRespawnEvent.patch b/patches/server/0301-Implement-PlayerPostRespawnEvent.patch similarity index 95% rename from patches/server/0302-Implement-PlayerPostRespawnEvent.patch rename to patches/server/0301-Implement-PlayerPostRespawnEvent.patch index 1d84434683..798b8ae0dd 100644 --- a/patches/server/0302-Implement-PlayerPostRespawnEvent.patch +++ b/patches/server/0301-Implement-PlayerPostRespawnEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerPostRespawnEvent diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index f7e0364b4f5cf73d36f26ad169c93259b727082c..ee1b40ef92e343e829040b8df5a2db67846f2982 100644 +index f86dd0b58a13c7908961533c75e20ea73c0cb658..b6bebb1eee1ee552b18860c8414f4866897c2bbd 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -751,9 +751,14 @@ public abstract class PlayerList { diff --git a/patches/server/0303-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/server/0302-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/0302-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/0303-Server-Tick-Events.patch similarity index 100% rename from patches/server/0304-Server-Tick-Events.patch rename to patches/server/0303-Server-Tick-Events.patch diff --git a/patches/server/0305-PlayerDeathEvent-getItemsToKeep.patch b/patches/server/0304-PlayerDeathEvent-getItemsToKeep.patch similarity index 100% rename from patches/server/0305-PlayerDeathEvent-getItemsToKeep.patch rename to patches/server/0304-PlayerDeathEvent-getItemsToKeep.patch diff --git a/patches/server/0306-Optimize-Captured-TileEntity-Lookup.patch b/patches/server/0305-Optimize-Captured-TileEntity-Lookup.patch similarity index 94% rename from patches/server/0306-Optimize-Captured-TileEntity-Lookup.patch rename to patches/server/0305-Optimize-Captured-TileEntity-Lookup.patch index 434643aefe..ce3b4d80db 100644 --- a/patches/server/0306-Optimize-Captured-TileEntity-Lookup.patch +++ b/patches/server/0305-Optimize-Captured-TileEntity-Lookup.patch @@ -10,7 +10,7 @@ Optimize to check if the captured list even has values in it, and also to just do a get call since the value can never be null. diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index ec12d394df2c240994b614d1252b220c836d6c89..53fd518e164ac774aab4484268abc836ccbbf60a 100644 +index d315a31f6b489ee88f81eb3d1b358c92e1e1619c..f300b637466b7e591a4d7e19dd7cfefa7f954e6a 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -1000,9 +1000,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0307-Add-Heightmap-API.patch b/patches/server/0306-Add-Heightmap-API.patch similarity index 100% rename from patches/server/0307-Add-Heightmap-API.patch rename to patches/server/0306-Add-Heightmap-API.patch diff --git a/patches/server/0308-Mob-Spawner-API-Enhancements.patch b/patches/server/0307-Mob-Spawner-API-Enhancements.patch similarity index 100% rename from patches/server/0308-Mob-Spawner-API-Enhancements.patch rename to patches/server/0307-Mob-Spawner-API-Enhancements.patch diff --git a/patches/server/0309-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/server/0308-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/0308-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/0309-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/0309-Fix-sounds-when-item-frames-are-modified-MC-123450.patch diff --git a/patches/server/0311-Implement-CraftBlockSoundGroup.patch b/patches/server/0310-Implement-CraftBlockSoundGroup.patch similarity index 100% rename from patches/server/0311-Implement-CraftBlockSoundGroup.patch rename to patches/server/0310-Implement-CraftBlockSoundGroup.patch diff --git a/patches/server/0312-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/server/0311-Configurable-Keep-Spawn-Loaded-range-per-world.patch similarity index 99% rename from patches/server/0312-Configurable-Keep-Spawn-Loaded-range-per-world.patch rename to patches/server/0311-Configurable-Keep-Spawn-Loaded-range-per-world.patch index 1b3f0d96b0..76abd46c7f 100644 --- a/patches/server/0312-Configurable-Keep-Spawn-Loaded-range-per-world.patch +++ b/patches/server/0311-Configurable-Keep-Spawn-Loaded-range-per-world.patch @@ -63,7 +63,7 @@ index af90bb579429336cc4e99386fd620c898c23d274..96fd66ed2742a79064852af6e936830d // this.updateMobSpawningFlags(); worldserver.setSpawnSettings(this.isSpawningMonsters(), this.isSpawningAnimals()); diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index a26138470065a720045e3079e5e96d6c4fa765ce..9d269ba80056eec6658501aa8217ee1eadf0aaf3 100644 +index d70e6744edcac48322bfeb8a7df814e65c752af4..6f88791ccea015b4a820782f46639adaae1f3447 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1883,12 +1883,84 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0313-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0312-Allow-Saving-of-Oversized-Chunks.patch similarity index 100% rename from patches/server/0313-Allow-Saving-of-Oversized-Chunks.patch rename to patches/server/0312-Allow-Saving-of-Oversized-Chunks.patch diff --git a/patches/server/0314-Expose-the-internal-current-tick.patch b/patches/server/0313-Expose-the-internal-current-tick.patch similarity index 100% rename from patches/server/0314-Expose-the-internal-current-tick.patch rename to patches/server/0313-Expose-the-internal-current-tick.patch diff --git a/patches/server/0315-Fix-World-isChunkGenerated-calls.patch b/patches/server/0314-Fix-World-isChunkGenerated-calls.patch similarity index 100% rename from patches/server/0315-Fix-World-isChunkGenerated-calls.patch rename to patches/server/0314-Fix-World-isChunkGenerated-calls.patch diff --git a/patches/server/0316-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/server/0315-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/0315-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/0316-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/0316-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch diff --git a/patches/server/0318-Configurable-projectile-relative-velocity.patch b/patches/server/0317-Configurable-projectile-relative-velocity.patch similarity index 100% rename from patches/server/0318-Configurable-projectile-relative-velocity.patch rename to patches/server/0317-Configurable-projectile-relative-velocity.patch diff --git a/patches/server/0319-offset-item-frame-ticking.patch b/patches/server/0318-offset-item-frame-ticking.patch similarity index 100% rename from patches/server/0319-offset-item-frame-ticking.patch rename to patches/server/0318-offset-item-frame-ticking.patch diff --git a/patches/server/0320-Fix-MC-158900.patch b/patches/server/0319-Fix-MC-158900.patch similarity index 94% rename from patches/server/0320-Fix-MC-158900.patch rename to patches/server/0319-Fix-MC-158900.patch index f38074f3e2..38342b5322 100644 --- a/patches/server/0320-Fix-MC-158900.patch +++ b/patches/server/0319-Fix-MC-158900.patch @@ -7,7 +7,7 @@ The problem was we were checking isExpired() on the entry, but if it was expired at that point, then it would be null. diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index ee1b40ef92e343e829040b8df5a2db67846f2982..29f1182026dade5b846ac411ff11260dbc9b5bc9 100644 +index b6bebb1eee1ee552b18860c8414f4866897c2bbd..68935845e9041706c2e203ff436f50d92c190a8f 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -627,8 +627,10 @@ public abstract class PlayerList { diff --git a/patches/server/0321-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0320-Prevent-consuming-the-wrong-itemstack.patch similarity index 100% rename from patches/server/0321-Prevent-consuming-the-wrong-itemstack.patch rename to patches/server/0320-Prevent-consuming-the-wrong-itemstack.patch diff --git a/patches/server/0322-Dont-send-unnecessary-sign-update.patch b/patches/server/0321-Dont-send-unnecessary-sign-update.patch similarity index 100% rename from patches/server/0322-Dont-send-unnecessary-sign-update.patch rename to patches/server/0321-Dont-send-unnecessary-sign-update.patch diff --git a/patches/server/0323-Add-option-to-disable-pillager-patrols.patch b/patches/server/0322-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/0322-Add-option-to-disable-pillager-patrols.patch diff --git a/patches/server/0324-Flat-bedrock-generator-settings.patch b/patches/server/0323-Flat-bedrock-generator-settings.patch similarity index 100% rename from patches/server/0324-Flat-bedrock-generator-settings.patch rename to patches/server/0323-Flat-bedrock-generator-settings.patch diff --git a/patches/server/0325-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0324-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/0324-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/0325-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/0325-MC-145656-Fix-Follow-Range-Initial-Target.patch diff --git a/patches/server/0327-Duplicate-UUID-Resolve-Option.patch b/patches/server/0326-Duplicate-UUID-Resolve-Option.patch similarity index 100% rename from patches/server/0327-Duplicate-UUID-Resolve-Option.patch rename to patches/server/0326-Duplicate-UUID-Resolve-Option.patch diff --git a/patches/server/0328-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0327-PlayerDeathEvent-shouldDropExperience.patch similarity index 100% rename from patches/server/0328-PlayerDeathEvent-shouldDropExperience.patch rename to patches/server/0327-PlayerDeathEvent-shouldDropExperience.patch diff --git a/patches/server/0329-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0328-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/0328-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/0329-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/0329-Don-t-load-Chunks-from-Hoppers-and-other-things.patch diff --git a/patches/server/0331-Optimise-EntityGetter-getPlayerByUUID.patch b/patches/server/0330-Optimise-EntityGetter-getPlayerByUUID.patch similarity index 94% rename from patches/server/0331-Optimise-EntityGetter-getPlayerByUUID.patch rename to patches/server/0330-Optimise-EntityGetter-getPlayerByUUID.patch index 37849cfe03..af603958ef 100644 --- a/patches/server/0331-Optimise-EntityGetter-getPlayerByUUID.patch +++ b/patches/server/0330-Optimise-EntityGetter-getPlayerByUUID.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Optimise EntityGetter#getPlayerByUUID Use the PlayerList map instead of iterating over all players diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 9d269ba80056eec6658501aa8217ee1eadf0aaf3..5e40d1570af4fb59647e9e2facf4229fe6df7887 100644 +index 6f88791ccea015b4a820782f46639adaae1f3447..6681f8a2e0a49a70edd40c32c95b2ff89c4f92af 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -554,6 +554,15 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0332-Fix-items-not-falling-correctly.patch b/patches/server/0331-Fix-items-not-falling-correctly.patch similarity index 100% rename from patches/server/0332-Fix-items-not-falling-correctly.patch rename to patches/server/0331-Fix-items-not-falling-correctly.patch diff --git a/patches/server/0333-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0332-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/0332-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/0333-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/0333-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/0334-Entity-Activation-Range-2.0.patch similarity index 99% rename from patches/server/0335-Entity-Activation-Range-2.0.patch rename to patches/server/0334-Entity-Activation-Range-2.0.patch index d196178d06..8a930530f5 100644 --- a/patches/server/0335-Entity-Activation-Range-2.0.patch +++ b/patches/server/0334-Entity-Activation-Range-2.0.patch @@ -18,7 +18,7 @@ public net.minecraft.world.entity.Entity isInsidePortal public net.minecraft.world.entity.LivingEntity jumping diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 5e40d1570af4fb59647e9e2facf4229fe6df7887..84a3f0d2b9c3ad2c1ad1cb68a154155c065a2a32 100644 +index 6681f8a2e0a49a70edd40c32c95b2ff89c4f92af..8718f4d458f0ab52b308e33814bbe30b460a0405 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -2,7 +2,6 @@ package net.minecraft.server.level; @@ -112,7 +112,7 @@ index 5e40d1570af4fb59647e9e2facf4229fe6df7887..84a3f0d2b9c3ad2c1ad1cb68a154155c } else { passenger.stopRiding(); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 75effaa34f06d85ee4e26d9a598acc85c94e9767..17471b840456e80a6a10947b2cf1e6daad05ea19 100644 +index 5397d84d790c32d369b0726db16571348285d8fb..b65c8b48c3a3dd71cb5945dca104cc67a1f2ce6d 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -395,6 +395,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S @@ -348,7 +348,7 @@ index b149e8bcac034bb3fc118a9adcb0de45e18ed5e9..fc35cfc9d045f3e5b6a50af1d0ba83b6 + } diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 53fd518e164ac774aab4484268abc836ccbbf60a..c9c7c9934a672adb1529aabc26f7f8bb5829b931 100644 +index f300b637466b7e591a4d7e19dd7cfefa7f954e6a..2e5b01cc9c438a2bee7eb770e4c266425a9d287f 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -163,6 +163,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0336-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/server/0335-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/0335-Guard-against-serializing-mismatching-chunk-coordina.patch diff --git a/patches/server/0337-Implement-alternative-item-despawn-rate.patch b/patches/server/0336-Implement-alternative-item-despawn-rate.patch similarity index 100% rename from patches/server/0337-Implement-alternative-item-despawn-rate.patch rename to patches/server/0336-Implement-alternative-item-despawn-rate.patch diff --git a/patches/server/0338-Tracking-Range-Improvements.patch b/patches/server/0337-Tracking-Range-Improvements.patch similarity index 100% rename from patches/server/0338-Tracking-Range-Improvements.patch rename to patches/server/0337-Tracking-Range-Improvements.patch diff --git a/patches/server/0339-Fix-items-vanishing-through-end-portal.patch b/patches/server/0338-Fix-items-vanishing-through-end-portal.patch similarity index 93% rename from patches/server/0339-Fix-items-vanishing-through-end-portal.patch rename to patches/server/0338-Fix-items-vanishing-through-end-portal.patch index a60f57aff0..2033b87738 100644 --- a/patches/server/0339-Fix-items-vanishing-through-end-portal.patch +++ b/patches/server/0338-Fix-items-vanishing-through-end-portal.patch @@ -13,7 +13,7 @@ Quickly loading the exact world spawn chunk before searching the heightmap resolves the issue without having to load all spawn chunks. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 17471b840456e80a6a10947b2cf1e6daad05ea19..2e6b700b3648d716f63dca46019f425d2919e912 100644 +index b65c8b48c3a3dd71cb5945dca104cc67a1f2ce6d..cf3742d3d771f6e0c71917bafda7027bd69b1aff 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3411,6 +3411,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0340-implement-optional-per-player-mob-spawns.patch b/patches/server/0339-implement-optional-per-player-mob-spawns.patch similarity index 99% rename from patches/server/0340-implement-optional-per-player-mob-spawns.patch rename to patches/server/0339-implement-optional-per-player-mob-spawns.patch index 5cd0c5834c..cf530597be 100644 --- a/patches/server/0340-implement-optional-per-player-mob-spawns.patch +++ b/patches/server/0339-implement-optional-per-player-mob-spawns.patch @@ -39,7 +39,7 @@ index 9b16464c4edf334093c9aa0bd164348197b96455..bd15131b7506e965bcf64be203307312 double d0 = (double) SectionPos.sectionToBlockCoord(pos.x, 8); double d1 = (double) SectionPos.sectionToBlockCoord(pos.z, 8); diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index d30373d369049827b5b7611d35c8b7fc8fc08d23..9478b18839932af463181311586c7f590c497356 100644 +index 058b4e79ac861e772e828b92aacffba7efe4bb7e..5011946a0f8144e617ec24f0ec51d40173d6f451 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java @@ -549,7 +549,19 @@ public class ServerChunkCache extends ChunkSource { diff --git a/patches/server/0341-Anti-Xray.patch b/patches/server/0340-Anti-Xray.patch similarity index 99% rename from patches/server/0341-Anti-Xray.patch rename to patches/server/0340-Anti-Xray.patch index 3ab41bd0f8..43e1aa46ee 100644 --- a/patches/server/0341-Anti-Xray.patch +++ b/patches/server/0340-Anti-Xray.patch @@ -1104,7 +1104,7 @@ index be89e5b8c1ea7f85aef267a15986affa5fa1fd4b..43472855136f26b282d94fd241853d86 public ClientboundLevelChunkWithLightPacket(FriendlyByteBuf buf) { diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 84a3f0d2b9c3ad2c1ad1cb68a154155c065a2a32..86403239e04ddf7afc3c1c1f1badb3ca53b6f26b 100644 +index 8718f4d458f0ab52b308e33814bbe30b460a0405..67a5f24fbcf5b618a76f5f59329d25af4e73b9d0 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -568,7 +568,7 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -1155,7 +1155,7 @@ index 5de5209e04d631bd6a50e28e8d3abebf148252c1..19b3f4fa7678a038bf25efc2a8b46dda 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 c9c7c9934a672adb1529aabc26f7f8bb5829b931..48b264c5e50a33ee9a1d60bf592964eb1b6c79ce 100644 +index 2e5b01cc9c438a2bee7eb770e4c266425a9d287f..35fd928c87403d98a80b6c13fa9df83496576c8f 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -178,6 +178,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0342-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0341-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/0341-Bees-get-gravity-in-void.-Fixes-MC-167279.patch diff --git a/patches/server/0343-Improve-Block-breakNaturally-API.patch b/patches/server/0342-Improve-Block-breakNaturally-API.patch similarity index 100% rename from patches/server/0343-Improve-Block-breakNaturally-API.patch rename to patches/server/0342-Improve-Block-breakNaturally-API.patch diff --git a/patches/server/0344-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0343-Optimise-getChunkAt-calls-for-loaded-chunks.patch similarity index 96% rename from patches/server/0344-Optimise-getChunkAt-calls-for-loaded-chunks.patch rename to patches/server/0343-Optimise-getChunkAt-calls-for-loaded-chunks.patch index 8270dafbce..e4a793399b 100644 --- a/patches/server/0344-Optimise-getChunkAt-calls-for-loaded-chunks.patch +++ b/patches/server/0343-Optimise-getChunkAt-calls-for-loaded-chunks.patch @@ -7,7 +7,7 @@ bypass the need to get a player chunk, then get the either, then unwrap it... diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index 9478b18839932af463181311586c7f590c497356..9adc447e89395f4d8564b0db7829ffccbb0f2344 100644 +index 5011946a0f8144e617ec24f0ec51d40173d6f451..c9688f21731030f0721e3d11795005a593e5bf53 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java @@ -268,6 +268,12 @@ public class ServerChunkCache extends ChunkSource { diff --git a/patches/server/0345-Add-debug-for-sync-chunk-loads.patch b/patches/server/0344-Add-debug-for-sync-chunk-loads.patch similarity index 98% rename from patches/server/0345-Add-debug-for-sync-chunk-loads.patch rename to patches/server/0344-Add-debug-for-sync-chunk-loads.patch index 4d4066f24b..16492a76a2 100644 --- a/patches/server/0345-Add-debug-for-sync-chunk-loads.patch +++ b/patches/server/0344-Add-debug-for-sync-chunk-loads.patch @@ -300,7 +300,7 @@ index 0000000000000000000000000000000000000000..95d6022c9cfb2e36ec5a71be6e343540 + } +} diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index 9adc447e89395f4d8564b0db7829ffccbb0f2344..3a8a4757b9b39b48cbedd65620a114130ae6ab1c 100644 +index c9688f21731030f0721e3d11795005a593e5bf53..f57d01e1137d73377652f4f118f859340f7bd681 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java @@ -292,6 +292,7 @@ public class ServerChunkCache extends ChunkSource { @@ -312,7 +312,7 @@ index 9adc447e89395f4d8564b0db7829ffccbb0f2344..3a8a4757b9b39b48cbedd65620a11413 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 86403239e04ddf7afc3c1c1f1badb3ca53b6f26b..da59ce7c1eda353d0a5479317f347d78a70e0f95 100644 +index 67a5f24fbcf5b618a76f5f59329d25af4e73b9d0..cfb28fbb860ac3d09589776d1b722cbb72d12de8 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -647,6 +647,13 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0346-Improve-java-version-check.patch b/patches/server/0345-Improve-java-version-check.patch similarity index 100% rename from patches/server/0346-Improve-java-version-check.patch rename to patches/server/0345-Improve-java-version-check.patch diff --git a/patches/server/0347-Add-ThrownEggHatchEvent.patch b/patches/server/0346-Add-ThrownEggHatchEvent.patch similarity index 100% rename from patches/server/0347-Add-ThrownEggHatchEvent.patch rename to patches/server/0346-Add-ThrownEggHatchEvent.patch diff --git a/patches/server/0348-Entity-Jump-API.patch b/patches/server/0347-Entity-Jump-API.patch similarity index 100% rename from patches/server/0348-Entity-Jump-API.patch rename to patches/server/0347-Entity-Jump-API.patch diff --git a/patches/server/0349-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0348-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/0348-Add-option-to-nerf-pigmen-from-nether-portals.patch diff --git a/patches/server/0350-Make-the-GUI-graph-fancier.patch b/patches/server/0349-Make-the-GUI-graph-fancier.patch similarity index 100% rename from patches/server/0350-Make-the-GUI-graph-fancier.patch rename to patches/server/0349-Make-the-GUI-graph-fancier.patch diff --git a/patches/server/0351-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0350-add-hand-to-BlockMultiPlaceEvent.patch similarity index 100% rename from patches/server/0351-add-hand-to-BlockMultiPlaceEvent.patch rename to patches/server/0350-add-hand-to-BlockMultiPlaceEvent.patch diff --git a/patches/server/0352-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0351-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/0351-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/0352-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/0352-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/0353-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/0353-Configurable-chance-of-villager-zombie-infection.patch diff --git a/patches/server/0355-Optimise-Chunk-getFluid.patch b/patches/server/0354-Optimise-Chunk-getFluid.patch similarity index 100% rename from patches/server/0355-Optimise-Chunk-getFluid.patch rename to patches/server/0354-Optimise-Chunk-getFluid.patch diff --git a/patches/server/0356-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0355-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/0355-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/0356-Add-tick-times-API-and-mspt-command.patch similarity index 100% rename from patches/server/0357-Add-tick-times-API-and-mspt-command.patch rename to patches/server/0356-Add-tick-times-API-and-mspt-command.patch diff --git a/patches/server/0358-Expose-MinecraftServer-isRunning.patch b/patches/server/0357-Expose-MinecraftServer-isRunning.patch similarity index 100% rename from patches/server/0358-Expose-MinecraftServer-isRunning.patch rename to patches/server/0357-Expose-MinecraftServer-isRunning.patch diff --git a/patches/server/0359-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0358-Add-Raw-Byte-ItemStack-Serialization.patch similarity index 100% rename from patches/server/0359-Add-Raw-Byte-ItemStack-Serialization.patch rename to patches/server/0358-Add-Raw-Byte-ItemStack-Serialization.patch diff --git a/patches/server/0360-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0359-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/0359-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/0360-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/0360-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/0361-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/0361-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/0362-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/0362-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch index 04e362d095..ce4fff308a 100644 --- a/patches/server/0363-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch +++ b/patches/server/0362-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch @@ -25,7 +25,7 @@ index bd15131b7506e965bcf64be20330731256a1e1f0..0e3c89b9d75160d0e8947d042a1568da 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 da59ce7c1eda353d0a5479317f347d78a70e0f95..a2c3a4b70ba4694fa6ce013bdf601e08f30cadae 100644 +index cfb28fbb860ac3d09589776d1b722cbb72d12de8..3ba431c4841a03018660f5137894b10298b417b9 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -2502,7 +2502,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0364-Don-t-tick-dead-players.patch b/patches/server/0363-Don-t-tick-dead-players.patch similarity index 100% rename from patches/server/0364-Don-t-tick-dead-players.patch rename to patches/server/0363-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/0364-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/0364-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/0365-Optimize-Collision-to-not-load-chunks.patch similarity index 97% rename from patches/server/0366-Optimize-Collision-to-not-load-chunks.patch rename to patches/server/0365-Optimize-Collision-to-not-load-chunks.patch index 2be6231d77..3d509bf03c 100644 --- a/patches/server/0366-Optimize-Collision-to-not-load-chunks.patch +++ b/patches/server/0365-Optimize-Collision-to-not-load-chunks.patch @@ -14,7 +14,7 @@ movement will load only the chunk the player enters anyways and avoids loading massive amounts of surrounding chunks due to large AABB lookups. diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 29f1182026dade5b846ac411ff11260dbc9b5bc9..0d662f0c7530538e39001d5cf52ee00246a20092 100644 +index 68935845e9041706c2e203ff436f50d92c190a8f..d4734253bb5f45b62a31aa5c260a414ce9979736 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -822,6 +822,7 @@ public abstract class PlayerList { @@ -26,7 +26,7 @@ index 29f1182026dade5b846ac411ff11260dbc9b5bc9..0d662f0c7530538e39001d5cf52ee002 // CraftBukkit end entityplayer1.setPos(entityplayer1.getX(), entityplayer1.getY() + 1.0D, entityplayer1.getZ()); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index aba3e8e8873ef9b782382b09c6f5e243744c18b8..28b69ad104810721bb8c78fe4bda616e8598109f 100644 +index 32558b5acfbc13f969d6d5c4e9a61d0beca6c41b..2e45aef27d9a9f224779357c649df796ddc16b8e 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -238,6 +238,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0367-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0366-Don-t-move-existing-players-to-world-spawn.patch similarity index 96% rename from patches/server/0367-Don-t-move-existing-players-to-world-spawn.patch rename to patches/server/0366-Don-t-move-existing-players-to-world-spawn.patch index 18e26db623..2134a7ae8d 100644 --- a/patches/server/0367-Don-t-move-existing-players-to-world-spawn.patch +++ b/patches/server/0366-Don-t-move-existing-players-to-world-spawn.patch @@ -35,7 +35,7 @@ index 4c0968ee547fe606b340ab28dfd391716745bc3f..ff0191dd75b5014e224db8f1419dcec2 this.gameMode.setLevel((ServerLevel) world); } diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 0d662f0c7530538e39001d5cf52ee00246a20092..1b49ac7da3c28712eeec7a5a3771105d4b28e3fa 100644 +index d4734253bb5f45b62a31aa5c260a414ce9979736..9036d9941b1597e14d3b25a5143d914248338800 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -226,6 +226,7 @@ public abstract class PlayerList { diff --git a/patches/server/0368-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0367-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/0367-Optimize-GoalSelector-Goal.Flag-Set-operations.patch diff --git a/patches/server/0369-Improved-Watchdog-Support.patch b/patches/server/0368-Improved-Watchdog-Support.patch similarity index 99% rename from patches/server/0369-Improved-Watchdog-Support.patch rename to patches/server/0368-Improved-Watchdog-Support.patch index df3f3a06a9..520fe4923f 100644 --- a/patches/server/0369-Improved-Watchdog-Support.patch +++ b/patches/server/0368-Improved-Watchdog-Support.patch @@ -271,7 +271,7 @@ index 109c7ff78d4c1f5496d294f52ecfd9df2070db1e..fe47a38137f7b7fa94c507e790eec4fb } diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 1b49ac7da3c28712eeec7a5a3771105d4b28e3fa..96c1938a83cf70b76a3b547cd96a7d395a1b9d7e 100644 +index 9036d9941b1597e14d3b25a5143d914248338800..f644c8b89e96d35fb9f2ac7941dcfcf9e8b66451 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -532,7 +532,7 @@ public abstract class PlayerList { @@ -296,7 +296,7 @@ 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 48b264c5e50a33ee9a1d60bf592964eb1b6c79ce..7a604d2679c65b15e6d651e65c0475404aee9592 100644 +index 35fd928c87403d98a80b6c13fa9df83496576c8f..179a7708a5f4674b31a87c49ca3d5c4c4dbd4b65 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -915,6 +915,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0370-Optimize-Pathfinding.patch b/patches/server/0369-Optimize-Pathfinding.patch similarity index 100% rename from patches/server/0370-Optimize-Pathfinding.patch rename to patches/server/0369-Optimize-Pathfinding.patch diff --git a/patches/server/0371-Reduce-Either-Optional-allocation.patch b/patches/server/0370-Reduce-Either-Optional-allocation.patch similarity index 100% rename from patches/server/0371-Reduce-Either-Optional-allocation.patch rename to patches/server/0370-Reduce-Either-Optional-allocation.patch diff --git a/patches/server/0372-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/server/0371-Reduce-memory-footprint-of-NBTTagCompound.patch similarity index 100% rename from patches/server/0372-Reduce-memory-footprint-of-NBTTagCompound.patch rename to patches/server/0371-Reduce-memory-footprint-of-NBTTagCompound.patch diff --git a/patches/server/0373-Prevent-opening-inventories-when-frozen.patch b/patches/server/0372-Prevent-opening-inventories-when-frozen.patch similarity index 100% rename from patches/server/0373-Prevent-opening-inventories-when-frozen.patch rename to patches/server/0372-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/0373-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/0373-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/0374-Implement-Player-Client-Options-API.patch similarity index 99% rename from patches/server/0375-Implement-Player-Client-Options-API.patch rename to patches/server/0374-Implement-Player-Client-Options-API.patch index 9101a071e8..32141f17e0 100644 --- a/patches/server/0375-Implement-Player-Client-Options-API.patch +++ b/patches/server/0374-Implement-Player-Client-Options-API.patch @@ -136,7 +136,7 @@ index 3a026f766e2d67e005ae8a06337d465f92c8d1f3..352fbab070ccdb683e9a7558292c86cc this.adventure$locale = net.kyori.adventure.translation.Translator.parseLocale(this.language); // Paper this.requestedViewDistance = clientOptions.viewDistance(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 629a3cdefd42c09bb2561a56a725357b40ef9ce2..706ff6991f36da3b7c55cc4aa88f3cceba2b3f2d 100644 +index 54dbe08e2ed589ad6d67d1940467255e2d3d1978..20e1dfb1c5616b93b20139c2023fbac54348e0cd 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -615,6 +615,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0376-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0375-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/0375-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/0376-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch similarity index 98% rename from patches/server/0377-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch rename to patches/server/0376-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch index e5671be840..e3c1343a13 100644 --- a/patches/server/0377-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch +++ b/patches/server/0376-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch @@ -55,7 +55,7 @@ index 352fbab070ccdb683e9a7558292c86cc443c018b..b2e980c1f2e2ec417f75fbd7bdd2188f // CraftBukkit end public boolean isRealPlayer; // Paper diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 96c1938a83cf70b76a3b547cd96a7d395a1b9d7e..c81818c77954aed263fd8e8a7d214ddd012f3d71 100644 +index f644c8b89e96d35fb9f2ac7941dcfcf9e8b66451..3986d49b0e3405248913a685c44b27d091c4152e 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -295,6 +295,12 @@ public abstract class PlayerList { diff --git a/patches/server/0378-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0377-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch similarity index 97% rename from patches/server/0378-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch rename to patches/server/0377-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch index 997b9cf038..7dc5f051b4 100644 --- a/patches/server/0378-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch +++ b/patches/server/0377-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch @@ -10,7 +10,7 @@ Co-authored-by: Wyatt Childers Co-authored-by: Jake Potrebic diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index c81818c77954aed263fd8e8a7d214ddd012f3d71..ac5e83589b812290032773755f51c89107ccb5a4 100644 +index 3986d49b0e3405248913a685c44b27d091c4152e..6d61e70d1d5ad5bce6432f91d3b23c1734ad629c 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -194,7 +194,7 @@ public abstract class PlayerList { @@ -87,7 +87,7 @@ index c81818c77954aed263fd8e8a7d214ddd012f3d71..ac5e83589b812290032773755f51c891 } // Paper end diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 28b69ad104810721bb8c78fe4bda616e8598109f..9626b9827dcf5bf86c95b210d2ec9b4285239a97 100644 +index 2e45aef27d9a9f224779357c649df796ddc16b8e..88aa0ef38590c291d02b930e86d7e9f8e8958422 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2335,27 +2335,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0379-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0378-Add-PlayerAttackEntityCooldownResetEvent.patch similarity index 100% rename from patches/server/0379-Add-PlayerAttackEntityCooldownResetEvent.patch rename to patches/server/0378-Add-PlayerAttackEntityCooldownResetEvent.patch diff --git a/patches/server/0380-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0379-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/0379-Don-t-fire-BlockFade-on-worldgen-threads.patch diff --git a/patches/server/0381-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0380-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/0380-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/0381-Fix-numerous-item-duplication-issues-and-teleport-is.patch similarity index 98% rename from patches/server/0382-Fix-numerous-item-duplication-issues-and-teleport-is.patch rename to patches/server/0381-Fix-numerous-item-duplication-issues-and-teleport-is.patch index a4f8c5ec2e..176b39b9fb 100644 --- a/patches/server/0382-Fix-numerous-item-duplication-issues-and-teleport-is.patch +++ b/patches/server/0381-Fix-numerous-item-duplication-issues-and-teleport-is.patch @@ -16,7 +16,7 @@ So even if something NEW comes up, it would be impossible to drop the same item twice because the source was destroyed. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 9626b9827dcf5bf86c95b210d2ec9b4285239a97..b3d50a16748a295aa952c22e90708ea33a7af992 100644 +index 88aa0ef38590c291d02b930e86d7e9f8e8958422..5d56c6650ecac018e7404395fa75e80e19f070fb 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2465,11 +2465,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S @@ -113,7 +113,7 @@ index 9eea89e4c3ec5f999ec7f5773f4c37209211c173..4b1366a456e7132d438fc99bd62e1dd7 this.drops = new ArrayList<>(); // CraftBukkit end diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java -index 2512e7757fa9135bfaf436790f5fce815d43b9ee..17b6649a7e36fc9322f857e83551d8a99f4f288d 100644 +index 810bead2f19de70786027b190137f743a0c40ee7..4f9afae94a4cbf28a532e889d441c63df50642d9 100644 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java @@ -624,7 +624,7 @@ public class ArmorStand extends LivingEntity { diff --git a/patches/server/0383-Villager-Restocks-API.patch b/patches/server/0382-Villager-Restocks-API.patch similarity index 100% rename from patches/server/0383-Villager-Restocks-API.patch rename to patches/server/0382-Villager-Restocks-API.patch diff --git a/patches/server/0384-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0383-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/0383-Validate-PickItem-Packet-and-kick-for-invalid.patch diff --git a/patches/server/0385-Expose-game-version.patch b/patches/server/0384-Expose-game-version.patch similarity index 100% rename from patches/server/0385-Expose-game-version.patch rename to patches/server/0384-Expose-game-version.patch diff --git a/patches/server/0386-Optimize-Voxel-Shape-Merging.patch b/patches/server/0385-Optimize-Voxel-Shape-Merging.patch similarity index 100% rename from patches/server/0386-Optimize-Voxel-Shape-Merging.patch rename to patches/server/0385-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/0386-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/0386-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch diff --git a/patches/server/0388-misc-debugging-dumps.patch b/patches/server/0387-misc-debugging-dumps.patch similarity index 100% rename from patches/server/0388-misc-debugging-dumps.patch rename to patches/server/0387-misc-debugging-dumps.patch diff --git a/patches/server/0389-Prevent-teleporting-dead-entities.patch b/patches/server/0388-Prevent-teleporting-dead-entities.patch similarity index 100% rename from patches/server/0389-Prevent-teleporting-dead-entities.patch rename to patches/server/0388-Prevent-teleporting-dead-entities.patch diff --git a/patches/server/0390-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0389-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/0389-Deobfuscate-stacktraces-in-log-messages-crash-report.patch index 46fbee9223..2a1c6327f5 100644 --- a/patches/server/0390-Deobfuscate-stacktraces-in-log-messages-crash-report.patch +++ b/patches/server/0389-Deobfuscate-stacktraces-in-log-messages-crash-report.patch @@ -557,7 +557,7 @@ index fe47a38137f7b7fa94c507e790eec4fb7303595f..7f5ecea0ee78a534d7c56fa9e3ad2117 paperConfigurations.initializeWorldDefaultsConfiguration(this.registryAccess()); 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 a2c3a4b70ba4694fa6ce013bdf601e08f30cadae..8dc958dca402346d94d84c3d5c073cf00c438cee 100644 +index 3ba431c4841a03018660f5137894b10298b417b9..fe1ec3aa37b1750467f59fe6ec653900d54ddff0 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -223,7 +223,9 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0391-Implement-Mob-Goal-API.patch b/patches/server/0390-Implement-Mob-Goal-API.patch similarity index 100% rename from patches/server/0391-Implement-Mob-Goal-API.patch rename to patches/server/0390-Implement-Mob-Goal-API.patch diff --git a/patches/server/0392-Add-villager-reputation-API.patch b/patches/server/0391-Add-villager-reputation-API.patch similarity index 100% rename from patches/server/0392-Add-villager-reputation-API.patch rename to patches/server/0391-Add-villager-reputation-API.patch diff --git a/patches/server/0393-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0392-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/0392-Option-for-maximum-exp-value-when-merging-orbs.patch diff --git a/patches/server/0394-ExperienceOrbMergeEvent.patch b/patches/server/0393-ExperienceOrbMergeEvent.patch similarity index 100% rename from patches/server/0394-ExperienceOrbMergeEvent.patch rename to patches/server/0393-ExperienceOrbMergeEvent.patch diff --git a/patches/server/0395-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0394-Fix-PotionEffect-ignores-icon-flag.patch similarity index 100% rename from patches/server/0395-Fix-PotionEffect-ignores-icon-flag.patch rename to patches/server/0394-Fix-PotionEffect-ignores-icon-flag.patch diff --git a/patches/server/0396-Optimize-brigadier-child-sorting-performance.patch b/patches/server/0395-Optimize-brigadier-child-sorting-performance.patch similarity index 100% rename from patches/server/0396-Optimize-brigadier-child-sorting-performance.patch rename to patches/server/0395-Optimize-brigadier-child-sorting-performance.patch diff --git a/patches/server/0397-Potential-bed-API.patch b/patches/server/0396-Potential-bed-API.patch similarity index 100% rename from patches/server/0397-Potential-bed-API.patch rename to patches/server/0396-Potential-bed-API.patch diff --git a/patches/server/0398-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0397-Wait-for-Async-Tasks-during-shutdown.patch similarity index 100% rename from patches/server/0398-Wait-for-Async-Tasks-during-shutdown.patch rename to patches/server/0397-Wait-for-Async-Tasks-during-shutdown.patch diff --git a/patches/server/0399-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0398-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/0398-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/0399-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch similarity index 99% rename from patches/server/0400-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch rename to patches/server/0399-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch index 99941d8036..3318713b1f 100644 --- a/patches/server/0400-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch +++ b/patches/server/0399-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch @@ -25,7 +25,7 @@ index 120151da61398ea8afcd658a8407efcf738b9476..b7cf13fe4a0af243c0e76d75439b28d5 if (!this.level.isInWorldBounds(blockposition)) { diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 7a604d2679c65b15e6d651e65c0475404aee9592..121f82c3e27d0c1e935871ab0e7c994393e73398 100644 +index 179a7708a5f4674b31a87c49ca3d5c4c4dbd4b65..d89b6c99e1cf4c6171ea6f2dad1e812760707603 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -521,6 +521,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0401-Ensure-safe-gateway-teleport.patch b/patches/server/0400-Ensure-safe-gateway-teleport.patch similarity index 100% rename from patches/server/0401-Ensure-safe-gateway-teleport.patch rename to patches/server/0400-Ensure-safe-gateway-teleport.patch diff --git a/patches/server/0402-Add-option-for-console-having-all-permissions.patch b/patches/server/0401-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/0401-Add-option-for-console-having-all-permissions.patch diff --git a/patches/server/0403-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0402-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/0402-Fix-villager-trading-demand-MC-163962.patch diff --git a/patches/server/0404-Maps-shouldn-t-load-chunks.patch b/patches/server/0403-Maps-shouldn-t-load-chunks.patch similarity index 100% rename from patches/server/0404-Maps-shouldn-t-load-chunks.patch rename to patches/server/0403-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/0404-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/0404-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/0405-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch similarity index 100% rename from patches/server/0406-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch rename to patches/server/0405-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch diff --git a/patches/server/0407-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0406-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/0406-Fix-piston-physics-inconsistency-MC-188840.patch diff --git a/patches/server/0408-Fix-sand-duping.patch b/patches/server/0407-Fix-sand-duping.patch similarity index 100% rename from patches/server/0408-Fix-sand-duping.patch rename to patches/server/0407-Fix-sand-duping.patch diff --git a/patches/server/0409-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0408-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/0408-Fix-missing-chunks-due-to-integer-overflow.patch diff --git a/patches/server/0410-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/server/0409-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/0409-Prevent-position-desync-in-playerconnection-causing-.patch diff --git a/patches/server/0411-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0410-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/0410-Inventory-getHolder-method-without-block-snapshot.patch diff --git a/patches/server/0412-Improve-Arrow-API.patch b/patches/server/0411-Improve-Arrow-API.patch similarity index 100% rename from patches/server/0412-Improve-Arrow-API.patch rename to patches/server/0411-Improve-Arrow-API.patch diff --git a/patches/server/0413-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0412-Add-and-implement-PlayerRecipeBookClickEvent.patch similarity index 100% rename from patches/server/0413-Add-and-implement-PlayerRecipeBookClickEvent.patch rename to patches/server/0412-Add-and-implement-PlayerRecipeBookClickEvent.patch diff --git a/patches/server/0414-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/0413-Use-distance-map-to-optimise-entity-tracker.patch similarity index 99% rename from patches/server/0414-Use-distance-map-to-optimise-entity-tracker.patch rename to patches/server/0413-Use-distance-map-to-optimise-entity-tracker.patch index 63137a0b5a..b0bbb8a721 100644 --- a/patches/server/0414-Use-distance-map-to-optimise-entity-tracker.patch +++ b/patches/server/0413-Use-distance-map-to-optimise-entity-tracker.patch @@ -236,7 +236,7 @@ index 8d12a6da0f0679fd14c2a498f9645bd04b2d8ed7..290a231deb203eb46cb91eb23c28d8e9 return object instanceof ChunkMap.TrackedEntity ? ((ChunkMap.TrackedEntity) object).entity.getId() == this.entity.getId() : false; } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index b3d50a16748a295aa952c22e90708ea33a7af992..1ad820b4954f11d2bab92708eb0c44739317603e 100644 +index 5d56c6650ecac018e7404395fa75e80e19f070fb..5ffcb63bafc11cca5e04c85605cc71cf6c29e812 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -56,6 +56,7 @@ import net.minecraft.network.syncher.EntityDataSerializers; diff --git a/patches/server/0415-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0414-Hide-sync-chunk-writes-behind-flag.patch similarity index 100% rename from patches/server/0415-Hide-sync-chunk-writes-behind-flag.patch rename to patches/server/0414-Hide-sync-chunk-writes-behind-flag.patch diff --git a/patches/server/0416-Add-permission-for-command-blocks.patch b/patches/server/0415-Add-permission-for-command-blocks.patch similarity index 100% rename from patches/server/0416-Add-permission-for-command-blocks.patch rename to patches/server/0415-Add-permission-for-command-blocks.patch diff --git a/patches/server/0417-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0416-Ensure-Entity-AABB-s-are-never-invalid.patch similarity index 95% rename from patches/server/0417-Ensure-Entity-AABB-s-are-never-invalid.patch rename to patches/server/0416-Ensure-Entity-AABB-s-are-never-invalid.patch index 3100d0d71c..f436d1a9ab 100644 --- a/patches/server/0417-Ensure-Entity-AABB-s-are-never-invalid.patch +++ b/patches/server/0416-Ensure-Entity-AABB-s-are-never-invalid.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Ensure Entity AABB's are never invalid diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 1ad820b4954f11d2bab92708eb0c44739317603e..76a1803f806d3bf1a54dae15d8155d6a0920cf07 100644 +index 5ffcb63bafc11cca5e04c85605cc71cf6c29e812..0924677535ba455a2118f7022bdd361c609022d4 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -726,8 +726,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0418-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0417-Fix-Per-World-Difficulty-Remembering-Difficulty.patch similarity index 100% rename from patches/server/0418-Fix-Per-World-Difficulty-Remembering-Difficulty.patch rename to patches/server/0417-Fix-Per-World-Difficulty-Remembering-Difficulty.patch diff --git a/patches/server/0419-Paper-dumpitem-command.patch b/patches/server/0418-Paper-dumpitem-command.patch similarity index 100% rename from patches/server/0419-Paper-dumpitem-command.patch rename to patches/server/0418-Paper-dumpitem-command.patch diff --git a/patches/server/0420-Improve-Legacy-Component-serialization-size.patch b/patches/server/0419-Improve-Legacy-Component-serialization-size.patch similarity index 100% rename from patches/server/0420-Improve-Legacy-Component-serialization-size.patch rename to patches/server/0419-Improve-Legacy-Component-serialization-size.patch diff --git a/patches/server/0421-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0420-Optimize-Bit-Operations-by-inlining.patch similarity index 100% rename from patches/server/0421-Optimize-Bit-Operations-by-inlining.patch rename to patches/server/0420-Optimize-Bit-Operations-by-inlining.patch diff --git a/patches/server/0422-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0421-Add-Plugin-Tickets-to-API-Chunk-Methods.patch similarity index 100% rename from patches/server/0422-Add-Plugin-Tickets-to-API-Chunk-Methods.patch rename to patches/server/0421-Add-Plugin-Tickets-to-API-Chunk-Methods.patch diff --git a/patches/server/0423-initial-work-on-native-Adventure-codecs.patch b/patches/server/0422-initial-work-on-native-Adventure-codecs.patch similarity index 100% rename from patches/server/0423-initial-work-on-native-Adventure-codecs.patch rename to patches/server/0422-initial-work-on-native-Adventure-codecs.patch diff --git a/patches/server/0424-incremental-chunk-and-player-saving.patch b/patches/server/0423-incremental-chunk-and-player-saving.patch similarity index 96% rename from patches/server/0424-incremental-chunk-and-player-saving.patch rename to patches/server/0423-incremental-chunk-and-player-saving.patch index e51a56080a..c4c7dc3bd5 100644 --- a/patches/server/0424-incremental-chunk-and-player-saving.patch +++ b/patches/server/0423-incremental-chunk-and-player-saving.patch @@ -56,7 +56,7 @@ index 87e0cc467a2139e763130a375387b6df46336992..a82f7dd2cbc2f6311b810f117f0970a4 // Paper start - move executeAll() into full server tick timing try (co.aikar.timings.Timing ignored = MinecraftTimings.processTasksTimer.startTiming()) { diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index 3a8a4757b9b39b48cbedd65620a114130ae6ab1c..e725dd92ae15f62b078bda3572d0663468f37939 100644 +index f57d01e1137d73377652f4f118f859340f7bd681..18dceb057ff13679e7caa4b8028ec2e9b5e29381 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java @@ -450,6 +450,15 @@ public class ServerChunkCache extends ChunkSource { @@ -76,7 +76,7 @@ index 3a8a4757b9b39b48cbedd65620a114130ae6ab1c..e725dd92ae15f62b078bda3572d06634 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 8dc958dca402346d94d84c3d5c073cf00c438cee..d9fafffc52b5db0b55022c02b9321d47a2b49827 100644 +index fe1ec3aa37b1750467f59fe6ec653900d54ddff0..e2296d2add58b599ea105434cc511b964a978774 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1302,6 +1302,37 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -130,7 +130,7 @@ index 898403dad5e9bac4b565e1c75871245fe5cd7908..25c5f23b859961c792b2ec08404171ee private static final int NEUTRAL_MOB_DEATH_NOTIFICATION_RADII_Y = 10; private static final int FLY_STAT_RECORDING_SPEED = 25; diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index ac5e83589b812290032773755f51c89107ccb5a4..ccf715d1ddb029ebadbab88be8ef1e914b5220be 100644 +index 6d61e70d1d5ad5bce6432f91d3b23c1734ad629c..ed686f82dfd264a6b5d0a89163786574525f043e 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -552,6 +552,7 @@ public abstract class PlayerList { diff --git a/patches/server/0425-Support-old-UUID-format-for-NBT.patch b/patches/server/0424-Support-old-UUID-format-for-NBT.patch similarity index 100% rename from patches/server/0425-Support-old-UUID-format-for-NBT.patch rename to patches/server/0424-Support-old-UUID-format-for-NBT.patch diff --git a/patches/server/0426-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0425-Convert-legacy-attributes-in-Item-Meta.patch similarity index 100% rename from patches/server/0426-Convert-legacy-attributes-in-Item-Meta.patch rename to patches/server/0425-Convert-legacy-attributes-in-Item-Meta.patch diff --git a/patches/server/0427-Remove-some-streams-from-structures.patch b/patches/server/0426-Remove-some-streams-from-structures.patch similarity index 100% rename from patches/server/0427-Remove-some-streams-from-structures.patch rename to patches/server/0426-Remove-some-streams-from-structures.patch diff --git a/patches/server/0428-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0427-Remove-streams-from-classes-related-villager-gossip.patch similarity index 100% rename from patches/server/0428-Remove-streams-from-classes-related-villager-gossip.patch rename to patches/server/0427-Remove-streams-from-classes-related-villager-gossip.patch diff --git a/patches/server/0429-Support-components-in-ItemMeta.patch b/patches/server/0428-Support-components-in-ItemMeta.patch similarity index 100% rename from patches/server/0429-Support-components-in-ItemMeta.patch rename to patches/server/0428-Support-components-in-ItemMeta.patch diff --git a/patches/server/0430-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/server/0429-Improve-fix-EntityTargetLivingEntityEvent.patch similarity index 100% rename from patches/server/0430-Improve-fix-EntityTargetLivingEntityEvent.patch rename to patches/server/0429-Improve-fix-EntityTargetLivingEntityEvent.patch diff --git a/patches/server/0431-Add-entity-liquid-API.patch b/patches/server/0430-Add-entity-liquid-API.patch similarity index 100% rename from patches/server/0431-Add-entity-liquid-API.patch rename to patches/server/0430-Add-entity-liquid-API.patch diff --git a/patches/server/0432-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0431-Update-itemstack-legacy-name-and-lore.patch similarity index 100% rename from patches/server/0432-Update-itemstack-legacy-name-and-lore.patch rename to patches/server/0431-Update-itemstack-legacy-name-and-lore.patch diff --git a/patches/server/0433-Add-PrepareResultEvent.patch b/patches/server/0432-Add-PrepareResultEvent.patch similarity index 100% rename from patches/server/0433-Add-PrepareResultEvent.patch rename to patches/server/0432-Add-PrepareResultEvent.patch diff --git a/patches/server/0434-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0433-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch similarity index 100% rename from patches/server/0434-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch rename to patches/server/0433-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch diff --git a/patches/server/0435-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0434-Fix-arrows-never-despawning-MC-125757.patch similarity index 100% rename from patches/server/0435-Fix-arrows-never-despawning-MC-125757.patch rename to patches/server/0434-Fix-arrows-never-despawning-MC-125757.patch diff --git a/patches/server/0436-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0435-Thread-Safe-Vanilla-Command-permission-checking.patch similarity index 100% rename from patches/server/0436-Thread-Safe-Vanilla-Command-permission-checking.patch rename to patches/server/0435-Thread-Safe-Vanilla-Command-permission-checking.patch diff --git a/patches/server/0437-Fix-SPIGOT-5989.patch b/patches/server/0436-Fix-SPIGOT-5989.patch similarity index 97% rename from patches/server/0437-Fix-SPIGOT-5989.patch rename to patches/server/0436-Fix-SPIGOT-5989.patch index 44a0f6091d..6b4d6c7bc1 100644 --- a/patches/server/0437-Fix-SPIGOT-5989.patch +++ b/patches/server/0436-Fix-SPIGOT-5989.patch @@ -10,7 +10,7 @@ This fixes that by checking if the modified spawn location is still at a respawn anchor. diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index ccf715d1ddb029ebadbab88be8ef1e914b5220be..7f05a1c3847c36699d3c9acbb1d7cd05363c94c5 100644 +index ed686f82dfd264a6b5d0a89163786574525f043e..e9c19cb33ce1ca81b81dbf9dc927289a8ab0520d 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -808,6 +808,7 @@ public abstract class PlayerList { diff --git a/patches/server/0438-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0437-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch similarity index 100% rename from patches/server/0438-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch rename to patches/server/0437-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch diff --git a/patches/server/0439-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0438-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch similarity index 100% rename from patches/server/0439-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch rename to patches/server/0438-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch diff --git a/patches/server/0440-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0439-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch similarity index 100% rename from patches/server/0440-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch rename to patches/server/0439-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch diff --git a/patches/server/0441-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0440-Optimize-NetworkManager-Exception-Handling.patch similarity index 100% rename from patches/server/0441-Optimize-NetworkManager-Exception-Handling.patch rename to patches/server/0440-Optimize-NetworkManager-Exception-Handling.patch diff --git a/patches/server/0442-Fix-some-rails-connecting-improperly.patch b/patches/server/0441-Fix-some-rails-connecting-improperly.patch similarity index 100% rename from patches/server/0442-Fix-some-rails-connecting-improperly.patch rename to patches/server/0441-Fix-some-rails-connecting-improperly.patch diff --git a/patches/server/0443-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0442-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch similarity index 100% rename from patches/server/0443-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch rename to patches/server/0442-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch diff --git a/patches/server/0444-Brand-support.patch b/patches/server/0443-Brand-support.patch similarity index 98% rename from patches/server/0444-Brand-support.patch rename to patches/server/0443-Brand-support.patch index 5001b165f4..9acc6313b2 100644 --- a/patches/server/0444-Brand-support.patch +++ b/patches/server/0443-Brand-support.patch @@ -57,7 +57,7 @@ index 6b53e65308fb4118ef2d78ec9d171722ba2301f5..2d0ce31011ce1dbbf3c86f09bbf9a41a } catch (Exception ex) { ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 706ff6991f36da3b7c55cc4aa88f3cceba2b3f2d..559878d9dad24e0c90c317ad9be593f7ccbc05ad 100644 +index 20e1dfb1c5616b93b20139c2023fbac54348e0cd..b46bd98bd94f26227cecd2f2265e27df940fb2a5 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -3021,6 +3021,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0445-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0444-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from patches/server/0445-Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/server/0444-Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/patches/server/0446-Don-t-require-FACING-data.patch b/patches/server/0445-Don-t-require-FACING-data.patch similarity index 100% rename from patches/server/0446-Don-t-require-FACING-data.patch rename to patches/server/0445-Don-t-require-FACING-data.patch diff --git a/patches/server/0447-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0446-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch similarity index 96% rename from patches/server/0447-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch rename to patches/server/0446-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch index ce59435ff9..9054284c93 100644 --- a/patches/server/0447-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch +++ b/patches/server/0446-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 d9fafffc52b5db0b55022c02b9321d47a2b49827..a9a724f1e586c7e04e88bc1ff8dff442d83aaf16 100644 +index e2296d2add58b599ea105434cc511b964a978774..7dca6f99beff7d2ce3631a3c4ea299fcf6bf2b3a 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -2020,9 +2020,11 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0448-Add-moon-phase-API.patch b/patches/server/0447-Add-moon-phase-API.patch similarity index 100% rename from patches/server/0448-Add-moon-phase-API.patch rename to patches/server/0447-Add-moon-phase-API.patch diff --git a/patches/server/0449-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0448-Do-not-let-the-server-load-chunks-from-newer-version.patch similarity index 100% rename from patches/server/0449-Do-not-let-the-server-load-chunks-from-newer-version.patch rename to patches/server/0448-Do-not-let-the-server-load-chunks-from-newer-version.patch diff --git a/patches/server/0450-Prevent-headless-pistons-from-being-created.patch b/patches/server/0449-Prevent-headless-pistons-from-being-created.patch similarity index 100% rename from patches/server/0450-Prevent-headless-pistons-from-being-created.patch rename to patches/server/0449-Prevent-headless-pistons-from-being-created.patch diff --git a/patches/server/0451-Add-BellRingEvent.patch b/patches/server/0450-Add-BellRingEvent.patch similarity index 100% rename from patches/server/0451-Add-BellRingEvent.patch rename to patches/server/0450-Add-BellRingEvent.patch diff --git a/patches/server/0452-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0451-Add-zombie-targets-turtle-egg-config.patch similarity index 100% rename from patches/server/0452-Add-zombie-targets-turtle-egg-config.patch rename to patches/server/0451-Add-zombie-targets-turtle-egg-config.patch diff --git a/patches/server/0453-Buffer-joins-to-world.patch b/patches/server/0452-Buffer-joins-to-world.patch similarity index 100% rename from patches/server/0453-Buffer-joins-to-world.patch rename to patches/server/0452-Buffer-joins-to-world.patch diff --git a/patches/server/0454-Eigencraft-redstone-implementation.patch b/patches/server/0453-Eigencraft-redstone-implementation.patch similarity index 100% rename from patches/server/0454-Eigencraft-redstone-implementation.patch rename to patches/server/0453-Eigencraft-redstone-implementation.patch diff --git a/patches/server/0455-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0454-Fix-hex-colors-not-working-in-some-kick-messages.patch similarity index 100% rename from patches/server/0455-Fix-hex-colors-not-working-in-some-kick-messages.patch rename to patches/server/0454-Fix-hex-colors-not-working-in-some-kick-messages.patch diff --git a/patches/server/0456-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0455-PortalCreateEvent-needs-to-know-its-entity.patch similarity index 100% rename from patches/server/0456-PortalCreateEvent-needs-to-know-its-entity.patch rename to patches/server/0455-PortalCreateEvent-needs-to-know-its-entity.patch diff --git a/patches/server/0457-Add-more-Evoker-API.patch b/patches/server/0456-Add-more-Evoker-API.patch similarity index 100% rename from patches/server/0457-Add-more-Evoker-API.patch rename to patches/server/0456-Add-more-Evoker-API.patch diff --git a/patches/server/0458-Add-methods-to-get-translation-keys.patch b/patches/server/0457-Add-methods-to-get-translation-keys.patch similarity index 100% rename from patches/server/0458-Add-methods-to-get-translation-keys.patch rename to patches/server/0457-Add-methods-to-get-translation-keys.patch diff --git a/patches/server/0459-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0458-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from patches/server/0459-Create-HoverEvent-from-ItemStack-Entity.patch rename to patches/server/0458-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/patches/server/0460-Cache-block-data-strings.patch b/patches/server/0459-Cache-block-data-strings.patch similarity index 100% rename from patches/server/0460-Cache-block-data-strings.patch rename to patches/server/0459-Cache-block-data-strings.patch diff --git a/patches/server/0461-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0460-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch similarity index 98% rename from patches/server/0461-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch rename to patches/server/0460-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch index 514bbe29cc..a7c24784c3 100644 --- a/patches/server/0461-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch +++ b/patches/server/0460-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch @@ -31,7 +31,7 @@ index dce7e232b4e2c2a7aa997da1c6aef955f8846e17..45b8c7520c5a966fa0923dd8f616f30c } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 76a1803f806d3bf1a54dae15d8155d6a0920cf07..2693057247bc2640c043db1baf50c579d4058a68 100644 +index 0924677535ba455a2118f7022bdd361c609022d4..452789dc47393580374bf438e6229b1e6cd3832b 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -160,6 +160,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0462-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0461-Add-additional-open-container-api-to-HumanEntity.patch similarity index 100% rename from patches/server/0462-Add-additional-open-container-api-to-HumanEntity.patch rename to patches/server/0461-Add-additional-open-container-api-to-HumanEntity.patch diff --git a/patches/server/0463-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0462-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch similarity index 100% rename from patches/server/0463-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch rename to patches/server/0462-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch diff --git a/patches/server/0464-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0463-Extend-block-drop-capture-to-capture-all-items-added.patch similarity index 96% rename from patches/server/0464-Extend-block-drop-capture-to-capture-all-items-added.patch rename to patches/server/0463-Extend-block-drop-capture-to-capture-all-items-added.patch index 8484d72776..f24d6009f7 100644 --- a/patches/server/0464-Extend-block-drop-capture-to-capture-all-items-added.patch +++ b/patches/server/0463-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 a9a724f1e586c7e04e88bc1ff8dff442d83aaf16..2ce0a851bc0989bb0fe294b92a9aa428c38ba266 100644 +index 7dca6f99beff7d2ce3631a3c4ea299fcf6bf2b3a..bbd1940c5520bbdc0fa1dd177e41f2670957fdd5 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1528,6 +1528,12 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0465-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0464-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch similarity index 88% rename from patches/server/0465-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch rename to patches/server/0464-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch index 900933f30e..35e55d554a 100644 --- a/patches/server/0465-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch +++ b/patches/server/0464-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Expose the Entity Counter to allow plugins to use valid and diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 2693057247bc2640c043db1baf50c579d4058a68..fa48ed90623106065f4b84f2ffbf889ae70842eb 100644 +index 452789dc47393580374bf438e6229b1e6cd3832b..e3275f09f48c9e69179fd17901d4294ddb68a435 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -4493,4 +4493,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S @@ -21,7 +21,7 @@ index 2693057247bc2640c043db1baf50c579d4058a68..fa48ed90623106065f4b84f2ffbf889a + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index a394298df60ddd0aa709f9e250520da9db8c9589..5d1df87177b3d6a5f4c4b1f12bbbba7b597f2911 100644 +index 2ff5d2c357a4832e2624ef53fb0110d61fddc6fc..88deea72f7456c178f54f6a245c84a64ffab6926 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -504,6 +504,11 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0466-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0465-Lazily-track-plugin-scoreboards-by-default.patch similarity index 100% rename from patches/server/0466-Lazily-track-plugin-scoreboards-by-default.patch rename to patches/server/0465-Lazily-track-plugin-scoreboards-by-default.patch diff --git a/patches/server/0467-Entity-isTicking.patch b/patches/server/0466-Entity-isTicking.patch similarity index 93% rename from patches/server/0467-Entity-isTicking.patch rename to patches/server/0466-Entity-isTicking.patch index 8c369bbc3f..e03bc39974 100644 --- a/patches/server/0467-Entity-isTicking.patch +++ b/patches/server/0466-Entity-isTicking.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Entity#isTicking diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index fa48ed90623106065f4b84f2ffbf889ae70842eb..f0158217eceeaf73555a741957324ce0258fa6b2 100644 +index e3275f09f48c9e69179fd17901d4294ddb68a435..46637e6913e5f2aae0be6aa67b95f1fe604b021e 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -4498,5 +4498,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0468-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0467-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch similarity index 100% rename from patches/server/0468-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch rename to patches/server/0467-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch diff --git a/patches/server/0469-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0468-Fix-Concurrency-issue-in-ShufflingList.patch similarity index 100% rename from patches/server/0469-Fix-Concurrency-issue-in-ShufflingList.patch rename to patches/server/0468-Fix-Concurrency-issue-in-ShufflingList.patch diff --git a/patches/server/0470-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0469-Reset-Ender-Crystals-on-Dragon-Spawn.patch similarity index 100% rename from patches/server/0470-Reset-Ender-Crystals-on-Dragon-Spawn.patch rename to patches/server/0469-Reset-Ender-Crystals-on-Dragon-Spawn.patch diff --git a/patches/server/0471-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0470-Fix-for-large-move-vectors-crashing-server.patch similarity index 100% rename from patches/server/0471-Fix-for-large-move-vectors-crashing-server.patch rename to patches/server/0470-Fix-for-large-move-vectors-crashing-server.patch diff --git a/patches/server/0472-Optimise-getType-calls.patch b/patches/server/0471-Optimise-getType-calls.patch similarity index 100% rename from patches/server/0472-Optimise-getType-calls.patch rename to patches/server/0471-Optimise-getType-calls.patch diff --git a/patches/server/0473-Villager-resetOffers.patch b/patches/server/0472-Villager-resetOffers.patch similarity index 100% rename from patches/server/0473-Villager-resetOffers.patch rename to patches/server/0472-Villager-resetOffers.patch diff --git a/patches/server/0474-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0473-Retain-block-place-order-when-capturing-blockstates.patch similarity index 93% rename from patches/server/0474-Retain-block-place-order-when-capturing-blockstates.patch rename to patches/server/0473-Retain-block-place-order-when-capturing-blockstates.patch index 4394091ee3..2d7288e3c4 100644 --- a/patches/server/0474-Retain-block-place-order-when-capturing-blockstates.patch +++ b/patches/server/0473-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 121f82c3e27d0c1e935871ab0e7c994393e73398..bdf11c543fe8904585eda72dc92206ac22daff58 100644 +index d89b6c99e1cf4c6171ea6f2dad1e812760707603..f9b37892ca92f0fb4943088ad6c4f1f48db287c6 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -160,7 +160,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0475-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0474-Reduce-blockpos-allocation-from-pathfinding.patch similarity index 100% rename from patches/server/0475-Reduce-blockpos-allocation-from-pathfinding.patch rename to patches/server/0474-Reduce-blockpos-allocation-from-pathfinding.patch diff --git a/patches/server/0476-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0475-Fix-item-locations-dropped-from-campfires.patch similarity index 100% rename from patches/server/0476-Fix-item-locations-dropped-from-campfires.patch rename to patches/server/0475-Fix-item-locations-dropped-from-campfires.patch diff --git a/patches/server/0477-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0476-Fixed-TileEntityBell-memory-leak.patch similarity index 100% rename from patches/server/0477-Fixed-TileEntityBell-memory-leak.patch rename to patches/server/0476-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/0477-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/0477-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch diff --git a/patches/server/0479-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0478-Add-getOfflinePlayerIfCached-String.patch similarity index 100% rename from patches/server/0479-Add-getOfflinePlayerIfCached-String.patch rename to patches/server/0478-Add-getOfflinePlayerIfCached-String.patch diff --git a/patches/server/0480-Add-ignore-discounts-API.patch b/patches/server/0479-Add-ignore-discounts-API.patch similarity index 100% rename from patches/server/0480-Add-ignore-discounts-API.patch rename to patches/server/0479-Add-ignore-discounts-API.patch diff --git a/patches/server/0481-Toggle-for-removing-existing-dragon.patch b/patches/server/0480-Toggle-for-removing-existing-dragon.patch similarity index 100% rename from patches/server/0481-Toggle-for-removing-existing-dragon.patch rename to patches/server/0480-Toggle-for-removing-existing-dragon.patch diff --git a/patches/server/0482-Fix-client-lag-on-advancement-loading.patch b/patches/server/0481-Fix-client-lag-on-advancement-loading.patch similarity index 95% rename from patches/server/0482-Fix-client-lag-on-advancement-loading.patch rename to patches/server/0481-Fix-client-lag-on-advancement-loading.patch index 0b59c874f4..68881e20e8 100644 --- a/patches/server/0482-Fix-client-lag-on-advancement-loading.patch +++ b/patches/server/0481-Fix-client-lag-on-advancement-loading.patch @@ -15,7 +15,7 @@ manually reload the advancement data for all players, which normally takes place as a part of the datapack reloading. diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 5d1df87177b3d6a5f4c4b1f12bbbba7b597f2911..5930cc6af2d73e6301b0ebe59ea53e0a7ea2098a 100644 +index 88deea72f7456c178f54f6a245c84a64ffab6926..bcf88a137616b83f3400afd18c6fe9f3b2b2db34 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -329,7 +329,13 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0483-Item-no-age-no-player-pickup.patch b/patches/server/0482-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/0482-Item-no-age-no-player-pickup.patch diff --git a/patches/server/0484-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0483-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/0483-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch diff --git a/patches/server/0485-Beacon-API-custom-effect-ranges.patch b/patches/server/0484-Beacon-API-custom-effect-ranges.patch similarity index 100% rename from patches/server/0485-Beacon-API-custom-effect-ranges.patch rename to patches/server/0484-Beacon-API-custom-effect-ranges.patch diff --git a/patches/server/0486-Add-API-for-quit-reason.patch b/patches/server/0485-Add-API-for-quit-reason.patch similarity index 98% rename from patches/server/0486-Add-API-for-quit-reason.patch rename to patches/server/0485-Add-API-for-quit-reason.patch index 0b31510646..6f8d023e01 100644 --- a/patches/server/0486-Add-API-for-quit-reason.patch +++ b/patches/server/0485-Add-API-for-quit-reason.patch @@ -49,7 +49,7 @@ index 2d0ce31011ce1dbbf3c86f09bbf9a41a6e4a158f..156e49d682be26f0962cae960acaef61 this.connection.disconnect(ichatbasecomponent); })); diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 7f05a1c3847c36699d3c9acbb1d7cd05363c94c5..f57be0d9111582b279f5ee6988f56068b9b63968 100644 +index e9c19cb33ce1ca81b81dbf9dc927289a8ab0520d..d101376e05abb72aa874c11fe820fdee469302b1 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -579,7 +579,7 @@ public abstract class PlayerList { diff --git a/patches/server/0487-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0486-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/0486-Add-Wandering-Trader-spawn-rate-config-options.patch diff --git a/patches/server/0488-Expose-world-spawn-angle.patch b/patches/server/0487-Expose-world-spawn-angle.patch similarity index 91% rename from patches/server/0488-Expose-world-spawn-angle.patch rename to patches/server/0487-Expose-world-spawn-angle.patch index 3185d4efb6..80e8e1b939 100644 --- a/patches/server/0488-Expose-world-spawn-angle.patch +++ b/patches/server/0487-Expose-world-spawn-angle.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Expose world spawn angle diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index f57be0d9111582b279f5ee6988f56068b9b63968..5d1af62e7d06f1fbcfe1eec0293ca3065a88454f 100644 +index d101376e05abb72aa874c11fe820fdee469302b1..3ae3d47f3b94b4626f37ffbca1d2d958931b3b71 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -851,7 +851,7 @@ public abstract class PlayerList { diff --git a/patches/server/0489-Add-Destroy-Speed-API.patch b/patches/server/0488-Add-Destroy-Speed-API.patch similarity index 100% rename from patches/server/0489-Add-Destroy-Speed-API.patch rename to patches/server/0488-Add-Destroy-Speed-API.patch diff --git a/patches/server/0490-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0489-Fix-Player-spawnParticle-x-y-z-precision-loss.patch similarity index 93% rename from patches/server/0490-Fix-Player-spawnParticle-x-y-z-precision-loss.patch rename to patches/server/0489-Fix-Player-spawnParticle-x-y-z-precision-loss.patch index bff2784ef1..612ff88032 100644 --- a/patches/server/0490-Fix-Player-spawnParticle-x-y-z-precision-loss.patch +++ b/patches/server/0489-Fix-Player-spawnParticle-x-y-z-precision-loss.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix Player spawnParticle x/y/z precision loss diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 559878d9dad24e0c90c317ad9be593f7ccbc05ad..dc901d056051e6300d78a2949ca6b42169316c3e 100644 +index b46bd98bd94f26227cecd2f2265e27df940fb2a5..d65b493e9ed4f9cd57f787185691d0511a5de854 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2545,7 +2545,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0491-Add-LivingEntity-clearActiveItem.patch b/patches/server/0490-Add-LivingEntity-clearActiveItem.patch similarity index 100% rename from patches/server/0491-Add-LivingEntity-clearActiveItem.patch rename to patches/server/0490-Add-LivingEntity-clearActiveItem.patch diff --git a/patches/server/0492-Add-PlayerItemCooldownEvent.patch b/patches/server/0491-Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/server/0492-Add-PlayerItemCooldownEvent.patch rename to patches/server/0491-Add-PlayerItemCooldownEvent.patch diff --git a/patches/server/0493-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0492-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/0492-Significantly-improve-performance-of-the-end-generat.patch diff --git a/patches/server/0494-More-lightning-API.patch b/patches/server/0493-More-lightning-API.patch similarity index 100% rename from patches/server/0494-More-lightning-API.patch rename to patches/server/0493-More-lightning-API.patch diff --git a/patches/server/0495-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0494-Climbing-should-not-bypass-cramming-gamerule.patch similarity index 97% rename from patches/server/0495-Climbing-should-not-bypass-cramming-gamerule.patch rename to patches/server/0494-Climbing-should-not-bypass-cramming-gamerule.patch index 6f67ee4787..ade6b3feea 100644 --- a/patches/server/0495-Climbing-should-not-bypass-cramming-gamerule.patch +++ b/patches/server/0494-Climbing-should-not-bypass-cramming-gamerule.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Climbing should not bypass cramming gamerule diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index f0158217eceeaf73555a741957324ce0258fa6b2..90621d3dfe8660f9b389ed292a3582a5dbb726bd 100644 +index 46637e6913e5f2aae0be6aa67b95f1fe604b021e..28d12ffb79a29be67b6476ae7fa87b557f55839f 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2062,6 +2062,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S @@ -116,7 +116,7 @@ index 6b7453281e32aae20778f26b4098df418401c45b..a13a1725356ca4430f1f0a6d121fc086 } diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java -index 17b6649a7e36fc9322f857e83551d8a99f4f288d..483d8c627a60e04f66f0135a8d64e6d5366e0997 100644 +index 4f9afae94a4cbf28a532e889d441c63df50642d9..d46b3b346540cc78cb93f3ce8bc8adc89b3d9b3d 100644 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java @@ -343,7 +343,7 @@ public class ArmorStand extends LivingEntity { diff --git a/patches/server/0496-Added-missing-default-perms-for-commands.patch b/patches/server/0495-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/0495-Added-missing-default-perms-for-commands.patch diff --git a/patches/server/0497-Add-PlayerShearBlockEvent.patch b/patches/server/0496-Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/server/0497-Add-PlayerShearBlockEvent.patch rename to patches/server/0496-Add-PlayerShearBlockEvent.patch diff --git a/patches/server/0498-Limit-recipe-packets.patch b/patches/server/0497-Limit-recipe-packets.patch similarity index 100% rename from patches/server/0498-Limit-recipe-packets.patch rename to patches/server/0497-Limit-recipe-packets.patch diff --git a/patches/server/0499-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0498-Fix-CraftSound-backwards-compatibility.patch similarity index 100% rename from patches/server/0499-Fix-CraftSound-backwards-compatibility.patch rename to patches/server/0498-Fix-CraftSound-backwards-compatibility.patch diff --git a/patches/server/0500-Player-Chunk-Load-Unload-Events.patch b/patches/server/0499-Player-Chunk-Load-Unload-Events.patch similarity index 100% rename from patches/server/0500-Player-Chunk-Load-Unload-Events.patch rename to patches/server/0499-Player-Chunk-Load-Unload-Events.patch diff --git a/patches/server/0501-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0500-Optimize-Dynamic-get-Missing-Keys.patch similarity index 100% rename from patches/server/0501-Optimize-Dynamic-get-Missing-Keys.patch rename to patches/server/0500-Optimize-Dynamic-get-Missing-Keys.patch diff --git a/patches/server/0502-Expose-LivingEntity-hurt-direction.patch b/patches/server/0501-Expose-LivingEntity-hurt-direction.patch similarity index 100% rename from patches/server/0502-Expose-LivingEntity-hurt-direction.patch rename to patches/server/0501-Expose-LivingEntity-hurt-direction.patch diff --git a/patches/server/0503-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0502-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from patches/server/0503-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/server/0502-Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/patches/server/0504-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0503-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch similarity index 100% rename from patches/server/0504-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch rename to patches/server/0503-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch diff --git a/patches/server/0505-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0504-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch similarity index 100% rename from patches/server/0505-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch rename to patches/server/0504-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch diff --git a/patches/server/0506-Implement-TargetHitEvent.patch b/patches/server/0505-Implement-TargetHitEvent.patch similarity index 100% rename from patches/server/0506-Implement-TargetHitEvent.patch rename to patches/server/0505-Implement-TargetHitEvent.patch diff --git a/patches/server/0507-MC-4-Fix-item-position-desync.patch b/patches/server/0506-MC-4-Fix-item-position-desync.patch similarity index 96% rename from patches/server/0507-MC-4-Fix-item-position-desync.patch rename to patches/server/0506-MC-4-Fix-item-position-desync.patch index f253480e4a..48a9f48a82 100644 --- a/patches/server/0507-MC-4-Fix-item-position-desync.patch +++ b/patches/server/0506-MC-4-Fix-item-position-desync.patch @@ -28,7 +28,7 @@ index 05ac41e136da43284fb24a6b698ebd36318278fb..33d9131e9c75ef23cd637f5d6c39a270 public Vec3 decode(long x, long y, long z) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 90621d3dfe8660f9b389ed292a3582a5dbb726bd..e68874f8d3d7628d11c1164849a4f835399d2452 100644 +index 28d12ffb79a29be67b6476ae7fa87b557f55839f..a0c70b204007a906076d3a1f28c84521ad4471c4 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -4269,6 +4269,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0508-Additional-Block-Material-API-s.patch b/patches/server/0507-Additional-Block-Material-API-s.patch similarity index 100% rename from patches/server/0508-Additional-Block-Material-API-s.patch rename to patches/server/0507-Additional-Block-Material-API-s.patch diff --git a/patches/server/0509-Fix-harming-potion-dupe.patch b/patches/server/0508-Fix-harming-potion-dupe.patch similarity index 100% rename from patches/server/0509-Fix-harming-potion-dupe.patch rename to patches/server/0508-Fix-harming-potion-dupe.patch diff --git a/patches/server/0510-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0509-Implement-API-to-get-Material-from-Boats-and-Minecar.patch similarity index 100% rename from patches/server/0510-Implement-API-to-get-Material-from-Boats-and-Minecar.patch rename to patches/server/0509-Implement-API-to-get-Material-from-Boats-and-Minecar.patch diff --git a/patches/server/0511-Cache-burn-durations.patch b/patches/server/0510-Cache-burn-durations.patch similarity index 100% rename from patches/server/0511-Cache-burn-durations.patch rename to patches/server/0510-Cache-burn-durations.patch diff --git a/patches/server/0512-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0511-Allow-disabling-mob-spawner-spawn-egg-transformation.patch similarity index 51% rename from patches/server/0512-Allow-disabling-mob-spawner-spawn-egg-transformation.patch rename to patches/server/0511-Allow-disabling-mob-spawner-spawn-egg-transformation.patch index 5fedca1570..7580ba7931 100644 --- a/patches/server/0512-Allow-disabling-mob-spawner-spawn-egg-transformation.patch +++ b/patches/server/0511-Allow-disabling-mob-spawner-spawn-egg-transformation.patch @@ -5,22 +5,15 @@ Subject: [PATCH] Allow disabling mob spawner spawn egg transformation diff --git a/src/main/java/net/minecraft/world/item/SpawnEggItem.java b/src/main/java/net/minecraft/world/item/SpawnEggItem.java -index 8176b64e49166cc24ef7f011881fda38bc68c2a4..591291d3d872d505a6031048c21b2cbeeb5394b2 100644 +index 8176b64e49166cc24ef7f011881fda38bc68c2a4..4f10f801dc126e9135432939b6663770c0e7a0bc 100644 --- a/src/main/java/net/minecraft/world/item/SpawnEggItem.java +++ b/src/main/java/net/minecraft/world/item/SpawnEggItem.java -@@ -63,6 +63,7 @@ public class SpawnEggItem extends Item { +@@ -63,6 +63,8 @@ public class SpawnEggItem extends Item { EntityType entitytypes; if (tileentity instanceof Spawner) { -+ if (!world.paperConfig().entities.spawning.disableMobSpawnerSpawnEggTransformation) { // Paper - add condition ++ if (world.paperConfig().entities.spawning.disableMobSpawnerSpawnEggTransformation) return InteractionResult.FAIL; // Paper ++ Spawner spawner = (Spawner) tileentity; entitytypes = this.getType(itemstack.getTag()); -@@ -71,6 +72,7 @@ public class SpawnEggItem extends Item { - world.gameEvent((Entity) context.getPlayer(), GameEvent.BLOCK_CHANGE, blockposition); - itemstack.shrink(1); - return InteractionResult.CONSUME; -+ } // Paper - end if - } else { - BlockPos blockposition1; - diff --git a/patches/server/0513-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0512-Fix-Not-a-string-Map-Conversion-spam.patch similarity index 100% rename from patches/server/0513-Fix-Not-a-string-Map-Conversion-spam.patch rename to patches/server/0512-Fix-Not-a-string-Map-Conversion-spam.patch diff --git a/patches/server/0514-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0513-Implement-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/server/0514-Implement-PlayerFlowerPotManipulateEvent.patch rename to patches/server/0513-Implement-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/server/0515-Fix-interact-event-not-being-called-sometimes.patch b/patches/server/0514-Fix-interact-event-not-being-called-sometimes.patch similarity index 100% rename from patches/server/0515-Fix-interact-event-not-being-called-sometimes.patch rename to patches/server/0514-Fix-interact-event-not-being-called-sometimes.patch diff --git a/patches/server/0516-Zombie-API-breaking-doors.patch b/patches/server/0515-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/server/0516-Zombie-API-breaking-doors.patch rename to patches/server/0515-Zombie-API-breaking-doors.patch diff --git a/patches/server/0517-Fix-nerfed-slime-when-splitting.patch b/patches/server/0516-Fix-nerfed-slime-when-splitting.patch similarity index 100% rename from patches/server/0517-Fix-nerfed-slime-when-splitting.patch rename to patches/server/0516-Fix-nerfed-slime-when-splitting.patch diff --git a/patches/server/0518-Add-EntityLoadCrossbowEvent.patch b/patches/server/0517-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/server/0518-Add-EntityLoadCrossbowEvent.patch rename to patches/server/0517-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/server/0519-Added-WorldGameRuleChangeEvent.patch b/patches/server/0518-Added-WorldGameRuleChangeEvent.patch similarity index 100% rename from patches/server/0519-Added-WorldGameRuleChangeEvent.patch rename to patches/server/0518-Added-WorldGameRuleChangeEvent.patch diff --git a/patches/server/0520-Added-ServerResourcesReloadedEvent.patch b/patches/server/0519-Added-ServerResourcesReloadedEvent.patch similarity index 100% rename from patches/server/0520-Added-ServerResourcesReloadedEvent.patch rename to patches/server/0519-Added-ServerResourcesReloadedEvent.patch diff --git a/patches/server/0521-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0520-Added-world-settings-for-mobs-picking-up-loot.patch similarity index 100% rename from patches/server/0521-Added-world-settings-for-mobs-picking-up-loot.patch rename to patches/server/0520-Added-world-settings-for-mobs-picking-up-loot.patch diff --git a/patches/server/0522-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0521-Implemented-BlockFailedDispenseEvent.patch similarity index 100% rename from patches/server/0522-Implemented-BlockFailedDispenseEvent.patch rename to patches/server/0521-Implemented-BlockFailedDispenseEvent.patch diff --git a/patches/server/0523-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0522-Added-PlayerLecternPageChangeEvent.patch similarity index 100% rename from patches/server/0523-Added-PlayerLecternPageChangeEvent.patch rename to patches/server/0522-Added-PlayerLecternPageChangeEvent.patch diff --git a/patches/server/0524-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0523-Added-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from patches/server/0524-Added-PlayerLoomPatternSelectEvent.patch rename to patches/server/0523-Added-PlayerLoomPatternSelectEvent.patch diff --git a/patches/server/0525-Configurable-door-breaking-difficulty.patch b/patches/server/0524-Configurable-door-breaking-difficulty.patch similarity index 100% rename from patches/server/0525-Configurable-door-breaking-difficulty.patch rename to patches/server/0524-Configurable-door-breaking-difficulty.patch diff --git a/patches/server/0526-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0525-Empty-commands-shall-not-be-dispatched.patch similarity index 100% rename from patches/server/0526-Empty-commands-shall-not-be-dispatched.patch rename to patches/server/0525-Empty-commands-shall-not-be-dispatched.patch diff --git a/patches/server/0527-Remove-stale-POIs.patch b/patches/server/0526-Remove-stale-POIs.patch similarity index 91% rename from patches/server/0527-Remove-stale-POIs.patch rename to patches/server/0526-Remove-stale-POIs.patch index 2da820387f..a9dbe9d6ea 100644 --- a/patches/server/0527-Remove-stale-POIs.patch +++ b/patches/server/0526-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 2ce0a851bc0989bb0fe294b92a9aa428c38ba266..b02cb4229533568ed270737aa8cd792f23a44524 100644 +index bbd1940c5520bbdc0fa1dd177e41f2670957fdd5..6d5e73a5c582192d9e569471b6bc025ec84cc547 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -2089,6 +2089,11 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0528-Fix-villager-boat-exploit.patch b/patches/server/0527-Fix-villager-boat-exploit.patch similarity index 93% rename from patches/server/0528-Fix-villager-boat-exploit.patch rename to patches/server/0527-Fix-villager-boat-exploit.patch index 11379f98f0..53da0387cc 100644 --- a/patches/server/0528-Fix-villager-boat-exploit.patch +++ b/patches/server/0527-Fix-villager-boat-exploit.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix villager boat exploit diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 5d1af62e7d06f1fbcfe1eec0293ca3065a88454f..0d6ee2bce8e4243912e9c90999002a7efd68ac71 100644 +index 3ae3d47f3b94b4626f37ffbca1d2d958931b3b71..1131ee88f35c3898f0119c414c8376b0d9130169 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -604,6 +604,14 @@ public abstract class PlayerList { diff --git a/patches/server/0529-Add-sendOpLevel-API.patch b/patches/server/0528-Add-sendOpLevel-API.patch similarity index 92% rename from patches/server/0529-Add-sendOpLevel-API.patch rename to patches/server/0528-Add-sendOpLevel-API.patch index 22fec1fa81..6b1ea0674d 100644 --- a/patches/server/0529-Add-sendOpLevel-API.patch +++ b/patches/server/0528-Add-sendOpLevel-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add sendOpLevel API diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 0d6ee2bce8e4243912e9c90999002a7efd68ac71..c76245eccdfbfc22c8c5bc9c04471259769b3ab1 100644 +index 1131ee88f35c3898f0119c414c8376b0d9130169..bf361396bc2ec5d5c7b45d425af990c037ba0694 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -1099,6 +1099,11 @@ public abstract class PlayerList { @@ -32,7 +32,7 @@ index 0d6ee2bce8e4243912e9c90999002a7efd68ac71..c76245eccdfbfc22c8c5bc9c04471259 public boolean isWhiteListed(GameProfile profile) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index dc901d056051e6300d78a2949ca6b42169316c3e..7fbe129062a36e6e41d564989901cdab272109df 100644 +index d65b493e9ed4f9cd57f787185691d0511a5de854..a3557443f484e4046823e8b08f2fd55c6967bdea 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -639,6 +639,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0530-TODO-Registry-Modification-API.patch b/patches/server/0529-TODO-Registry-Modification-API.patch similarity index 100% rename from patches/server/0530-TODO-Registry-Modification-API.patch rename to patches/server/0529-TODO-Registry-Modification-API.patch diff --git a/patches/server/0531-Add-StructuresLocateEvent.patch b/patches/server/0530-Add-StructuresLocateEvent.patch similarity index 100% rename from patches/server/0531-Add-StructuresLocateEvent.patch rename to patches/server/0530-Add-StructuresLocateEvent.patch diff --git a/patches/server/0532-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0531-Collision-option-for-requiring-a-player-participant.patch similarity index 96% rename from patches/server/0532-Collision-option-for-requiring-a-player-participant.patch rename to patches/server/0531-Collision-option-for-requiring-a-player-participant.patch index 817dd32f23..a6df151a0e 100644 --- a/patches/server/0532-Collision-option-for-requiring-a-player-participant.patch +++ b/patches/server/0531-Collision-option-for-requiring-a-player-participant.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Collision option for requiring a player participant diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index e68874f8d3d7628d11c1164849a4f835399d2452..3aa34902d4325c1ac2ad9d64ae2e5fa36a6d88e9 100644 +index a0c70b204007a906076d3a1f28c84521ad4471c4..3b2c100c678dab10f72483769fba6cbf3371d377 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1932,6 +1932,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0533-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0532-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch similarity index 100% rename from patches/server/0533-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch rename to patches/server/0532-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch diff --git a/patches/server/0534-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0533-Return-chat-component-with-empty-text-instead-of-thr.patch similarity index 100% rename from patches/server/0534-Return-chat-component-with-empty-text-instead-of-thr.patch rename to patches/server/0533-Return-chat-component-with-empty-text-instead-of-thr.patch diff --git a/patches/server/0535-Make-schedule-command-per-world.patch b/patches/server/0534-Make-schedule-command-per-world.patch similarity index 100% rename from patches/server/0535-Make-schedule-command-per-world.patch rename to patches/server/0534-Make-schedule-command-per-world.patch diff --git a/patches/server/0536-Configurable-max-leash-distance.patch b/patches/server/0535-Configurable-max-leash-distance.patch similarity index 100% rename from patches/server/0536-Configurable-max-leash-distance.patch rename to patches/server/0535-Configurable-max-leash-distance.patch diff --git a/patches/server/0537-Implement-BlockPreDispenseEvent.patch b/patches/server/0536-Implement-BlockPreDispenseEvent.patch similarity index 100% rename from patches/server/0537-Implement-BlockPreDispenseEvent.patch rename to patches/server/0536-Implement-BlockPreDispenseEvent.patch diff --git a/patches/server/0538-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0537-Added-firing-of-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/server/0538-Added-firing-of-PlayerChangeBeaconEffectEvent.patch rename to patches/server/0537-Added-firing-of-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/server/0539-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0538-Add-toggle-for-always-placing-the-dragon-egg.patch similarity index 100% rename from patches/server/0539-Add-toggle-for-always-placing-the-dragon-egg.patch rename to patches/server/0538-Add-toggle-for-always-placing-the-dragon-egg.patch diff --git a/patches/server/0540-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0539-Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/server/0540-Added-PlayerStonecutterRecipeSelectEvent.patch rename to patches/server/0539-Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/server/0541-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0540-Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 100% rename from patches/server/0541-Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to patches/server/0540-Add-dropLeash-variable-to-EntityUnleashEvent.patch diff --git a/patches/server/0542-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0541-Reset-shield-blocking-on-dimension-change.patch similarity index 100% rename from patches/server/0542-Reset-shield-blocking-on-dimension-change.patch rename to patches/server/0541-Reset-shield-blocking-on-dimension-change.patch diff --git a/patches/server/0543-add-DragonEggFormEvent.patch b/patches/server/0542-add-DragonEggFormEvent.patch similarity index 100% rename from patches/server/0543-add-DragonEggFormEvent.patch rename to patches/server/0542-add-DragonEggFormEvent.patch diff --git a/patches/server/0544-EntityMoveEvent.patch b/patches/server/0543-EntityMoveEvent.patch similarity index 97% rename from patches/server/0544-EntityMoveEvent.patch rename to patches/server/0543-EntityMoveEvent.patch index ef35d6716b..959895a4c7 100644 --- a/patches/server/0544-EntityMoveEvent.patch +++ b/patches/server/0543-EntityMoveEvent.patch @@ -17,7 +17,7 @@ index c063dece36e110691297b38635a9d14d70c4e391..5f440e3d3a750c65d0d13834eca553b8 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 b02cb4229533568ed270737aa8cd792f23a44524..86f6c89459ba0f7b304348f22e2c3ad5b47014c4 100644 +index 6d5e73a5c582192d9e569471b6bc025ec84cc547..21866ac2fd37362fd888b29b180a6aeb2b128d42 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 { diff --git a/patches/server/0545-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0544-added-option-to-disable-pathfinding-updates-on-block.patch similarity index 91% rename from patches/server/0545-added-option-to-disable-pathfinding-updates-on-block.patch rename to patches/server/0544-added-option-to-disable-pathfinding-updates-on-block.patch index 4aedbe63b9..17bc3654a3 100644 --- a/patches/server/0545-added-option-to-disable-pathfinding-updates-on-block.patch +++ b/patches/server/0544-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 86f6c89459ba0f7b304348f22e2c3ad5b47014c4..b3f8607221c3508fa8a8435bec1d490c7b05cd91 100644 +index 21866ac2fd37362fd888b29b180a6aeb2b128d42..721a9ebaa2710ed26ecdf52ce3be26da7d91aa4b 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1673,6 +1673,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0546-Inline-shift-direction-fields.patch b/patches/server/0545-Inline-shift-direction-fields.patch similarity index 100% rename from patches/server/0546-Inline-shift-direction-fields.patch rename to patches/server/0545-Inline-shift-direction-fields.patch diff --git a/patches/server/0547-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0546-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/server/0547-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/server/0546-Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/server/0548-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0547-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/server/0548-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/server/0547-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/server/0549-living-entity-allow-attribute-registration.patch b/patches/server/0548-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/server/0549-living-entity-allow-attribute-registration.patch rename to patches/server/0548-living-entity-allow-attribute-registration.patch diff --git a/patches/server/0550-fix-dead-slime-setSize-invincibility.patch b/patches/server/0549-fix-dead-slime-setSize-invincibility.patch similarity index 100% rename from patches/server/0550-fix-dead-slime-setSize-invincibility.patch rename to patches/server/0549-fix-dead-slime-setSize-invincibility.patch diff --git a/patches/server/0551-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0550-Merchant-getRecipes-should-return-an-immutable-list.patch similarity index 100% rename from patches/server/0551-Merchant-getRecipes-should-return-an-immutable-list.patch rename to patches/server/0550-Merchant-getRecipes-should-return-an-immutable-list.patch diff --git a/patches/server/0552-Expose-Tracked-Players.patch b/patches/server/0551-Expose-Tracked-Players.patch similarity index 100% rename from patches/server/0552-Expose-Tracked-Players.patch rename to patches/server/0551-Expose-Tracked-Players.patch diff --git a/patches/server/0553-Remove-streams-from-SensorNearest.patch b/patches/server/0552-Remove-streams-from-SensorNearest.patch similarity index 100% rename from patches/server/0553-Remove-streams-from-SensorNearest.patch rename to patches/server/0552-Remove-streams-from-SensorNearest.patch diff --git a/patches/server/0554-Improve-ServerGUI.patch b/patches/server/0553-Improve-ServerGUI.patch similarity index 100% rename from patches/server/0554-Improve-ServerGUI.patch rename to patches/server/0553-Improve-ServerGUI.patch diff --git a/patches/server/0555-fix-converting-txt-to-json-file.patch b/patches/server/0554-fix-converting-txt-to-json-file.patch similarity index 97% rename from patches/server/0555-fix-converting-txt-to-json-file.patch rename to patches/server/0554-fix-converting-txt-to-json-file.patch index 4dd2dcb8f6..5ba9235c6a 100644 --- a/patches/server/0555-fix-converting-txt-to-json-file.patch +++ b/patches/server/0554-fix-converting-txt-to-json-file.patch @@ -48,7 +48,7 @@ index ac918da8234553e4d88664b240feddc1fea8bd6b..e92708f60fec876c62e720420f133a9b if (!OldUsersConverter.serverReadyAfterUserconversion(this)) { return false; diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index c76245eccdfbfc22c8c5bc9c04471259769b3ab1..d2573260e4fa4f0c410bf92fe590a4b0d1b679c9 100644 +index bf361396bc2ec5d5c7b45d425af990c037ba0694..c8f40d71619a53f85b71ef5af397bbfa65fd797f 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -176,6 +176,7 @@ public abstract class PlayerList { diff --git a/patches/server/0556-Add-worldborder-events.patch b/patches/server/0555-Add-worldborder-events.patch similarity index 100% rename from patches/server/0556-Add-worldborder-events.patch rename to patches/server/0555-Add-worldborder-events.patch diff --git a/patches/server/0557-added-PlayerNameEntityEvent.patch b/patches/server/0556-added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/server/0557-added-PlayerNameEntityEvent.patch rename to patches/server/0556-added-PlayerNameEntityEvent.patch diff --git a/patches/server/0558-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0557-Prevent-grindstones-from-overstacking-items.patch similarity index 100% rename from patches/server/0558-Prevent-grindstones-from-overstacking-items.patch rename to patches/server/0557-Prevent-grindstones-from-overstacking-items.patch diff --git a/patches/server/0559-Add-recipe-to-cook-events.patch b/patches/server/0558-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/server/0559-Add-recipe-to-cook-events.patch rename to patches/server/0558-Add-recipe-to-cook-events.patch diff --git a/patches/server/0560-Add-Block-isValidTool.patch b/patches/server/0559-Add-Block-isValidTool.patch similarity index 100% rename from patches/server/0560-Add-Block-isValidTool.patch rename to patches/server/0559-Add-Block-isValidTool.patch diff --git a/patches/server/0561-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0560-Allow-using-signs-inside-spawn-protection.patch similarity index 100% rename from patches/server/0561-Allow-using-signs-inside-spawn-protection.patch rename to patches/server/0560-Allow-using-signs-inside-spawn-protection.patch diff --git a/patches/server/0562-Expand-world-key-API.patch b/patches/server/0561-Expand-world-key-API.patch similarity index 97% rename from patches/server/0562-Expand-world-key-API.patch rename to patches/server/0561-Expand-world-key-API.patch index 6711571fad..c2607d4cb0 100644 --- a/patches/server/0562-Expand-world-key-API.patch +++ b/patches/server/0561-Expand-world-key-API.patch @@ -67,7 +67,7 @@ index 561436bdff6b1a46b37cad519885c952da7e5b5d..f9e8882b1a85fbdf1901d96b4e8ce69b // Check if a World already exists with the UID. if (this.getWorld(world.getUID()) != null) { diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 5930cc6af2d73e6301b0ebe59ea53e0a7ea2098a..d18498628ed4a42660f8c10cc5b9e12b671163f6 100644 +index bcf88a137616b83f3400afd18c6fe9f3b2b2db34..01b71837d1c1836b72216f97a09d43b13a875186 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -515,6 +515,11 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0563-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0562-Add-fast-alternative-constructor-for-Rotations.patch similarity index 100% rename from patches/server/0563-Add-fast-alternative-constructor-for-Rotations.patch rename to patches/server/0562-Add-fast-alternative-constructor-for-Rotations.patch diff --git a/patches/server/0564-Item-Rarity-API.patch b/patches/server/0563-Item-Rarity-API.patch similarity index 96% rename from patches/server/0564-Item-Rarity-API.patch rename to patches/server/0563-Item-Rarity-API.patch index 8fa580570c..ec2a02c6d8 100644 --- a/patches/server/0564-Item-Rarity-API.patch +++ b/patches/server/0563-Item-Rarity-API.patch @@ -7,7 +7,7 @@ Subject: [PATCH] Item Rarity API public net.minecraft.world.item.Item rarity diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index d18498628ed4a42660f8c10cc5b9e12b671163f6..2a6e1c9d184f7884ae16f4f575a657303867a60f 100644 +index 01b71837d1c1836b72216f97a09d43b13a875186..5bb6735a2423c4fdffe6d0ef866fc15f0f552064 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -520,6 +520,20 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0565-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0564-Drop-carried-item-when-player-has-disconnected.patch similarity index 92% rename from patches/server/0565-Drop-carried-item-when-player-has-disconnected.patch rename to patches/server/0564-Drop-carried-item-when-player-has-disconnected.patch index 54d57e13b2..b3bc183092 100644 --- a/patches/server/0565-Drop-carried-item-when-player-has-disconnected.patch +++ b/patches/server/0564-Drop-carried-item-when-player-has-disconnected.patch @@ -7,7 +7,7 @@ Fixes disappearance of held items, when a player gets disconnected and PlayerDro Closes #5036 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index d2573260e4fa4f0c410bf92fe590a4b0d1b679c9..f76bdc288c9c8ac24030eb9c6ad8b1c92d42e1c0 100644 +index c8f40d71619a53f85b71ef5af397bbfa65fd797f..59d847b87d7d35598231a1352a1a1ed32f38c176 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -597,6 +597,14 @@ public abstract class PlayerList { diff --git a/patches/server/0566-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0565-forced-whitelist-use-configurable-kick-message.patch similarity index 100% rename from patches/server/0566-forced-whitelist-use-configurable-kick-message.patch rename to patches/server/0565-forced-whitelist-use-configurable-kick-message.patch diff --git a/patches/server/0567-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0566-Don-t-ignore-result-of-PlayerEditBookEvent.patch similarity index 100% rename from patches/server/0567-Don-t-ignore-result-of-PlayerEditBookEvent.patch rename to patches/server/0566-Don-t-ignore-result-of-PlayerEditBookEvent.patch diff --git a/patches/server/0568-Expose-protocol-version.patch b/patches/server/0567-Expose-protocol-version.patch similarity index 91% rename from patches/server/0568-Expose-protocol-version.patch rename to patches/server/0567-Expose-protocol-version.patch index d9e2c80621..98a2a8529a 100644 --- a/patches/server/0568-Expose-protocol-version.patch +++ b/patches/server/0567-Expose-protocol-version.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Expose protocol version diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 2a6e1c9d184f7884ae16f4f575a657303867a60f..bd6b9a3058a75d7fad15920d9580bb0a0f0a0957 100644 +index 5bb6735a2423c4fdffe6d0ef866fc15f0f552064..5c29720a702ceceeb0ac1b0f136c599a16290242 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -534,6 +534,11 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0569-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0568-Enhance-console-tab-completions-for-brigadier-comman.patch similarity index 100% rename from patches/server/0569-Enhance-console-tab-completions-for-brigadier-comman.patch rename to patches/server/0568-Enhance-console-tab-completions-for-brigadier-comman.patch diff --git a/patches/server/0570-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0569-Fix-PlayerItemConsumeEvent-cancelling-properly.patch similarity index 100% rename from patches/server/0570-Fix-PlayerItemConsumeEvent-cancelling-properly.patch rename to patches/server/0569-Fix-PlayerItemConsumeEvent-cancelling-properly.patch diff --git a/patches/server/0571-Add-bypass-host-check.patch b/patches/server/0570-Add-bypass-host-check.patch similarity index 100% rename from patches/server/0571-Add-bypass-host-check.patch rename to patches/server/0570-Add-bypass-host-check.patch diff --git a/patches/server/0572-Set-area-affect-cloud-rotation.patch b/patches/server/0571-Set-area-affect-cloud-rotation.patch similarity index 100% rename from patches/server/0572-Set-area-affect-cloud-rotation.patch rename to patches/server/0571-Set-area-affect-cloud-rotation.patch diff --git a/patches/server/0573-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0572-add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/server/0573-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/server/0572-add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/server/0574-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0573-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/server/0574-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/server/0573-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/server/0575-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0574-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/server/0575-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/server/0574-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/server/0576-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0575-fix-PigZombieAngerEvent-cancellation.patch similarity index 100% rename from patches/server/0576-fix-PigZombieAngerEvent-cancellation.patch rename to patches/server/0575-fix-PigZombieAngerEvent-cancellation.patch diff --git a/patches/server/0577-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0576-fix-PlayerItemHeldEvent-firing-twice.patch similarity index 100% rename from patches/server/0577-fix-PlayerItemHeldEvent-firing-twice.patch rename to patches/server/0576-fix-PlayerItemHeldEvent-firing-twice.patch diff --git a/patches/server/0578-Added-PlayerDeepSleepEvent.patch b/patches/server/0577-Added-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/server/0578-Added-PlayerDeepSleepEvent.patch rename to patches/server/0577-Added-PlayerDeepSleepEvent.patch diff --git a/patches/server/0579-More-World-API.patch b/patches/server/0578-More-World-API.patch similarity index 100% rename from patches/server/0579-More-World-API.patch rename to patches/server/0578-More-World-API.patch diff --git a/patches/server/0580-Added-PlayerBedFailEnterEvent.patch b/patches/server/0579-Added-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/server/0580-Added-PlayerBedFailEnterEvent.patch rename to patches/server/0579-Added-PlayerBedFailEnterEvent.patch diff --git a/patches/server/0581-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0580-Implement-methods-to-convert-between-Component-and-B.patch similarity index 100% rename from patches/server/0581-Implement-methods-to-convert-between-Component-and-B.patch rename to patches/server/0580-Implement-methods-to-convert-between-Component-and-B.patch diff --git a/patches/server/0582-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0581-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch similarity index 95% rename from patches/server/0582-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch rename to patches/server/0581-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch index 21aa421872..a79fb53695 100644 --- a/patches/server/0582-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch +++ b/patches/server/0581-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix anchor respawn acting as a bed respawn from the end diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index f76bdc288c9c8ac24030eb9c6ad8b1c92d42e1c0..6ba2510a98332db7b271aa9a190577402cdac9a4 100644 +index 59d847b87d7d35598231a1352a1a1ed32f38c176..c2951a771456fc803dee0691cbe40f56a3010c70 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -824,6 +824,7 @@ public abstract class PlayerList { diff --git a/patches/server/0583-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0582-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/server/0583-Introduce-beacon-activation-deactivation-events.patch rename to patches/server/0582-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/server/0584-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0583-add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 97% rename from patches/server/0584-add-RespawnFlags-to-PlayerRespawnEvent.patch rename to patches/server/0583-add-RespawnFlags-to-PlayerRespawnEvent.patch index 8a26f519f9..2e685fd7ff 100644 --- a/patches/server/0584-add-RespawnFlags-to-PlayerRespawnEvent.patch +++ b/patches/server/0583-add-RespawnFlags-to-PlayerRespawnEvent.patch @@ -18,7 +18,7 @@ index b30f884007f79023d4bde8053c3a94f22cd59485..ba65b69e967ad933fec5e87da1ccfba2 } else { if (this.player.getHealth() > 0.0F) { diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 6ba2510a98332db7b271aa9a190577402cdac9a4..2ed83d020ec5fe2aca1a66b2196c7fc9f41bf4c5 100644 +index c2951a771456fc803dee0691cbe40f56a3010c70..bccb8400dd50654bae5cab23e1944fd5e6732648 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -783,6 +783,12 @@ public abstract class PlayerList { diff --git a/patches/server/0585-Add-Channel-initialization-listeners.patch b/patches/server/0584-Add-Channel-initialization-listeners.patch similarity index 100% rename from patches/server/0585-Add-Channel-initialization-listeners.patch rename to patches/server/0584-Add-Channel-initialization-listeners.patch diff --git a/patches/server/0586-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0585-Send-empty-commands-if-tab-completion-is-disabled.patch similarity index 100% rename from patches/server/0586-Send-empty-commands-if-tab-completion-is-disabled.patch rename to patches/server/0585-Send-empty-commands-if-tab-completion-is-disabled.patch diff --git a/patches/server/0587-Add-more-WanderingTrader-API.patch b/patches/server/0586-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/server/0587-Add-more-WanderingTrader-API.patch rename to patches/server/0586-Add-more-WanderingTrader-API.patch diff --git a/patches/server/0588-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0587-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/server/0588-Add-EntityBlockStorage-clearEntities.patch rename to patches/server/0587-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/server/0589-Entity-load-save-limit-per-chunk.patch b/patches/server/0588-Entity-load-save-limit-per-chunk.patch similarity index 100% rename from patches/server/0589-Entity-load-save-limit-per-chunk.patch rename to patches/server/0588-Entity-load-save-limit-per-chunk.patch diff --git a/patches/server/0590-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0589-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/server/0590-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/server/0589-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/server/0591-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0590-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0591-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch rename to patches/server/0590-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0592-Inventory-close.patch b/patches/server/0591-Inventory-close.patch similarity index 100% rename from patches/server/0592-Inventory-close.patch rename to patches/server/0591-Inventory-close.patch diff --git a/patches/server/0593-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0592-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/server/0593-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/server/0592-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/server/0594-Add-basic-Datapack-API.patch b/patches/server/0593-Add-basic-Datapack-API.patch similarity index 100% rename from patches/server/0594-Add-basic-Datapack-API.patch rename to patches/server/0593-Add-basic-Datapack-API.patch diff --git a/patches/server/0595-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0594-Add-environment-variable-to-disable-server-gui.patch similarity index 100% rename from patches/server/0595-Add-environment-variable-to-disable-server-gui.patch rename to patches/server/0594-Add-environment-variable-to-disable-server-gui.patch diff --git a/patches/server/0596-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0595-additions-to-PlayerGameModeChangeEvent.patch similarity index 99% rename from patches/server/0596-additions-to-PlayerGameModeChangeEvent.patch rename to patches/server/0595-additions-to-PlayerGameModeChangeEvent.patch index 1eb6f64810..286b4ff68b 100644 --- a/patches/server/0596-additions-to-PlayerGameModeChangeEvent.patch +++ b/patches/server/0595-additions-to-PlayerGameModeChangeEvent.patch @@ -144,7 +144,7 @@ index ba65b69e967ad933fec5e87da1ccfba25a42a372..eb04b74e2d71bf1842a19b346576f0ff } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 7fbe129062a36e6e41d564989901cdab272109df..d962222765ebe277fd833e551f6a57a1601d6088 100644 +index a3557443f484e4046823e8b08f2fd55c6967bdea..7c66265f7e472add3b41ffb7044f3c8d45144ac8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1565,7 +1565,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0597-ItemStack-repair-check-API.patch b/patches/server/0596-ItemStack-repair-check-API.patch similarity index 97% rename from patches/server/0597-ItemStack-repair-check-API.patch rename to patches/server/0596-ItemStack-repair-check-API.patch index ed89b03c14..cbd86fa511 100644 --- a/patches/server/0597-ItemStack-repair-check-API.patch +++ b/patches/server/0596-ItemStack-repair-check-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] ItemStack repair check API diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index bd6b9a3058a75d7fad15920d9580bb0a0f0a0957..893bc4334b72db328711221496e57e872dc1f6d8 100644 +index 5c29720a702ceceeb0ac1b0f136c599a16290242..df3414179413cc7d2161ad9572777ded60324749 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -535,6 +535,14 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0598-More-Enchantment-API.patch b/patches/server/0597-More-Enchantment-API.patch similarity index 100% rename from patches/server/0598-More-Enchantment-API.patch rename to patches/server/0597-More-Enchantment-API.patch diff --git a/patches/server/0599-Move-range-check-for-block-placing-up.patch b/patches/server/0598-Move-range-check-for-block-placing-up.patch similarity index 100% rename from patches/server/0599-Move-range-check-for-block-placing-up.patch rename to patches/server/0598-Move-range-check-for-block-placing-up.patch diff --git a/patches/server/0600-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0599-Fix-and-optimise-world-force-upgrading.patch similarity index 99% rename from patches/server/0600-Fix-and-optimise-world-force-upgrading.patch rename to patches/server/0599-Fix-and-optimise-world-force-upgrading.patch index 99508408bd..5bc181f573 100644 --- a/patches/server/0600-Fix-and-optimise-world-force-upgrading.patch +++ b/patches/server/0599-Fix-and-optimise-world-force-upgrading.patch @@ -298,7 +298,7 @@ index 36ca381445102fee1960410aa56e8b2a28dca615..8937b71511bc1dce082683b4107d52e0 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 bdf11c543fe8904585eda72dc92206ac22daff58..aa6b7d93d8dc18e8ee475c89af465f8b7b4eab7d 100644 +index f9b37892ca92f0fb4943088ad6c4f1f48db287c6..befd147f604bf9cf881893580436bbf8fbead86d 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -187,6 +187,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0601-Add-Mob-lookAt-API.patch b/patches/server/0600-Add-Mob-lookAt-API.patch similarity index 100% rename from patches/server/0601-Add-Mob-lookAt-API.patch rename to patches/server/0600-Add-Mob-lookAt-API.patch diff --git a/patches/server/0602-Add-Unix-domain-socket-support.patch b/patches/server/0601-Add-Unix-domain-socket-support.patch similarity index 100% rename from patches/server/0602-Add-Unix-domain-socket-support.patch rename to patches/server/0601-Add-Unix-domain-socket-support.patch diff --git a/patches/server/0603-Add-EntityInsideBlockEvent.patch b/patches/server/0602-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/server/0603-Add-EntityInsideBlockEvent.patch rename to patches/server/0602-Add-EntityInsideBlockEvent.patch diff --git a/patches/server/0604-Attributes-API-for-item-defaults.patch b/patches/server/0603-Attributes-API-for-item-defaults.patch similarity index 94% rename from patches/server/0604-Attributes-API-for-item-defaults.patch rename to patches/server/0603-Attributes-API-for-item-defaults.patch index 8cef04d572..0ffe27c99d 100644 --- a/patches/server/0604-Attributes-API-for-item-defaults.patch +++ b/patches/server/0603-Attributes-API-for-item-defaults.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Attributes API for item defaults diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 893bc4334b72db328711221496e57e872dc1f6d8..5045af60302e1929d9f904cb74214c3c15cfe60d 100644 +index df3414179413cc7d2161ad9572777ded60324749..78778f010b458a8ca011ef636c2ce5f45feafa85 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -543,6 +543,19 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0605-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0604-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 98% rename from patches/server/0605-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/server/0604-Add-cause-to-Weather-ThunderChangeEvents.patch index 44cd0eaeee..f543421cd7 100644 --- a/patches/server/0605-Add-cause-to-Weather-ThunderChangeEvents.patch +++ b/patches/server/0604-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 b3f8607221c3508fa8a8435bec1d490c7b05cd91..d021091d7ae7d62fd2199a2ffd936c45cc42797f 100644 +index 721a9ebaa2710ed26ecdf52ce3be26da7d91aa4b..3f1a2ea5ff192685c913ba1de643a63115707774 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -668,8 +668,8 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0606-More-Lidded-Block-API.patch b/patches/server/0605-More-Lidded-Block-API.patch similarity index 100% rename from patches/server/0606-More-Lidded-Block-API.patch rename to patches/server/0605-More-Lidded-Block-API.patch diff --git a/patches/server/0607-Limit-item-frame-cursors-on-maps.patch b/patches/server/0606-Limit-item-frame-cursors-on-maps.patch similarity index 100% rename from patches/server/0607-Limit-item-frame-cursors-on-maps.patch rename to patches/server/0606-Limit-item-frame-cursors-on-maps.patch diff --git a/patches/server/0608-Add-PlayerKickEvent-causes.patch b/patches/server/0607-Add-PlayerKickEvent-causes.patch similarity index 99% rename from patches/server/0608-Add-PlayerKickEvent-causes.patch rename to patches/server/0607-Add-PlayerKickEvent-causes.patch index 19a6ff927e..5464b41fdf 100644 --- a/patches/server/0608-Add-PlayerKickEvent-causes.patch +++ b/patches/server/0607-Add-PlayerKickEvent-causes.patch @@ -437,7 +437,7 @@ index fea666b6734310c225e86ae551aed6571e4903a8..6b92f00fe51ebb1730aecc85d58ce6f2 } diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 2ed83d020ec5fe2aca1a66b2196c7fc9f41bf4c5..3deb549aa3eec8947e01250ee7c6ce306973387b 100644 +index bccb8400dd50654bae5cab23e1944fd5e6732648..a9cba92048b37135b048fd6fa7d00470c855053f 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -684,7 +684,7 @@ public abstract class PlayerList { @@ -491,7 +491,7 @@ index 6724d0a1af13e97bc1d3bd94fd43fef742a0deab..20ba0a0c9eae28658888a77dd2170f62 } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index d962222765ebe277fd833e551f6a57a1601d6088..1706ea0d94cb81f7db78df3fc3957a220abc6e89 100644 +index 7c66265f7e472add3b41ffb7044f3c8d45144ac8..b22c386f46b59f7a8bad46e9ea2fa312b254cb60 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -597,7 +597,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0609-Add-PufferFishStateChangeEvent.patch b/patches/server/0608-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/server/0609-Add-PufferFishStateChangeEvent.patch rename to patches/server/0608-Add-PufferFishStateChangeEvent.patch diff --git a/patches/server/0610-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0609-Fix-PlayerBucketEmptyEvent-result-itemstack.patch similarity index 100% rename from patches/server/0610-Fix-PlayerBucketEmptyEvent-result-itemstack.patch rename to patches/server/0609-Fix-PlayerBucketEmptyEvent-result-itemstack.patch diff --git a/patches/server/0611-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0610-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch similarity index 100% rename from patches/server/0611-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch rename to patches/server/0610-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch diff --git a/patches/server/0612-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0611-Add-option-to-fix-items-merging-through-walls.patch similarity index 100% rename from patches/server/0612-Add-option-to-fix-items-merging-through-walls.patch rename to patches/server/0611-Add-option-to-fix-items-merging-through-walls.patch diff --git a/patches/server/0613-Add-BellRevealRaiderEvent.patch b/patches/server/0612-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/server/0613-Add-BellRevealRaiderEvent.patch rename to patches/server/0612-Add-BellRevealRaiderEvent.patch diff --git a/patches/server/0614-Fix-invulnerable-end-crystals.patch b/patches/server/0613-Fix-invulnerable-end-crystals.patch similarity index 100% rename from patches/server/0614-Fix-invulnerable-end-crystals.patch rename to patches/server/0613-Fix-invulnerable-end-crystals.patch diff --git a/patches/server/0615-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0614-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/server/0615-Add-ElderGuardianAppearanceEvent.patch rename to patches/server/0614-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/server/0616-Fix-dangerous-end-portal-logic.patch b/patches/server/0615-Fix-dangerous-end-portal-logic.patch similarity index 97% rename from patches/server/0616-Fix-dangerous-end-portal-logic.patch rename to patches/server/0615-Fix-dangerous-end-portal-logic.patch index 9079d176f6..57f7231a1d 100644 --- a/patches/server/0616-Fix-dangerous-end-portal-logic.patch +++ b/patches/server/0615-Fix-dangerous-end-portal-logic.patch @@ -11,7 +11,7 @@ Move the tick logic into the post tick, where portaling was designed to happen in the first place. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 3aa34902d4325c1ac2ad9d64ae2e5fa36a6d88e9..407b713be2d2426f49e5978770e40cdf03c5ce1a 100644 +index 3b2c100c678dab10f72483769fba6cbf3371d377..229ed03a59c77d37242b44edabc2ddb843037fa6 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -490,6 +490,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0617-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0616-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch similarity index 100% rename from patches/server/0617-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch rename to patches/server/0616-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch diff --git a/patches/server/0618-Make-item-validations-configurable.patch b/patches/server/0617-Make-item-validations-configurable.patch similarity index 100% rename from patches/server/0618-Make-item-validations-configurable.patch rename to patches/server/0617-Make-item-validations-configurable.patch diff --git a/patches/server/0619-Line-Of-Sight-Changes.patch b/patches/server/0618-Line-Of-Sight-Changes.patch similarity index 95% rename from patches/server/0619-Line-Of-Sight-Changes.patch rename to patches/server/0618-Line-Of-Sight-Changes.patch index aac10c6b95..8cfc77a081 100644 --- a/patches/server/0619-Line-Of-Sight-Changes.patch +++ b/patches/server/0618-Line-Of-Sight-Changes.patch @@ -19,7 +19,7 @@ index d6b80be711b11758ef0bb3187dbcb6e597ef35d3..4a11bf06a725a5c1927e24ac4ad066f7 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java -index 29369cab2ccdd1d43fc67dbe2e666e477f96b26d..a31df5b8de2a18ad08f1c38fb2ccf7a1f8c9e5e8 100644 +index 29369cab2ccdd1d43fc67dbe2e666e477f96b26d..50c1d8ee5804d6e44e2dbbd84328dcd46708ea2e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java @@ -1027,5 +1027,21 @@ public abstract class CraftRegionAccessor implements RegionAccessor { @@ -40,7 +40,7 @@ index 29369cab2ccdd1d43fc67dbe2e666e477f96b26d..a31df5b8de2a18ad08f1c38fb2ccf7a1 + return false; // Return early if the distance is greater than 128 blocks + } + -+ return this.getHandle().clip(new net.minecraft.world.level.ClipContext(start, end, net.minecraft.world.level.ClipContext.Block.COLLIDER, net.minecraft.world.level.ClipContext.Fluid.NONE, null)).getType() == net.minecraft.world.phys.HitResult.Type.MISS; ++ return this.getHandle().clip(new net.minecraft.world.level.ClipContext(start, end, net.minecraft.world.level.ClipContext.Block.COLLIDER, net.minecraft.world.level.ClipContext.Fluid.NONE, net.minecraft.world.phys.shapes.CollisionContext.empty())).getType() == net.minecraft.world.phys.HitResult.Type.MISS; + } // Paper end } diff --git a/patches/server/0620-add-per-world-spawn-limits.patch b/patches/server/0619-add-per-world-spawn-limits.patch similarity index 100% rename from patches/server/0620-add-per-world-spawn-limits.patch rename to patches/server/0619-add-per-world-spawn-limits.patch diff --git a/patches/server/0621-Fix-potions-splash-events.patch b/patches/server/0620-Fix-potions-splash-events.patch similarity index 100% rename from patches/server/0621-Fix-potions-splash-events.patch rename to patches/server/0620-Fix-potions-splash-events.patch diff --git a/patches/server/0622-Add-more-LimitedRegion-API.patch b/patches/server/0621-Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/server/0622-Add-more-LimitedRegion-API.patch rename to patches/server/0621-Add-more-LimitedRegion-API.patch diff --git a/patches/server/0623-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0622-Fix-PlayerDropItemEvent-using-wrong-item.patch similarity index 100% rename from patches/server/0623-Fix-PlayerDropItemEvent-using-wrong-item.patch rename to patches/server/0622-Fix-PlayerDropItemEvent-using-wrong-item.patch diff --git a/patches/server/0624-Missing-Entity-API.patch b/patches/server/0623-Missing-Entity-API.patch similarity index 99% rename from patches/server/0624-Missing-Entity-API.patch rename to patches/server/0623-Missing-Entity-API.patch index 9ed75b394a..6eadc37117 100644 --- a/patches/server/0624-Missing-Entity-API.patch +++ b/patches/server/0623-Missing-Entity-API.patch @@ -371,7 +371,7 @@ index 2645f52f5071bf57daf584e21a1f5cb6098110a8..cbe8593cecd84f1598649801bebcb463 @Override protected EntityHitResult findHitEntity(Vec3 currentPosition, Vec3 nextPosition) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java -index a31df5b8de2a18ad08f1c38fb2ccf7a1f8c9e5e8..dac05caba1692025af8c930e7118b8b5706f7122 100644 +index 50c1d8ee5804d6e44e2dbbd84328dcd46708ea2e..44c08acdbc8316e501d9f25159f712a55d444b17 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java @@ -861,14 +861,19 @@ public abstract class CraftRegionAccessor implements RegionAccessor { diff --git a/patches/server/0625-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0624-Ensure-disconnect-for-book-edit-is-called-on-main.patch similarity index 100% rename from patches/server/0625-Ensure-disconnect-for-book-edit-is-called-on-main.patch rename to patches/server/0624-Ensure-disconnect-for-book-edit-is-called-on-main.patch diff --git a/patches/server/0626-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0625-Fix-return-value-of-Block-applyBoneMeal-always-being.patch similarity index 100% rename from patches/server/0626-Fix-return-value-of-Block-applyBoneMeal-always-being.patch rename to patches/server/0625-Fix-return-value-of-Block-applyBoneMeal-always-being.patch diff --git a/patches/server/0627-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0626-Use-getChunkIfLoadedImmediately-in-places.patch similarity index 94% rename from patches/server/0627-Use-getChunkIfLoadedImmediately-in-places.patch rename to patches/server/0626-Use-getChunkIfLoadedImmediately-in-places.patch index 2914a25854..0e0343624f 100644 --- a/patches/server/0627-Use-getChunkIfLoadedImmediately-in-places.patch +++ b/patches/server/0626-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 d021091d7ae7d62fd2199a2ffd936c45cc42797f..d2e173c644ca005afd124b30566a01c22bcb7e0e 100644 +index 3f1a2ea5ff192685c913ba1de643a63115707774..529eb11c6a8e81d17e4e855f6e8bf2b87e2df0b1 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -230,7 +230,7 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -21,7 +21,7 @@ index d021091d7ae7d62fd2199a2ffd936c45cc42797f..d2e173c644ca005afd124b30566a01c2 @Override diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index aa6b7d93d8dc18e8ee475c89af465f8b7b4eab7d..0e679bbbc000c32b840e5f3155a3c275216b20b5 100644 +index befd147f604bf9cf881893580436bbf8fbead86d..031fe212e5bc28ac675f835bec37c1bca3c5351f 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -204,6 +204,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0628-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0627-Fix-commands-from-signs-not-firing-command-events.patch similarity index 100% rename from patches/server/0628-Fix-commands-from-signs-not-firing-command-events.patch rename to patches/server/0627-Fix-commands-from-signs-not-firing-command-events.patch diff --git a/patches/server/0629-Adds-PlayerArmSwingEvent.patch b/patches/server/0628-Adds-PlayerArmSwingEvent.patch similarity index 100% rename from patches/server/0629-Adds-PlayerArmSwingEvent.patch rename to patches/server/0628-Adds-PlayerArmSwingEvent.patch diff --git a/patches/server/0630-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0629-Fixes-kick-event-leave-message-not-being-sent.patch similarity index 98% rename from patches/server/0630-Fixes-kick-event-leave-message-not-being-sent.patch rename to patches/server/0629-Fixes-kick-event-leave-message-not-being-sent.patch index 3b39b465a0..e559407c1f 100644 --- a/patches/server/0630-Fixes-kick-event-leave-message-not-being-sent.patch +++ b/patches/server/0629-Fixes-kick-event-leave-message-not-being-sent.patch @@ -96,7 +96,7 @@ index 0133b27284966ace784603c0dbde37879529a35b..d5b7d62e5a00d4db9439eb220c498b40 this.server.getPlayerList().broadcastSystemMessage(PaperAdventure.asVanilla(quitMessage), false); // Paper end diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 3deb549aa3eec8947e01250ee7c6ce306973387b..60a8ec8937ce8b384ca8272aae865577395afc47 100644 +index a9cba92048b37135b048fd6fa7d00470c855053f..18205f003ca93cb9836b8b0bdb680ac88998880d 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -570,6 +570,11 @@ public abstract class PlayerList { diff --git a/patches/server/0631-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0630-Add-config-for-mobs-immune-to-default-effects.patch similarity index 100% rename from patches/server/0631-Add-config-for-mobs-immune-to-default-effects.patch rename to patches/server/0630-Add-config-for-mobs-immune-to-default-effects.patch diff --git a/patches/server/0632-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0631-Fix-incorrect-message-for-outdated-client.patch similarity index 100% rename from patches/server/0632-Fix-incorrect-message-for-outdated-client.patch rename to patches/server/0631-Fix-incorrect-message-for-outdated-client.patch diff --git a/patches/server/0633-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0632-Don-t-apply-cramming-damage-to-players.patch similarity index 100% rename from patches/server/0633-Don-t-apply-cramming-damage-to-players.patch rename to patches/server/0632-Don-t-apply-cramming-damage-to-players.patch diff --git a/patches/server/0634-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0633-Rate-options-and-timings-for-sensors-and-behaviors.patch similarity index 98% rename from patches/server/0634-Rate-options-and-timings-for-sensors-and-behaviors.patch rename to patches/server/0633-Rate-options-and-timings-for-sensors-and-behaviors.patch index 297c6b3a06..5ef4de39f3 100644 --- a/patches/server/0634-Rate-options-and-timings-for-sensors-and-behaviors.patch +++ b/patches/server/0633-Rate-options-and-timings-for-sensors-and-behaviors.patch @@ -9,7 +9,7 @@ This adds config options to specify the tick rate for sensors ones might need tweaking. diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java -index 59affb62cb487d60e8c3e32decf89d6cb7d22f8d..4d861f9a58f8ea238471af22f387854d855b1801 100644 +index 4bd813161a5d76a83cdbd0a9209b9ea9e60ffe1b..e2764186bd6b838ed5cd86c15597a08d079ef984 100644 --- a/src/main/java/co/aikar/timings/MinecraftTimings.java +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java @@ -115,6 +115,14 @@ public final class MinecraftTimings { diff --git a/patches/server/0635-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0634-Add-a-bunch-of-missing-forceDrop-toggles.patch similarity index 100% rename from patches/server/0635-Add-a-bunch-of-missing-forceDrop-toggles.patch rename to patches/server/0634-Add-a-bunch-of-missing-forceDrop-toggles.patch diff --git a/patches/server/0636-Stinger-API.patch b/patches/server/0635-Stinger-API.patch similarity index 100% rename from patches/server/0636-Stinger-API.patch rename to patches/server/0635-Stinger-API.patch diff --git a/patches/server/0637-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0636-Fix-incosistency-issue-with-empty-map-items-in-CB.patch similarity index 100% rename from patches/server/0637-Fix-incosistency-issue-with-empty-map-items-in-CB.patch rename to patches/server/0636-Fix-incosistency-issue-with-empty-map-items-in-CB.patch diff --git a/patches/server/0638-Add-System.out-err-catcher.patch b/patches/server/0637-Add-System.out-err-catcher.patch similarity index 100% rename from patches/server/0638-Add-System.out-err-catcher.patch rename to patches/server/0637-Add-System.out-err-catcher.patch diff --git a/patches/server/0639-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0638-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/server/0639-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/server/0638-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/server/0640-Improve-boat-collision-performance.patch b/patches/server/0639-Improve-boat-collision-performance.patch similarity index 100% rename from patches/server/0640-Improve-boat-collision-performance.patch rename to patches/server/0639-Improve-boat-collision-performance.patch diff --git a/patches/server/0641-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0640-Prevent-AFK-kick-while-watching-end-credits.patch similarity index 100% rename from patches/server/0641-Prevent-AFK-kick-while-watching-end-credits.patch rename to patches/server/0640-Prevent-AFK-kick-while-watching-end-credits.patch diff --git a/patches/server/0642-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0641-Allow-skipping-writing-of-comments-to-server.propert.patch similarity index 100% rename from patches/server/0642-Allow-skipping-writing-of-comments-to-server.propert.patch rename to patches/server/0641-Allow-skipping-writing-of-comments-to-server.propert.patch diff --git a/patches/server/0643-Add-PlayerSetSpawnEvent.patch b/patches/server/0642-Add-PlayerSetSpawnEvent.patch similarity index 98% rename from patches/server/0643-Add-PlayerSetSpawnEvent.patch rename to patches/server/0642-Add-PlayerSetSpawnEvent.patch index 43a01bc7fb..442c0cde86 100644 --- a/patches/server/0643-Add-PlayerSetSpawnEvent.patch +++ b/patches/server/0642-Add-PlayerSetSpawnEvent.patch @@ -154,7 +154,7 @@ index d08111e8107ddffdeff3fc044fc18b915d24433c..b1be9c5d7346841ea4c0f9b8aec5e7c4 public SectionPos getLastSectionPos() { diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 60a8ec8937ce8b384ca8272aae865577395afc47..3b5a498a602b2cafb58a0130227eb6d4e8f3802d 100644 +index 18205f003ca93cb9836b8b0bdb680ac88998880d..53dbfb828f4d6f47b87e7ff6829a8dbc3de2f0fd 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -874,7 +874,7 @@ public abstract class PlayerList { @@ -187,7 +187,7 @@ index ecaa7f0b2bf795f16187f11fa27f6d5d435ccbfe..c83ffba568f33323b0f8b9a03fa0b7bb } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 1706ea0d94cb81f7db78df3fc3957a220abc6e89..ca8f06538d140b22f8ed4418aaf544c853f7f8a8 100644 +index b22c386f46b59f7a8bad46e9ea2fa312b254cb60..9652608958dc453cd259eb589f28ef0efbb11442 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1324,9 +1324,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0644-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0643-Make-hoppers-respect-inventory-max-stack-size.patch similarity index 100% rename from patches/server/0644-Make-hoppers-respect-inventory-max-stack-size.patch rename to patches/server/0643-Make-hoppers-respect-inventory-max-stack-size.patch diff --git a/patches/server/0645-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0644-Optimize-entity-tracker-passenger-checks.patch similarity index 100% rename from patches/server/0645-Optimize-entity-tracker-passenger-checks.patch rename to patches/server/0644-Optimize-entity-tracker-passenger-checks.patch diff --git a/patches/server/0646-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0645-Config-option-for-Piglins-guarding-chests.patch similarity index 100% rename from patches/server/0646-Config-option-for-Piglins-guarding-chests.patch rename to patches/server/0645-Config-option-for-Piglins-guarding-chests.patch diff --git a/patches/server/0647-Added-EntityDamageItemEvent.patch b/patches/server/0646-Added-EntityDamageItemEvent.patch similarity index 100% rename from patches/server/0647-Added-EntityDamageItemEvent.patch rename to patches/server/0646-Added-EntityDamageItemEvent.patch diff --git a/patches/server/0648-Optimize-indirect-passenger-iteration.patch b/patches/server/0647-Optimize-indirect-passenger-iteration.patch similarity index 95% rename from patches/server/0648-Optimize-indirect-passenger-iteration.patch rename to patches/server/0647-Optimize-indirect-passenger-iteration.patch index b66874058d..04f5ad2db9 100644 --- a/patches/server/0648-Optimize-indirect-passenger-iteration.patch +++ b/patches/server/0647-Optimize-indirect-passenger-iteration.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Optimize indirect passenger iteration diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 407b713be2d2426f49e5978770e40cdf03c5ce1a..2731b44b3cd5de300ffcf93c690a617091b199ef 100644 +index 229ed03a59c77d37242b44edabc2ddb843037fa6..6889b02637178db2caad58e5513847fb96e04ecb 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3926,20 +3926,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0649-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0648-Configurable-item-frame-map-cursor-update-interval.patch similarity index 100% rename from patches/server/0649-Configurable-item-frame-map-cursor-update-interval.patch rename to patches/server/0648-Configurable-item-frame-map-cursor-update-interval.patch diff --git a/patches/server/0650-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0649-Make-EntityUnleashEvent-cancellable.patch similarity index 100% rename from patches/server/0650-Make-EntityUnleashEvent-cancellable.patch rename to patches/server/0649-Make-EntityUnleashEvent-cancellable.patch diff --git a/patches/server/0651-Clear-bucket-NBT-after-dispense.patch b/patches/server/0650-Clear-bucket-NBT-after-dispense.patch similarity index 100% rename from patches/server/0651-Clear-bucket-NBT-after-dispense.patch rename to patches/server/0650-Clear-bucket-NBT-after-dispense.patch diff --git a/patches/server/0652-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0651-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/server/0652-Change-EnderEye-target-without-changing-other-things.patch rename to patches/server/0651-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/server/0653-Add-BlockBreakBlockEvent.patch b/patches/server/0652-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/server/0653-Add-BlockBreakBlockEvent.patch rename to patches/server/0652-Add-BlockBreakBlockEvent.patch diff --git a/patches/server/0654-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0653-Option-to-prevent-NBT-copy-in-smithing-recipes.patch similarity index 100% rename from patches/server/0654-Option-to-prevent-NBT-copy-in-smithing-recipes.patch rename to patches/server/0653-Option-to-prevent-NBT-copy-in-smithing-recipes.patch diff --git a/patches/server/0655-More-CommandBlock-API.patch b/patches/server/0654-More-CommandBlock-API.patch similarity index 100% rename from patches/server/0655-More-CommandBlock-API.patch rename to patches/server/0654-More-CommandBlock-API.patch diff --git a/patches/server/0656-Add-missing-team-sidebar-display-slots.patch b/patches/server/0655-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/server/0656-Add-missing-team-sidebar-display-slots.patch rename to patches/server/0655-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/server/0657-Add-back-EntityPortalExitEvent.patch b/patches/server/0656-Add-back-EntityPortalExitEvent.patch similarity index 97% rename from patches/server/0657-Add-back-EntityPortalExitEvent.patch rename to patches/server/0656-Add-back-EntityPortalExitEvent.patch index 9314a6cd93..97155b3279 100644 --- a/patches/server/0657-Add-back-EntityPortalExitEvent.patch +++ b/patches/server/0656-Add-back-EntityPortalExitEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add back EntityPortalExitEvent diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 2731b44b3cd5de300ffcf93c690a617091b199ef..5f642ba64877a3ba53f69b8cffd99ed8c56a3d3f 100644 +index 6889b02637178db2caad58e5513847fb96e04ecb..6f023b22a1051baaa5310d8c5a1aa6d8b76d8992 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3373,6 +3373,28 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0658-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0657-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 96% rename from patches/server/0658-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/server/0657-Add-methods-to-find-targets-for-lightning-strikes.patch index 2817f50b08..8806ef17e2 100644 --- a/patches/server/0658-Add-methods-to-find-targets-for-lightning-strikes.patch +++ b/patches/server/0657-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 d2e173c644ca005afd124b30566a01c22bcb7e0e..d5709319497a5589665388afd61307dc7755332d 100644 +index 529eb11c6a8e81d17e4e855f6e8bf2b87e2df0b1..345db68dfaca2f2a6ffc4c2f610e008360b268f9 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -994,6 +994,11 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0659-Get-entity-default-attributes.patch b/patches/server/0658-Get-entity-default-attributes.patch similarity index 98% rename from patches/server/0659-Get-entity-default-attributes.patch rename to patches/server/0658-Get-entity-default-attributes.patch index 2baecce8ee..0bd7acf63f 100644 --- a/patches/server/0659-Get-entity-default-attributes.patch +++ b/patches/server/0658-Get-entity-default-attributes.patch @@ -81,7 +81,7 @@ index 0000000000000000000000000000000000000000..68044b8439c302114240d0ae4da93ab3 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 5045af60302e1929d9f904cb74214c3c15cfe60d..33988ab25aba60c75bffbd39da5562333875d0c1 100644 +index 78778f010b458a8ca011ef636c2ce5f45feafa85..bff45bb3e7e8157070a56ddffe983953e7938f3b 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -560,6 +560,18 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0660-Left-handed-API.patch b/patches/server/0659-Left-handed-API.patch similarity index 100% rename from patches/server/0660-Left-handed-API.patch rename to patches/server/0659-Left-handed-API.patch diff --git a/patches/server/0661-Add-more-advancement-API.patch b/patches/server/0660-Add-more-advancement-API.patch similarity index 100% rename from patches/server/0661-Add-more-advancement-API.patch rename to patches/server/0660-Add-more-advancement-API.patch diff --git a/patches/server/0662-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0661-Add-ItemFactory-getSpawnEgg-API.patch similarity index 100% rename from patches/server/0662-Add-ItemFactory-getSpawnEgg-API.patch rename to patches/server/0661-Add-ItemFactory-getSpawnEgg-API.patch diff --git a/patches/server/0663-Add-critical-damage-API.patch b/patches/server/0662-Add-critical-damage-API.patch similarity index 100% rename from patches/server/0663-Add-critical-damage-API.patch rename to patches/server/0662-Add-critical-damage-API.patch diff --git a/patches/server/0664-Fix-issues-with-mob-conversion.patch b/patches/server/0663-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/server/0664-Fix-issues-with-mob-conversion.patch rename to patches/server/0663-Fix-issues-with-mob-conversion.patch diff --git a/patches/server/0665-Add-isCollidable-methods-to-various-places.patch b/patches/server/0664-Add-isCollidable-methods-to-various-places.patch similarity index 96% rename from patches/server/0665-Add-isCollidable-methods-to-various-places.patch rename to patches/server/0664-Add-isCollidable-methods-to-various-places.patch index 4da501d7dd..f02bfe0a1d 100644 --- a/patches/server/0665-Add-isCollidable-methods-to-various-places.patch +++ b/patches/server/0664-Add-isCollidable-methods-to-various-places.patch @@ -39,7 +39,7 @@ index aca63719790429d3d7c7c59a1931a98221c70fc0..31bb92c026a4a2de0e8d3500f6ecf35b + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 33988ab25aba60c75bffbd39da5562333875d0c1..da0d44cf18888945ed24d941af0f1a3562156e50 100644 +index bff45bb3e7e8157070a56ddffe983953e7938f3b..580b6c134743c35d9eb1d98a2d038d1c8f10054c 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -572,6 +572,12 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0666-Goat-ram-API.patch b/patches/server/0665-Goat-ram-API.patch similarity index 100% rename from patches/server/0666-Goat-ram-API.patch rename to patches/server/0665-Goat-ram-API.patch diff --git a/patches/server/0667-Add-API-for-resetting-a-single-score.patch b/patches/server/0666-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/server/0667-Add-API-for-resetting-a-single-score.patch rename to patches/server/0666-Add-API-for-resetting-a-single-score.patch diff --git a/patches/server/0668-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0667-Add-Raw-Byte-Entity-Serialization.patch similarity index 96% rename from patches/server/0668-Add-Raw-Byte-Entity-Serialization.patch rename to patches/server/0667-Add-Raw-Byte-Entity-Serialization.patch index cdfebd0f66..3ab3ca8f28 100644 --- a/patches/server/0668-Add-Raw-Byte-Entity-Serialization.patch +++ b/patches/server/0667-Add-Raw-Byte-Entity-Serialization.patch @@ -7,7 +7,7 @@ Subject: [PATCH] Add Raw Byte Entity Serialization public net.minecraft.world.entity.Entity setLevel(Lnet/minecraft/world/level/Level;)V diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 5f642ba64877a3ba53f69b8cffd99ed8c56a3d3f..430f36da1e40d8427f24994ab16e68da79f575d2 100644 +index 6f023b22a1051baaa5310d8c5a1aa6d8b76d8992..65ab99c3f3f1478db6e14d713e82346d3ecc06a5 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2157,6 +2157,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S @@ -47,7 +47,7 @@ index 6065336cd30e6400bd8875768f06c44a4be0a1e1..32fd3b7067894bc442bc5a74dbcf6016 // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index da0d44cf18888945ed24d941af0f1a3562156e50..ef59fcd13f8835001fcc6fba6165ffd6c35784fa 100644 +index 580b6c134743c35d9eb1d98a2d038d1c8f10054c..4a5af85ebb573950c0c65d3a5f25b586173d16dd 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -483,6 +483,29 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0669-Vanilla-command-permission-fixes.patch b/patches/server/0668-Vanilla-command-permission-fixes.patch similarity index 100% rename from patches/server/0669-Vanilla-command-permission-fixes.patch rename to patches/server/0668-Vanilla-command-permission-fixes.patch diff --git a/patches/server/0670-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0669-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch similarity index 97% rename from patches/server/0670-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch rename to patches/server/0669-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch index 11d63cc2d0..741987c8fa 100644 --- a/patches/server/0670-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch +++ b/patches/server/0669-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 d5709319497a5589665388afd61307dc7755332d..938a07d2e90ea2516b064d930b38e8908be91055 100644 +index 345db68dfaca2f2a6ffc4c2f610e008360b268f9..174f374353e8706c94bfd4466ad42f69d76b2508 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1574,9 +1574,13 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0671-Fix-GameProfileCache-concurrency.patch b/patches/server/0670-Fix-GameProfileCache-concurrency.patch similarity index 100% rename from patches/server/0671-Fix-GameProfileCache-concurrency.patch rename to patches/server/0670-Fix-GameProfileCache-concurrency.patch diff --git a/patches/server/0672-Improve-and-expand-AsyncCatcher.patch b/patches/server/0671-Improve-and-expand-AsyncCatcher.patch similarity index 100% rename from patches/server/0672-Improve-and-expand-AsyncCatcher.patch rename to patches/server/0671-Improve-and-expand-AsyncCatcher.patch diff --git a/patches/server/0673-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0672-Add-paper-mobcaps-and-paper-playermobcaps.patch similarity index 100% rename from patches/server/0673-Add-paper-mobcaps-and-paper-playermobcaps.patch rename to patches/server/0672-Add-paper-mobcaps-and-paper-playermobcaps.patch diff --git a/patches/server/0674-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0673-Sanitize-ResourceLocation-error-logging.patch similarity index 100% rename from patches/server/0674-Sanitize-ResourceLocation-error-logging.patch rename to patches/server/0673-Sanitize-ResourceLocation-error-logging.patch diff --git a/patches/server/0675-Optimise-general-POI-access.patch b/patches/server/0674-Optimise-general-POI-access.patch similarity index 100% rename from patches/server/0675-Optimise-general-POI-access.patch rename to patches/server/0674-Optimise-general-POI-access.patch diff --git a/patches/server/0676-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0675-Custom-table-implementation-for-blockstate-state-loo.patch similarity index 100% rename from patches/server/0676-Custom-table-implementation-for-blockstate-state-loo.patch rename to patches/server/0675-Custom-table-implementation-for-blockstate-state-loo.patch diff --git a/patches/server/0677-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0676-Manually-inline-methods-in-BlockPosition.patch similarity index 100% rename from patches/server/0677-Manually-inline-methods-in-BlockPosition.patch rename to patches/server/0676-Manually-inline-methods-in-BlockPosition.patch diff --git a/patches/server/0678-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0677-Name-craft-scheduler-threads-according-to-the-plugin.patch similarity index 100% rename from patches/server/0678-Name-craft-scheduler-threads-according-to-the-plugin.patch rename to patches/server/0677-Name-craft-scheduler-threads-according-to-the-plugin.patch diff --git a/patches/server/0679-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0678-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch similarity index 94% rename from patches/server/0679-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch rename to patches/server/0678-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch index 28d10c6045..b0d144de35 100644 --- a/patches/server/0679-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch +++ b/patches/server/0678-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch @@ -13,7 +13,7 @@ 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 0e679bbbc000c32b840e5f3155a3c275216b20b5..58394bbf228f96f717e5318cd016caf9d2f09343 100644 +index 031fe212e5bc28ac675f835bec37c1bca3c5351f..db92c938803155ed59a1913d287a352fad351e9d 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -458,6 +458,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0680-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0679-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch similarity index 100% rename from patches/server/0680-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch rename to patches/server/0679-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch diff --git a/patches/server/0681-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0680-Don-t-lookup-fluid-state-when-raytracing.patch similarity index 100% rename from patches/server/0681-Don-t-lookup-fluid-state-when-raytracing.patch rename to patches/server/0680-Don-t-lookup-fluid-state-when-raytracing.patch diff --git a/patches/server/0682-Time-scoreboard-search.patch b/patches/server/0681-Time-scoreboard-search.patch similarity index 96% rename from patches/server/0682-Time-scoreboard-search.patch rename to patches/server/0681-Time-scoreboard-search.patch index 2247be6de8..8d15084758 100644 --- a/patches/server/0682-Time-scoreboard-search.patch +++ b/patches/server/0681-Time-scoreboard-search.patch @@ -7,7 +7,7 @@ Plugins leaking scoreboards will make this very expensive, let server owners debug it easily diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java -index 4d861f9a58f8ea238471af22f387854d855b1801..e8aad2eecd8263118e3eca9e2be84a00277bc15e 100644 +index e2764186bd6b838ed5cd86c15597a08d079ef984..6b3cde6d4d1e63bec01f502f2027ee9fddac08aa 100644 --- a/src/main/java/co/aikar/timings/MinecraftTimings.java +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java @@ -46,6 +46,7 @@ public final class MinecraftTimings { diff --git a/patches/server/0683-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0682-Send-full-pos-packets-for-hard-colliding-entities.patch similarity index 100% rename from patches/server/0683-Send-full-pos-packets-for-hard-colliding-entities.patch rename to patches/server/0682-Send-full-pos-packets-for-hard-colliding-entities.patch diff --git a/patches/server/0684-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0683-Do-not-run-raytrace-logic-for-AIR.patch similarity index 100% rename from patches/server/0684-Do-not-run-raytrace-logic-for-AIR.patch rename to patches/server/0683-Do-not-run-raytrace-logic-for-AIR.patch diff --git a/patches/server/0685-Execute-chunk-tasks-mid-tick.patch b/patches/server/0684-Execute-chunk-tasks-mid-tick.patch similarity index 93% rename from patches/server/0685-Execute-chunk-tasks-mid-tick.patch rename to patches/server/0684-Execute-chunk-tasks-mid-tick.patch index b3bdc8e4ac..f6668668dc 100644 --- a/patches/server/0685-Execute-chunk-tasks-mid-tick.patch +++ b/patches/server/0684-Execute-chunk-tasks-mid-tick.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Execute chunk tasks mid-tick This will help the server load chunks if tick times are high. diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java -index e8aad2eecd8263118e3eca9e2be84a00277bc15e..190f6727351bc1d4e071da095d2f6365de095379 100644 +index 6b3cde6d4d1e63bec01f502f2027ee9fddac08aa..46449728f69ee7d4f78470f8da23c055acd53a3b 100644 --- a/src/main/java/co/aikar/timings/MinecraftTimings.java +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java @@ -48,6 +48,8 @@ public final class MinecraftTimings { @@ -103,7 +103,7 @@ index 6f17e5631aace53f75e6badf514dbb77c50065b9..0a23cfeaba071c2179de1931caa86bc4 } else { if (this.tickRateManager.isSprinting() || this.haveTime()) { diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index e725dd92ae15f62b078bda3572d0663468f37939..1f7586b71c579d48de32a307c0ce543130f0851b 100644 +index 18dceb057ff13679e7caa4b8028ec2e9b5e29381..f8a848487c1d8fea5ae1d397908baf2e05efc00b 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java @@ -566,6 +566,7 @@ public class ServerChunkCache extends ChunkSource { @@ -114,16 +114,16 @@ index e725dd92ae15f62b078bda3572d0663468f37939..1f7586b71c579d48de32a307c0ce5431 while (iterator1.hasNext()) { ServerChunkCache.ChunkAndHolder chunkproviderserver_a = (ServerChunkCache.ChunkAndHolder) iterator1.next(); LevelChunk chunk1 = chunkproviderserver_a.chunk; -@@ -580,6 +581,7 @@ public class ServerChunkCache extends ChunkSource { +@@ -579,6 +580,7 @@ public class ServerChunkCache extends ChunkSource { + if (this.level.shouldTickBlocksAt(chunkcoordintpair.toLong())) { - this.level.timings.doTickTiles.startTiming(); // Spigot this.level.tickChunk(chunk1, l); + if ((chunksTicked++ & 1) == 0) net.minecraft.server.MinecraftServer.getServer().executeMidTickTasks(); // Paper - this.level.timings.doTickTiles.stopTiming(); // Spigot } } + } diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 938a07d2e90ea2516b064d930b38e8908be91055..81381a4b401046b2ea76627814c740dca73b9592 100644 +index 174f374353e8706c94bfd4466ad42f69d76b2508..5885fede6ac94e9d098a00c55cff27c9109afa57 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -217,6 +217,7 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -151,7 +151,7 @@ index 938a07d2e90ea2516b064d930b38e8908be91055..81381a4b401046b2ea76627814c740dc } diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 58394bbf228f96f717e5318cd016caf9d2f09343..c6b590381b8464ff9d7410b833889af5238e206a 100644 +index db92c938803155ed59a1913d287a352fad351e9d..526ed13d199c0469cc68efb57dad0ccf40317c0c 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -929,6 +929,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0686-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0685-Oprimise-map-impl-for-tracked-players.patch similarity index 100% rename from patches/server/0686-Oprimise-map-impl-for-tracked-players.patch rename to patches/server/0685-Oprimise-map-impl-for-tracked-players.patch diff --git a/patches/server/0687-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0686-Optimise-BlockSoil-nearby-water-lookup.patch similarity index 100% rename from patches/server/0687-Optimise-BlockSoil-nearby-water-lookup.patch rename to patches/server/0686-Optimise-BlockSoil-nearby-water-lookup.patch diff --git a/patches/server/0688-Optimise-random-block-ticking.patch b/patches/server/0687-Optimise-random-block-ticking.patch similarity index 99% rename from patches/server/0688-Optimise-random-block-ticking.patch rename to patches/server/0687-Optimise-random-block-ticking.patch index 8aeca11a5c..bde8fcef53 100644 --- a/patches/server/0688-Optimise-random-block-ticking.patch +++ b/patches/server/0687-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 81381a4b401046b2ea76627814c740dca73b9592..5d0ea7d1cd52469f9951b5b4db2daa0f9ab1b7d8 100644 +index 5885fede6ac94e9d098a00c55cff27c9109afa57..9b9bd7e4ee5e748640ebcd144338a189aec991e8 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -856,6 +856,10 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -324,7 +324,7 @@ index 722e323d2ae3f4ac8aa3197fed79f7d926d5ccfa..f8c1dfc8e121a406955348a1ec00c264 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 c6b590381b8464ff9d7410b833889af5238e206a..fe263132ed204dbd1b939d92dc16eec40162fb76 100644 +index 526ed13d199c0469cc68efb57dad0ccf40317c0c..10ffc49a68fae99cf6d3da92553d703df0f35f1e 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -1400,10 +1400,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0689-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0688-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch similarity index 100% rename from patches/server/0689-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch rename to patches/server/0688-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch diff --git a/patches/server/0690-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0689-Use-Velocity-compression-and-cipher-natives.patch similarity index 100% rename from patches/server/0690-Use-Velocity-compression-and-cipher-natives.patch rename to patches/server/0689-Use-Velocity-compression-and-cipher-natives.patch diff --git a/patches/server/0691-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0690-Detail-more-information-in-watchdog-dumps.patch similarity index 98% rename from patches/server/0691-Detail-more-information-in-watchdog-dumps.patch rename to patches/server/0690-Detail-more-information-in-watchdog-dumps.patch index b3502d266d..e46baa9221 100644 --- a/patches/server/0691-Detail-more-information-in-watchdog-dumps.patch +++ b/patches/server/0690-Detail-more-information-in-watchdog-dumps.patch @@ -76,7 +76,7 @@ index 7de24c39b460e43d27839b3821e67213508ece81..7297bca9224c12d7ace0e1967340d994 }); 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 5d0ea7d1cd52469f9951b5b4db2daa0f9ab1b7d8..baa70699c3f8960b39af38502f40d43c8580e9ab 100644 +index 9b9bd7e4ee5e748640ebcd144338a189aec991e8..5ff0275067f11bcd723cf8884788f76e966832e4 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1240,7 +1240,26 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -122,7 +122,7 @@ index 5d0ea7d1cd52469f9951b5b4db2daa0f9ab1b7d8..baa70699c3f8960b39af38502f40d43c private void tickPassenger(Entity vehicle, Entity passenger) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 430f36da1e40d8427f24994ab16e68da79f575d2..66bca8bd3cfb5956104d5d8bef4b34d84d3cf21f 100644 +index 65ab99c3f3f1478db6e14d713e82346d3ecc06a5..1aac748a6ac485ad66f4501ae22cd6a422a966b5 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1029,7 +1029,42 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0692-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0691-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch similarity index 100% rename from patches/server/0692-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch rename to patches/server/0691-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch diff --git a/patches/server/0693-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0692-Fix-Bukkit-NamespacedKey-shenanigans.patch similarity index 100% rename from patches/server/0693-Fix-Bukkit-NamespacedKey-shenanigans.patch rename to patches/server/0692-Fix-Bukkit-NamespacedKey-shenanigans.patch diff --git a/patches/server/0694-Distance-manager-tick-timings.patch b/patches/server/0693-Distance-manager-tick-timings.patch similarity index 95% rename from patches/server/0694-Distance-manager-tick-timings.patch rename to patches/server/0693-Distance-manager-tick-timings.patch index f2a04605c8..731b2b5f86 100644 --- a/patches/server/0694-Distance-manager-tick-timings.patch +++ b/patches/server/0693-Distance-manager-tick-timings.patch @@ -7,7 +7,7 @@ Recently this has been taking up more time, so add a timings to really figure out how much. diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java -index 190f6727351bc1d4e071da095d2f6365de095379..a5f10adde531c4657791d5d0797101a28bd3faa7 100644 +index 46449728f69ee7d4f78470f8da23c055acd53a3b..4b467f1af93452d13829f756d55dee18b8889d40 100644 --- a/src/main/java/co/aikar/timings/MinecraftTimings.java +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java @@ -47,6 +47,7 @@ public final class MinecraftTimings { diff --git a/patches/server/0695-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0694-Fix-merchant-inventory-not-closing-on-entity-removal.patch similarity index 94% rename from patches/server/0695-Fix-merchant-inventory-not-closing-on-entity-removal.patch rename to patches/server/0694-Fix-merchant-inventory-not-closing-on-entity-removal.patch index c9a5242d9e..15317ec1f0 100644 --- a/patches/server/0695-Fix-merchant-inventory-not-closing-on-entity-removal.patch +++ b/patches/server/0694-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 baa70699c3f8960b39af38502f40d43c8580e9ab..b9b7896c2f850f9a02900932ea9255dc0aa07e26 100644 +index 5ff0275067f11bcd723cf8884788f76e966832e4..cfc53b3c270e02131ef1b3daf3476e3cce21e6e1 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -2683,6 +2683,11 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0696-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0695-Check-requirement-before-suggesting-root-nodes.patch similarity index 100% rename from patches/server/0696-Check-requirement-before-suggesting-root-nodes.patch rename to patches/server/0695-Check-requirement-before-suggesting-root-nodes.patch diff --git a/patches/server/0697-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0696-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch similarity index 100% rename from patches/server/0697-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch rename to patches/server/0696-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch diff --git a/patches/server/0698-Add-packet-limiter-config.patch b/patches/server/0697-Add-packet-limiter-config.patch similarity index 100% rename from patches/server/0698-Add-packet-limiter-config.patch rename to patches/server/0697-Add-packet-limiter-config.patch diff --git a/patches/server/0699-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0698-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch similarity index 100% rename from patches/server/0699-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch rename to patches/server/0698-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch diff --git a/patches/server/0700-Ensure-valid-vehicle-status.patch b/patches/server/0699-Ensure-valid-vehicle-status.patch similarity index 100% rename from patches/server/0700-Ensure-valid-vehicle-status.patch rename to patches/server/0699-Ensure-valid-vehicle-status.patch diff --git a/patches/server/0701-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0700-Prevent-softlocked-end-exit-portal-generation.patch similarity index 100% rename from patches/server/0701-Prevent-softlocked-end-exit-portal-generation.patch rename to patches/server/0700-Prevent-softlocked-end-exit-portal-generation.patch diff --git a/patches/server/0702-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0701-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch similarity index 100% rename from patches/server/0702-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch rename to patches/server/0701-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch diff --git a/patches/server/0703-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0702-Don-t-log-debug-logging-being-disabled.patch similarity index 100% rename from patches/server/0703-Don-t-log-debug-logging-being-disabled.patch rename to patches/server/0702-Don-t-log-debug-logging-being-disabled.patch diff --git a/patches/server/0704-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0703-fix-various-menus-with-empty-level-accesses.patch similarity index 100% rename from patches/server/0704-fix-various-menus-with-empty-level-accesses.patch rename to patches/server/0703-fix-various-menus-with-empty-level-accesses.patch diff --git a/patches/server/0705-Preserve-overstacked-loot.patch b/patches/server/0704-Preserve-overstacked-loot.patch similarity index 100% rename from patches/server/0705-Preserve-overstacked-loot.patch rename to patches/server/0704-Preserve-overstacked-loot.patch diff --git a/patches/server/0706-Update-head-rotation-in-missing-places.patch b/patches/server/0705-Update-head-rotation-in-missing-places.patch similarity index 93% rename from patches/server/0706-Update-head-rotation-in-missing-places.patch rename to patches/server/0705-Update-head-rotation-in-missing-places.patch index d506c0b927..b45a4c13f8 100644 --- a/patches/server/0706-Update-head-rotation-in-missing-places.patch +++ b/patches/server/0705-Update-head-rotation-in-missing-places.patch @@ -8,7 +8,7 @@ This is because bukkit uses a separate head rotation field for yaw. This issue only applies to players. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 66bca8bd3cfb5956104d5d8bef4b34d84d3cf21f..9f966aad558a26f75846a4ae2e891a370376b90b 100644 +index 1aac748a6ac485ad66f4501ae22cd6a422a966b5..4be223f2aa5ecf259e7d6551c8ca8876fb343f59 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1916,6 +1916,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0707-prevent-unintended-light-block-manipulation.patch b/patches/server/0706-prevent-unintended-light-block-manipulation.patch similarity index 100% rename from patches/server/0707-prevent-unintended-light-block-manipulation.patch rename to patches/server/0706-prevent-unintended-light-block-manipulation.patch diff --git a/patches/server/0708-Fix-CraftCriteria-defaults-map.patch b/patches/server/0707-Fix-CraftCriteria-defaults-map.patch similarity index 100% rename from patches/server/0708-Fix-CraftCriteria-defaults-map.patch rename to patches/server/0707-Fix-CraftCriteria-defaults-map.patch diff --git a/patches/server/0709-Fix-upstreams-block-state-factories.patch b/patches/server/0708-Fix-upstreams-block-state-factories.patch similarity index 100% rename from patches/server/0709-Fix-upstreams-block-state-factories.patch rename to patches/server/0708-Fix-upstreams-block-state-factories.patch diff --git a/patches/server/0710-Configurable-feature-seeds.patch b/patches/server/0709-Configurable-feature-seeds.patch similarity index 100% rename from patches/server/0710-Configurable-feature-seeds.patch rename to patches/server/0709-Configurable-feature-seeds.patch diff --git a/patches/server/0711-Add-root-admin-user-detection.patch b/patches/server/0710-Add-root-admin-user-detection.patch similarity index 100% rename from patches/server/0711-Add-root-admin-user-detection.patch rename to patches/server/0710-Add-root-admin-user-detection.patch diff --git a/patches/server/0712-Always-allow-item-changing-in-Fireball.patch b/patches/server/0711-Always-allow-item-changing-in-Fireball.patch similarity index 100% rename from patches/server/0712-Always-allow-item-changing-in-Fireball.patch rename to patches/server/0711-Always-allow-item-changing-in-Fireball.patch diff --git a/patches/server/0713-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0712-don-t-attempt-to-teleport-dead-entities.patch similarity index 91% rename from patches/server/0713-don-t-attempt-to-teleport-dead-entities.patch rename to patches/server/0712-don-t-attempt-to-teleport-dead-entities.patch index 0d950c4e57..e0c851266a 100644 --- a/patches/server/0713-don-t-attempt-to-teleport-dead-entities.patch +++ b/patches/server/0712-don-t-attempt-to-teleport-dead-entities.patch @@ -5,7 +5,7 @@ Subject: [PATCH] don't attempt to teleport dead entities diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 9f966aad558a26f75846a4ae2e891a370376b90b..3a3cc572369f4eab96d748d97af97f02c49d2a37 100644 +index 4be223f2aa5ecf259e7d6551c8ca8876fb343f59..09a49aa1f33796ab5947010538f504c49d2af226 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -792,7 +792,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0714-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0713-Prevent-excessive-velocity-through-repeated-crits.patch similarity index 100% rename from patches/server/0714-Prevent-excessive-velocity-through-repeated-crits.patch rename to patches/server/0713-Prevent-excessive-velocity-through-repeated-crits.patch diff --git a/patches/server/0715-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0714-Remove-client-side-code-using-deprecated-for-removal.patch similarity index 100% rename from patches/server/0715-Remove-client-side-code-using-deprecated-for-removal.patch rename to patches/server/0714-Remove-client-side-code-using-deprecated-for-removal.patch diff --git a/patches/server/0716-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0715-Fix-removing-recipes-from-RecipeIterator.patch similarity index 100% rename from patches/server/0716-Fix-removing-recipes-from-RecipeIterator.patch rename to patches/server/0715-Fix-removing-recipes-from-RecipeIterator.patch diff --git a/patches/server/0717-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0716-Prevent-sending-oversized-item-data-in-equipment-and.patch similarity index 100% rename from patches/server/0717-Prevent-sending-oversized-item-data-in-equipment-and.patch rename to patches/server/0716-Prevent-sending-oversized-item-data-in-equipment-and.patch diff --git a/patches/server/0718-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0717-Hide-unnecessary-itemmeta-from-clients.patch similarity index 100% rename from patches/server/0718-Hide-unnecessary-itemmeta-from-clients.patch rename to patches/server/0717-Hide-unnecessary-itemmeta-from-clients.patch diff --git a/patches/server/0719-Fix-Spigot-growth-modifiers.patch b/patches/server/0718-Fix-Spigot-growth-modifiers.patch similarity index 100% rename from patches/server/0719-Fix-Spigot-growth-modifiers.patch rename to patches/server/0718-Fix-Spigot-growth-modifiers.patch diff --git a/patches/server/0720-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0719-Prevent-ContainerOpenersCounter-openCount-from-going.patch similarity index 100% rename from patches/server/0720-Prevent-ContainerOpenersCounter-openCount-from-going.patch rename to patches/server/0719-Prevent-ContainerOpenersCounter-openCount-from-going.patch diff --git a/patches/server/0721-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0720-Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/server/0721-Add-PlayerItemFrameChangeEvent.patch rename to patches/server/0720-Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/server/0722-Optimize-HashMapPalette.patch b/patches/server/0721-Optimize-HashMapPalette.patch similarity index 100% rename from patches/server/0722-Optimize-HashMapPalette.patch rename to patches/server/0721-Optimize-HashMapPalette.patch diff --git a/patches/server/0723-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0722-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 100% rename from patches/server/0723-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/server/0722-Allow-delegation-to-vanilla-chunk-gen.patch diff --git a/patches/server/0724-Collision-optimisations.patch b/patches/server/0723-Collision-optimisations.patch similarity index 99% rename from patches/server/0724-Collision-optimisations.patch rename to patches/server/0723-Collision-optimisations.patch index 45fe8c9abf..4cf76f9bb1 100644 --- a/patches/server/0724-Collision-optimisations.patch +++ b/patches/server/0723-Collision-optimisations.patch @@ -2226,7 +2226,7 @@ index 4d39c57941dcefc2c507f69adea2b042bc78662b..eed929059c7ee445a9ae6dbf778c4e26 } } diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 3b5a498a602b2cafb58a0130227eb6d4e8f3802d..c92545e3cd199c7e123f65d42ca8976d2da27509 100644 +index 53dbfb828f4d6f47b87e7ff6829a8dbc3de2f0fd..30ad9f878d0b76c6bef594448c3122d614a7aa8c 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -911,7 +911,7 @@ public abstract class PlayerList { @@ -2239,7 +2239,7 @@ index 3b5a498a602b2cafb58a0130227eb6d4e8f3802d..c92545e3cd199c7e123f65d42ca8976d entityplayer1.setPos(entityplayer1.getX(), entityplayer1.getY() + 1.0D, entityplayer1.getZ()); } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 3a3cc572369f4eab96d748d97af97f02c49d2a37..3a0bae57ba9888849dd8227b29a79fb682077911 100644 +index 09a49aa1f33796ab5947010538f504c49d2af226..b8c5c8ecf1a1a2bddcf8df15042e617908ab122c 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1215,9 +1215,44 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S @@ -2469,7 +2469,7 @@ index 3a3cc572369f4eab96d748d97af97f02c49d2a37..3a0bae57ba9888849dd8227b29a79fb6 } diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java -index 483d8c627a60e04f66f0135a8d64e6d5366e0997..68fc2f614253f43ed9b09f54ca06aabb2bdd8fe3 100644 +index d46b3b346540cc78cb93f3ce8bc8adc89b3d9b3d..ab708b256183fc54fe8e13f341d8a38acf611739 100644 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java @@ -353,7 +353,7 @@ public class ArmorStand extends LivingEntity { @@ -2629,7 +2629,7 @@ 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 fe263132ed204dbd1b939d92dc16eec40162fb76..dbabf221bb0d49a2632728a6d04ff3e55a7d5898 100644 +index 10ffc49a68fae99cf6d3da92553d703df0f35f1e..78fd63052f1eb5a650befecdad07cbc755658632 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -300,6 +300,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0725-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0724-Optimise-collision-checking-in-player-move-packet-ha.patch similarity index 100% rename from patches/server/0725-Optimise-collision-checking-in-player-move-packet-ha.patch rename to patches/server/0724-Optimise-collision-checking-in-player-move-packet-ha.patch diff --git a/patches/server/0726-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0725-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch similarity index 100% rename from patches/server/0726-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch rename to patches/server/0725-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch diff --git a/patches/server/0727-Add-more-Campfire-API.patch b/patches/server/0726-Add-more-Campfire-API.patch similarity index 100% rename from patches/server/0727-Add-more-Campfire-API.patch rename to patches/server/0726-Add-more-Campfire-API.patch diff --git a/patches/server/0728-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0727-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch similarity index 100% rename from patches/server/0728-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch rename to patches/server/0727-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch diff --git a/patches/server/0729-Fix-tripwire-state-inconsistency.patch b/patches/server/0728-Fix-tripwire-state-inconsistency.patch similarity index 88% rename from patches/server/0729-Fix-tripwire-state-inconsistency.patch rename to patches/server/0728-Fix-tripwire-state-inconsistency.patch index 49aa2d69f5..4433ab45c4 100644 --- a/patches/server/0729-Fix-tripwire-state-inconsistency.patch +++ b/patches/server/0728-Fix-tripwire-state-inconsistency.patch @@ -41,7 +41,7 @@ index bbb7d1b03c78758d608e89129aacec151242831c..1a0c5fb62e80681604110e95c1ae7b36 } else if (iblockdata1.is((Block) this)) { ++k; diff --git a/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java b/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java -index 02b62ac13d4968f80cb0ae3702755d0f1d95e692..f922db802ae9fd05ce4b3b8d16531d9f7f458412 100644 +index 02b62ac13d4968f80cb0ae3702755d0f1d95e692..a3cef4ac925d09ad8789a59b46df134cf25c282a 100644 --- a/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java +++ b/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java @@ -118,7 +118,13 @@ public class TripWireHookBlock extends Block { @@ -76,3 +76,12 @@ index 02b62ac13d4968f80cb0ae3702755d0f1d95e692..f922db802ae9fd05ce4b3b8d16531d9f aiblockdata[k] = iblockdata2; if (k == i) { world.scheduleTick(pos, block, 10); +@@ -187,7 +194,7 @@ public class TripWireHookBlock extends Block { + // CraftBukkit end + + TripWireHookBlock.emitState(world, pos, flag4, flag5, flag2, flag3); +- if (!flag) { ++ if (!beingRemoved) { // Paper + if (world.getBlockState(pos).getBlock() == Blocks.TRIPWIRE_HOOK) // Paper - validate + world.setBlock(pos, (BlockState) iblockdata3.setValue(TripWireHookBlock.FACING, enumdirection), 3); + if (flag1) { diff --git a/patches/server/0730-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0729-Forward-CraftEntity-in-teleport-command.patch similarity index 94% rename from patches/server/0730-Forward-CraftEntity-in-teleport-command.patch rename to patches/server/0729-Forward-CraftEntity-in-teleport-command.patch index 27c621b123..614b09f4c6 100644 --- a/patches/server/0730-Forward-CraftEntity-in-teleport-command.patch +++ b/patches/server/0729-Forward-CraftEntity-in-teleport-command.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Forward CraftEntity in teleport command diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 3a0bae57ba9888849dd8227b29a79fb682077911..92b2e09ff556b1aad835f5e8e67e9af324ed964a 100644 +index b8c5c8ecf1a1a2bddcf8df15042e617908ab122c..584a254d1a5222d404f5bc8062830cb82c228a66 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3535,6 +3535,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0731-Improve-scoreboard-entries.patch b/patches/server/0730-Improve-scoreboard-entries.patch similarity index 100% rename from patches/server/0731-Improve-scoreboard-entries.patch rename to patches/server/0730-Improve-scoreboard-entries.patch diff --git a/patches/server/0732-Entity-powdered-snow-API.patch b/patches/server/0731-Entity-powdered-snow-API.patch similarity index 100% rename from patches/server/0732-Entity-powdered-snow-API.patch rename to patches/server/0731-Entity-powdered-snow-API.patch diff --git a/patches/server/0733-Add-API-for-item-entity-health.patch b/patches/server/0732-Add-API-for-item-entity-health.patch similarity index 100% rename from patches/server/0733-Add-API-for-item-entity-health.patch rename to patches/server/0732-Add-API-for-item-entity-health.patch diff --git a/patches/server/0734-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0733-Fix-entity-type-tags-suggestions-in-selectors.patch similarity index 100% rename from patches/server/0734-Fix-entity-type-tags-suggestions-in-selectors.patch rename to patches/server/0733-Fix-entity-type-tags-suggestions-in-selectors.patch diff --git a/patches/server/0735-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0734-Configurable-max-block-light-for-monster-spawning.patch similarity index 100% rename from patches/server/0735-Configurable-max-block-light-for-monster-spawning.patch rename to patches/server/0734-Configurable-max-block-light-for-monster-spawning.patch diff --git a/patches/server/0736-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0735-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch similarity index 100% rename from patches/server/0736-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch rename to patches/server/0735-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch diff --git a/patches/server/0737-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0736-Load-effect-amplifiers-greater-than-127-correctly.patch similarity index 100% rename from patches/server/0737-Load-effect-amplifiers-greater-than-127-correctly.patch rename to patches/server/0736-Load-effect-amplifiers-greater-than-127-correctly.patch diff --git a/patches/server/0738-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0737-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/server/0738-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/server/0737-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/server/0739-Fix-bees-aging-inside-hives.patch b/patches/server/0738-Fix-bees-aging-inside-hives.patch similarity index 100% rename from patches/server/0739-Fix-bees-aging-inside-hives.patch rename to patches/server/0738-Fix-bees-aging-inside-hives.patch diff --git a/patches/server/0740-Bucketable-API.patch b/patches/server/0739-Bucketable-API.patch similarity index 100% rename from patches/server/0740-Bucketable-API.patch rename to patches/server/0739-Bucketable-API.patch diff --git a/patches/server/0741-Validate-usernames.patch b/patches/server/0740-Validate-usernames.patch similarity index 97% rename from patches/server/0741-Validate-usernames.patch rename to patches/server/0740-Validate-usernames.patch index 5f2ffd33bc..7ce986ccde 100644 --- a/patches/server/0741-Validate-usernames.patch +++ b/patches/server/0740-Validate-usernames.patch @@ -56,7 +56,7 @@ index 0c4fb4a7d4fcdc6d724beb13a16bd729a3c525cd..20ba13c06edf125ba216d1ca8794868a GameProfile gameprofile = this.server.getSingleplayerProfile(); diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index c92545e3cd199c7e123f65d42ca8976d2da27509..1e15c3576b6b506335c66a4ca0a47f3aa178c72a 100644 +index 30ad9f878d0b76c6bef594448c3122d614a7aa8c..147fed3b3f0b052bc2892eaf001f0fb5c9198a85 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -679,7 +679,7 @@ public abstract class PlayerList { diff --git a/patches/server/0742-Make-water-animal-spawn-height-configurable.patch b/patches/server/0741-Make-water-animal-spawn-height-configurable.patch similarity index 100% rename from patches/server/0742-Make-water-animal-spawn-height-configurable.patch rename to patches/server/0741-Make-water-animal-spawn-height-configurable.patch diff --git a/patches/server/0743-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0742-Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 100% rename from patches/server/0743-Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/server/0742-Expose-vanilla-BiomeProvider-from-WorldInfo.patch diff --git a/patches/server/0744-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0743-Add-config-option-for-worlds-affected-by-time-cmd.patch similarity index 100% rename from patches/server/0744-Add-config-option-for-worlds-affected-by-time-cmd.patch rename to patches/server/0743-Add-config-option-for-worlds-affected-by-time-cmd.patch diff --git a/patches/server/0745-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0744-Add-new-overload-to-PersistentDataContainer-has.patch similarity index 100% rename from patches/server/0745-Add-new-overload-to-PersistentDataContainer-has.patch rename to patches/server/0744-Add-new-overload-to-PersistentDataContainer-has.patch diff --git a/patches/server/0746-Multiple-Entries-with-Scoreboards.patch b/patches/server/0745-Multiple-Entries-with-Scoreboards.patch similarity index 100% rename from patches/server/0746-Multiple-Entries-with-Scoreboards.patch rename to patches/server/0745-Multiple-Entries-with-Scoreboards.patch diff --git a/patches/server/0747-Reset-placed-block-on-exception.patch b/patches/server/0746-Reset-placed-block-on-exception.patch similarity index 100% rename from patches/server/0747-Reset-placed-block-on-exception.patch rename to patches/server/0746-Reset-placed-block-on-exception.patch diff --git a/patches/server/0748-Add-configurable-height-for-slime-spawn.patch b/patches/server/0747-Add-configurable-height-for-slime-spawn.patch similarity index 100% rename from patches/server/0748-Add-configurable-height-for-slime-spawn.patch rename to patches/server/0747-Add-configurable-height-for-slime-spawn.patch diff --git a/patches/server/0749-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0748-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0749-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch rename to patches/server/0748-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0750-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0749-Fix-xp-reward-for-baby-zombies.patch similarity index 100% rename from patches/server/0750-Fix-xp-reward-for-baby-zombies.patch rename to patches/server/0749-Fix-xp-reward-for-baby-zombies.patch diff --git a/patches/server/0751-Kick-on-main-for-illegal-chat.patch b/patches/server/0750-Kick-on-main-for-illegal-chat.patch similarity index 100% rename from patches/server/0751-Kick-on-main-for-illegal-chat.patch rename to patches/server/0750-Kick-on-main-for-illegal-chat.patch diff --git a/patches/server/0752-Multi-Block-Change-API-Implementation.patch b/patches/server/0751-Multi-Block-Change-API-Implementation.patch similarity index 97% rename from patches/server/0752-Multi-Block-Change-API-Implementation.patch rename to patches/server/0751-Multi-Block-Change-API-Implementation.patch index fa8f03b75f..cd8f6a6b66 100644 --- a/patches/server/0752-Multi-Block-Change-API-Implementation.patch +++ b/patches/server/0751-Multi-Block-Change-API-Implementation.patch @@ -24,7 +24,7 @@ index f96d61bdeb556665d6e6e5023f9d77fd82204e89..e3f355c85eb7cc8c1683e3009502c10a public void write(FriendlyByteBuf buf) { buf.writeLong(this.sectionPos.asLong()); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index ca8f06538d140b22f8ed4418aaf544c853f7f8a8..d2c836d747effbdc424787976eabbd1b1b30fd3c 100644 +index 9652608958dc453cd259eb589f28ef0efbb11442..451f558c4904b5e67bad86305c9e058813f25126 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -892,6 +892,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0753-Fix-NotePlayEvent.patch b/patches/server/0752-Fix-NotePlayEvent.patch similarity index 100% rename from patches/server/0753-Fix-NotePlayEvent.patch rename to patches/server/0752-Fix-NotePlayEvent.patch diff --git a/patches/server/0754-Freeze-Tick-Lock-API.patch b/patches/server/0753-Freeze-Tick-Lock-API.patch similarity index 100% rename from patches/server/0754-Freeze-Tick-Lock-API.patch rename to patches/server/0753-Freeze-Tick-Lock-API.patch diff --git a/patches/server/0755-Dolphin-API.patch b/patches/server/0754-Dolphin-API.patch similarity index 100% rename from patches/server/0755-Dolphin-API.patch rename to patches/server/0754-Dolphin-API.patch diff --git a/patches/server/0756-More-PotionEffectType-API.patch b/patches/server/0755-More-PotionEffectType-API.patch similarity index 100% rename from patches/server/0756-More-PotionEffectType-API.patch rename to patches/server/0755-More-PotionEffectType-API.patch diff --git a/patches/server/0757-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0756-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch similarity index 100% rename from patches/server/0757-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch rename to patches/server/0756-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch diff --git a/patches/server/0758-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0757-API-for-creating-command-sender-which-forwards-feedb.patch similarity index 100% rename from patches/server/0758-API-for-creating-command-sender-which-forwards-feedb.patch rename to patches/server/0757-API-for-creating-command-sender-which-forwards-feedb.patch diff --git a/patches/server/0759-Add-missing-structure-set-seed-configs.patch b/patches/server/0758-Add-missing-structure-set-seed-configs.patch similarity index 100% rename from patches/server/0759-Add-missing-structure-set-seed-configs.patch rename to patches/server/0758-Add-missing-structure-set-seed-configs.patch diff --git a/patches/server/0760-Implement-regenerateChunk.patch b/patches/server/0759-Implement-regenerateChunk.patch similarity index 100% rename from patches/server/0760-Implement-regenerateChunk.patch rename to patches/server/0759-Implement-regenerateChunk.patch diff --git a/patches/server/0761-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0760-Fix-cancelled-powdered-snow-bucket-placement.patch similarity index 100% rename from patches/server/0761-Fix-cancelled-powdered-snow-bucket-placement.patch rename to patches/server/0760-Fix-cancelled-powdered-snow-bucket-placement.patch diff --git a/patches/server/0762-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0761-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch similarity index 100% rename from patches/server/0762-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch rename to patches/server/0761-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch diff --git a/patches/server/0763-Add-GameEvent-tags.patch b/patches/server/0762-Add-GameEvent-tags.patch similarity index 100% rename from patches/server/0763-Add-GameEvent-tags.patch rename to patches/server/0762-Add-GameEvent-tags.patch diff --git a/patches/server/0764-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0763-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch similarity index 100% rename from patches/server/0764-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch rename to patches/server/0763-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch diff --git a/patches/server/0765-Furnace-RecipesUsed-API.patch b/patches/server/0764-Furnace-RecipesUsed-API.patch similarity index 100% rename from patches/server/0765-Furnace-RecipesUsed-API.patch rename to patches/server/0764-Furnace-RecipesUsed-API.patch diff --git a/patches/server/0766-Configurable-sculk-sensor-listener-range.patch b/patches/server/0765-Configurable-sculk-sensor-listener-range.patch similarity index 100% rename from patches/server/0766-Configurable-sculk-sensor-listener-range.patch rename to patches/server/0765-Configurable-sculk-sensor-listener-range.patch diff --git a/patches/server/0767-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0766-Add-missing-block-data-mins-and-maxes.patch similarity index 100% rename from patches/server/0767-Add-missing-block-data-mins-and-maxes.patch rename to patches/server/0766-Add-missing-block-data-mins-and-maxes.patch diff --git a/patches/server/0768-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0767-Option-to-have-default-CustomSpawners-in-custom-worl.patch similarity index 100% rename from patches/server/0768-Option-to-have-default-CustomSpawners-in-custom-worl.patch rename to patches/server/0767-Option-to-have-default-CustomSpawners-in-custom-worl.patch diff --git a/patches/server/0769-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0768-Put-world-into-worldlist-before-initing-the-world.patch similarity index 100% rename from patches/server/0769-Put-world-into-worldlist-before-initing-the-world.patch rename to patches/server/0768-Put-world-into-worldlist-before-initing-the-world.patch diff --git a/patches/server/0770-Fix-Entity-Position-Desync.patch b/patches/server/0769-Fix-Entity-Position-Desync.patch similarity index 100% rename from patches/server/0770-Fix-Entity-Position-Desync.patch rename to patches/server/0769-Fix-Entity-Position-Desync.patch diff --git a/patches/server/0771-Custom-Potion-Mixes.patch b/patches/server/0770-Custom-Potion-Mixes.patch similarity index 100% rename from patches/server/0771-Custom-Potion-Mixes.patch rename to patches/server/0770-Custom-Potion-Mixes.patch diff --git a/patches/server/0772-Force-close-world-loading-screen.patch b/patches/server/0771-Force-close-world-loading-screen.patch similarity index 95% rename from patches/server/0772-Force-close-world-loading-screen.patch rename to patches/server/0771-Force-close-world-loading-screen.patch index 99fb498811..0b85261bfe 100644 --- a/patches/server/0772-Force-close-world-loading-screen.patch +++ b/patches/server/0771-Force-close-world-loading-screen.patch @@ -10,7 +10,7 @@ so we do not need that. The client only needs the chunk it is currently in to be loaded to close the loading screen, so we just send an empty one. diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 1e15c3576b6b506335c66a4ca0a47f3aa178c72a..8f558f515d495962bec621d795bf1ea363c0ddbe 100644 +index 147fed3b3f0b052bc2892eaf001f0fb5c9198a85..d728e637449ace459b3501fd6a4fb77657a5ca55 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -398,6 +398,16 @@ public abstract class PlayerList { diff --git a/patches/server/0773-Fix-falling-block-spawn-methods.patch b/patches/server/0772-Fix-falling-block-spawn-methods.patch similarity index 97% rename from patches/server/0773-Fix-falling-block-spawn-methods.patch rename to patches/server/0772-Fix-falling-block-spawn-methods.patch index 8ddcee80cc..3cbc860a56 100644 --- a/patches/server/0773-Fix-falling-block-spawn-methods.patch +++ b/patches/server/0772-Fix-falling-block-spawn-methods.patch @@ -11,7 +11,7 @@ Restores the API behavior from previous versions of the server public net.minecraft.world.entity.item.FallingBlockEntity (Lnet/minecraft/world/level/Level;DDDLnet/minecraft/world/level/block/state/BlockState;)V diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java -index dac05caba1692025af8c930e7118b8b5706f7122..aabdd9bb57974758e66e52e913afe01a41d85b3f 100644 +index 44c08acdbc8316e501d9f25159f712a55d444b17..2ef96856920a8fb032ccc113c73a1b6271596a06 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java @@ -629,7 +629,7 @@ public abstract class CraftRegionAccessor implements RegionAccessor { diff --git a/patches/server/0774-Expose-furnace-minecart-push-values.patch b/patches/server/0773-Expose-furnace-minecart-push-values.patch similarity index 100% rename from patches/server/0774-Expose-furnace-minecart-push-values.patch rename to patches/server/0773-Expose-furnace-minecart-push-values.patch diff --git a/patches/server/0775-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0774-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch similarity index 100% rename from patches/server/0775-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch rename to patches/server/0774-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch diff --git a/patches/server/0776-More-Projectile-API.patch b/patches/server/0775-More-Projectile-API.patch similarity index 100% rename from patches/server/0776-More-Projectile-API.patch rename to patches/server/0775-More-Projectile-API.patch diff --git a/patches/server/0777-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0776-Fix-swamp-hut-cat-generation-deadlock.patch similarity index 100% rename from patches/server/0777-Fix-swamp-hut-cat-generation-deadlock.patch rename to patches/server/0776-Fix-swamp-hut-cat-generation-deadlock.patch diff --git a/patches/server/0778-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0777-Don-t-allow-vehicle-movement-from-players-while-tele.patch similarity index 100% rename from patches/server/0778-Don-t-allow-vehicle-movement-from-players-while-tele.patch rename to patches/server/0777-Don-t-allow-vehicle-movement-from-players-while-tele.patch diff --git a/patches/server/0779-Implement-getComputedBiome-API.patch b/patches/server/0778-Implement-getComputedBiome-API.patch similarity index 96% rename from patches/server/0779-Implement-getComputedBiome-API.patch rename to patches/server/0778-Implement-getComputedBiome-API.patch index 212b84fe81..a141826041 100644 --- a/patches/server/0779-Implement-getComputedBiome-API.patch +++ b/patches/server/0778-Implement-getComputedBiome-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Implement getComputedBiome API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java -index aabdd9bb57974758e66e52e913afe01a41d85b3f..681d29902a14b36e4b72e1ca530e131e1aaf273f 100644 +index 2ef96856920a8fb032ccc113c73a1b6271596a06..9c31a042d2ff82689a4bcc9d90fe08e5f8329985 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java @@ -224,6 +224,13 @@ public abstract class CraftRegionAccessor implements RegionAccessor { diff --git a/patches/server/0780-Make-some-itemstacks-nonnull.patch b/patches/server/0779-Make-some-itemstacks-nonnull.patch similarity index 100% rename from patches/server/0780-Make-some-itemstacks-nonnull.patch rename to patches/server/0779-Make-some-itemstacks-nonnull.patch diff --git a/patches/server/0781-Implement-enchantWithLevels-API.patch b/patches/server/0780-Implement-enchantWithLevels-API.patch similarity index 100% rename from patches/server/0781-Implement-enchantWithLevels-API.patch rename to patches/server/0780-Implement-enchantWithLevels-API.patch diff --git a/patches/server/0782-Fix-saving-in-unloadWorld.patch b/patches/server/0781-Fix-saving-in-unloadWorld.patch similarity index 100% rename from patches/server/0782-Fix-saving-in-unloadWorld.patch rename to patches/server/0781-Fix-saving-in-unloadWorld.patch diff --git a/patches/server/0783-Buffer-OOB-setBlock-calls.patch b/patches/server/0782-Buffer-OOB-setBlock-calls.patch similarity index 100% rename from patches/server/0783-Buffer-OOB-setBlock-calls.patch rename to patches/server/0782-Buffer-OOB-setBlock-calls.patch diff --git a/patches/server/0784-Add-TameableDeathMessageEvent.patch b/patches/server/0783-Add-TameableDeathMessageEvent.patch similarity index 100% rename from patches/server/0784-Add-TameableDeathMessageEvent.patch rename to patches/server/0783-Add-TameableDeathMessageEvent.patch diff --git a/patches/server/0785-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0784-Fix-new-block-data-for-EntityChangeBlockEvent.patch similarity index 100% rename from patches/server/0785-Fix-new-block-data-for-EntityChangeBlockEvent.patch rename to patches/server/0784-Fix-new-block-data-for-EntityChangeBlockEvent.patch diff --git a/patches/server/0786-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0785-fix-player-loottables-running-when-mob-loot-gamerule.patch similarity index 100% rename from patches/server/0786-fix-player-loottables-running-when-mob-loot-gamerule.patch rename to patches/server/0785-fix-player-loottables-running-when-mob-loot-gamerule.patch diff --git a/patches/server/0787-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0786-Ensure-entity-passenger-world-matches-ridden-entity.patch similarity index 90% rename from patches/server/0787-Ensure-entity-passenger-world-matches-ridden-entity.patch rename to patches/server/0786-Ensure-entity-passenger-world-matches-ridden-entity.patch index 032aa8b7ce..89d95d4c80 100644 --- a/patches/server/0787-Ensure-entity-passenger-world-matches-ridden-entity.patch +++ b/patches/server/0786-Ensure-entity-passenger-world-matches-ridden-entity.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Ensure entity passenger world matches ridden entity Bad plugins doing this would cause some obvious problems... diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 8f3b6cbe715e30922191444833584ed17439b518..bd83e27310bb04f064120fe0be60e498a2e4468f 100644 +index 8f178446ee632ae2aad735cae2edf6db96250f43..3fc282f8211eb3a7a7d096cc22b1bdb6545d70fa 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2849,7 +2849,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0788-Guard-against-invalid-entity-positions.patch b/patches/server/0787-Guard-against-invalid-entity-positions.patch similarity index 95% rename from patches/server/0788-Guard-against-invalid-entity-positions.patch rename to patches/server/0787-Guard-against-invalid-entity-positions.patch index 823f785196..9ec2f9c8da 100644 --- a/patches/server/0788-Guard-against-invalid-entity-positions.patch +++ b/patches/server/0787-Guard-against-invalid-entity-positions.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Guard against invalid entity positions Anything not finite should be blocked and logged diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index bd83e27310bb04f064120fe0be60e498a2e4468f..f5fa686060d40b0e8eddb910464c31085c3ee7c1 100644 +index 3fc282f8211eb3a7a7d096cc22b1bdb6545d70fa..8c20610c57ba90df364c9a65e867e35c9920a770 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -4543,11 +4543,33 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0789-cache-resource-keys.patch b/patches/server/0788-cache-resource-keys.patch similarity index 100% rename from patches/server/0789-cache-resource-keys.patch rename to patches/server/0788-cache-resource-keys.patch diff --git a/patches/server/0790-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0789-Allow-to-change-the-podium-for-the-EnderDragon.patch similarity index 100% rename from patches/server/0790-Allow-to-change-the-podium-for-the-EnderDragon.patch rename to patches/server/0789-Allow-to-change-the-podium-for-the-EnderDragon.patch diff --git a/patches/server/0791-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0790-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch similarity index 100% rename from patches/server/0791-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch rename to patches/server/0790-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch diff --git a/patches/server/0792-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0791-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch similarity index 100% rename from patches/server/0792-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch rename to patches/server/0791-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch diff --git a/patches/server/0793-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0792-Prevent-tile-entity-copies-loading-chunks.patch similarity index 100% rename from patches/server/0793-Prevent-tile-entity-copies-loading-chunks.patch rename to patches/server/0792-Prevent-tile-entity-copies-loading-chunks.patch diff --git a/patches/server/0794-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0793-Use-username-instead-of-display-name-in-PlayerList-g.patch similarity index 92% rename from patches/server/0794-Use-username-instead-of-display-name-in-PlayerList-g.patch rename to patches/server/0793-Use-username-instead-of-display-name-in-PlayerList-g.patch index 2952acaa5c..f6eb91a04c 100644 --- a/patches/server/0794-Use-username-instead-of-display-name-in-PlayerList-g.patch +++ b/patches/server/0793-Use-username-instead-of-display-name-in-PlayerList-g.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Use username instead of display name in diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 8f558f515d495962bec621d795bf1ea363c0ddbe..5afafee10b32b7f09757b5d60ad58e35cd467c17 100644 +index d728e637449ace459b3501fd6a4fb77657a5ca55..4bf3598f8d6f6f469a5a17e8067fd5035732da19 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -1445,7 +1445,7 @@ public abstract class PlayerList { diff --git a/patches/server/0795-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0794-Pass-ServerLevel-for-gamerule-callbacks.patch similarity index 100% rename from patches/server/0795-Pass-ServerLevel-for-gamerule-callbacks.patch rename to patches/server/0794-Pass-ServerLevel-for-gamerule-callbacks.patch diff --git a/patches/server/0796-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0795-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch similarity index 100% rename from patches/server/0796-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch rename to patches/server/0795-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch diff --git a/patches/server/0797-WorldCreator-keepSpawnLoaded.patch b/patches/server/0796-WorldCreator-keepSpawnLoaded.patch similarity index 100% rename from patches/server/0797-WorldCreator-keepSpawnLoaded.patch rename to patches/server/0796-WorldCreator-keepSpawnLoaded.patch diff --git a/patches/server/0798-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/server/0797-Fix-CME-in-CraftPersistentDataTypeRegistry.patch similarity index 100% rename from patches/server/0798-Fix-CME-in-CraftPersistentDataTypeRegistry.patch rename to patches/server/0797-Fix-CME-in-CraftPersistentDataTypeRegistry.patch diff --git a/patches/server/0799-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0798-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch similarity index 100% rename from patches/server/0799-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch rename to patches/server/0798-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch diff --git a/patches/server/0800-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0799-Add-EntityDyeEvent-and-CollarColorable-interface.patch similarity index 100% rename from patches/server/0800-Add-EntityDyeEvent-and-CollarColorable-interface.patch rename to patches/server/0799-Add-EntityDyeEvent-and-CollarColorable-interface.patch diff --git a/patches/server/0801-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0800-Fire-CauldronLevelChange-on-initial-fill.patch similarity index 100% rename from patches/server/0801-Fire-CauldronLevelChange-on-initial-fill.patch rename to patches/server/0800-Fire-CauldronLevelChange-on-initial-fill.patch diff --git a/patches/server/0802-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0801-fix-powder-snow-cauldrons-not-turning-to-water.patch similarity index 100% rename from patches/server/0802-fix-powder-snow-cauldrons-not-turning-to-water.patch rename to patches/server/0801-fix-powder-snow-cauldrons-not-turning-to-water.patch diff --git a/patches/server/0803-Add-PlayerStopUsingItemEvent.patch b/patches/server/0802-Add-PlayerStopUsingItemEvent.patch similarity index 100% rename from patches/server/0803-Add-PlayerStopUsingItemEvent.patch rename to patches/server/0802-Add-PlayerStopUsingItemEvent.patch diff --git a/patches/server/0804-Don-t-tick-markers.patch b/patches/server/0803-Don-t-tick-markers.patch similarity index 97% rename from patches/server/0804-Don-t-tick-markers.patch rename to patches/server/0803-Don-t-tick-markers.patch index a99d1e88a5..fa67dd14e5 100644 --- a/patches/server/0804-Don-t-tick-markers.patch +++ b/patches/server/0803-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 b9b7896c2f850f9a02900932ea9255dc0aa07e26..cc91327050998c5e725ee71ac8b91b41a8b01bdf 100644 +index cfc53b3c270e02131ef1b3daf3476e3cce21e6e1..3ac7c157cddfaa9262e727705eb88b55a637f618 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -2593,6 +2593,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0805-Expand-FallingBlock-API.patch b/patches/server/0804-Expand-FallingBlock-API.patch similarity index 100% rename from patches/server/0805-Expand-FallingBlock-API.patch rename to patches/server/0804-Expand-FallingBlock-API.patch diff --git a/patches/server/0806-Do-not-accept-invalid-client-settings.patch b/patches/server/0805-Do-not-accept-invalid-client-settings.patch similarity index 100% rename from patches/server/0806-Do-not-accept-invalid-client-settings.patch rename to patches/server/0805-Do-not-accept-invalid-client-settings.patch diff --git a/patches/server/0807-Add-support-for-Proxy-Protocol.patch b/patches/server/0806-Add-support-for-Proxy-Protocol.patch similarity index 100% rename from patches/server/0807-Add-support-for-Proxy-Protocol.patch rename to patches/server/0806-Add-support-for-Proxy-Protocol.patch diff --git a/patches/server/0808-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0807-Fix-OfflinePlayer-getBedSpawnLocation.patch similarity index 100% rename from patches/server/0808-Fix-OfflinePlayer-getBedSpawnLocation.patch rename to patches/server/0807-Fix-OfflinePlayer-getBedSpawnLocation.patch diff --git a/patches/server/0809-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0808-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch similarity index 100% rename from patches/server/0809-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch rename to patches/server/0808-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch diff --git a/patches/server/0810-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0809-Sanitize-Sent-BlockEntity-NBT.patch similarity index 100% rename from patches/server/0810-Sanitize-Sent-BlockEntity-NBT.patch rename to patches/server/0809-Sanitize-Sent-BlockEntity-NBT.patch diff --git a/patches/server/0811-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0810-Disable-component-selector-resolving-in-books-by-def.patch similarity index 100% rename from patches/server/0811-Disable-component-selector-resolving-in-books-by-def.patch rename to patches/server/0810-Disable-component-selector-resolving-in-books-by-def.patch diff --git a/patches/server/0812-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0811-Prevent-entity-loading-causing-async-lookups.patch similarity index 97% rename from patches/server/0812-Prevent-entity-loading-causing-async-lookups.patch rename to patches/server/0811-Prevent-entity-loading-causing-async-lookups.patch index 4b8810c4c7..673402cf15 100644 --- a/patches/server/0812-Prevent-entity-loading-causing-async-lookups.patch +++ b/patches/server/0811-Prevent-entity-loading-causing-async-lookups.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent entity loading causing async lookups diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index f5fa686060d40b0e8eddb910464c31085c3ee7c1..3dc4345abb975b555931614642be910785f98a7c 100644 +index 8c20610c57ba90df364c9a65e867e35c9920a770..78a0be97cffbf2387ee4c05a00bf039a8c0474e1 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -801,6 +801,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0813-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0812-Throw-exception-on-world-create-while-being-ticked.patch similarity index 100% rename from patches/server/0813-Throw-exception-on-world-create-while-being-ticked.patch rename to patches/server/0812-Throw-exception-on-world-create-while-being-ticked.patch diff --git a/patches/server/0814-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0813-Add-Alternate-Current-redstone-implementation.patch similarity index 99% rename from patches/server/0814-Add-Alternate-Current-redstone-implementation.patch rename to patches/server/0813-Add-Alternate-Current-redstone-implementation.patch index 43ec0625a2..01ea974e0e 100644 --- a/patches/server/0814-Add-Alternate-Current-redstone-implementation.patch +++ b/patches/server/0813-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 cc91327050998c5e725ee71ac8b91b41a8b01bdf..9c63f83d2a907afa630b4e05ea486db4d63ff8ec 100644 +index 3ac7c157cddfaa9262e727705eb88b55a637f618..e04447234ee94cab2034a0382a541ee2565d4796 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -224,6 +224,7 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -2034,7 +2034,7 @@ index cc91327050998c5e725ee71ac8b91b41a8b01bdf..9c63f83d2a907afa630b4e05ea486db4 EntityCallbacks() {} diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index dbabf221bb0d49a2632728a6d04ff3e55a7d5898..7886c49b1b224469b8b542023891b2645b69ec71 100644 +index 78fd63052f1eb5a650befecdad07cbc755658632..3a5bf6937a98d60be0d0142a15cf12d8de9b687f 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -1876,4 +1876,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0815-Dont-resent-entity-on-art-update.patch b/patches/server/0814-Dont-resent-entity-on-art-update.patch similarity index 100% rename from patches/server/0815-Dont-resent-entity-on-art-update.patch rename to patches/server/0814-Dont-resent-entity-on-art-update.patch diff --git a/patches/server/0816-Add-WardenAngerChangeEvent.patch b/patches/server/0815-Add-WardenAngerChangeEvent.patch similarity index 100% rename from patches/server/0816-Add-WardenAngerChangeEvent.patch rename to patches/server/0815-Add-WardenAngerChangeEvent.patch diff --git a/patches/server/0817-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0816-Add-option-for-strict-advancement-dimension-checks.patch similarity index 100% rename from patches/server/0817-Add-option-for-strict-advancement-dimension-checks.patch rename to patches/server/0816-Add-option-for-strict-advancement-dimension-checks.patch diff --git a/patches/server/0818-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0817-Add-missing-important-BlockStateListPopulator-method.patch similarity index 100% rename from patches/server/0818-Add-missing-important-BlockStateListPopulator-method.patch rename to patches/server/0817-Add-missing-important-BlockStateListPopulator-method.patch diff --git a/patches/server/0819-Nameable-Banner-API.patch b/patches/server/0818-Nameable-Banner-API.patch similarity index 100% rename from patches/server/0819-Nameable-Banner-API.patch rename to patches/server/0818-Nameable-Banner-API.patch diff --git a/patches/server/0820-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0819-Don-t-broadcast-messages-to-command-blocks.patch similarity index 100% rename from patches/server/0820-Don-t-broadcast-messages-to-command-blocks.patch rename to patches/server/0819-Don-t-broadcast-messages-to-command-blocks.patch diff --git a/patches/server/0821-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0820-Prevent-empty-items-from-being-added-to-world.patch similarity index 93% rename from patches/server/0821-Prevent-empty-items-from-being-added-to-world.patch rename to patches/server/0820-Prevent-empty-items-from-being-added-to-world.patch index ef8820e5fa..0b51ffec2d 100644 --- a/patches/server/0821-Prevent-empty-items-from-being-added-to-world.patch +++ b/patches/server/0820-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 9c63f83d2a907afa630b4e05ea486db4d63ff8ec..60eb96c274ac1b899de9b6f79eaab8596aee012c 100644 +index e04447234ee94cab2034a0382a541ee2565d4796..f8c4d9477c924c76d2fbcef7eac1f928541356a4 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1583,6 +1583,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0822-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0821-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch similarity index 100% rename from patches/server/0822-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch rename to patches/server/0821-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch diff --git a/patches/server/0823-Add-Player-getFishHook.patch b/patches/server/0822-Add-Player-getFishHook.patch similarity index 100% rename from patches/server/0823-Add-Player-getFishHook.patch rename to patches/server/0822-Add-Player-getFishHook.patch diff --git a/patches/server/0824-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0823-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch similarity index 100% rename from patches/server/0824-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch rename to patches/server/0823-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch diff --git a/patches/server/0825-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0824-Add-various-missing-EntityDropItemEvent-calls.patch similarity index 98% rename from patches/server/0825-Add-various-missing-EntityDropItemEvent-calls.patch rename to patches/server/0824-Add-various-missing-EntityDropItemEvent-calls.patch index 3fe01f546e..9a5870d6fe 100644 --- a/patches/server/0825-Add-various-missing-EntityDropItemEvent-calls.patch +++ b/patches/server/0824-Add-various-missing-EntityDropItemEvent-calls.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add various missing EntityDropItemEvent calls diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 3dc4345abb975b555931614642be910785f98a7c..97bd7295c1e9af1666cb16c77f54b92947610724 100644 +index 78a0be97cffbf2387ee4c05a00bf039a8c0474e1..17e781869a53791d9f928ab99883c9ef68ed0e27 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2701,6 +2701,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0826-Fix-Bee-flower-NPE.patch b/patches/server/0825-Fix-Bee-flower-NPE.patch similarity index 100% rename from patches/server/0826-Fix-Bee-flower-NPE.patch rename to patches/server/0825-Fix-Bee-flower-NPE.patch diff --git a/patches/server/0827-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0826-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch similarity index 100% rename from patches/server/0827-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch rename to patches/server/0826-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch diff --git a/patches/server/0828-More-Teleport-API.patch b/patches/server/0827-More-Teleport-API.patch similarity index 99% rename from patches/server/0828-More-Teleport-API.patch rename to patches/server/0827-More-Teleport-API.patch index 1f040ff8a0..665e4aab53 100644 --- a/patches/server/0828-More-Teleport-API.patch +++ b/patches/server/0827-More-Teleport-API.patch @@ -72,7 +72,7 @@ index d4fffcc5bb746df8dc177780f15ff4dbca64c018..ed30e079c23f564cbd0a45b38586bd12 // Let the server handle cross world teleports if (location.getWorld() != null && !location.getWorld().equals(this.getWorld())) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index d2c836d747effbdc424787976eabbd1b1b30fd3c..4310a5aa2661131751dd9e4e760dca1ece2c54c6 100644 +index 451f558c4904b5e67bad86305c9e058813f25126..e29b53dcf0db8eda8ad7f494ce188cde28fc5fea 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1213,13 +1213,101 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0829-Add-EntityPortalReadyEvent.patch b/patches/server/0828-Add-EntityPortalReadyEvent.patch similarity index 95% rename from patches/server/0829-Add-EntityPortalReadyEvent.patch rename to patches/server/0828-Add-EntityPortalReadyEvent.patch index 1eb1a2e389..8741a56d25 100644 --- a/patches/server/0829-Add-EntityPortalReadyEvent.patch +++ b/patches/server/0828-Add-EntityPortalReadyEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add EntityPortalReadyEvent diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 97bd7295c1e9af1666cb16c77f54b92947610724..4ef45d704107d03a506627da80ebfeb41a0945f8 100644 +index 17e781869a53791d9f928ab99883c9ef68ed0e27..52504f71a34fe8700c68533ff82d98fe23f8edc9 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3103,6 +3103,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0830-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0829-Don-t-use-level-random-in-entity-constructors.patch similarity index 100% rename from patches/server/0830-Don-t-use-level-random-in-entity-constructors.patch rename to patches/server/0829-Don-t-use-level-random-in-entity-constructors.patch diff --git a/patches/server/0831-Send-block-entities-after-destroy-prediction.patch b/patches/server/0830-Send-block-entities-after-destroy-prediction.patch similarity index 100% rename from patches/server/0831-Send-block-entities-after-destroy-prediction.patch rename to patches/server/0830-Send-block-entities-after-destroy-prediction.patch diff --git a/patches/server/0832-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0831-Warn-on-plugins-accessing-faraway-chunks.patch similarity index 98% rename from patches/server/0832-Warn-on-plugins-accessing-faraway-chunks.patch rename to patches/server/0831-Warn-on-plugins-accessing-faraway-chunks.patch index 3f6448421c..68393ca908 100644 --- a/patches/server/0832-Warn-on-plugins-accessing-faraway-chunks.patch +++ b/patches/server/0831-Warn-on-plugins-accessing-faraway-chunks.patch @@ -5,7 +5,7 @@ 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 7886c49b1b224469b8b542023891b2645b69ec71..d26216ad6395f6d74a7fa4d080f5edfd44605ae4 100644 +index 3a5bf6937a98d60be0d0142a15cf12d8de9b687f..436c16feb53b3dbf32e86f1960714d3d3ffeffd8 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -813,7 +813,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0833-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0832-Custom-Chat-Completion-Suggestions-API.patch similarity index 94% rename from patches/server/0833-Custom-Chat-Completion-Suggestions-API.patch rename to patches/server/0832-Custom-Chat-Completion-Suggestions-API.patch index dd055c705b..6a4bbb4c07 100644 --- a/patches/server/0833-Custom-Chat-Completion-Suggestions-API.patch +++ b/patches/server/0832-Custom-Chat-Completion-Suggestions-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Custom Chat Completion Suggestions API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 4310a5aa2661131751dd9e4e760dca1ece2c54c6..8b17cd24be2ce0d89ebe36cf83e89615b7590622 100644 +index e29b53dcf0db8eda8ad7f494ce188cde28fc5fea..c874c4143945e8a46cf3cdd8af758700a62845ec 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -653,6 +653,24 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0834-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0833-Add-and-fix-missing-BlockFadeEvents.patch similarity index 100% rename from patches/server/0834-Add-and-fix-missing-BlockFadeEvents.patch rename to patches/server/0833-Add-and-fix-missing-BlockFadeEvents.patch diff --git a/patches/server/0835-Collision-API.patch b/patches/server/0834-Collision-API.patch similarity index 92% rename from patches/server/0835-Collision-API.patch rename to patches/server/0834-Collision-API.patch index 2628a16abb..1a8631fdd2 100644 --- a/patches/server/0835-Collision-API.patch +++ b/patches/server/0834-Collision-API.patch @@ -5,12 +5,12 @@ Subject: [PATCH] Collision API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java -index 681d29902a14b36e4b72e1ca530e131e1aaf273f..0b7faa5b0fce81fd1790341599c632ffc5b171f3 100644 +index 9c31a042d2ff82689a4bcc9d90fe08e5f8329985..76d529ad7d1ce543b8f262b3a36f17405cc9da92 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java @@ -1055,5 +1055,12 @@ public abstract class CraftRegionAccessor implements RegionAccessor { - return this.getHandle().clip(new net.minecraft.world.level.ClipContext(start, end, net.minecraft.world.level.ClipContext.Block.COLLIDER, net.minecraft.world.level.ClipContext.Fluid.NONE, null)).getType() == net.minecraft.world.phys.HitResult.Type.MISS; + return this.getHandle().clip(new net.minecraft.world.level.ClipContext(start, end, net.minecraft.world.level.ClipContext.Block.COLLIDER, net.minecraft.world.level.ClipContext.Fluid.NONE, net.minecraft.world.phys.shapes.CollisionContext.empty())).getType() == net.minecraft.world.phys.HitResult.Type.MISS; } + + @Override diff --git a/patches/server/0836-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0835-Fix-suggest-command-message-for-brigadier-syntax-exc.patch similarity index 100% rename from patches/server/0836-Fix-suggest-command-message-for-brigadier-syntax-exc.patch rename to patches/server/0835-Fix-suggest-command-message-for-brigadier-syntax-exc.patch diff --git a/patches/server/0837-Block-Ticking-API.patch b/patches/server/0836-Block-Ticking-API.patch similarity index 100% rename from patches/server/0837-Block-Ticking-API.patch rename to patches/server/0836-Block-Ticking-API.patch diff --git a/patches/server/0838-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0837-Add-Velocity-IP-Forwarding-Support.patch similarity index 100% rename from patches/server/0838-Add-Velocity-IP-Forwarding-Support.patch rename to patches/server/0837-Add-Velocity-IP-Forwarding-Support.patch diff --git a/patches/server/0839-Add-NamespacedKey-biome-methods.patch b/patches/server/0838-Add-NamespacedKey-biome-methods.patch similarity index 95% rename from patches/server/0839-Add-NamespacedKey-biome-methods.patch rename to patches/server/0838-Add-NamespacedKey-biome-methods.patch index c6af412c83..897f91ee26 100644 --- a/patches/server/0839-Add-NamespacedKey-biome-methods.patch +++ b/patches/server/0838-Add-NamespacedKey-biome-methods.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add NamespacedKey biome methods Co-authored-by: Thonk <30448663+ExcessiveAmountsOfZombies@users.noreply.github.com> diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index ef59fcd13f8835001fcc6fba6165ffd6c35784fa..7cfb8ffd7d107aef20a86d044b453c49e9f59b7f 100644 +index 4a5af85ebb573950c0c65d3a5f25b586173d16dd..7ebb0ef30bb0c613aae8b3899404010c6243e02a 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -601,6 +601,19 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0840-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0839-Fix-plugin-loggers-on-server-shutdown.patch similarity index 100% rename from patches/server/0840-Fix-plugin-loggers-on-server-shutdown.patch rename to patches/server/0839-Fix-plugin-loggers-on-server-shutdown.patch diff --git a/patches/server/0841-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0840-Stop-large-look-changes-from-crashing-the-server.patch similarity index 100% rename from patches/server/0841-Stop-large-look-changes-from-crashing-the-server.patch rename to patches/server/0840-Stop-large-look-changes-from-crashing-the-server.patch diff --git a/patches/server/0842-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0841-Fire-EntityChangeBlockEvent-in-more-places.patch similarity index 100% rename from patches/server/0842-Fire-EntityChangeBlockEvent-in-more-places.patch rename to patches/server/0841-Fire-EntityChangeBlockEvent-in-more-places.patch diff --git a/patches/server/0843-Missing-eating-regain-reason.patch b/patches/server/0842-Missing-eating-regain-reason.patch similarity index 100% rename from patches/server/0843-Missing-eating-regain-reason.patch rename to patches/server/0842-Missing-eating-regain-reason.patch diff --git a/patches/server/0844-Missing-effect-cause.patch b/patches/server/0843-Missing-effect-cause.patch similarity index 100% rename from patches/server/0844-Missing-effect-cause.patch rename to patches/server/0843-Missing-effect-cause.patch diff --git a/patches/server/0845-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0844-Added-byte-array-serialization-deserialization-for-P.patch similarity index 100% rename from patches/server/0845-Added-byte-array-serialization-deserialization-for-P.patch rename to patches/server/0844-Added-byte-array-serialization-deserialization-for-P.patch diff --git a/patches/server/0846-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0845-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch similarity index 100% rename from patches/server/0846-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch rename to patches/server/0845-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch diff --git a/patches/server/0847-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0846-Call-BlockPhysicsEvent-more-often.patch similarity index 100% rename from patches/server/0847-Call-BlockPhysicsEvent-more-often.patch rename to patches/server/0846-Call-BlockPhysicsEvent-more-often.patch diff --git a/patches/server/0848-Configurable-chat-thread-limit.patch b/patches/server/0847-Configurable-chat-thread-limit.patch similarity index 100% rename from patches/server/0848-Configurable-chat-thread-limit.patch rename to patches/server/0847-Configurable-chat-thread-limit.patch diff --git a/patches/server/0849-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0848-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch similarity index 100% rename from patches/server/0849-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch rename to patches/server/0848-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch diff --git a/patches/server/0850-fix-Jigsaw-block-kicking-user.patch b/patches/server/0849-fix-Jigsaw-block-kicking-user.patch similarity index 100% rename from patches/server/0850-fix-Jigsaw-block-kicking-user.patch rename to patches/server/0849-fix-Jigsaw-block-kicking-user.patch diff --git a/patches/server/0851-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0850-use-BlockFormEvent-for-mud-converting-into-clay.patch similarity index 100% rename from patches/server/0851-use-BlockFormEvent-for-mud-converting-into-clay.patch rename to patches/server/0850-use-BlockFormEvent-for-mud-converting-into-clay.patch diff --git a/patches/server/0852-Add-getDrops-to-BlockState.patch b/patches/server/0851-Add-getDrops-to-BlockState.patch similarity index 100% rename from patches/server/0852-Add-getDrops-to-BlockState.patch rename to patches/server/0851-Add-getDrops-to-BlockState.patch diff --git a/patches/server/0853-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0852-Fix-a-bunch-of-vanilla-bugs.patch similarity index 99% rename from patches/server/0853-Fix-a-bunch-of-vanilla-bugs.patch rename to patches/server/0852-Fix-a-bunch-of-vanilla-bugs.patch index ee79529fe3..bfbf87e86c 100644 --- a/patches/server/0853-Fix-a-bunch-of-vanilla-bugs.patch +++ b/patches/server/0852-Fix-a-bunch-of-vanilla-bugs.patch @@ -127,7 +127,7 @@ index b71be5e7e18f884cf35cc3a940c87e744e00f811..81d3d664d4397e528a02e50469622c4f 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 60eb96c274ac1b899de9b6f79eaab8596aee012c..80283588344ae3ba4a58d4be2c0bfc769cbcd78d 100644 +index f8c4d9477c924c76d2fbcef7eac1f928541356a4..222e85b22c5d1f5a135e7620df0786c709dff2e4 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1028,7 +1028,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0854-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0853-Remove-unnecessary-onTrackingStart-during-navigation.patch similarity index 94% rename from patches/server/0854-Remove-unnecessary-onTrackingStart-during-navigation.patch rename to patches/server/0853-Remove-unnecessary-onTrackingStart-during-navigation.patch index 650345f057..3e82380c51 100644 --- a/patches/server/0854-Remove-unnecessary-onTrackingStart-during-navigation.patch +++ b/patches/server/0853-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 80283588344ae3ba4a58d4be2c0bfc769cbcd78d..ba30421e53f935e2860564f8e3748160d64e3665 100644 +index 222e85b22c5d1f5a135e7620df0786c709dff2e4..9ea6786730d6a8e9fddd49a0b28eeefd2d5a8ef4 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -2629,7 +2629,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0855-Fix-custom-piglin-loved-items.patch b/patches/server/0854-Fix-custom-piglin-loved-items.patch similarity index 100% rename from patches/server/0855-Fix-custom-piglin-loved-items.patch rename to patches/server/0854-Fix-custom-piglin-loved-items.patch diff --git a/patches/server/0856-EntityPickupItemEvent-fixes.patch b/patches/server/0855-EntityPickupItemEvent-fixes.patch similarity index 100% rename from patches/server/0856-EntityPickupItemEvent-fixes.patch rename to patches/server/0855-EntityPickupItemEvent-fixes.patch diff --git a/patches/server/0857-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0856-Correctly-handle-interactions-with-items-on-cooldown.patch similarity index 100% rename from patches/server/0857-Correctly-handle-interactions-with-items-on-cooldown.patch rename to patches/server/0856-Correctly-handle-interactions-with-items-on-cooldown.patch diff --git a/patches/server/0858-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0857-Add-PlayerInventorySlotChangeEvent.patch similarity index 100% rename from patches/server/0858-Add-PlayerInventorySlotChangeEvent.patch rename to patches/server/0857-Add-PlayerInventorySlotChangeEvent.patch diff --git a/patches/server/0859-Elder-Guardian-appearance-API.patch b/patches/server/0858-Elder-Guardian-appearance-API.patch similarity index 90% rename from patches/server/0859-Elder-Guardian-appearance-API.patch rename to patches/server/0858-Elder-Guardian-appearance-API.patch index f8aba3a5cd..fb4385bc55 100644 --- a/patches/server/0859-Elder-Guardian-appearance-API.patch +++ b/patches/server/0858-Elder-Guardian-appearance-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Elder Guardian appearance API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 8b17cd24be2ce0d89ebe36cf83e89615b7590622..ac2db507170797103bf15aabda2097ddb221b9fc 100644 +index c874c4143945e8a46cf3cdd8af758700a62845ec..ef96a54e1c6c002a6968df4f20695e5a82d42277 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -3174,6 +3174,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0860-Allow-changing-bed-s-occupied-property.patch b/patches/server/0859-Allow-changing-bed-s-occupied-property.patch similarity index 100% rename from patches/server/0860-Allow-changing-bed-s-occupied-property.patch rename to patches/server/0859-Allow-changing-bed-s-occupied-property.patch diff --git a/patches/server/0861-Add-entity-knockback-API.patch b/patches/server/0860-Add-entity-knockback-API.patch similarity index 100% rename from patches/server/0861-Add-entity-knockback-API.patch rename to patches/server/0860-Add-entity-knockback-API.patch diff --git a/patches/server/0862-Detect-headless-JREs.patch b/patches/server/0861-Detect-headless-JREs.patch similarity index 100% rename from patches/server/0862-Detect-headless-JREs.patch rename to patches/server/0861-Detect-headless-JREs.patch diff --git a/patches/server/0863-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0862-fixed-entity-vehicle-collision-event-not-called.patch similarity index 100% rename from patches/server/0863-fixed-entity-vehicle-collision-event-not-called.patch rename to patches/server/0862-fixed-entity-vehicle-collision-event-not-called.patch diff --git a/patches/server/0864-optimized-dirt-and-snow-spreading.patch b/patches/server/0863-optimized-dirt-and-snow-spreading.patch similarity index 100% rename from patches/server/0864-optimized-dirt-and-snow-spreading.patch rename to patches/server/0863-optimized-dirt-and-snow-spreading.patch diff --git a/patches/server/0865-Added-EntityToggleSitEvent.patch b/patches/server/0864-Added-EntityToggleSitEvent.patch similarity index 100% rename from patches/server/0865-Added-EntityToggleSitEvent.patch rename to patches/server/0864-Added-EntityToggleSitEvent.patch diff --git a/patches/server/0866-Add-fire-tick-delay-option.patch b/patches/server/0865-Add-fire-tick-delay-option.patch similarity index 100% rename from patches/server/0866-Add-fire-tick-delay-option.patch rename to patches/server/0865-Add-fire-tick-delay-option.patch diff --git a/patches/server/0867-Add-Moving-Piston-API.patch b/patches/server/0866-Add-Moving-Piston-API.patch similarity index 100% rename from patches/server/0867-Add-Moving-Piston-API.patch rename to patches/server/0866-Add-Moving-Piston-API.patch diff --git a/patches/server/0868-Ignore-impossible-spawn-tick.patch b/patches/server/0867-Ignore-impossible-spawn-tick.patch similarity index 100% rename from patches/server/0868-Ignore-impossible-spawn-tick.patch rename to patches/server/0867-Ignore-impossible-spawn-tick.patch diff --git a/patches/server/0869-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0868-Track-projectile-source-for-fireworks-from-dispenser.patch similarity index 100% rename from patches/server/0869-Track-projectile-source-for-fireworks-from-dispenser.patch rename to patches/server/0868-Track-projectile-source-for-fireworks-from-dispenser.patch diff --git a/patches/server/0870-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0869-Fix-EntityArgument-suggestion-permissions-to-align-w.patch similarity index 100% rename from patches/server/0870-Fix-EntityArgument-suggestion-permissions-to-align-w.patch rename to patches/server/0869-Fix-EntityArgument-suggestion-permissions-to-align-w.patch diff --git a/patches/server/0871-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0870-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch similarity index 95% rename from patches/server/0871-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch rename to patches/server/0870-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch index 35cca1d29e..b222f94c0e 100644 --- a/patches/server/0871-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch +++ b/patches/server/0870-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix EntityCombustEvent cancellation cant fully prevent diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 4ef45d704107d03a506627da80ebfeb41a0945f8..a59d738a8697ed06c445b0837b887aabcd92e366 100644 +index 52504f71a34fe8700c68533ff82d98fe23f8edc9..e758f3dce618c7b021ea1828c1b2fc3807455f4a 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3382,6 +3382,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0872-Prevent-compass-from-loading-chunks.patch b/patches/server/0871-Prevent-compass-from-loading-chunks.patch similarity index 100% rename from patches/server/0872-Prevent-compass-from-loading-chunks.patch rename to patches/server/0871-Prevent-compass-from-loading-chunks.patch diff --git a/patches/server/0873-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0872-Add-PrePlayerAttackEntityEvent.patch similarity index 100% rename from patches/server/0873-Add-PrePlayerAttackEntityEvent.patch rename to patches/server/0872-Add-PrePlayerAttackEntityEvent.patch diff --git a/patches/server/0874-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0873-ensure-reset-EnderDragon-boss-event-name.patch similarity index 100% rename from patches/server/0874-ensure-reset-EnderDragon-boss-event-name.patch rename to patches/server/0873-ensure-reset-EnderDragon-boss-event-name.patch diff --git a/patches/server/0875-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0874-fix-MC-252817-green-map-markers-do-not-disappear.patch similarity index 100% rename from patches/server/0875-fix-MC-252817-green-map-markers-do-not-disappear.patch rename to patches/server/0874-fix-MC-252817-green-map-markers-do-not-disappear.patch diff --git a/patches/server/0876-Add-Player-Warden-Warning-API.patch b/patches/server/0875-Add-Player-Warden-Warning-API.patch similarity index 95% rename from patches/server/0876-Add-Player-Warden-Warning-API.patch rename to patches/server/0875-Add-Player-Warden-Warning-API.patch index dd42258b02..5e924a9dd1 100644 --- a/patches/server/0876-Add-Player-Warden-Warning-API.patch +++ b/patches/server/0875-Add-Player-Warden-Warning-API.patch @@ -10,7 +10,7 @@ public net.minecraft.world.entity.monster.warden.WardenSpawnTracker cooldownTick public net.minecraft.world.entity.monster.warden.WardenSpawnTracker increaseWarningLevel()V diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index ac2db507170797103bf15aabda2097ddb221b9fc..07fa6de6ec35cf0ea738629b48c2457488831a26 100644 +index ef96a54e1c6c002a6968df4f20695e5a82d42277..07fb5740cf99e79b229f00b9ebb7b886233f1e9a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -3179,6 +3179,41 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0877-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0876-More-vanilla-friendly-methods-to-update-trades.patch similarity index 100% rename from patches/server/0877-More-vanilla-friendly-methods-to-update-trades.patch rename to patches/server/0876-More-vanilla-friendly-methods-to-update-trades.patch diff --git a/patches/server/0878-Add-paper-dumplisteners-command.patch b/patches/server/0877-Add-paper-dumplisteners-command.patch similarity index 100% rename from patches/server/0878-Add-paper-dumplisteners-command.patch rename to patches/server/0877-Add-paper-dumplisteners-command.patch diff --git a/patches/server/0879-check-global-player-list-where-appropriate.patch b/patches/server/0878-check-global-player-list-where-appropriate.patch similarity index 97% rename from patches/server/0879-check-global-player-list-where-appropriate.patch rename to patches/server/0878-check-global-player-list-where-appropriate.patch index 01c76e7a95..7d89111c22 100644 --- a/patches/server/0879-check-global-player-list-where-appropriate.patch +++ b/patches/server/0878-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 ba30421e53f935e2860564f8e3748160d64e3665..56f1bbeaab24975b76026ebb5a4c73b62635c730 100644 +index 9ea6786730d6a8e9fddd49a0b28eeefd2d5a8ef4..ded19a243173c9d5c3d56d61a719ce169eeb0dfa 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -2751,4 +2751,12 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0880-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0879-Fix-async-entity-add-due-to-fungus-trees.patch similarity index 95% rename from patches/server/0880-Fix-async-entity-add-due-to-fungus-trees.patch rename to patches/server/0879-Fix-async-entity-add-due-to-fungus-trees.patch index c0f4e92ef9..52867ed817 100644 --- a/patches/server/0880-Fix-async-entity-add-due-to-fungus-trees.patch +++ b/patches/server/0879-Fix-async-entity-add-due-to-fungus-trees.patch @@ -17,7 +17,7 @@ index 49c7825156afd053df1b7721a63070b51427aff2..14a5492428eac823a295ef3746d0aca6 BlockEntity tileentity = iblockdata.hasBlockEntity() ? this.getBlockEntity(pos) : null; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java -index 0b7faa5b0fce81fd1790341599c632ffc5b171f3..096e1cc920f5f48fe59b9419827c3cbb7adefe14 100644 +index 76d529ad7d1ce543b8f262b3a36f17405cc9da92..866fd29fe52d7eec4e72db400a05645eb8984a2b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java @@ -405,10 +405,10 @@ public abstract class CraftRegionAccessor implements RegionAccessor { diff --git a/patches/server/0881-ItemStack-damage-API.patch b/patches/server/0880-ItemStack-damage-API.patch similarity index 100% rename from patches/server/0881-ItemStack-damage-API.patch rename to patches/server/0880-ItemStack-damage-API.patch diff --git a/patches/server/0882-Friction-API.patch b/patches/server/0881-Friction-API.patch similarity index 100% rename from patches/server/0882-Friction-API.patch rename to patches/server/0881-Friction-API.patch diff --git a/patches/server/0883-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0882-Ability-to-control-player-s-insomnia-and-phantoms.patch similarity index 100% rename from patches/server/0883-Ability-to-control-player-s-insomnia-and-phantoms.patch rename to patches/server/0882-Ability-to-control-player-s-insomnia-and-phantoms.patch diff --git a/patches/server/0884-Fix-player-kick-on-shutdown.patch b/patches/server/0883-Fix-player-kick-on-shutdown.patch similarity index 100% rename from patches/server/0884-Fix-player-kick-on-shutdown.patch rename to patches/server/0883-Fix-player-kick-on-shutdown.patch diff --git a/patches/server/0885-Sync-offhand-slot-in-menus.patch b/patches/server/0884-Sync-offhand-slot-in-menus.patch similarity index 100% rename from patches/server/0885-Sync-offhand-slot-in-menus.patch rename to patches/server/0884-Sync-offhand-slot-in-menus.patch diff --git a/patches/server/0886-Player-Entity-Tracking-Events.patch b/patches/server/0885-Player-Entity-Tracking-Events.patch similarity index 100% rename from patches/server/0886-Player-Entity-Tracking-Events.patch rename to patches/server/0885-Player-Entity-Tracking-Events.patch diff --git a/patches/server/0887-Limit-pet-look-distance.patch b/patches/server/0886-Limit-pet-look-distance.patch similarity index 100% rename from patches/server/0887-Limit-pet-look-distance.patch rename to patches/server/0886-Limit-pet-look-distance.patch diff --git a/patches/server/0888-Properly-resend-entities.patch b/patches/server/0887-Properly-resend-entities.patch similarity index 99% rename from patches/server/0888-Properly-resend-entities.patch rename to patches/server/0887-Properly-resend-entities.patch index e82b71ed76..d599fa0de4 100644 --- a/patches/server/0888-Properly-resend-entities.patch +++ b/patches/server/0887-Properly-resend-entities.patch @@ -98,7 +98,7 @@ index d8f21804945a5c3212316e37350df1d1fc6903a4..6b0ce578ec3aee339bc77c348ebd90cd } diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 5afafee10b32b7f09757b5d60ad58e35cd467c17..53f9286d37215af55ab17c447327b13464c7a79d 100644 +index 4bf3598f8d6f6f469a5a17e8067fd5035732da19..e1c0811c6dc8f3e268c60d23a25942a2c6d22475 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -376,7 +376,7 @@ public abstract class PlayerList { diff --git a/patches/server/0889-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0888-Fixes-and-additions-to-the-SpawnReason-API.patch similarity index 100% rename from patches/server/0889-Fixes-and-additions-to-the-SpawnReason-API.patch rename to patches/server/0888-Fixes-and-additions-to-the-SpawnReason-API.patch diff --git a/patches/server/0890-fix-Instruments.patch b/patches/server/0889-fix-Instruments.patch similarity index 96% rename from patches/server/0890-fix-Instruments.patch rename to patches/server/0889-fix-Instruments.patch index d596e05466..8053f92e28 100644 --- a/patches/server/0890-fix-Instruments.patch +++ b/patches/server/0889-fix-Instruments.patch @@ -6,7 +6,7 @@ Subject: [PATCH] fix Instruments properly handle Player#playNote diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 07fa6de6ec35cf0ea738629b48c2457488831a26..4985580c4a59ae9b220cf718d7cc97c2b76f764e 100644 +index 07fb5740cf99e79b229f00b9ebb7b886233f1e9a..7b54aff9dbade8cfed1db09c1734a1a77610f2cf 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -730,7 +730,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0891-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0890-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch similarity index 100% rename from patches/server/0891-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch rename to patches/server/0890-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch diff --git a/patches/server/0892-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0891-Fix-inconsistencies-in-dispense-events-regarding-sta.patch similarity index 100% rename from patches/server/0892-Fix-inconsistencies-in-dispense-events-regarding-sta.patch rename to patches/server/0891-Fix-inconsistencies-in-dispense-events-regarding-sta.patch diff --git a/patches/server/0893-Add-BlockLockCheckEvent.patch b/patches/server/0892-Add-BlockLockCheckEvent.patch similarity index 100% rename from patches/server/0893-Add-BlockLockCheckEvent.patch rename to patches/server/0892-Add-BlockLockCheckEvent.patch diff --git a/patches/server/0894-Add-Sneaking-API-for-Entities.patch b/patches/server/0893-Add-Sneaking-API-for-Entities.patch similarity index 100% rename from patches/server/0894-Add-Sneaking-API-for-Entities.patch rename to patches/server/0893-Add-Sneaking-API-for-Entities.patch diff --git a/patches/server/0895-Improve-logging-and-errors.patch b/patches/server/0894-Improve-logging-and-errors.patch similarity index 100% rename from patches/server/0895-Improve-logging-and-errors.patch rename to patches/server/0894-Improve-logging-and-errors.patch diff --git a/patches/server/0896-Improve-PortalEvents.patch b/patches/server/0895-Improve-PortalEvents.patch similarity index 93% rename from patches/server/0896-Improve-PortalEvents.patch rename to patches/server/0895-Improve-PortalEvents.patch index 8f61fb9118..e4cfe4be44 100644 --- a/patches/server/0896-Improve-PortalEvents.patch +++ b/patches/server/0895-Improve-PortalEvents.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Improve PortalEvents diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index a59d738a8697ed06c445b0837b887aabcd92e366..fab6f1a470334e0a2a552ff12da70f463888d7f1 100644 +index e758f3dce618c7b021ea1828c1b2fc3807455f4a..bfbb99e82c00eef9772c605e172645252af6e8ad 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3769,7 +3769,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0897-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0896-Add-config-option-for-spider-worldborder-climbing.patch similarity index 95% rename from patches/server/0897-Add-config-option-for-spider-worldborder-climbing.patch rename to patches/server/0896-Add-config-option-for-spider-worldborder-climbing.patch index 098c8b986a..10224d6629 100644 --- a/patches/server/0897-Add-config-option-for-spider-worldborder-climbing.patch +++ b/patches/server/0896-Add-config-option-for-spider-worldborder-climbing.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add config option for spider worldborder climbing diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index fab6f1a470334e0a2a552ff12da70f463888d7f1..a84811f050378840206f7c2c4591bcd0b948c8fa 100644 +index bfbb99e82c00eef9772c605e172645252af6e8ad..620ff3a4741742f27d0998d22bb5b998af7aaa83 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -408,6 +408,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0898-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0897-Add-missing-SpigotConfig-logCommands-check.patch similarity index 100% rename from patches/server/0898-Add-missing-SpigotConfig-logCommands-check.patch rename to patches/server/0897-Add-missing-SpigotConfig-logCommands-check.patch diff --git a/patches/server/0899-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0898-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch similarity index 100% rename from patches/server/0899-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch rename to patches/server/0898-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch diff --git a/patches/server/0900-Flying-Fall-Damage.patch b/patches/server/0899-Flying-Fall-Damage.patch similarity index 95% rename from patches/server/0900-Flying-Fall-Damage.patch rename to patches/server/0899-Flying-Fall-Damage.patch index bfadf1102b..5f2de88e08 100644 --- a/patches/server/0900-Flying-Fall-Damage.patch +++ b/patches/server/0899-Flying-Fall-Damage.patch @@ -26,7 +26,7 @@ index 078dd3ccf046d3ee5ef41108e9db4736182778f1..82978c058c64563eb091fe9efbe42ade } else { if (fallDistance >= 2.0F) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 4985580c4a59ae9b220cf718d7cc97c2b76f764e..2bcc2f8579d28dd13843f8e456c9725243381425 100644 +index 7b54aff9dbade8cfed1db09c1734a1a77610f2cf..b8c7058cb007161ce33baee4275014f389cf717b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2417,6 +2417,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0901-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/server/0900-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch similarity index 100% rename from patches/server/0901-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch rename to patches/server/0900-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch diff --git a/patches/server/0902-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0901-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch similarity index 91% rename from patches/server/0902-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch rename to patches/server/0901-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch index d10e0424ef..8ef515d686 100644 --- a/patches/server/0902-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch +++ b/patches/server/0901-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Expose pre-collision moving velocity to diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index a84811f050378840206f7c2c4591bcd0b948c8fa..133b9aca368959cbad3d87c5f4ab1cc447b66859 100644 +index 620ff3a4741742f27d0998d22bb5b998af7aaa83..dad8faf21093f351bd4d66b99ab16caf8bda608f 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1161,7 +1161,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0903-config-for-disabling-entity-tag-tags.patch b/patches/server/0902-config-for-disabling-entity-tag-tags.patch similarity index 100% rename from patches/server/0903-config-for-disabling-entity-tag-tags.patch rename to patches/server/0902-config-for-disabling-entity-tag-tags.patch diff --git a/patches/server/0904-Use-single-player-info-update-packet-on-join.patch b/patches/server/0903-Use-single-player-info-update-packet-on-join.patch similarity index 97% rename from patches/server/0904-Use-single-player-info-update-packet-on-join.patch rename to patches/server/0903-Use-single-player-info-update-packet-on-join.patch index c1cdf124b2..d95352bba9 100644 --- a/patches/server/0904-Use-single-player-info-update-packet-on-join.patch +++ b/patches/server/0903-Use-single-player-info-update-packet-on-join.patch @@ -18,7 +18,7 @@ index 4e1f5ae65e3727a6a0495a18d543134beb2a052d..a45d258bbf29f0e3e6082eda802a5fda } diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 53f9286d37215af55ab17c447327b13464c7a79d..a3f63e83f193acf6164ab1b099d5217afd043ddc 100644 +index e1c0811c6dc8f3e268c60d23a25942a2c6d22475..3927558c62cf24af915d37eb8e983339bc0f2aa3 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -358,6 +358,7 @@ public abstract class PlayerList { diff --git a/patches/server/0905-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0904-Correctly-shrink-items-during-EntityResurrectEvent.patch similarity index 100% rename from patches/server/0905-Correctly-shrink-items-during-EntityResurrectEvent.patch rename to patches/server/0904-Correctly-shrink-items-during-EntityResurrectEvent.patch diff --git a/patches/server/0906-Win-Screen-API.patch b/patches/server/0905-Win-Screen-API.patch similarity index 93% rename from patches/server/0906-Win-Screen-API.patch rename to patches/server/0905-Win-Screen-API.patch index 60deaed892..cf0f50b2fa 100644 --- a/patches/server/0906-Win-Screen-API.patch +++ b/patches/server/0905-Win-Screen-API.patch @@ -7,7 +7,7 @@ Subject: [PATCH] Win Screen API public net.minecraft.server.level.ServerPlayer seenCredits diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 2bcc2f8579d28dd13843f8e456c9725243381425..fc17e93c18e9c3adce8015332c2bebc68cd38267 100644 +index b8c7058cb007161ce33baee4275014f389cf717b..423d91cec2442a7cd2f81145942dbe3a6b1ec7be 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1232,6 +1232,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0907-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0906-Remove-CraftItemStack-setAmount-null-assignment.patch similarity index 100% rename from patches/server/0907-Remove-CraftItemStack-setAmount-null-assignment.patch rename to patches/server/0906-Remove-CraftItemStack-setAmount-null-assignment.patch diff --git a/patches/server/0908-Fix-force-opening-enchantment-tables.patch b/patches/server/0907-Fix-force-opening-enchantment-tables.patch similarity index 100% rename from patches/server/0908-Fix-force-opening-enchantment-tables.patch rename to patches/server/0907-Fix-force-opening-enchantment-tables.patch diff --git a/patches/server/0909-Add-Entity-Body-Yaw-API.patch b/patches/server/0908-Add-Entity-Body-Yaw-API.patch similarity index 100% rename from patches/server/0909-Add-Entity-Body-Yaw-API.patch rename to patches/server/0908-Add-Entity-Body-Yaw-API.patch diff --git a/patches/server/0910-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0909-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch similarity index 100% rename from patches/server/0910-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch rename to patches/server/0909-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch diff --git a/patches/server/0911-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0910-Update-the-flag-when-a-captured-block-state-is-outda.patch similarity index 90% rename from patches/server/0911-Update-the-flag-when-a-captured-block-state-is-outda.patch rename to patches/server/0910-Update-the-flag-when-a-captured-block-state-is-outda.patch index cab62dd1c1..10e3a02f03 100644 --- a/patches/server/0911-Update-the-flag-when-a-captured-block-state-is-outda.patch +++ b/patches/server/0910-Update-the-flag-when-a-captured-block-state-is-outda.patch @@ -5,7 +5,7 @@ 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 d26216ad6395f6d74a7fa4d080f5edfd44605ae4..f45b5fccb994a0d333aec772461ff0580a28261b 100644 +index 436c16feb53b3dbf32e86f1960714d3d3ffeffd8..da037e8e62c1fb51f13c3fe0dd9fc2061209ca8f 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -923,6 +923,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0912-Add-EntityFertilizeEggEvent.patch b/patches/server/0911-Add-EntityFertilizeEggEvent.patch similarity index 100% rename from patches/server/0912-Add-EntityFertilizeEggEvent.patch rename to patches/server/0911-Add-EntityFertilizeEggEvent.patch diff --git a/patches/server/0913-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0912-Fix-HumanEntity-drop-not-updating-the-client-inv.patch similarity index 100% rename from patches/server/0913-Fix-HumanEntity-drop-not-updating-the-client-inv.patch rename to patches/server/0912-Fix-HumanEntity-drop-not-updating-the-client-inv.patch diff --git a/patches/server/0914-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0913-Add-CompostItemEvent-and-EntityCompostItemEvent.patch similarity index 100% rename from patches/server/0914-Add-CompostItemEvent-and-EntityCompostItemEvent.patch rename to patches/server/0913-Add-CompostItemEvent-and-EntityCompostItemEvent.patch diff --git a/patches/server/0915-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0914-Correctly-handle-ArmorStand-invisibility.patch similarity index 100% rename from patches/server/0915-Correctly-handle-ArmorStand-invisibility.patch rename to patches/server/0914-Correctly-handle-ArmorStand-invisibility.patch diff --git a/patches/server/0916-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0915-Fix-advancement-triggers-for-entity-damage.patch similarity index 100% rename from patches/server/0916-Fix-advancement-triggers-for-entity-damage.patch rename to patches/server/0915-Fix-advancement-triggers-for-entity-damage.patch diff --git a/patches/server/0917-Fix-text-display-error-on-spawn.patch b/patches/server/0916-Fix-text-display-error-on-spawn.patch similarity index 100% rename from patches/server/0917-Fix-text-display-error-on-spawn.patch rename to patches/server/0916-Fix-text-display-error-on-spawn.patch diff --git a/patches/server/0918-Fix-certain-inventories-returning-null-Locations.patch b/patches/server/0917-Fix-certain-inventories-returning-null-Locations.patch similarity index 100% rename from patches/server/0918-Fix-certain-inventories-returning-null-Locations.patch rename to patches/server/0917-Fix-certain-inventories-returning-null-Locations.patch diff --git a/patches/server/0919-Add-Shearable-API.patch b/patches/server/0918-Add-Shearable-API.patch similarity index 100% rename from patches/server/0919-Add-Shearable-API.patch rename to patches/server/0918-Add-Shearable-API.patch diff --git a/patches/server/0920-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0919-Fix-SpawnEggMeta-get-setSpawnedType.patch similarity index 100% rename from patches/server/0920-Fix-SpawnEggMeta-get-setSpawnedType.patch rename to patches/server/0919-Fix-SpawnEggMeta-get-setSpawnedType.patch diff --git a/patches/server/0921-Optimize-Hoppers.patch b/patches/server/0920-Optimize-Hoppers.patch similarity index 100% rename from patches/server/0921-Optimize-Hoppers.patch rename to patches/server/0920-Optimize-Hoppers.patch diff --git a/patches/server/0922-Fix-beehives-generating-from-using-bonemeal.patch b/patches/server/0921-Fix-beehives-generating-from-using-bonemeal.patch similarity index 100% rename from patches/server/0922-Fix-beehives-generating-from-using-bonemeal.patch rename to patches/server/0921-Fix-beehives-generating-from-using-bonemeal.patch diff --git a/patches/server/0923-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0922-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch similarity index 100% rename from patches/server/0923-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch rename to patches/server/0922-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch diff --git a/patches/server/0924-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0923-Treat-sequence-violations-like-they-should-be.patch similarity index 100% rename from patches/server/0924-Treat-sequence-violations-like-they-should-be.patch rename to patches/server/0923-Treat-sequence-violations-like-they-should-be.patch diff --git a/patches/server/0925-remove-duplicate-animate-packet-for-records.patch b/patches/server/0924-remove-duplicate-animate-packet-for-records.patch similarity index 100% rename from patches/server/0925-remove-duplicate-animate-packet-for-records.patch rename to patches/server/0924-remove-duplicate-animate-packet-for-records.patch diff --git a/patches/server/0926-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0925-Prevent-causing-expired-keys-from-impacting-new-join.patch similarity index 100% rename from patches/server/0926-Prevent-causing-expired-keys-from-impacting-new-join.patch rename to patches/server/0925-Prevent-causing-expired-keys-from-impacting-new-join.patch diff --git a/patches/server/0927-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0926-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch similarity index 90% rename from patches/server/0927-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch rename to patches/server/0926-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch index ae18dbdcf7..14c5d47749 100644 --- a/patches/server/0927-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch +++ b/patches/server/0926-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 56f1bbeaab24975b76026ebb5a4c73b62635c730..b0576234320042b0c9c1f326671b76fa3a2a6915 100644 +index ded19a243173c9d5c3d56d61a719ce169eeb0dfa..ae9aef03d4c9d106e025c3e91310dbef948804b1 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1720,6 +1720,11 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0928-Use-array-for-gamerule-storage.patch b/patches/server/0927-Use-array-for-gamerule-storage.patch similarity index 100% rename from patches/server/0928-Use-array-for-gamerule-storage.patch rename to patches/server/0927-Use-array-for-gamerule-storage.patch diff --git a/patches/server/0929-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0928-Fix-a-couple-of-upstream-bed-issues.patch similarity index 100% rename from patches/server/0929-Fix-a-couple-of-upstream-bed-issues.patch rename to patches/server/0928-Fix-a-couple-of-upstream-bed-issues.patch diff --git a/patches/server/0930-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0929-Fix-demo-flag-not-enabling-demo-mode.patch similarity index 100% rename from patches/server/0930-Fix-demo-flag-not-enabling-demo-mode.patch rename to patches/server/0929-Fix-demo-flag-not-enabling-demo-mode.patch diff --git a/patches/server/0931-Add-Mob-Experience-reward-API.patch b/patches/server/0930-Add-Mob-Experience-reward-API.patch similarity index 100% rename from patches/server/0931-Add-Mob-Experience-reward-API.patch rename to patches/server/0930-Add-Mob-Experience-reward-API.patch diff --git a/patches/server/0932-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0931-Break-redstone-on-top-of-trap-doors-early.patch similarity index 100% rename from patches/server/0932-Break-redstone-on-top-of-trap-doors-early.patch rename to patches/server/0931-Break-redstone-on-top-of-trap-doors-early.patch diff --git a/patches/server/0933-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0932-Fix-DamageCause-for-Falling-Blocks.patch similarity index 100% rename from patches/server/0933-Fix-DamageCause-for-Falling-Blocks.patch rename to patches/server/0932-Fix-DamageCause-for-Falling-Blocks.patch diff --git a/patches/server/0934-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0933-Avoid-Lazy-Initialization-for-Enum-Fields.patch similarity index 100% rename from patches/server/0934-Avoid-Lazy-Initialization-for-Enum-Fields.patch rename to patches/server/0933-Avoid-Lazy-Initialization-for-Enum-Fields.patch diff --git a/patches/server/0935-More-accurate-isInOpenWater-impl.patch b/patches/server/0934-More-accurate-isInOpenWater-impl.patch similarity index 100% rename from patches/server/0935-More-accurate-isInOpenWater-impl.patch rename to patches/server/0934-More-accurate-isInOpenWater-impl.patch diff --git a/patches/server/0936-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0935-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch similarity index 100% rename from patches/server/0936-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch rename to patches/server/0935-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch diff --git a/patches/server/0937-Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/server/0936-Optimise-recalcBlockCounts-for-empty-sections.patch similarity index 100% rename from patches/server/0937-Optimise-recalcBlockCounts-for-empty-sections.patch rename to patches/server/0936-Optimise-recalcBlockCounts-for-empty-sections.patch diff --git a/patches/server/0938-Expand-PlayerItemMendEvent.patch b/patches/server/0937-Expand-PlayerItemMendEvent.patch similarity index 98% rename from patches/server/0938-Expand-PlayerItemMendEvent.patch rename to patches/server/0937-Expand-PlayerItemMendEvent.patch index c49b6e3ee1..e0e75180d8 100644 --- a/patches/server/0938-Expand-PlayerItemMendEvent.patch +++ b/patches/server/0937-Expand-PlayerItemMendEvent.patch @@ -33,7 +33,7 @@ index cab5636fe6be9ee7f23ffbd5a399d2aeea1cd538..fb74f13ab2a977224e843a468ea8c72d return k > 0 ? this.repairPlayerItems(player, k) : 0; } else { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index fc17e93c18e9c3adce8015332c2bebc68cd38267..f06d3ad7b98a659755c0ca0659396a10726c2025 100644 +index 423d91cec2442a7cd2f81145942dbe3a6b1ec7be..f341c329970a7d8738735186380144d617d96121 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1754,11 +1754,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0939-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0938-Refresh-ProjectileSource-for-projectiles.patch similarity index 97% rename from patches/server/0939-Refresh-ProjectileSource-for-projectiles.patch rename to patches/server/0938-Refresh-ProjectileSource-for-projectiles.patch index 321c994382..5bb2761eba 100644 --- a/patches/server/0939-Refresh-ProjectileSource-for-projectiles.patch +++ b/patches/server/0938-Refresh-ProjectileSource-for-projectiles.patch @@ -14,7 +14,7 @@ clearing the owner. Co-authored-by: Warrior <50800980+Warriorrrr@users.noreply.github.com> diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 133b9aca368959cbad3d87c5f4ab1cc447b66859..dfa077ad2e632bc71be41917d5923edae12f7738 100644 +index dad8faf21093f351bd4d66b99ab16caf8bda608f..ed91a1d8877f8d2b2be26389f10d5323e3975b30 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -384,6 +384,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0940-Add-transient-modifier-API.patch b/patches/server/0939-Add-transient-modifier-API.patch similarity index 100% rename from patches/server/0940-Add-transient-modifier-API.patch rename to patches/server/0939-Add-transient-modifier-API.patch diff --git a/patches/server/0941-Fix-block-place-logic.patch b/patches/server/0940-Fix-block-place-logic.patch similarity index 97% rename from patches/server/0941-Fix-block-place-logic.patch rename to patches/server/0940-Fix-block-place-logic.patch index 2158922ff2..8c7f0376e1 100644 --- a/patches/server/0941-Fix-block-place-logic.patch +++ b/patches/server/0940-Fix-block-place-logic.patch @@ -41,7 +41,7 @@ index 0822300eaf771d70f887d91a160115eaa7e3ec89..11173571f3589d4301a2528db96718c0 } diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index f45b5fccb994a0d333aec772461ff0580a28261b..74e68160dc650c0426785b0f88892c29edadb29c 100644 +index da037e8e62c1fb51f13c3fe0dd9fc2061209ca8f..c77e2d35b95c1d57449f4639f3728d29540d0dc6 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -1038,17 +1038,18 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0942-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0941-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch similarity index 100% rename from patches/server/0942-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch rename to patches/server/0941-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch diff --git a/patches/server/0943-Ignore-inline-definitions-of-trim-material-pattern.patch b/patches/server/0942-Ignore-inline-definitions-of-trim-material-pattern.patch similarity index 100% rename from patches/server/0943-Ignore-inline-definitions-of-trim-material-pattern.patch rename to patches/server/0942-Ignore-inline-definitions-of-trim-material-pattern.patch diff --git a/patches/server/0944-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0943-Call-BlockGrowEvent-for-missing-blocks.patch similarity index 100% rename from patches/server/0944-Call-BlockGrowEvent-for-missing-blocks.patch rename to patches/server/0943-Call-BlockGrowEvent-for-missing-blocks.patch diff --git a/patches/server/0945-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0944-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch similarity index 100% rename from patches/server/0945-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch rename to patches/server/0944-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch diff --git a/patches/server/0946-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0945-fix-MapLike-spam-for-missing-key-selector.patch similarity index 100% rename from patches/server/0946-fix-MapLike-spam-for-missing-key-selector.patch rename to patches/server/0945-fix-MapLike-spam-for-missing-key-selector.patch diff --git a/patches/server/0947-Fix-sniffer-removeExploredLocation.patch b/patches/server/0946-Fix-sniffer-removeExploredLocation.patch similarity index 100% rename from patches/server/0947-Fix-sniffer-removeExploredLocation.patch rename to patches/server/0946-Fix-sniffer-removeExploredLocation.patch diff --git a/patches/server/0948-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0947-Add-method-to-remove-all-active-potion-effects.patch similarity index 100% rename from patches/server/0948-Add-method-to-remove-all-active-potion-effects.patch rename to patches/server/0947-Add-method-to-remove-all-active-potion-effects.patch diff --git a/patches/server/0949-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch b/patches/server/0948-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch similarity index 100% rename from patches/server/0949-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch rename to patches/server/0948-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch diff --git a/patches/server/0950-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0949-Fix-incorrect-crafting-result-amount-for-fireworks.patch similarity index 100% rename from patches/server/0950-Fix-incorrect-crafting-result-amount-for-fireworks.patch rename to patches/server/0949-Fix-incorrect-crafting-result-amount-for-fireworks.patch diff --git a/patches/server/0951-Properly-Cancel-Usable-Items.patch b/patches/server/0950-Properly-Cancel-Usable-Items.patch similarity index 100% rename from patches/server/0951-Properly-Cancel-Usable-Items.patch rename to patches/server/0950-Properly-Cancel-Usable-Items.patch diff --git a/patches/server/0952-Add-event-for-player-editing-sign.patch b/patches/server/0951-Add-event-for-player-editing-sign.patch similarity index 100% rename from patches/server/0952-Add-event-for-player-editing-sign.patch rename to patches/server/0951-Add-event-for-player-editing-sign.patch diff --git a/patches/server/0953-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0952-Only-tick-item-frames-if-players-can-see-it.patch similarity index 100% rename from patches/server/0953-Only-tick-item-frames-if-players-can-see-it.patch rename to patches/server/0952-Only-tick-item-frames-if-players-can-see-it.patch diff --git a/patches/server/0954-Improve-command-function-perm-level-checks.patch b/patches/server/0953-Improve-command-function-perm-level-checks.patch similarity index 100% rename from patches/server/0954-Improve-command-function-perm-level-checks.patch rename to patches/server/0953-Improve-command-function-perm-level-checks.patch diff --git a/patches/server/0955-Add-option-to-disable-block-updates.patch b/patches/server/0954-Add-option-to-disable-block-updates.patch similarity index 100% rename from patches/server/0955-Add-option-to-disable-block-updates.patch rename to patches/server/0954-Add-option-to-disable-block-updates.patch diff --git a/patches/server/0956-Call-missing-BlockDispenseEvent.patch b/patches/server/0955-Call-missing-BlockDispenseEvent.patch similarity index 100% rename from patches/server/0956-Call-missing-BlockDispenseEvent.patch rename to patches/server/0955-Call-missing-BlockDispenseEvent.patch diff --git a/patches/server/0957-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0956-Don-t-load-chunks-for-supporting-block-checks.patch similarity index 90% rename from patches/server/0957-Don-t-load-chunks-for-supporting-block-checks.patch rename to patches/server/0956-Don-t-load-chunks-for-supporting-block-checks.patch index a9cb5d558c..87c1a77544 100644 --- a/patches/server/0957-Don-t-load-chunks-for-supporting-block-checks.patch +++ b/patches/server/0956-Don-t-load-chunks-for-supporting-block-checks.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't load chunks for supporting block checks diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index dfa077ad2e632bc71be41917d5923edae12f7738..36a6eb05f983f0137590c8ed1ec154affd9cdbd3 100644 +index ed91a1d8877f8d2b2be26389f10d5323e3975b30..8af2d49fdb46deab17fd801e5ba56eec289b4dd0 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1361,7 +1361,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0958-Optimize-player-lookups-for-beacons.patch b/patches/server/0957-Optimize-player-lookups-for-beacons.patch similarity index 100% rename from patches/server/0958-Optimize-player-lookups-for-beacons.patch rename to patches/server/0957-Optimize-player-lookups-for-beacons.patch diff --git a/patches/server/0959-Add-Sign-getInteractableSideFor.patch b/patches/server/0958-Add-Sign-getInteractableSideFor.patch similarity index 100% rename from patches/server/0959-Add-Sign-getInteractableSideFor.patch rename to patches/server/0958-Add-Sign-getInteractableSideFor.patch diff --git a/patches/server/0960-Array-backed-synched-entity-data.patch b/patches/server/0959-Array-backed-synched-entity-data.patch similarity index 100% rename from patches/server/0960-Array-backed-synched-entity-data.patch rename to patches/server/0959-Array-backed-synched-entity-data.patch diff --git a/patches/server/0961-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0960-fix-item-meta-for-tadpole-buckets.patch similarity index 100% rename from patches/server/0961-fix-item-meta-for-tadpole-buckets.patch rename to patches/server/0960-fix-item-meta-for-tadpole-buckets.patch diff --git a/patches/server/0962-Suppress-Item-Meta-Validation-Checks.patch b/patches/server/0961-Suppress-Item-Meta-Validation-Checks.patch similarity index 100% rename from patches/server/0962-Suppress-Item-Meta-Validation-Checks.patch rename to patches/server/0961-Suppress-Item-Meta-Validation-Checks.patch diff --git a/patches/server/0963-Fix-BanList-API.patch b/patches/server/0962-Fix-BanList-API.patch similarity index 99% rename from patches/server/0963-Fix-BanList-API.patch rename to patches/server/0962-Fix-BanList-API.patch index fefd6839a7..4abcc92f22 100644 --- a/patches/server/0963-Fix-BanList-API.patch +++ b/patches/server/0962-Fix-BanList-API.patch @@ -208,7 +208,7 @@ index 172202accf4448a933fcf1ff820316c7910dd7f7..50ee7656580d386db473c054f5c5ec57 return null; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index f06d3ad7b98a659755c0ca0659396a10726c2025..c83dc24a5265443210b9609e1acd17b7a2e16724 100644 +index f341c329970a7d8738735186380144d617d96121..41ed3b57756ed0837d4d2ea8fbec6d03c0705b47 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1652,23 +1652,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0964-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0963-Determine-lava-and-water-fluid-explosion-resistance-.patch similarity index 100% rename from patches/server/0964-Determine-lava-and-water-fluid-explosion-resistance-.patch rename to patches/server/0963-Determine-lava-and-water-fluid-explosion-resistance-.patch diff --git a/patches/server/0965-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0964-Fix-possible-NPE-on-painting-creation.patch similarity index 95% rename from patches/server/0965-Fix-possible-NPE-on-painting-creation.patch rename to patches/server/0964-Fix-possible-NPE-on-painting-creation.patch index 79b881dbab..93383802dd 100644 --- a/patches/server/0965-Fix-possible-NPE-on-painting-creation.patch +++ b/patches/server/0964-Fix-possible-NPE-on-painting-creation.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix possible NPE on painting creation diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java -index 096e1cc920f5f48fe59b9419827c3cbb7adefe14..ee8819884868b70f2a3644141eca1d92abe2b7a8 100644 +index 866fd29fe52d7eec4e72db400a05645eb8984a2b..de015e675b40fa391bb7d03d30c86dc3dd72cb13 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java @@ -951,6 +951,7 @@ public abstract class CraftRegionAccessor implements RegionAccessor { diff --git a/patches/server/0966-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0965-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch similarity index 100% rename from patches/server/0966-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch rename to patches/server/0965-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch diff --git a/patches/server/0967-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0966-ExperienceOrb-should-call-EntitySpawnEvent.patch similarity index 100% rename from patches/server/0967-ExperienceOrb-should-call-EntitySpawnEvent.patch rename to patches/server/0966-ExperienceOrb-should-call-EntitySpawnEvent.patch diff --git a/patches/server/0968-Don-t-tick-signs.patch b/patches/server/0967-Don-t-tick-signs.patch similarity index 100% rename from patches/server/0968-Don-t-tick-signs.patch rename to patches/server/0967-Don-t-tick-signs.patch diff --git a/patches/server/0969-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0968-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch similarity index 100% rename from patches/server/0969-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch rename to patches/server/0968-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch diff --git a/patches/server/0970-Add-whitelist-events.patch b/patches/server/0969-Add-whitelist-events.patch similarity index 100% rename from patches/server/0970-Add-whitelist-events.patch rename to patches/server/0969-Add-whitelist-events.patch diff --git a/patches/server/0971-Implement-PlayerFailMoveEvent.patch b/patches/server/0970-Implement-PlayerFailMoveEvent.patch similarity index 100% rename from patches/server/0971-Implement-PlayerFailMoveEvent.patch rename to patches/server/0970-Implement-PlayerFailMoveEvent.patch diff --git a/patches/server/0972-Folia-scheduler-and-owned-region-API.patch b/patches/server/0971-Folia-scheduler-and-owned-region-API.patch similarity index 99% rename from patches/server/0972-Folia-scheduler-and-owned-region-API.patch rename to patches/server/0971-Folia-scheduler-and-owned-region-API.patch index b75ff59584..3efe7051b1 100644 --- a/patches/server/0972-Folia-scheduler-and-owned-region-API.patch +++ b/patches/server/0971-Folia-scheduler-and-owned-region-API.patch @@ -1146,7 +1146,7 @@ index 50316da08ae259dcc0d02c28081a352f09d1a19a..a8f9f4e23575cb58045f9d8efe011a60 this.profiler.push("commandFunctions"); MinecraftTimings.commandFunctionsTimer.startTiming(); // Spigot // Paper diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index a3f63e83f193acf6164ab1b099d5217afd043ddc..20eb64a88b887b539b24ea8cd8d9e63add8852df 100644 +index 3927558c62cf24af915d37eb8e983339bc0f2aa3..895c4accbcf43baaa8a4d560e8b5c0d4dfae3ccc 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -649,6 +649,7 @@ public abstract class PlayerList { @@ -1158,7 +1158,7 @@ index a3f63e83f193acf6164ab1b099d5217afd043ddc..20eb64a88b887b539b24ea8cd8d9e63a this.players.remove(entityplayer); this.playersByName.remove(entityplayer.getScoreboardName().toLowerCase(java.util.Locale.ROOT)); // Spigot diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 36a6eb05f983f0137590c8ed1ec154affd9cdbd3..703825e9956201ddf211816553a1f1b509e1592f 100644 +index 8af2d49fdb46deab17fd801e5ba56eec289b4dd0..23488823fe48f502c1f64ace79030bf0f7e85626 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -247,11 +247,23 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0973-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0972-Only-erase-allay-memory-on-non-item-targets.patch similarity index 100% rename from patches/server/0973-Only-erase-allay-memory-on-non-item-targets.patch rename to patches/server/0972-Only-erase-allay-memory-on-non-item-targets.patch diff --git a/patches/server/0974-API-for-updating-recipes-on-clients.patch b/patches/server/0973-API-for-updating-recipes-on-clients.patch similarity index 97% rename from patches/server/0974-API-for-updating-recipes-on-clients.patch rename to patches/server/0973-API-for-updating-recipes-on-clients.patch index 0338fe112c..a4f1e59125 100644 --- a/patches/server/0974-API-for-updating-recipes-on-clients.patch +++ b/patches/server/0973-API-for-updating-recipes-on-clients.patch @@ -5,7 +5,7 @@ Subject: [PATCH] API for updating recipes on clients diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 20eb64a88b887b539b24ea8cd8d9e63add8852df..c1790d8f13af1ff7059dfe952cbdcdcca22d8df4 100644 +index 895c4accbcf43baaa8a4d560e8b5c0d4dfae3ccc..098bb36a66e022da30302936aba10d296587ac88 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -1539,6 +1539,13 @@ public abstract class PlayerList { diff --git a/patches/server/0975-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0974-Fix-rotation-when-spawning-display-entities.patch similarity index 88% rename from patches/server/0975-Fix-rotation-when-spawning-display-entities.patch rename to patches/server/0974-Fix-rotation-when-spawning-display-entities.patch index 9ca2cbee34..9887bc2462 100644 --- a/patches/server/0975-Fix-rotation-when-spawning-display-entities.patch +++ b/patches/server/0974-Fix-rotation-when-spawning-display-entities.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix rotation when spawning display entities diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java -index ee8819884868b70f2a3644141eca1d92abe2b7a8..b8043e9f92736ebfa0707613f2fec78b14c1fe72 100644 +index de015e675b40fa391bb7d03d30c86dc3dd72cb13..b7fd9448ea9f26636724b229af5cffc28d927d62 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java @@ -1021,6 +1021,7 @@ public abstract class CraftRegionAccessor implements RegionAccessor { diff --git a/patches/server/0976-Only-capture-actual-tree-growth.patch b/patches/server/0975-Only-capture-actual-tree-growth.patch similarity index 98% rename from patches/server/0976-Only-capture-actual-tree-growth.patch rename to patches/server/0975-Only-capture-actual-tree-growth.patch index d7fe43d806..f97b14591b 100644 --- a/patches/server/0976-Only-capture-actual-tree-growth.patch +++ b/patches/server/0975-Only-capture-actual-tree-growth.patch @@ -29,7 +29,7 @@ index db523ded8132f2010391c9f909319d0ae042a741..852727221d5cb8bcc14c57664622c13d } 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 74e68160dc650c0426785b0f88892c29edadb29c..0afad3487a3939981abda6a2342e90683816a39f 100644 +index c77e2d35b95c1d57449f4639f3728d29540d0dc6..03967f4168f0544a82958b37fbd437a66bed4d60 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -1888,4 +1888,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0977-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0976-Use-correct-source-for-mushroom-block-spread-event.patch similarity index 100% rename from patches/server/0977-Use-correct-source-for-mushroom-block-spread-event.patch rename to patches/server/0976-Use-correct-source-for-mushroom-block-spread-event.patch diff --git a/patches/server/0978-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0977-Respect-randomizeData-on-more-entities-when-spawning.patch similarity index 97% rename from patches/server/0978-Respect-randomizeData-on-more-entities-when-spawning.patch rename to patches/server/0977-Respect-randomizeData-on-more-entities-when-spawning.patch index bf695f6ac3..5321d8c5c0 100644 --- a/patches/server/0978-Respect-randomizeData-on-more-entities-when-spawning.patch +++ b/patches/server/0977-Respect-randomizeData-on-more-entities-when-spawning.patch @@ -9,7 +9,7 @@ Subject: [PATCH] Respect randomizeData on more entities when spawning * ExperienceOrb diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java -index b8043e9f92736ebfa0707613f2fec78b14c1fe72..c343577efccfc95274b5f2a870d057ec57529484 100644 +index b7fd9448ea9f26636724b229af5cffc28d927d62..87698a123ce027b4f7b0dcc9eaf034a5b8de6de3 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java @@ -634,6 +634,11 @@ public abstract class CraftRegionAccessor implements RegionAccessor { diff --git a/patches/server/0979-Use-correct-seed-on-api-world-load.patch b/patches/server/0978-Use-correct-seed-on-api-world-load.patch similarity index 100% rename from patches/server/0979-Use-correct-seed-on-api-world-load.patch rename to patches/server/0978-Use-correct-seed-on-api-world-load.patch diff --git a/patches/server/0980-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0979-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch similarity index 100% rename from patches/server/0980-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch rename to patches/server/0979-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch diff --git a/patches/server/0981-Cache-map-ids-on-item-frames.patch b/patches/server/0980-Cache-map-ids-on-item-frames.patch similarity index 100% rename from patches/server/0981-Cache-map-ids-on-item-frames.patch rename to patches/server/0980-Cache-map-ids-on-item-frames.patch diff --git a/patches/server/0982-Fix-custom-statistic-criteria-creation.patch b/patches/server/0981-Fix-custom-statistic-criteria-creation.patch similarity index 93% rename from patches/server/0982-Fix-custom-statistic-criteria-creation.patch rename to patches/server/0981-Fix-custom-statistic-criteria-creation.patch index 4f6d00f22d..8811d3a725 100644 --- a/patches/server/0982-Fix-custom-statistic-criteria-creation.patch +++ b/patches/server/0981-Fix-custom-statistic-criteria-creation.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix custom statistic criteria creation diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 7cfb8ffd7d107aef20a86d044b453c49e9f59b7f..c0e36388652e89059c91117722945645119a5738 100644 +index 7ebb0ef30bb0c613aae8b3899404010c6243e02a..da3f74ba0c84ad5a1447de72c9a90fdd88c254a7 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -614,6 +614,12 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0983-Bandaid-fix-for-Effect.patch b/patches/server/0982-Bandaid-fix-for-Effect.patch similarity index 98% rename from patches/server/0983-Bandaid-fix-for-Effect.patch rename to patches/server/0982-Bandaid-fix-for-Effect.patch index dfa02d4f83..c74852ba53 100644 --- a/patches/server/0983-Bandaid-fix-for-Effect.patch +++ b/patches/server/0982-Bandaid-fix-for-Effect.patch @@ -58,7 +58,7 @@ index c77fec78636805a496ecea3e56f26290dbcbffff..abb14719496971a780650782bdce17c6 // Special case: the axis is optional for ELECTRIC_SPARK Preconditions.checkArgument(effect.getData() == null || effect == Effect.ELECTRIC_SPARK, "Wrong kind of data for the %s effect", effect); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index c83dc24a5265443210b9609e1acd17b7a2e16724..74e906364aa8f2f9754d5d1b90f95e286bd0d544 100644 +index 41ed3b57756ed0837d4d2ea8fbec6d03c0705b47..c05635559fe1241d363c06755dc1fdd1a0701c5c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -879,7 +879,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0984-SculkCatalyst-bloom-API.patch b/patches/server/0983-SculkCatalyst-bloom-API.patch similarity index 100% rename from patches/server/0984-SculkCatalyst-bloom-API.patch rename to patches/server/0983-SculkCatalyst-bloom-API.patch diff --git a/patches/server/0985-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0984-API-for-an-entity-s-scoreboard-name.patch similarity index 100% rename from patches/server/0985-API-for-an-entity-s-scoreboard-name.patch rename to patches/server/0984-API-for-an-entity-s-scoreboard-name.patch diff --git a/patches/server/0986-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/0985-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch similarity index 98% rename from patches/server/0986-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch rename to patches/server/0985-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch index d147593a77..822f9113b1 100644 --- a/patches/server/0986-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch +++ b/patches/server/0985-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch @@ -38,7 +38,7 @@ index c081842b4416d15342cbfc583ef367901dab2b7e..4d406ced4a1996b8883574ce0b785dc1 // Paper end diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index 1f7586b71c579d48de32a307c0ce543130f0851b..bf14dbec0a08370364bf652ababadac27917b7f1 100644 +index f8a848487c1d8fea5ae1d397908baf2e05efc00b..bb222f61b67ea6b8e2b900dbfdcdbe58b1caabca 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java @@ -539,7 +539,17 @@ public class ServerChunkCache extends ChunkSource { diff --git a/patches/server/0987-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0986-Deprecate-and-replace-methods-with-old-StructureType.patch similarity index 100% rename from patches/server/0987-Deprecate-and-replace-methods-with-old-StructureType.patch rename to patches/server/0986-Deprecate-and-replace-methods-with-old-StructureType.patch diff --git a/patches/server/0988-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0987-Don-t-tab-complete-namespaced-commands-if-send-names.patch similarity index 100% rename from patches/server/0988-Don-t-tab-complete-namespaced-commands-if-send-names.patch rename to patches/server/0987-Don-t-tab-complete-namespaced-commands-if-send-names.patch diff --git a/patches/server/0989-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0988-Properly-handle-BlockBreakEvent-isDropItems.patch similarity index 100% rename from patches/server/0989-Properly-handle-BlockBreakEvent-isDropItems.patch rename to patches/server/0988-Properly-handle-BlockBreakEvent-isDropItems.patch diff --git a/patches/server/0990-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0989-Fire-entity-death-event-for-ender-dragon.patch similarity index 100% rename from patches/server/0990-Fire-entity-death-event-for-ender-dragon.patch rename to patches/server/0989-Fire-entity-death-event-for-ender-dragon.patch diff --git a/patches/server/0991-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0990-Configurable-entity-tracking-range-by-Y-coordinate.patch similarity index 100% rename from patches/server/0991-Configurable-entity-tracking-range-by-Y-coordinate.patch rename to patches/server/0990-Configurable-entity-tracking-range-by-Y-coordinate.patch diff --git a/patches/server/0992-Add-Listing-API-for-Player.patch b/patches/server/0991-Add-Listing-API-for-Player.patch similarity index 98% rename from patches/server/0992-Add-Listing-API-for-Player.patch rename to patches/server/0991-Add-Listing-API-for-Player.patch index c697387347..687c28dee0 100644 --- a/patches/server/0992-Add-Listing-API-for-Player.patch +++ b/patches/server/0991-Add-Listing-API-for-Player.patch @@ -76,7 +76,7 @@ index aa1c6de4d6cb7bbca33d25895c54707d220ab62a..9810d62c99f5d7dfca61ddfbbc356aeb static class EntryBuilder { diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index c1790d8f13af1ff7059dfe952cbdcdcca22d8df4..e1bd408336a80d819e760b76d9636de06fdf0abe 100644 +index 098bb36a66e022da30302936aba10d296587ac88..a35638a92479b90afa89cf201fc45b49c9e767f3 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -356,14 +356,22 @@ public abstract class PlayerList { @@ -113,7 +113,7 @@ index c1790d8f13af1ff7059dfe952cbdcdcca22d8df4..e1bd408336a80d819e760b76d9636de0 // Paper end player.sentListPacket = true; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 74e906364aa8f2f9754d5d1b90f95e286bd0d544..21d419d2dfb28f0dbc818f328d599b32f37a8ac2 100644 +index c05635559fe1241d363c06755dc1fdd1a0701c5c..50df2725e5e3dd595567c8233b4aac5f022ef1d0 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -185,6 +185,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0993-Configurable-Region-Compression-Format.patch b/patches/server/0992-Configurable-Region-Compression-Format.patch similarity index 100% rename from patches/server/0993-Configurable-Region-Compression-Format.patch rename to patches/server/0992-Configurable-Region-Compression-Format.patch diff --git a/patches/server/0994-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/server/0993-Expose-clicked-BlockFace-during-BlockDamageEvent.patch similarity index 100% rename from patches/server/0994-Expose-clicked-BlockFace-during-BlockDamageEvent.patch rename to patches/server/0993-Expose-clicked-BlockFace-during-BlockDamageEvent.patch diff --git a/patches/server/0995-Fix-NPE-on-Boat-getStatus.patch b/patches/server/0994-Fix-NPE-on-Boat-getStatus.patch similarity index 100% rename from patches/server/0995-Fix-NPE-on-Boat-getStatus.patch rename to patches/server/0994-Fix-NPE-on-Boat-getStatus.patch diff --git a/patches/server/0996-Expand-Pose-API.patch b/patches/server/0995-Expand-Pose-API.patch similarity index 95% rename from patches/server/0996-Expand-Pose-API.patch rename to patches/server/0995-Expand-Pose-API.patch index 03e4d05ac1..40eb4c3386 100644 --- a/patches/server/0996-Expand-Pose-API.patch +++ b/patches/server/0995-Expand-Pose-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Expand Pose API diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 703825e9956201ddf211816553a1f1b509e1592f..92508e9ea17d2ea00b4da20a249325c390442016 100644 +index 23488823fe48f502c1f64ace79030bf0f7e85626..62bdce9516804942862b33667bc571e3bcac1a70 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -422,6 +422,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0997-More-DragonBattle-API.patch b/patches/server/0996-More-DragonBattle-API.patch similarity index 100% rename from patches/server/0997-More-DragonBattle-API.patch rename to patches/server/0996-More-DragonBattle-API.patch diff --git a/patches/server/0998-Deep-clone-unhandled-nbt-tags.patch b/patches/server/0997-Deep-clone-unhandled-nbt-tags.patch similarity index 100% rename from patches/server/0998-Deep-clone-unhandled-nbt-tags.patch rename to patches/server/0997-Deep-clone-unhandled-nbt-tags.patch diff --git a/patches/server/0999-Add-PlayerPickItemEvent.patch b/patches/server/0998-Add-PlayerPickItemEvent.patch similarity index 100% rename from patches/server/0999-Add-PlayerPickItemEvent.patch rename to patches/server/0998-Add-PlayerPickItemEvent.patch diff --git a/patches/server/1000-Improve-performance-of-mass-crafts.patch b/patches/server/0999-Improve-performance-of-mass-crafts.patch similarity index 100% rename from patches/server/1000-Improve-performance-of-mass-crafts.patch rename to patches/server/0999-Improve-performance-of-mass-crafts.patch diff --git a/patches/server/1001-Allow-trident-custom-damage.patch b/patches/server/1000-Allow-trident-custom-damage.patch similarity index 100% rename from patches/server/1001-Allow-trident-custom-damage.patch rename to patches/server/1000-Allow-trident-custom-damage.patch diff --git a/patches/server/1002-Expose-hand-during-BlockCanBuildEvent.patch b/patches/server/1001-Expose-hand-during-BlockCanBuildEvent.patch similarity index 100% rename from patches/server/1002-Expose-hand-during-BlockCanBuildEvent.patch rename to patches/server/1001-Expose-hand-during-BlockCanBuildEvent.patch diff --git a/patches/server/1003-Optimize-nearest-structure-border-iteration.patch b/patches/server/1002-Optimize-nearest-structure-border-iteration.patch similarity index 100% rename from patches/server/1003-Optimize-nearest-structure-border-iteration.patch rename to patches/server/1002-Optimize-nearest-structure-border-iteration.patch diff --git a/patches/server/1004-Implement-OfflinePlayer-isConnected.patch b/patches/server/1003-Implement-OfflinePlayer-isConnected.patch similarity index 94% rename from patches/server/1004-Implement-OfflinePlayer-isConnected.patch rename to patches/server/1003-Implement-OfflinePlayer-isConnected.patch index c295843152..61aaf002ad 100644 --- a/patches/server/1004-Implement-OfflinePlayer-isConnected.patch +++ b/patches/server/1003-Implement-OfflinePlayer-isConnected.patch @@ -23,7 +23,7 @@ index 9daec0782774ab51ea8091cb8ed9d0a106e34cfa..2bbc39c257965ad91ee360cdfcd3538a public String getName() { Player player = this.getPlayer(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 21d419d2dfb28f0dbc818f328d599b32f37a8ac2..cc7a5dac19faad801bf759cbf7aebd9c92d8be16 100644 +index 50df2725e5e3dd595567c8233b4aac5f022ef1d0..cf73b2c20f7cb65613cade7353c8a6a1063a61f2 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -285,6 +285,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/1005-Fix-inventory-desync.patch b/patches/server/1004-Fix-inventory-desync.patch similarity index 100% rename from patches/server/1005-Fix-inventory-desync.patch rename to patches/server/1004-Fix-inventory-desync.patch diff --git a/patches/server/1006-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/1005-Add-titleOverride-to-InventoryOpenEvent.patch similarity index 100% rename from patches/server/1006-Add-titleOverride-to-InventoryOpenEvent.patch rename to patches/server/1005-Add-titleOverride-to-InventoryOpenEvent.patch diff --git a/patches/server/1007-Configure-sniffer-egg-hatch-time.patch b/patches/server/1006-Configure-sniffer-egg-hatch-time.patch similarity index 100% rename from patches/server/1007-Configure-sniffer-egg-hatch-time.patch rename to patches/server/1006-Configure-sniffer-egg-hatch-time.patch diff --git a/patches/server/1008-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/1007-Do-crystal-portal-proximity-check-before-entity-look.patch similarity index 100% rename from patches/server/1008-Do-crystal-portal-proximity-check-before-entity-look.patch rename to patches/server/1007-Do-crystal-portal-proximity-check-before-entity-look.patch diff --git a/patches/server/1009-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/1008-Skip-POI-finding-if-stuck-in-vehicle.patch similarity index 100% rename from patches/server/1009-Skip-POI-finding-if-stuck-in-vehicle.patch rename to patches/server/1008-Skip-POI-finding-if-stuck-in-vehicle.patch diff --git a/patches/server/1010-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/1009-Add-slot-sanity-checks-in-container-clicks.patch similarity index 100% rename from patches/server/1010-Add-slot-sanity-checks-in-container-clicks.patch rename to patches/server/1009-Add-slot-sanity-checks-in-container-clicks.patch diff --git a/patches/server/1011-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/1010-Call-BlockRedstoneEvents-for-lecterns.patch similarity index 100% rename from patches/server/1011-Call-BlockRedstoneEvents-for-lecterns.patch rename to patches/server/1010-Call-BlockRedstoneEvents-for-lecterns.patch diff --git a/patches/server/1012-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/1011-Allow-proper-checking-of-empty-item-stacks.patch similarity index 100% rename from patches/server/1012-Allow-proper-checking-of-empty-item-stacks.patch rename to patches/server/1011-Allow-proper-checking-of-empty-item-stacks.patch diff --git a/patches/server/1013-Fix-silent-equipment-change-for-mobs.patch b/patches/server/1012-Fix-silent-equipment-change-for-mobs.patch similarity index 98% rename from patches/server/1013-Fix-silent-equipment-change-for-mobs.patch rename to patches/server/1012-Fix-silent-equipment-change-for-mobs.patch index 2076c5ac6d..bfc06d052d 100644 --- a/patches/server/1013-Fix-silent-equipment-change-for-mobs.patch +++ b/patches/server/1012-Fix-silent-equipment-change-for-mobs.patch @@ -47,7 +47,7 @@ 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 0afad3487a3939981abda6a2342e90683816a39f..396d32cde12ea7022714c4971ecbba3d215bb15b 100644 +index 03967f4168f0544a82958b37fbd437a66bed4d60..0b56e5f7f18fc4286992af22d402205b771165a3 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -1890,7 +1890,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/1014-Fix-spigot-s-Forced-Stats.patch b/patches/server/1013-Fix-spigot-s-Forced-Stats.patch similarity index 100% rename from patches/server/1014-Fix-spigot-s-Forced-Stats.patch rename to patches/server/1013-Fix-spigot-s-Forced-Stats.patch diff --git a/patches/server/1015-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/1014-Add-missing-InventoryHolders-to-inventories.patch similarity index 100% rename from patches/server/1015-Add-missing-InventoryHolders-to-inventories.patch rename to patches/server/1014-Add-missing-InventoryHolders-to-inventories.patch diff --git a/patches/server/1016-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/1015-Do-not-read-tile-entities-in-chunks-that-are-positio.patch similarity index 100% rename from patches/server/1016-Do-not-read-tile-entities-in-chunks-that-are-positio.patch rename to patches/server/1015-Do-not-read-tile-entities-in-chunks-that-are-positio.patch diff --git a/patches/server/1017-Actually-optimise-explosions.patch b/patches/server/1016-Actually-optimise-explosions.patch similarity index 100% rename from patches/server/1017-Actually-optimise-explosions.patch rename to patches/server/1016-Actually-optimise-explosions.patch diff --git a/patches/server/1018-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/1017-Add-missing-logs-for-log-ips-config-option.patch similarity index 100% rename from patches/server/1018-Add-missing-logs-for-log-ips-config-option.patch rename to patches/server/1017-Add-missing-logs-for-log-ips-config-option.patch diff --git a/patches/server/1019-Remove-Spigot-Bug-Fix-for-MC-109346.patch b/patches/server/1018-Remove-Spigot-Bug-Fix-for-MC-109346.patch similarity index 100% rename from patches/server/1019-Remove-Spigot-Bug-Fix-for-MC-109346.patch rename to patches/server/1018-Remove-Spigot-Bug-Fix-for-MC-109346.patch diff --git a/patches/server/1020-Fix-SuspiciousStewMeta.patch b/patches/server/1019-Fix-SuspiciousStewMeta.patch similarity index 100% rename from patches/server/1020-Fix-SuspiciousStewMeta.patch rename to patches/server/1019-Fix-SuspiciousStewMeta.patch diff --git a/patches/server/1021-Optimise-chunk-tick-iteration.patch b/patches/server/1020-Optimise-chunk-tick-iteration.patch similarity index 98% rename from patches/server/1021-Optimise-chunk-tick-iteration.patch rename to patches/server/1020-Optimise-chunk-tick-iteration.patch index 87a9537059..d122a200b0 100644 --- a/patches/server/1021-Optimise-chunk-tick-iteration.patch +++ b/patches/server/1020-Optimise-chunk-tick-iteration.patch @@ -187,7 +187,7 @@ index 68550d4497a5f10bf653482f79be77373df53f27..55f96545d6db95e3e657502a7910d96f public String getDebugStatus() { diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index bf14dbec0a08370364bf652ababadac27917b7f1..2defa2503fbb69ba92821b701dc63467a65cb4ee 100644 +index bb222f61b67ea6b8e2b900dbfdcdbe58b1caabca..561c5d47668b569d82d2a5fa8ba207064f2c50b4 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java @@ -516,18 +516,43 @@ public class ServerChunkCache extends ChunkSource { @@ -241,7 +241,7 @@ index bf14dbec0a08370364bf652ababadac27917b7f1..2defa2503fbb69ba92821b701dc63467 if (this.level.getServer().tickRateManager().runsNormally()) { gameprofilerfiller.popPush("naturalSpawnCount"); -@@ -562,33 +587,95 @@ public class ServerChunkCache extends ChunkSource { +@@ -562,38 +587,107 @@ public class ServerChunkCache extends ChunkSource { gameprofilerfiller.popPush("spawnAndTick"); boolean flag = this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && !this.level.players().isEmpty(); // CraftBukkit @@ -350,10 +350,8 @@ index bf14dbec0a08370364bf652ababadac27917b7f1..2defa2503fbb69ba92821b701dc63467 - if (this.level.shouldTickBlocksAt(chunkcoordintpair.toLong())) { + if (true || this.level.shouldTickBlocksAt(chunkcoordintpair.toLong())) { // Paper - optimise chunk tick iteration - this.level.timings.doTickTiles.startTiming(); // Spigot this.level.tickChunk(chunk1, l); if ((chunksTicked++ & 1) == 0) net.minecraft.server.MinecraftServer.getServer().executeMidTickTasks(); // Paper -@@ -596,6 +683,13 @@ public class ServerChunkCache extends ChunkSource { } } } @@ -367,7 +365,7 @@ index bf14dbec0a08370364bf652ababadac27917b7f1..2defa2503fbb69ba92821b701dc63467 gameprofilerfiller.popPush("customSpawners"); if (flag) { -@@ -606,11 +700,23 @@ public class ServerChunkCache extends ChunkSource { +@@ -604,11 +698,23 @@ public class ServerChunkCache extends ChunkSource { } gameprofilerfiller.popPush("broadcast"); diff --git a/patches/server/1022-Lag-compensation-ticks.patch b/patches/server/1021-Lag-compensation-ticks.patch similarity index 98% rename from patches/server/1022-Lag-compensation-ticks.patch rename to patches/server/1021-Lag-compensation-ticks.patch index 1af1b07a75..692ef6cdea 100644 --- a/patches/server/1022-Lag-compensation-ticks.patch +++ b/patches/server/1021-Lag-compensation-ticks.patch @@ -30,7 +30,7 @@ index a8f9f4e23575cb58045f9d8efe011a60a51dbd7a..34f19ac897a30c0c4e3ab406013fcca1 net.minecraft.world.level.block.entity.HopperBlockEntity.skipHopperEvents = worldserver.paperConfig().hopper.disableMoveEvent || org.bukkit.event.inventory.InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0; // Paper worldserver.hasEntityMoveEvent = io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index b0576234320042b0c9c1f326671b76fa3a2a6915..072e7b75ade6db8f48437d096639faf8f924ad03 100644 +index ae9aef03d4c9d106e025c3e91310dbef948804b1..cc6acabb9d531fbdb92393fb4d9ceabdce00a9e5 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -566,6 +566,17 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/1023-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/1022-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch similarity index 100% rename from patches/server/1023-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch rename to patches/server/1022-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch diff --git a/patches/server/1024-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/1023-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch similarity index 100% rename from patches/server/1024-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch rename to patches/server/1023-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch diff --git a/patches/server/1025-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/1024-Fix-team-sidebar-objectives-not-being-cleared.patch similarity index 100% rename from patches/server/1025-Fix-team-sidebar-objectives-not-being-cleared.patch rename to patches/server/1024-Fix-team-sidebar-objectives-not-being-cleared.patch diff --git a/patches/server/1026-Optimise-nearby-player-retrieval.patch b/patches/server/1025-Optimise-nearby-player-retrieval.patch similarity index 98% rename from patches/server/1026-Optimise-nearby-player-retrieval.patch rename to patches/server/1025-Optimise-nearby-player-retrieval.patch index 4b13d4535d..f569d52afe 100644 --- a/patches/server/1026-Optimise-nearby-player-retrieval.patch +++ b/patches/server/1025-Optimise-nearby-player-retrieval.patch @@ -8,7 +8,7 @@ we can instead use the nearby player tracking system to reduce the number of tests per search. diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 072e7b75ade6db8f48437d096639faf8f924ad03..d5543fe1c1f25798e7dea774d6e20132901dc05e 100644 +index cc6acabb9d531fbdb92393fb4d9ceabdce00a9e5..8a4f727cc538a47c437c2aa17999f197253adbde 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -577,6 +577,115 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/1027-Remove-streams-for-villager-AI.patch b/patches/server/1026-Remove-streams-for-villager-AI.patch similarity index 100% rename from patches/server/1027-Remove-streams-for-villager-AI.patch rename to patches/server/1026-Remove-streams-for-villager-AI.patch diff --git a/patches/server/1028-Fix-missing-map-initialize-event-call.patch b/patches/server/1027-Fix-missing-map-initialize-event-call.patch similarity index 96% rename from patches/server/1028-Fix-missing-map-initialize-event-call.patch rename to patches/server/1027-Fix-missing-map-initialize-event-call.patch index 7e7b19bed0..a197710044 100644 --- a/patches/server/1028-Fix-missing-map-initialize-event-call.patch +++ b/patches/server/1027-Fix-missing-map-initialize-event-call.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix missing map initialize event call diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index d5543fe1c1f25798e7dea774d6e20132901dc05e..eba414c592332b67143268ef56b912b35f2a2c14 100644 +index 8a4f727cc538a47c437c2aa17999f197253adbde..3820d1d79f445eb85ecab51fdcc74e62a1503636 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -2129,7 +2129,23 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/1029-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/1028-Update-entity-data-when-attaching-firework-to-entity.patch similarity index 100% rename from patches/server/1029-Update-entity-data-when-attaching-firework-to-entity.patch rename to patches/server/1028-Update-entity-data-when-attaching-firework-to-entity.patch diff --git a/patches/server/1030-Use-correct-variable-for-initializing-CraftLootTable.patch b/patches/server/1029-Use-correct-variable-for-initializing-CraftLootTable.patch similarity index 100% rename from patches/server/1030-Use-correct-variable-for-initializing-CraftLootTable.patch rename to patches/server/1029-Use-correct-variable-for-initializing-CraftLootTable.patch diff --git a/patches/server/1031-Make-setVelocity-method-of-Fireballs-change-the-trav.patch b/patches/server/1030-Make-setVelocity-method-of-Fireballs-change-the-trav.patch similarity index 100% rename from patches/server/1031-Make-setVelocity-method-of-Fireballs-change-the-trav.patch rename to patches/server/1030-Make-setVelocity-method-of-Fireballs-change-the-trav.patch diff --git a/patches/server/1032-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/1031-Fix-UnsafeValues-loadAdvancement.patch similarity index 96% rename from patches/server/1032-Fix-UnsafeValues-loadAdvancement.patch rename to patches/server/1031-Fix-UnsafeValues-loadAdvancement.patch index 392a8fee90..834c4d579b 100644 --- a/patches/server/1032-Fix-UnsafeValues-loadAdvancement.patch +++ b/patches/server/1031-Fix-UnsafeValues-loadAdvancement.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix UnsafeValues#loadAdvancement diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index c0e36388652e89059c91117722945645119a5738..9fe7038343320e3cb5fd5fcb661995726089bb5d 100644 +index da3f74ba0c84ad5a1447de72c9a90fdd88c254a7..ec2396f0e5d62b10450eaa7239a8c5479638b3c3 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -316,7 +316,27 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/1033-Add-player-idle-duration-API.patch b/patches/server/1032-Add-player-idle-duration-API.patch similarity index 91% rename from patches/server/1033-Add-player-idle-duration-API.patch rename to patches/server/1032-Add-player-idle-duration-API.patch index 6d0155b07c..e981d382d8 100644 --- a/patches/server/1033-Add-player-idle-duration-API.patch +++ b/patches/server/1032-Add-player-idle-duration-API.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add player idle duration API Implements API for getting and resetting a player's idle duration. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index cc7a5dac19faad801bf759cbf7aebd9c92d8be16..4728b99703c8851d2ffff48cf90a4455c9514b57 100644 +index cf73b2c20f7cb65613cade7353c8a6a1063a61f2..206f3d7b29c0b5261091ee98be60068a3e062e82 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -3296,6 +3296,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/1034-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/1033-Don-t-check-if-we-can-see-non-visible-entities.patch similarity index 100% rename from patches/server/1034-Don-t-check-if-we-can-see-non-visible-entities.patch rename to patches/server/1033-Don-t-check-if-we-can-see-non-visible-entities.patch diff --git a/patches/server/1035-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/1034-Fix-NPE-in-SculkBloomEvent-world-access.patch similarity index 100% rename from patches/server/1035-Fix-NPE-in-SculkBloomEvent-world-access.patch rename to patches/server/1034-Fix-NPE-in-SculkBloomEvent-world-access.patch diff --git a/patches/server/1036-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/1035-Allow-null-itemstack-for-Player-sendEquipmentChange.patch similarity index 90% rename from patches/server/1036-Allow-null-itemstack-for-Player-sendEquipmentChange.patch rename to patches/server/1035-Allow-null-itemstack-for-Player-sendEquipmentChange.patch index d3952c36f0..08ba5cdd03 100644 --- a/patches/server/1036-Allow-null-itemstack-for-Player-sendEquipmentChange.patch +++ b/patches/server/1035-Allow-null-itemstack-for-Player-sendEquipmentChange.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow null itemstack for Player#sendEquipmentChange diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 4728b99703c8851d2ffff48cf90a4455c9514b57..a689994508fbb6f117b57a1da97c14e588c792e5 100644 +index 206f3d7b29c0b5261091ee98be60068a3e062e82..f4065a4269c2da542664f41c67299c53bc8480c4 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1089,7 +1089,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/1037-Optimize-VarInts.patch b/patches/server/1036-Optimize-VarInts.patch similarity index 100% rename from patches/server/1037-Optimize-VarInts.patch rename to patches/server/1036-Optimize-VarInts.patch diff --git a/patches/server/1038-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/server/1037-Add-API-to-get-the-collision-shape-of-a-block-before.patch similarity index 100% rename from patches/server/1038-Add-API-to-get-the-collision-shape-of-a-block-before.patch rename to patches/server/1037-Add-API-to-get-the-collision-shape-of-a-block-before.patch diff --git a/patches/server/1039-Add-predicate-for-blocks-when-raytracing.patch b/patches/server/1038-Add-predicate-for-blocks-when-raytracing.patch similarity index 100% rename from patches/server/1039-Add-predicate-for-blocks-when-raytracing.patch rename to patches/server/1038-Add-predicate-for-blocks-when-raytracing.patch diff --git a/patches/server/1040-Broadcast-take-item-packets-with-collector-as-source.patch b/patches/server/1039-Broadcast-take-item-packets-with-collector-as-source.patch similarity index 100% rename from patches/server/1040-Broadcast-take-item-packets-with-collector-as-source.patch rename to patches/server/1039-Broadcast-take-item-packets-with-collector-as-source.patch diff --git a/patches/server/1041-fix-secure-profile-with-proxy-online-mode.patch b/patches/server/1040-fix-secure-profile-with-proxy-online-mode.patch similarity index 100% rename from patches/server/1041-fix-secure-profile-with-proxy-online-mode.patch rename to patches/server/1040-fix-secure-profile-with-proxy-online-mode.patch diff --git a/patches/server/1042-Expand-LingeringPotion-API.patch b/patches/server/1041-Expand-LingeringPotion-API.patch similarity index 100% rename from patches/server/1042-Expand-LingeringPotion-API.patch rename to patches/server/1041-Expand-LingeringPotion-API.patch diff --git a/patches/server/1043-Add-MaterialTagsTest.patch b/patches/server/1042-Add-MaterialTagsTest.patch similarity index 100% rename from patches/server/1043-Add-MaterialTagsTest.patch rename to patches/server/1042-Add-MaterialTagsTest.patch diff --git a/patches/server/1044-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/server/1043-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch similarity index 100% rename from patches/server/1044-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch rename to patches/server/1043-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch diff --git a/patches/server/1045-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/server/1044-Add-hand-to-fish-event-for-all-player-interactions.patch similarity index 100% rename from patches/server/1045-Add-hand-to-fish-event-for-all-player-interactions.patch rename to patches/server/1044-Add-hand-to-fish-event-for-all-player-interactions.patch diff --git a/patches/server/1046-Fix-several-issues-with-EntityBreedEvent.patch b/patches/server/1045-Fix-several-issues-with-EntityBreedEvent.patch similarity index 100% rename from patches/server/1046-Fix-several-issues-with-EntityBreedEvent.patch rename to patches/server/1045-Fix-several-issues-with-EntityBreedEvent.patch diff --git a/patches/server/1047-Add-UUID-attribute-modifier-API.patch b/patches/server/1046-Add-UUID-attribute-modifier-API.patch similarity index 100% rename from patches/server/1047-Add-UUID-attribute-modifier-API.patch rename to patches/server/1046-Add-UUID-attribute-modifier-API.patch diff --git a/patches/server/1048-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/server/1047-Fix-missing-event-call-for-entity-teleport-API.patch similarity index 100% rename from patches/server/1048-Fix-missing-event-call-for-entity-teleport-API.patch rename to patches/server/1047-Fix-missing-event-call-for-entity-teleport-API.patch diff --git a/patches/server/1049-Lazily-create-LootContext-for-criterions.patch b/patches/server/1048-Lazily-create-LootContext-for-criterions.patch similarity index 100% rename from patches/server/1049-Lazily-create-LootContext-for-criterions.patch rename to patches/server/1048-Lazily-create-LootContext-for-criterions.patch diff --git a/patches/server/1050-Don-t-fire-EntityPotionEffectEvent-during-worldgen.patch b/patches/server/1049-Don-t-fire-EntityPotionEffectEvent-during-worldgen.patch similarity index 100% rename from patches/server/1050-Don-t-fire-EntityPotionEffectEvent-during-worldgen.patch rename to patches/server/1049-Don-t-fire-EntityPotionEffectEvent-during-worldgen.patch diff --git a/patches/server/1051-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/server/1050-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch similarity index 100% rename from patches/server/1051-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch rename to patches/server/1050-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch diff --git a/patches/server/1052-Restore-vanilla-entity-drops-behavior.patch b/patches/server/1051-Restore-vanilla-entity-drops-behavior.patch similarity index 98% rename from patches/server/1052-Restore-vanilla-entity-drops-behavior.patch rename to patches/server/1051-Restore-vanilla-entity-drops-behavior.patch index b8beef2222..0c2b0b055b 100644 --- a/patches/server/1052-Restore-vanilla-entity-drops-behavior.patch +++ b/patches/server/1051-Restore-vanilla-entity-drops-behavior.patch @@ -39,7 +39,7 @@ index 5fe743567f2e9cf0f9442ddd87453c51af8060e6..8efbbd379244e3ed54d4aba199037cc2 } // Paper diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 92508e9ea17d2ea00b4da20a249325c390442016..7b3ec2f2a522b565ef16f8724cd0ec835e374a32 100644 +index 62bdce9516804942862b33667bc571e3bcac1a70..9abe817ae202edaa2d88cd59ae5c7db0b1c634be 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2702,6 +2702,25 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S @@ -123,7 +123,7 @@ index 1e07febcf7a3dfb281728cc5e3e4f15dd776d7e0..c9a4feb4a52c0eb621b120e5b8c18d0a } diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java -index 68fc2f614253f43ed9b09f54ca06aabb2bdd8fe3..630cb49ac05a8939c619c7b6710c9cf0ab85c8e7 100644 +index ab708b256183fc54fe8e13f341d8a38acf611739..1e86e86b0a100a5d14aee10b60e70c32d2733660 100644 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java @@ -610,7 +610,7 @@ public class ArmorStand extends LivingEntity { diff --git a/patches/server/1053-Add-Structure-check-API.patch b/patches/server/1052-Add-Structure-check-API.patch similarity index 100% rename from patches/server/1053-Add-Structure-check-API.patch rename to patches/server/1052-Add-Structure-check-API.patch diff --git a/patches/server/1054-Dont-resend-blocks-on-interactions.patch b/patches/server/1053-Dont-resend-blocks-on-interactions.patch similarity index 100% rename from patches/server/1054-Dont-resend-blocks-on-interactions.patch rename to patches/server/1053-Dont-resend-blocks-on-interactions.patch