diff --git a/patches/server/0727-Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/server/0138-Do-not-submit-profile-lookups-to-worldgen-threads.patch similarity index 77% rename from patches/server/0727-Do-not-submit-profile-lookups-to-worldgen-threads.patch rename to patches/server/0138-Do-not-submit-profile-lookups-to-worldgen-threads.patch index b4a4b8d8a..aece8e971 100644 --- a/patches/server/0727-Do-not-submit-profile-lookups-to-worldgen-threads.patch +++ b/patches/server/0138-Do-not-submit-profile-lookups-to-worldgen-threads.patch @@ -10,13 +10,13 @@ out due to a sync load, as the worldgen threads will be stalling on profile lookups. diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java -index 5f9e3d37c3ba79d26806374d73f87328cebb562d..206c6ce227ba19620185ac835af28d67caa76c40 100644 +index d7e22ddf89619b58516ccef1d75a4c33df61b73c..33ec7786cdf8c32e905d192fc8364418e47404d5 100644 --- a/src/main/java/net/minecraft/Util.java +++ b/src/main/java/net/minecraft/Util.java @@ -80,6 +80,22 @@ public class Util { private static final AtomicInteger WORKER_COUNT = new AtomicInteger(1); - private static final ExecutorService BOOTSTRAP_EXECUTOR = makeExecutor("Bootstrap", -2); // Paper - add -2 priority - private static final ExecutorService BACKGROUND_EXECUTOR = makeExecutor("Main", -1); // Paper - add -1 priority + private static final ExecutorService BOOTSTRAP_EXECUTOR = makeExecutor("Bootstrap"); + private static final ExecutorService BACKGROUND_EXECUTOR = makeExecutor("Main"); + // Paper start - don't submit BLOCKING PROFILE LOOKUPS to the world gen thread + public static final ExecutorService PROFILE_EXECUTOR = Executors.newFixedThreadPool(2, new java.util.concurrent.ThreadFactory() { + @@ -37,10 +37,10 @@ index 5f9e3d37c3ba79d26806374d73f87328cebb562d..206c6ce227ba19620185ac835af28d67 public static LongSupplier timeSource = System::nanoTime; public static final Ticker TICKER = new Ticker() { diff --git a/src/main/java/net/minecraft/server/players/GameProfileCache.java b/src/main/java/net/minecraft/server/players/GameProfileCache.java -index 8d86645ef264287d01203afd7bba516e78be5743..4dff88bdf14675718572e4b3720c0250ce6e730e 100644 +index c7edbd12361cfd3dcf1359917d579fae4c3cc8a7..6c8a1d9c7696fa55dae6ba5e4ea50a0ffc7ea543 100644 --- a/src/main/java/net/minecraft/server/players/GameProfileCache.java +++ b/src/main/java/net/minecraft/server/players/GameProfileCache.java -@@ -207,7 +207,7 @@ public class GameProfileCache { +@@ -181,7 +181,7 @@ public class GameProfileCache { } else { this.requests.put(username, CompletableFuture.supplyAsync(() -> { return this.get(username); @@ -62,3 +62,16 @@ index 0c7e29b589ab106013d979a20edc415b4b32a677..c5d5d90d10b30f30d1262367b3d75df4 Util.ifElse(profile, (profilex) -> { Property property = Iterables.getFirst(profilex.getProperties().get("textures"), (Property)null); if (property == null) { +diff --git a/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java b/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java +index 2d49bd6f3f017d43dfaa23cedf35040b64bcdcf8..9edc5e73819e0b55372f77c5e292eece74d837c7 100644 +--- a/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java ++++ b/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java +@@ -121,7 +121,7 @@ public final class CraftPlayerProfile implements PlayerProfile { + + @Override + public CompletableFuture update() { +- return CompletableFuture.supplyAsync(this::getUpdatedProfile, Util.backgroundExecutor()); ++ return CompletableFuture.supplyAsync(this::getUpdatedProfile, Util.PROFILE_EXECUTOR); // Paper - not a good idea to use BLOCKING OPERATIONS on the worldgen executor + } + + private CraftPlayerProfile getUpdatedProfile() { diff --git a/patches/server/0138-Add-UnknownCommandEvent.patch b/patches/server/0139-Add-UnknownCommandEvent.patch similarity index 92% rename from patches/server/0138-Add-UnknownCommandEvent.patch rename to patches/server/0139-Add-UnknownCommandEvent.patch index 2ef481f6d..800f58e3a 100644 --- a/patches/server/0138-Add-UnknownCommandEvent.patch +++ b/patches/server/0139-Add-UnknownCommandEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add UnknownCommandEvent diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 49d0e5e5cf1c529cbd0f4c58c88acf802f42a5bd..cf913f0678178d03c63eaa2b7a67e18abe17a7c5 100644 +index 20d1fafc33f207f5e922df9fa5e152e003717a1c..c55a18eadc2bef0c98abd46898e10a5110212c68 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -888,7 +888,13 @@ public final class CraftServer implements Server { diff --git a/patches/server/0139-Basic-PlayerProfile-API.patch b/patches/server/0140-Basic-PlayerProfile-API.patch similarity index 98% rename from patches/server/0139-Basic-PlayerProfile-API.patch rename to patches/server/0140-Basic-PlayerProfile-API.patch index 58cfbda54..b0c4edc16 100644 --- a/patches/server/0139-Basic-PlayerProfile-API.patch +++ b/patches/server/0140-Basic-PlayerProfile-API.patch @@ -7,7 +7,7 @@ Establishes base extension of profile systems for future edits too diff --git a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java new file mode 100644 -index 0000000000000000000000000000000000000000..d945ea3484d0350096046d43112490b94e3b9bcd +index 0000000000000000000000000000000000000000..7a5b24419507d00817aa3e8950d89f5174823387 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java @@ -0,0 +1,399 @@ @@ -185,7 +185,7 @@ index 0000000000000000000000000000000000000000..d945ea3484d0350096046d43112490b9 + final CraftPlayerProfile clone = clone(); + clone.complete(true); + return clone; -+ }, Util.backgroundExecutor()); ++ }, Util.PROFILE_EXECUTOR); + } + + @Override @@ -599,7 +599,7 @@ index a48a12a31a3d09a9373b688dcc093035f8f8a300..97b29bcb20e199c2d02457f8025e67e2 String s = (String) Optional.ofNullable((String) optionset.valueOf("world")).orElse(dedicatedserversettings.getProperties().levelName); LevelStorageSource convertable = LevelStorageSource.createDefault(file.toPath()); diff --git a/src/main/java/net/minecraft/server/players/GameProfileCache.java b/src/main/java/net/minecraft/server/players/GameProfileCache.java -index c7edbd12361cfd3dcf1359917d579fae4c3cc8a7..2a4f8aa6697ed6144440970c9abaf9f6e1a2c2ce 100644 +index 6c8a1d9c7696fa55dae6ba5e4ea50a0ffc7ea543..2347c7b44793aabe431b57bb1b44935fefbda6fe 100644 --- a/src/main/java/net/minecraft/server/players/GameProfileCache.java +++ b/src/main/java/net/minecraft/server/players/GameProfileCache.java @@ -136,6 +136,17 @@ public class GameProfileCache { @@ -621,7 +621,7 @@ index c7edbd12361cfd3dcf1359917d579fae4c3cc8a7..2a4f8aa6697ed6144440970c9abaf9f6 String s1 = name.toLowerCase(Locale.ROOT); GameProfileCache.GameProfileInfo usercache_usercacheentry = (GameProfileCache.GameProfileInfo) this.profilesByName.get(s1); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index cf913f0678178d03c63eaa2b7a67e18abe17a7c5..c334fa4dcd0ecab1a1cdfe7ebb0b6615e710f164 100644 +index c55a18eadc2bef0c98abd46898e10a5110212c68..e66595c24210ed3f2daab2add7e8acc8cf881fdc 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -241,6 +241,9 @@ import org.yaml.snakeyaml.error.MarkedYAMLException; @@ -681,7 +681,7 @@ index cf913f0678178d03c63eaa2b7a67e18abe17a7c5..c334fa4dcd0ecab1a1cdfe7ebb0b6615 // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java b/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java -index 2d49bd6f3f017d43dfaa23cedf35040b64bcdcf8..661d8e9882509700faa9bc10a2e3074c5553af44 100644 +index 9edc5e73819e0b55372f77c5e292eece74d837c7..9001c9dc68dc05944eb839c3354bea29249daa92 100644 --- a/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java +++ b/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java @@ -27,7 +27,7 @@ import org.bukkit.profile.PlayerProfile; diff --git a/patches/server/0140-Shoulder-Entities-Release-API.patch b/patches/server/0141-Shoulder-Entities-Release-API.patch similarity index 97% rename from patches/server/0140-Shoulder-Entities-Release-API.patch rename to patches/server/0141-Shoulder-Entities-Release-API.patch index bb1d20db9..6278bc65f 100644 --- a/patches/server/0140-Shoulder-Entities-Release-API.patch +++ b/patches/server/0141-Shoulder-Entities-Release-API.patch @@ -58,7 +58,7 @@ index 9aa134e56d661d033bb7229e6ab662534bf9cba9..794081610e52b7b8e04403510d1ad05f @Override public abstract boolean isSpectator(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index 2099056896954c700840f3c598f147e4983b86a1..ea024ec921a382e40c982cc529f13d08101ca131 100644 +index 2c934b7a2142a4d1ae21feeb95d23f22cfda3be0..3954ed194388c6487c6cd0303aea9e1b65a0f8ee 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -504,6 +504,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { diff --git a/patches/server/0141-Profile-Lookup-Events.patch b/patches/server/0142-Profile-Lookup-Events.patch similarity index 100% rename from patches/server/0141-Profile-Lookup-Events.patch rename to patches/server/0142-Profile-Lookup-Events.patch diff --git a/patches/server/0142-Block-player-logins-during-server-shutdown.patch b/patches/server/0143-Block-player-logins-during-server-shutdown.patch similarity index 100% rename from patches/server/0142-Block-player-logins-during-server-shutdown.patch rename to patches/server/0143-Block-player-logins-during-server-shutdown.patch diff --git a/patches/server/0143-Entity-fromMobSpawner.patch b/patches/server/0144-Entity-fromMobSpawner.patch similarity index 100% rename from patches/server/0143-Entity-fromMobSpawner.patch rename to patches/server/0144-Entity-fromMobSpawner.patch diff --git a/patches/server/0144-Improve-the-Saddle-API-for-Horses.patch b/patches/server/0145-Improve-the-Saddle-API-for-Horses.patch similarity index 100% rename from patches/server/0144-Improve-the-Saddle-API-for-Horses.patch rename to patches/server/0145-Improve-the-Saddle-API-for-Horses.patch diff --git a/patches/server/0145-Implement-ensureServerConversions-API.patch b/patches/server/0146-Implement-ensureServerConversions-API.patch similarity index 100% rename from patches/server/0145-Implement-ensureServerConversions-API.patch rename to patches/server/0146-Implement-ensureServerConversions-API.patch diff --git a/patches/server/0146-Implement-getI18NDisplayName.patch b/patches/server/0147-Implement-getI18NDisplayName.patch similarity index 100% rename from patches/server/0146-Implement-getI18NDisplayName.patch rename to patches/server/0147-Implement-getI18NDisplayName.patch diff --git a/patches/server/0147-ProfileWhitelistVerifyEvent.patch b/patches/server/0148-ProfileWhitelistVerifyEvent.patch similarity index 100% rename from patches/server/0147-ProfileWhitelistVerifyEvent.patch rename to patches/server/0148-ProfileWhitelistVerifyEvent.patch diff --git a/patches/server/0148-Fix-this-stupid-bullshit.patch b/patches/server/0149-Fix-this-stupid-bullshit.patch similarity index 100% rename from patches/server/0148-Fix-this-stupid-bullshit.patch rename to patches/server/0149-Fix-this-stupid-bullshit.patch diff --git a/patches/server/0149-LivingEntity-setKiller.patch b/patches/server/0150-LivingEntity-setKiller.patch similarity index 100% rename from patches/server/0149-LivingEntity-setKiller.patch rename to patches/server/0150-LivingEntity-setKiller.patch diff --git a/patches/server/0150-Ocelot-despawns-should-honor-nametags-and-leash.patch b/patches/server/0151-Ocelot-despawns-should-honor-nametags-and-leash.patch similarity index 100% rename from patches/server/0150-Ocelot-despawns-should-honor-nametags-and-leash.patch rename to patches/server/0151-Ocelot-despawns-should-honor-nametags-and-leash.patch diff --git a/patches/server/0151-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/patches/server/0152-Reset-spawner-timer-when-spawner-event-is-cancelled.patch similarity index 100% rename from patches/server/0151-Reset-spawner-timer-when-spawner-event-is-cancelled.patch rename to patches/server/0152-Reset-spawner-timer-when-spawner-event-is-cancelled.patch diff --git a/patches/server/0152-Allow-specifying-a-custom-authentication-servers-dow.patch b/patches/server/0153-Allow-specifying-a-custom-authentication-servers-dow.patch similarity index 100% rename from patches/server/0152-Allow-specifying-a-custom-authentication-servers-dow.patch rename to patches/server/0153-Allow-specifying-a-custom-authentication-servers-dow.patch diff --git a/patches/server/0153-Handle-plugin-prefixes-using-Log4J-configuration.patch b/patches/server/0154-Handle-plugin-prefixes-using-Log4J-configuration.patch similarity index 95% rename from patches/server/0153-Handle-plugin-prefixes-using-Log4J-configuration.patch rename to patches/server/0154-Handle-plugin-prefixes-using-Log4J-configuration.patch index 8eb888811..24e5ff4f3 100644 --- a/patches/server/0153-Handle-plugin-prefixes-using-Log4J-configuration.patch +++ b/patches/server/0154-Handle-plugin-prefixes-using-Log4J-configuration.patch @@ -15,7 +15,7 @@ This may cause additional prefixes to be disabled for plugins bypassing the plugin logger. diff --git a/build.gradle.kts b/build.gradle.kts -index a8bc19403fc82ef03e43afe8ddf5fa78890e8dda..22038142efe960acebba84a4cc81f5ce7eaa0512 100644 +index d4141a24cb5ba20e8c53c85206b32120ff18eb48..a57fad0a75fe18f70d3dd6cd5c6a2ab90eb0498d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -17,7 +17,7 @@ dependencies { @@ -28,7 +28,7 @@ index a8bc19403fc82ef03e43afe8ddf5fa78890e8dda..22038142efe960acebba84a4cc81f5ce implementation("org.apache.logging.log4j:log4j-iostreams:2.17.1") // Paper implementation("org.ow2.asm:asm:9.3") diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index a4ec0d7791deed7cb64d4a35e19ceb3d9d798221..2e684d28948d23a310b5d5029903a871e6f9b1ca 100644 +index 051d7c7fc5796ad056ae1ba5e5e630fde8794108..c2e3d32e51902503af88f089e366e784f42d999a 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -290,7 +290,7 @@ public class SpigotConfig diff --git a/patches/server/0154-Improve-Log4J-Configuration-Plugin-Loggers.patch b/patches/server/0155-Improve-Log4J-Configuration-Plugin-Loggers.patch similarity index 100% rename from patches/server/0154-Improve-Log4J-Configuration-Plugin-Loggers.patch rename to patches/server/0155-Improve-Log4J-Configuration-Plugin-Loggers.patch diff --git a/patches/server/0155-Add-PlayerJumpEvent.patch b/patches/server/0156-Add-PlayerJumpEvent.patch similarity index 100% rename from patches/server/0155-Add-PlayerJumpEvent.patch rename to patches/server/0156-Add-PlayerJumpEvent.patch diff --git a/patches/server/0156-handle-ServerboundKeepAlivePacket-async.patch b/patches/server/0157-handle-ServerboundKeepAlivePacket-async.patch similarity index 100% rename from patches/server/0156-handle-ServerboundKeepAlivePacket-async.patch rename to patches/server/0157-handle-ServerboundKeepAlivePacket-async.patch diff --git a/patches/server/0157-Expose-client-protocol-version-and-virtual-host.patch b/patches/server/0158-Expose-client-protocol-version-and-virtual-host.patch similarity index 97% rename from patches/server/0157-Expose-client-protocol-version-and-virtual-host.patch rename to patches/server/0158-Expose-client-protocol-version-and-virtual-host.patch index 5e405644f..197e172c8 100644 --- a/patches/server/0157-Expose-client-protocol-version-and-virtual-host.patch +++ b/patches/server/0158-Expose-client-protocol-version-and-virtual-host.patch @@ -90,7 +90,7 @@ index 9016aced079108aeae09f030a672467a953ef93f..4170bda451df3db43e7d57d87d1abb81 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 0b693866af8e0d8de275e87ca1232a03a6a35abe..7233d075b9c12c4beee872c204a4524c942f183d 100644 +index 4754f603ca1c80129f9ee3868b54d25c52a759cc..b956da482950b7383768d6bd60fa4360e179d7d8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -218,6 +218,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0158-revert-serverside-behavior-of-keepalives.patch b/patches/server/0159-revert-serverside-behavior-of-keepalives.patch similarity index 97% rename from patches/server/0158-revert-serverside-behavior-of-keepalives.patch rename to patches/server/0159-revert-serverside-behavior-of-keepalives.patch index bcdc79776..7c5718dee 100644 --- a/patches/server/0158-revert-serverside-behavior-of-keepalives.patch +++ b/patches/server/0159-revert-serverside-behavior-of-keepalives.patch @@ -17,7 +17,7 @@ from networking or during connections flood of chunk packets on slower clients, at the cost of dead connections being kept open for longer. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 32c59e612519323c8ee1956a1a893354913d1fda..71e52f71ac06f66696f5ae9b79ab490c7389927f 100644 +index a38061ba575a2603b6b04382cb2f5c8396b05bdd..86f9991cfe6aca5923c64d8cdde6e90b9ba5591d 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -240,7 +240,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0159-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/patches/server/0160-Send-attack-SoundEffects-only-to-players-who-can-see.patch similarity index 100% rename from patches/server/0159-Send-attack-SoundEffects-only-to-players-who-can-see.patch rename to patches/server/0160-Send-attack-SoundEffects-only-to-players-who-can-see.patch diff --git a/patches/server/0160-Add-PlayerArmorChangeEvent.patch b/patches/server/0161-Add-PlayerArmorChangeEvent.patch similarity index 94% rename from patches/server/0160-Add-PlayerArmorChangeEvent.patch rename to patches/server/0161-Add-PlayerArmorChangeEvent.patch index 0747a7d62..fab2852fe 100644 --- a/patches/server/0160-Add-PlayerArmorChangeEvent.patch +++ b/patches/server/0161-Add-PlayerArmorChangeEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerArmorChangeEvent diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 7c50e9c28f9f26b42d2baa51d8fa735bb182ffa5..27a2ba075a2f7575b6788c66a121fc906b19a99d 100644 +index 20bc6684b0394fe08aa35c371bf668d8ebcf98b1..39635eae8b2f92ffb171c5cbb37bed5bd610266b 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1,5 +1,6 @@ diff --git a/patches/server/0161-Prevent-logins-from-being-processed-when-the-player-.patch b/patches/server/0162-Prevent-logins-from-being-processed-when-the-player-.patch similarity index 92% rename from patches/server/0161-Prevent-logins-from-being-processed-when-the-player-.patch rename to patches/server/0162-Prevent-logins-from-being-processed-when-the-player-.patch index 31dd1f90e..7b4e3a0b6 100644 --- a/patches/server/0161-Prevent-logins-from-being-processed-when-the-player-.patch +++ b/patches/server/0162-Prevent-logins-from-being-processed-when-the-player-.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Prevent logins from being processed when the player has diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -index 9fe3ec7e6bd194b825a1b29bcff9fcd5e21f22ad..5bf48f4fb0794a1eaea3783add9e5852997434f6 100644 +index d2f0450c6bae722bfa9162b027e723eb10b22c78..145f3eae6622453d47769e10fb30ce8d31d5f847 100644 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java @@ -86,7 +86,11 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener diff --git a/patches/server/0162-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/patches/server/0163-Fix-MC-117075-TE-Unload-Lag-Spike.patch similarity index 96% rename from patches/server/0162-Fix-MC-117075-TE-Unload-Lag-Spike.patch rename to patches/server/0163-Fix-MC-117075-TE-Unload-Lag-Spike.patch index cc8e752db..d0a52d572 100644 --- a/patches/server/0162-Fix-MC-117075-TE-Unload-Lag-Spike.patch +++ b/patches/server/0163-Fix-MC-117075-TE-Unload-Lag-Spike.patch @@ -5,7 +5,7 @@ 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 5577a560d41a2467bd713f2fa7511c83a73c2f2d..e6b9b19cde9c3576745a10e0a12317fc99577ae8 100644 +index 4e843d9e28f7775faba3e47ca5a725f7921490e6..28c3aca868c11da6f61b19b9b35072995c8be8bf 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -691,6 +691,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0163-use-CB-BlockState-implementations-for-captured-block.patch b/patches/server/0164-use-CB-BlockState-implementations-for-captured-block.patch similarity index 97% rename from patches/server/0163-use-CB-BlockState-implementations-for-captured-block.patch rename to patches/server/0164-use-CB-BlockState-implementations-for-captured-block.patch index 73c67e8c1..8c4fa7bc1 100644 --- a/patches/server/0163-use-CB-BlockState-implementations-for-captured-block.patch +++ b/patches/server/0164-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 e6b9b19cde9c3576745a10e0a12317fc99577ae8..ad0f91d57b5cbf0c4439993ad99ec7a484729a2e 100644 +index 28c3aca868c11da6f61b19b9b35072995c8be8bf..4022c4d3b2ce935f69460e4de21f1fad7c100b26 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -148,7 +148,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0164-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/server/0165-API-to-get-a-BlockState-without-a-snapshot.patch similarity index 100% rename from patches/server/0164-API-to-get-a-BlockState-without-a-snapshot.patch rename to patches/server/0165-API-to-get-a-BlockState-without-a-snapshot.patch diff --git a/patches/server/0165-AsyncTabCompleteEvent.patch b/patches/server/0166-AsyncTabCompleteEvent.patch similarity index 98% rename from patches/server/0165-AsyncTabCompleteEvent.patch rename to patches/server/0166-AsyncTabCompleteEvent.patch index a0bb7bd2e..5d8c632d7 100644 --- a/patches/server/0165-AsyncTabCompleteEvent.patch +++ b/patches/server/0166-AsyncTabCompleteEvent.patch @@ -72,7 +72,7 @@ index 86f9991cfe6aca5923c64d8cdde6e90b9ba5591d..7f17875e359855a25618a52bc2e844fe @Override diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index c334fa4dcd0ecab1a1cdfe7ebb0b6615e710f164..a9731e89f2cddc2ae256bf955945f4d2f3cd0c28 100644 +index e66595c24210ed3f2daab2add7e8acc8cf881fdc..7e3631a75a2221955199f746e9b8f406a744121a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2082,7 +2082,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0166-PlayerPickupExperienceEvent.patch b/patches/server/0167-PlayerPickupExperienceEvent.patch similarity index 100% rename from patches/server/0166-PlayerPickupExperienceEvent.patch rename to patches/server/0167-PlayerPickupExperienceEvent.patch diff --git a/patches/server/0167-Ability-to-apply-mending-to-XP-API.patch b/patches/server/0168-Ability-to-apply-mending-to-XP-API.patch similarity index 96% rename from patches/server/0167-Ability-to-apply-mending-to-XP-API.patch rename to patches/server/0168-Ability-to-apply-mending-to-XP-API.patch index 3e9d938d7..b7043b48a 100644 --- a/patches/server/0167-Ability-to-apply-mending-to-XP-API.patch +++ b/patches/server/0168-Ability-to-apply-mending-to-XP-API.patch @@ -10,7 +10,7 @@ of giving the player experience points. Both an API To standalone mend, and apply mending logic to .giveExp has been added. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 7233d075b9c12c4beee872c204a4524c942f183d..e6ca45329c5f102ebf4abc729837108cad63a59f 100644 +index b956da482950b7383768d6bd60fa4360e179d7d8..153b5602f1c5f6ef7a184fc8c9cb72523fa3fccb 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1346,7 +1346,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0168-PlayerNaturallySpawnCreaturesEvent.patch b/patches/server/0169-PlayerNaturallySpawnCreaturesEvent.patch similarity index 100% rename from patches/server/0168-PlayerNaturallySpawnCreaturesEvent.patch rename to patches/server/0169-PlayerNaturallySpawnCreaturesEvent.patch diff --git a/patches/server/0169-Add-setPlayerProfile-API-for-Skulls.patch b/patches/server/0170-Add-setPlayerProfile-API-for-Skulls.patch similarity index 100% rename from patches/server/0169-Add-setPlayerProfile-API-for-Skulls.patch rename to patches/server/0170-Add-setPlayerProfile-API-for-Skulls.patch diff --git a/patches/server/0170-PreCreatureSpawnEvent.patch b/patches/server/0171-PreCreatureSpawnEvent.patch similarity index 100% rename from patches/server/0170-PreCreatureSpawnEvent.patch rename to patches/server/0171-PreCreatureSpawnEvent.patch diff --git a/patches/server/0171-Fill-Profile-Property-Events.patch b/patches/server/0172-Fill-Profile-Property-Events.patch similarity index 100% rename from patches/server/0171-Fill-Profile-Property-Events.patch rename to patches/server/0172-Fill-Profile-Property-Events.patch diff --git a/patches/server/0172-PlayerAdvancementCriterionGrantEvent.patch b/patches/server/0173-PlayerAdvancementCriterionGrantEvent.patch similarity index 100% rename from patches/server/0172-PlayerAdvancementCriterionGrantEvent.patch rename to patches/server/0173-PlayerAdvancementCriterionGrantEvent.patch diff --git a/patches/server/0173-Add-ArmorStand-Item-Meta.patch b/patches/server/0174-Add-ArmorStand-Item-Meta.patch similarity index 100% rename from patches/server/0173-Add-ArmorStand-Item-Meta.patch rename to patches/server/0174-Add-ArmorStand-Item-Meta.patch diff --git a/patches/server/0174-Extend-Player-Interact-cancellation.patch b/patches/server/0175-Extend-Player-Interact-cancellation.patch similarity index 100% rename from patches/server/0174-Extend-Player-Interact-cancellation.patch rename to patches/server/0175-Extend-Player-Interact-cancellation.patch diff --git a/patches/server/0175-Tameable-getOwnerUniqueId-API.patch b/patches/server/0176-Tameable-getOwnerUniqueId-API.patch similarity index 100% rename from patches/server/0175-Tameable-getOwnerUniqueId-API.patch rename to patches/server/0176-Tameable-getOwnerUniqueId-API.patch diff --git a/patches/server/0176-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/patches/server/0177-Toggleable-player-crits-helps-mitigate-hacked-client.patch similarity index 100% rename from patches/server/0176-Toggleable-player-crits-helps-mitigate-hacked-client.patch rename to patches/server/0177-Toggleable-player-crits-helps-mitigate-hacked-client.patch diff --git a/patches/server/0177-Disable-Explicit-Network-Manager-Flushing.patch b/patches/server/0178-Disable-Explicit-Network-Manager-Flushing.patch similarity index 100% rename from patches/server/0177-Disable-Explicit-Network-Manager-Flushing.patch rename to patches/server/0178-Disable-Explicit-Network-Manager-Flushing.patch diff --git a/patches/server/0178-Implement-extended-PaperServerListPingEvent.patch b/patches/server/0179-Implement-extended-PaperServerListPingEvent.patch similarity index 100% rename from patches/server/0178-Implement-extended-PaperServerListPingEvent.patch rename to patches/server/0179-Implement-extended-PaperServerListPingEvent.patch diff --git a/patches/server/0179-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/patches/server/0180-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch similarity index 100% rename from patches/server/0179-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch rename to patches/server/0180-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch diff --git a/patches/server/0180-Player.setPlayerProfile-API.patch b/patches/server/0181-Player.setPlayerProfile-API.patch similarity index 100% rename from patches/server/0180-Player.setPlayerProfile-API.patch rename to patches/server/0181-Player.setPlayerProfile-API.patch diff --git a/patches/server/0181-getPlayerUniqueId-API.patch b/patches/server/0182-getPlayerUniqueId-API.patch similarity index 94% rename from patches/server/0181-getPlayerUniqueId-API.patch rename to patches/server/0182-getPlayerUniqueId-API.patch index d908e8fdf..6c28496b9 100644 --- a/patches/server/0181-getPlayerUniqueId-API.patch +++ b/patches/server/0182-getPlayerUniqueId-API.patch @@ -9,7 +9,7 @@ In Offline Mode, will return an Offline UUID This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index a9731e89f2cddc2ae256bf955945f4d2f3cd0c28..53834d226cf577413d1514c54f5a4b0294a432e7 100644 +index 7e3631a75a2221955199f746e9b8f406a744121a..4950f11c12f29cb363acd639c16c4aa8efafdd17 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1704,6 +1704,25 @@ public final class CraftServer implements Server { diff --git a/patches/server/0182-Improved-Async-Task-Scheduler.patch b/patches/server/0183-Improved-Async-Task-Scheduler.patch similarity index 100% rename from patches/server/0182-Improved-Async-Task-Scheduler.patch rename to patches/server/0183-Improved-Async-Task-Scheduler.patch diff --git a/patches/server/0183-Make-legacy-ping-handler-more-reliable.patch b/patches/server/0184-Make-legacy-ping-handler-more-reliable.patch similarity index 98% rename from patches/server/0183-Make-legacy-ping-handler-more-reliable.patch rename to patches/server/0184-Make-legacy-ping-handler-more-reliable.patch index fa9de2b26..4b8b62f71 100644 --- a/patches/server/0183-Make-legacy-ping-handler-more-reliable.patch +++ b/patches/server/0184-Make-legacy-ping-handler-more-reliable.patch @@ -28,7 +28,7 @@ respond to the request. [2]: https://netty.io/wiki/user-guide-for-4.x.html#wiki-h4-13 diff --git a/src/main/java/net/minecraft/server/network/LegacyQueryHandler.java b/src/main/java/net/minecraft/server/network/LegacyQueryHandler.java -index d86c2287cb9f4c8cf99e4374ef8a7135041670a1..2818495aa221f8195f095e39091bd478cebb3807 100644 +index 1369321f60ba0d8f754b1aad6dbc6d6ab990f2bf..c4f1de1413e37e91492e7dd3fa33da5ef87fdbd5 100644 --- a/src/main/java/net/minecraft/server/network/LegacyQueryHandler.java +++ b/src/main/java/net/minecraft/server/network/LegacyQueryHandler.java @@ -16,6 +16,7 @@ public class LegacyQueryHandler extends ChannelInboundHandlerAdapter { diff --git a/patches/server/0184-Call-PaperServerListPingEvent-for-legacy-pings.patch b/patches/server/0185-Call-PaperServerListPingEvent-for-legacy-pings.patch similarity index 100% rename from patches/server/0184-Call-PaperServerListPingEvent-for-legacy-pings.patch rename to patches/server/0185-Call-PaperServerListPingEvent-for-legacy-pings.patch diff --git a/patches/server/0185-Flag-to-disable-the-channel-limit.patch b/patches/server/0186-Flag-to-disable-the-channel-limit.patch similarity index 95% rename from patches/server/0185-Flag-to-disable-the-channel-limit.patch rename to patches/server/0186-Flag-to-disable-the-channel-limit.patch index bc569ac1d..003c9370b 100644 --- a/patches/server/0185-Flag-to-disable-the-channel-limit.patch +++ b/patches/server/0186-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 380bdc7cfa8980d5db29a15b29613fc62d75de2a..68a6bb89a5946fba7d4baeb009895d7ca975cbe8 100644 +index fd3304d1e58f0976cd048d4a265181a0f1251c2f..64f891db064ab1ad74479a5d7fb4d7828217afc7 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -167,6 +167,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0186-Add-openSign-method-to-HumanEntity.patch b/patches/server/0187-Add-openSign-method-to-HumanEntity.patch similarity index 96% rename from patches/server/0186-Add-openSign-method-to-HumanEntity.patch rename to patches/server/0187-Add-openSign-method-to-HumanEntity.patch index 460c383cf..e3578a257 100644 --- a/patches/server/0186-Add-openSign-method-to-HumanEntity.patch +++ b/patches/server/0187-Add-openSign-method-to-HumanEntity.patch @@ -28,7 +28,7 @@ index 911843bf38ab750edd4a63417ba7a9deb6b64cb1..a0950f5902c3719dc31205ec43dca948 // Paper start diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index ea024ec921a382e40c982cc529f13d08101ca131..34e8ee0cc42c77715c62b0b4682f3df946266e11 100644 +index 3954ed194388c6487c6cd0303aea9e1b65a0f8ee..4ff81744b7c9113f57cf1fa89bb943902711b2dc 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -614,6 +614,12 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { diff --git a/patches/server/0187-Configurable-sprint-interruption-on-attack.patch b/patches/server/0188-Configurable-sprint-interruption-on-attack.patch similarity index 100% rename from patches/server/0187-Configurable-sprint-interruption-on-attack.patch rename to patches/server/0188-Configurable-sprint-interruption-on-attack.patch diff --git a/patches/server/0188-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/server/0189-Fix-exploit-that-allowed-colored-signs-to-be-created.patch similarity index 94% rename from patches/server/0188-Fix-exploit-that-allowed-colored-signs-to-be-created.patch rename to patches/server/0189-Fix-exploit-that-allowed-colored-signs-to-be-created.patch index e87df1925..96b5ad6c8 100644 --- a/patches/server/0188-Fix-exploit-that-allowed-colored-signs-to-be-created.patch +++ b/patches/server/0189-Fix-exploit-that-allowed-colored-signs-to-be-created.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix exploit that allowed colored signs to be created diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index cd9f1bea29833c0d263d43f4a8c76908c0c54b89..2d6bb5e7dee7a0e7ddaf6e05a9a1f9df9f1d195d 100644 +index 7f17875e359855a25618a52bc2e844fe10258aaf..d729042a22f01decbf30d35d7842e43cab283c05 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3002,9 +3002,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0189-EndermanEscapeEvent.patch b/patches/server/0190-EndermanEscapeEvent.patch similarity index 100% rename from patches/server/0189-EndermanEscapeEvent.patch rename to patches/server/0190-EndermanEscapeEvent.patch diff --git a/patches/server/0190-Enderman.teleportRandomly.patch b/patches/server/0191-Enderman.teleportRandomly.patch similarity index 100% rename from patches/server/0190-Enderman.teleportRandomly.patch rename to patches/server/0191-Enderman.teleportRandomly.patch diff --git a/patches/server/0191-Block-Enderpearl-Travel-Exploit.patch b/patches/server/0192-Block-Enderpearl-Travel-Exploit.patch similarity index 96% rename from patches/server/0191-Block-Enderpearl-Travel-Exploit.patch rename to patches/server/0192-Block-Enderpearl-Travel-Exploit.patch index 5ad567139..6ea8be62f 100644 --- a/patches/server/0191-Block-Enderpearl-Travel-Exploit.patch +++ b/patches/server/0192-Block-Enderpearl-Travel-Exploit.patch @@ -12,7 +12,7 @@ This disables that by not saving the thrower when the chunk is unloaded. This is mainly useful for survival servers that do not allow freeform teleporting. diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index e4d6fe5f19a575acfb08fcb8335f7519ed73b295..bd37a46aebe84e5d02b9ae40a57ed95c7c35c54b 100644 +index ddd956828996c9d7a86aa89a01cc5a2ee4606c30..2208dafab412df254bf4c17c1c03d1475b77fbd3 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -2072,6 +2072,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/0193-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/0193-Expand-World.spawnParticle-API-and-add-Builder.patch index 5886ca984..9d60fcd9e 100644 --- a/patches/server/0192-Expand-World.spawnParticle-API-and-add-Builder.patch +++ b/patches/server/0193-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 bd37a46aebe84e5d02b9ae40a57ed95c7c35c54b..96723a042c23d53a955c766d7899164684c32b74 100644 +index 2208dafab412df254bf4c17c1c03d1475b77fbd3..d394f7dd4ef1faa1b92a56945e5dab96b6dd17b8 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1485,12 +1485,17 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0193-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/patches/server/0194-Prevent-Frosted-Ice-from-loading-holding-chunks.patch similarity index 100% rename from patches/server/0193-Prevent-Frosted-Ice-from-loading-holding-chunks.patch rename to patches/server/0194-Prevent-Frosted-Ice-from-loading-holding-chunks.patch diff --git a/patches/server/0194-EndermanAttackPlayerEvent.patch b/patches/server/0195-EndermanAttackPlayerEvent.patch similarity index 100% rename from patches/server/0194-EndermanAttackPlayerEvent.patch rename to patches/server/0195-EndermanAttackPlayerEvent.patch diff --git a/patches/server/0195-WitchConsumePotionEvent.patch b/patches/server/0196-WitchConsumePotionEvent.patch similarity index 100% rename from patches/server/0195-WitchConsumePotionEvent.patch rename to patches/server/0196-WitchConsumePotionEvent.patch diff --git a/patches/server/0196-WitchThrowPotionEvent.patch b/patches/server/0197-WitchThrowPotionEvent.patch similarity index 100% rename from patches/server/0196-WitchThrowPotionEvent.patch rename to patches/server/0197-WitchThrowPotionEvent.patch diff --git a/patches/server/0197-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/patches/server/0198-Allow-spawning-Item-entities-with-World.spawnEntity.patch similarity index 100% rename from patches/server/0197-Allow-spawning-Item-entities-with-World.spawnEntity.patch rename to patches/server/0198-Allow-spawning-Item-entities-with-World.spawnEntity.patch diff --git a/patches/server/0198-WitchReadyPotionEvent.patch b/patches/server/0199-WitchReadyPotionEvent.patch similarity index 100% rename from patches/server/0198-WitchReadyPotionEvent.patch rename to patches/server/0199-WitchReadyPotionEvent.patch diff --git a/patches/server/0199-ItemStack-getMaxItemUseDuration.patch b/patches/server/0200-ItemStack-getMaxItemUseDuration.patch similarity index 100% rename from patches/server/0199-ItemStack-getMaxItemUseDuration.patch rename to patches/server/0200-ItemStack-getMaxItemUseDuration.patch diff --git a/patches/server/0200-Implement-EntityTeleportEndGatewayEvent.patch b/patches/server/0201-Implement-EntityTeleportEndGatewayEvent.patch similarity index 100% rename from patches/server/0200-Implement-EntityTeleportEndGatewayEvent.patch rename to patches/server/0201-Implement-EntityTeleportEndGatewayEvent.patch diff --git a/patches/server/0201-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/patches/server/0202-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch similarity index 100% rename from patches/server/0201-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch rename to patches/server/0202-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch diff --git a/patches/server/0202-Fix-CraftEntity-hashCode.patch b/patches/server/0203-Fix-CraftEntity-hashCode.patch similarity index 100% rename from patches/server/0202-Fix-CraftEntity-hashCode.patch rename to patches/server/0203-Fix-CraftEntity-hashCode.patch diff --git a/patches/server/0203-Configurable-Alternative-LootPool-Luck-Formula.patch b/patches/server/0204-Configurable-Alternative-LootPool-Luck-Formula.patch similarity index 100% rename from patches/server/0203-Configurable-Alternative-LootPool-Luck-Formula.patch rename to patches/server/0204-Configurable-Alternative-LootPool-Luck-Formula.patch diff --git a/patches/server/0204-Print-Error-details-when-failing-to-save-player-data.patch b/patches/server/0205-Print-Error-details-when-failing-to-save-player-data.patch similarity index 100% rename from patches/server/0204-Print-Error-details-when-failing-to-save-player-data.patch rename to patches/server/0205-Print-Error-details-when-failing-to-save-player-data.patch diff --git a/patches/server/0205-Make-shield-blocking-delay-configurable.patch b/patches/server/0206-Make-shield-blocking-delay-configurable.patch similarity index 96% rename from patches/server/0205-Make-shield-blocking-delay-configurable.patch rename to patches/server/0206-Make-shield-blocking-delay-configurable.patch index 006c2a4b1..c2dd0c466 100644 --- a/patches/server/0205-Make-shield-blocking-delay-configurable.patch +++ b/patches/server/0206-Make-shield-blocking-delay-configurable.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Make shield blocking delay configurable diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 27a2ba075a2f7575b6788c66a121fc906b19a99d..1d82dab7fad130e6674d7f137ca29258cc7632a4 100644 +index 39635eae8b2f92ffb171c5cbb37bed5bd610266b..a2bf006f79b0c22827720e7d95828590cb52c8ef 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3697,12 +3697,24 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0206-Improve-EntityShootBowEvent.patch b/patches/server/0207-Improve-EntityShootBowEvent.patch similarity index 100% rename from patches/server/0206-Improve-EntityShootBowEvent.patch rename to patches/server/0207-Improve-EntityShootBowEvent.patch diff --git a/patches/server/0207-PlayerReadyArrowEvent.patch b/patches/server/0208-PlayerReadyArrowEvent.patch similarity index 100% rename from patches/server/0207-PlayerReadyArrowEvent.patch rename to patches/server/0208-PlayerReadyArrowEvent.patch diff --git a/patches/server/0208-Implement-EntityKnockbackByEntityEvent.patch b/patches/server/0209-Implement-EntityKnockbackByEntityEvent.patch similarity index 98% rename from patches/server/0208-Implement-EntityKnockbackByEntityEvent.patch rename to patches/server/0209-Implement-EntityKnockbackByEntityEvent.patch index 384fd823d..8de06d78b 100644 --- a/patches/server/0208-Implement-EntityKnockbackByEntityEvent.patch +++ b/patches/server/0209-Implement-EntityKnockbackByEntityEvent.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Implement EntityKnockbackByEntityEvent This event is called when an entity receives knockback by another entity. diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 1d82dab7fad130e6674d7f137ca29258cc7632a4..da896f299072360a23cdfd025ed6f151a0441d4e 100644 +index a2bf006f79b0c22827720e7d95828590cb52c8ef..de16969a25bd72b4420e5ecbdb477a1adc51f2d1 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1456,7 +1456,7 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0209-Expand-Explosions-API.patch b/patches/server/0210-Expand-Explosions-API.patch similarity index 100% rename from patches/server/0209-Expand-Explosions-API.patch rename to patches/server/0210-Expand-Explosions-API.patch diff --git a/patches/server/0210-LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/server/0211-LivingEntity-Hand-Raised-Item-Use-API.patch similarity index 100% rename from patches/server/0210-LivingEntity-Hand-Raised-Item-Use-API.patch rename to patches/server/0211-LivingEntity-Hand-Raised-Item-Use-API.patch diff --git a/patches/server/0211-RangedEntity-API.patch b/patches/server/0212-RangedEntity-API.patch similarity index 100% rename from patches/server/0211-RangedEntity-API.patch rename to patches/server/0212-RangedEntity-API.patch diff --git a/patches/server/0212-Add-config-to-disable-ender-dragon-legacy-check.patch b/patches/server/0213-Add-config-to-disable-ender-dragon-legacy-check.patch similarity index 100% rename from patches/server/0212-Add-config-to-disable-ender-dragon-legacy-check.patch rename to patches/server/0213-Add-config-to-disable-ender-dragon-legacy-check.patch diff --git a/patches/server/0213-Implement-World.getEntity-UUID-API.patch b/patches/server/0214-Implement-World.getEntity-UUID-API.patch similarity index 100% rename from patches/server/0213-Implement-World.getEntity-UUID-API.patch rename to patches/server/0214-Implement-World.getEntity-UUID-API.patch diff --git a/patches/server/0214-InventoryCloseEvent-Reason-API.patch b/patches/server/0215-InventoryCloseEvent-Reason-API.patch similarity index 100% rename from patches/server/0214-InventoryCloseEvent-Reason-API.patch rename to patches/server/0215-InventoryCloseEvent-Reason-API.patch diff --git a/patches/server/0215-Vex-get-setSummoner-API.patch b/patches/server/0216-Vex-get-setSummoner-API.patch similarity index 100% rename from patches/server/0215-Vex-get-setSummoner-API.patch rename to patches/server/0216-Vex-get-setSummoner-API.patch diff --git a/patches/server/0216-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/server/0217-Refresh-player-inventory-when-cancelling-PlayerInter.patch similarity index 94% rename from patches/server/0216-Refresh-player-inventory-when-cancelling-PlayerInter.patch rename to patches/server/0217-Refresh-player-inventory-when-cancelling-PlayerInter.patch index 5396c53de..848c40c38 100644 --- a/patches/server/0216-Refresh-player-inventory-when-cancelling-PlayerInter.patch +++ b/patches/server/0217-Refresh-player-inventory-when-cancelling-PlayerInter.patch @@ -16,7 +16,7 @@ Refresh the player inventory when PlayerInteractEntityEvent is cancelled to avoid this problem. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index c91e8300fe0cb673567f0b0e725a6d460dcebf31..4b99de786be5fbefb94a5484868b897ab0f86a27 100644 +index 8b9e569ccefaa5123c966590a9bba77cc8eec64d..ff79bb6e51d8c7e4b61509f7cf95b1282e7a844e 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2426,6 +2426,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0217-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/server/0218-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch similarity index 94% rename from patches/server/0217-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch rename to patches/server/0218-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch index 46f516cc0..93bf1ca34 100644 --- a/patches/server/0217-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch +++ b/patches/server/0218-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Use AsyncAppender to keep logging IO off main thread diff --git a/build.gradle.kts b/build.gradle.kts -index 2a77dfc3045d7cbf035a4bc0cd25ee95555f83cd..d226f391e596e0303d0f8f29f594e0ddbe47bcd0 100644 +index a57fad0a75fe18f70d3dd6cd5c6a2ab90eb0498d..6dbac0f93481256dd57e76630ae9eea9d5c56849 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -26,6 +26,7 @@ dependencies { diff --git a/patches/server/0218-add-more-information-to-Entity.toString.patch b/patches/server/0219-add-more-information-to-Entity.toString.patch similarity index 100% rename from patches/server/0218-add-more-information-to-Entity.toString.patch rename to patches/server/0219-add-more-information-to-Entity.toString.patch diff --git a/patches/server/0219-Add-CraftMagicNumbers.isSupportedApiVersion.patch b/patches/server/0220-Add-CraftMagicNumbers.isSupportedApiVersion.patch similarity index 100% rename from patches/server/0219-Add-CraftMagicNumbers.isSupportedApiVersion.patch rename to patches/server/0220-Add-CraftMagicNumbers.isSupportedApiVersion.patch diff --git a/patches/server/0220-EnderDragon-Events.patch b/patches/server/0221-EnderDragon-Events.patch similarity index 100% rename from patches/server/0220-EnderDragon-Events.patch rename to patches/server/0221-EnderDragon-Events.patch diff --git a/patches/server/0221-PlayerElytraBoostEvent.patch b/patches/server/0222-PlayerElytraBoostEvent.patch similarity index 100% rename from patches/server/0221-PlayerElytraBoostEvent.patch rename to patches/server/0222-PlayerElytraBoostEvent.patch diff --git a/patches/server/0222-PlayerLaunchProjectileEvent.patch b/patches/server/0223-PlayerLaunchProjectileEvent.patch similarity index 100% rename from patches/server/0222-PlayerLaunchProjectileEvent.patch rename to patches/server/0223-PlayerLaunchProjectileEvent.patch diff --git a/patches/server/0223-Improve-BlockPosition-inlining.patch b/patches/server/0224-Improve-BlockPosition-inlining.patch similarity index 100% rename from patches/server/0223-Improve-BlockPosition-inlining.patch rename to patches/server/0224-Improve-BlockPosition-inlining.patch diff --git a/patches/server/0224-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/server/0225-Option-to-prevent-armor-stands-from-doing-entity-loo.patch similarity index 100% rename from patches/server/0224-Option-to-prevent-armor-stands-from-doing-entity-loo.patch rename to patches/server/0225-Option-to-prevent-armor-stands-from-doing-entity-loo.patch diff --git a/patches/server/0225-Vanished-players-don-t-have-rights.patch b/patches/server/0226-Vanished-players-don-t-have-rights.patch similarity index 100% rename from patches/server/0225-Vanished-players-don-t-have-rights.patch rename to patches/server/0226-Vanished-players-don-t-have-rights.patch diff --git a/patches/server/0226-Allow-disabling-armour-stand-ticking.patch b/patches/server/0227-Allow-disabling-armour-stand-ticking.patch similarity index 100% rename from patches/server/0226-Allow-disabling-armour-stand-ticking.patch rename to patches/server/0227-Allow-disabling-armour-stand-ticking.patch diff --git a/patches/server/0227-SkeletonHorse-Additions.patch b/patches/server/0228-SkeletonHorse-Additions.patch similarity index 100% rename from patches/server/0227-SkeletonHorse-Additions.patch rename to patches/server/0228-SkeletonHorse-Additions.patch diff --git a/patches/server/0228-Don-t-call-getItemMeta-on-hasItemMeta.patch b/patches/server/0229-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/0229-Don-t-call-getItemMeta-on-hasItemMeta.patch diff --git a/patches/server/0229-Implement-Expanded-ArmorStand-API.patch b/patches/server/0230-Implement-Expanded-ArmorStand-API.patch similarity index 100% rename from patches/server/0229-Implement-Expanded-ArmorStand-API.patch rename to patches/server/0230-Implement-Expanded-ArmorStand-API.patch diff --git a/patches/server/0230-AnvilDamageEvent.patch b/patches/server/0231-AnvilDamageEvent.patch similarity index 100% rename from patches/server/0230-AnvilDamageEvent.patch rename to patches/server/0231-AnvilDamageEvent.patch diff --git a/patches/server/0231-Add-hand-to-bucket-events.patch b/patches/server/0232-Add-hand-to-bucket-events.patch similarity index 99% rename from patches/server/0231-Add-hand-to-bucket-events.patch rename to patches/server/0232-Add-hand-to-bucket-events.patch index 0c3849fc4..b514aa8de 100644 --- a/patches/server/0231-Add-hand-to-bucket-events.patch +++ b/patches/server/0232-Add-hand-to-bucket-events.patch @@ -86,7 +86,7 @@ index 90c8ef9995e834c245cc33f5e59ffdabd5a0b8cd..7c6c928da4e0f3ac54fa9b9ddce7b0e0 int i = blockposition.getX(); int j = blockposition.getY(); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 49ec76720dea8c756817ded7d02bfea02f86d428..2dac07a71474fd9c92955914f121094fcad23212 100644 +index 1bc3edad4fa79b2efb34e92b4af492769a8fcf83..518e44f783f5062ce53e9907501bd3a54c8014bb 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -422,6 +422,20 @@ public class CraftEventFactory { diff --git a/patches/server/0232-Add-TNTPrimeEvent.patch b/patches/server/0233-Add-TNTPrimeEvent.patch similarity index 98% rename from patches/server/0232-Add-TNTPrimeEvent.patch rename to patches/server/0233-Add-TNTPrimeEvent.patch index 510fdc37c..ee73234df 100644 --- a/patches/server/0232-Add-TNTPrimeEvent.patch +++ b/patches/server/0233-Add-TNTPrimeEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add TNTPrimeEvent diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java -index dc2e57bfc5e85c9ef548cb895b3fcd1c09c4dacb..21d26be5edbc05ac78c2f4a092594d772d98c982 100644 +index d0ebcc23d863be630b55245aa2604c108ee6c93a..3a6e5893181ed681099f2748abca738af45ec9c9 100644 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java @@ -532,6 +532,11 @@ public class EnderDragon extends Mob implements Enemy { diff --git a/patches/server/0233-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/server/0234-Break-up-and-make-tab-spam-limits-configurable.patch similarity index 100% rename from patches/server/0233-Break-up-and-make-tab-spam-limits-configurable.patch rename to patches/server/0234-Break-up-and-make-tab-spam-limits-configurable.patch diff --git a/patches/server/0234-MC-135506-Experience-should-save-as-Integers.patch b/patches/server/0235-MC-135506-Experience-should-save-as-Integers.patch similarity index 100% rename from patches/server/0234-MC-135506-Experience-should-save-as-Integers.patch rename to patches/server/0235-MC-135506-Experience-should-save-as-Integers.patch diff --git a/patches/server/0235-Remove-unnecessary-itemmeta-handling.patch b/patches/server/0236-Remove-unnecessary-itemmeta-handling.patch similarity index 100% rename from patches/server/0235-Remove-unnecessary-itemmeta-handling.patch rename to patches/server/0236-Remove-unnecessary-itemmeta-handling.patch diff --git a/patches/server/0236-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/server/0237-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch similarity index 98% rename from patches/server/0236-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch rename to patches/server/0237-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch index 843e96207..b6ff8121b 100644 --- a/patches/server/0236-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch +++ b/patches/server/0237-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch @@ -29,7 +29,7 @@ index 4f2dfe5d2b646a1a2f19414388af13b26d28d504..213c94cecc1103056ce83625f1e78cd6 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 1e559d238441d28c52b3305c42dec0f6115b2626..547aea9a2ead3eff5690f18cfc351b01dd4cd395 100644 +index 0531b9c5b10fe250531b0c04cb2ffe2751e7d1c5..25df052247ba26b75e49c801587f71d0fed31c92 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -215,6 +215,9 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0237-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/server/0238-Add-Early-Warning-Feature-to-WatchDog.patch similarity index 99% rename from patches/server/0237-Add-Early-Warning-Feature-to-WatchDog.patch rename to patches/server/0238-Add-Early-Warning-Feature-to-WatchDog.patch index 8059a352b..ef610b354 100644 --- a/patches/server/0237-Add-Early-Warning-Feature-to-WatchDog.patch +++ b/patches/server/0238-Add-Early-Warning-Feature-to-WatchDog.patch @@ -33,7 +33,7 @@ index b248c0f481436b1b101dc1f75eaaf8023f4ba0ea..02ea5304a3f99d69005ab1a7ea85e6a1 com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 53834d226cf577413d1514c54f5a4b0294a432e7..3ffb9cb08dc3b71662364bd5553b895ddc0f9ab7 100644 +index 4950f11c12f29cb363acd639c16c4aa8efafdd17..9d5ff8b10c991443ebecc63989b3ba68acf756ca 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -907,6 +907,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0238-Use-ConcurrentHashMap-in-JsonList.patch b/patches/server/0239-Use-ConcurrentHashMap-in-JsonList.patch similarity index 100% rename from patches/server/0238-Use-ConcurrentHashMap-in-JsonList.patch rename to patches/server/0239-Use-ConcurrentHashMap-in-JsonList.patch diff --git a/patches/server/0239-Use-a-Queue-for-Queueing-Commands.patch b/patches/server/0240-Use-a-Queue-for-Queueing-Commands.patch similarity index 100% rename from patches/server/0239-Use-a-Queue-for-Queueing-Commands.patch rename to patches/server/0240-Use-a-Queue-for-Queueing-Commands.patch diff --git a/patches/server/0240-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/server/0241-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch similarity index 100% rename from patches/server/0240-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch rename to patches/server/0241-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch diff --git a/patches/server/0241-Optimize-BlockPosition-helper-methods.patch b/patches/server/0242-Optimize-BlockPosition-helper-methods.patch similarity index 100% rename from patches/server/0241-Optimize-BlockPosition-helper-methods.patch rename to patches/server/0242-Optimize-BlockPosition-helper-methods.patch diff --git a/patches/server/0242-Restore-vanilla-default-mob-spawn-range-and-water-an.patch b/patches/server/0243-Restore-vanilla-default-mob-spawn-range-and-water-an.patch similarity index 89% rename from patches/server/0242-Restore-vanilla-default-mob-spawn-range-and-water-an.patch rename to patches/server/0243-Restore-vanilla-default-mob-spawn-range-and-water-an.patch index 891e5bf4d..e10d949ee 100644 --- a/patches/server/0242-Restore-vanilla-default-mob-spawn-range-and-water-an.patch +++ b/patches/server/0243-Restore-vanilla-default-mob-spawn-range-and-water-an.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Restore vanilla default mob-spawn-range and water animals diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index feef74e3a6d50344245c4a61ece5b2194af1072f..c55321ec37b500199eda375cabca21e666612b9c 100644 +index d139cbcf0b159372f229bef6ae49b45a74c163ad..d4d2d11cf19167410ec6ad3417495e7130330d11 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -184,7 +184,7 @@ public class SpigotWorldConfig diff --git a/patches/server/0243-Slime-Pathfinder-Events.patch b/patches/server/0244-Slime-Pathfinder-Events.patch similarity index 100% rename from patches/server/0243-Slime-Pathfinder-Events.patch rename to patches/server/0244-Slime-Pathfinder-Events.patch diff --git a/patches/server/0244-Configurable-speed-for-water-flowing-over-lava.patch b/patches/server/0245-Configurable-speed-for-water-flowing-over-lava.patch similarity index 100% rename from patches/server/0244-Configurable-speed-for-water-flowing-over-lava.patch rename to patches/server/0245-Configurable-speed-for-water-flowing-over-lava.patch diff --git a/patches/server/0245-Optimize-CraftBlockData-Creation.patch b/patches/server/0246-Optimize-CraftBlockData-Creation.patch similarity index 100% rename from patches/server/0245-Optimize-CraftBlockData-Creation.patch rename to patches/server/0246-Optimize-CraftBlockData-Creation.patch diff --git a/patches/server/0246-Optimize-MappedRegistry.patch b/patches/server/0247-Optimize-MappedRegistry.patch similarity index 100% rename from patches/server/0246-Optimize-MappedRegistry.patch rename to patches/server/0247-Optimize-MappedRegistry.patch diff --git a/patches/server/0247-Add-PhantomPreSpawnEvent.patch b/patches/server/0248-Add-PhantomPreSpawnEvent.patch similarity index 100% rename from patches/server/0247-Add-PhantomPreSpawnEvent.patch rename to patches/server/0248-Add-PhantomPreSpawnEvent.patch diff --git a/patches/server/0248-Add-More-Creeper-API.patch b/patches/server/0249-Add-More-Creeper-API.patch similarity index 100% rename from patches/server/0248-Add-More-Creeper-API.patch rename to patches/server/0249-Add-More-Creeper-API.patch diff --git a/patches/server/0249-Inventory-removeItemAnySlot.patch b/patches/server/0250-Inventory-removeItemAnySlot.patch similarity index 100% rename from patches/server/0249-Inventory-removeItemAnySlot.patch rename to patches/server/0250-Inventory-removeItemAnySlot.patch diff --git a/patches/server/0250-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/patches/server/0251-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch similarity index 100% rename from patches/server/0250-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch rename to patches/server/0251-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch diff --git a/patches/server/0251-Asynchronous-chunk-IO-and-loading.patch b/patches/server/0252-Asynchronous-chunk-IO-and-loading.patch similarity index 99% rename from patches/server/0251-Asynchronous-chunk-IO-and-loading.patch rename to patches/server/0252-Asynchronous-chunk-IO-and-loading.patch index 65847ba2d..c97a1aa13 100644 --- a/patches/server/0251-Asynchronous-chunk-IO-and-loading.patch +++ b/patches/server/0252-Asynchronous-chunk-IO-and-loading.patch @@ -2716,7 +2716,7 @@ index a81644df294c739b72fc638cd06a3976250caa50..d66ec02b09bb7ae46aae8e55f0062613 } finally { chunkMap.callbackExecutor.run(); diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 547aea9a2ead3eff5690f18cfc351b01dd4cd395..f9b02224c455077ab37d60e830403681ca12ccc5 100644 +index 25df052247ba26b75e49c801587f71d0fed31c92..bde271171b035633ff263b6c60e85f2db5264879 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -316,6 +316,78 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -2820,7 +2820,7 @@ index 0d536d72ac918fbd403397ff369d10143ee9c204..be677d437d17b74c6188ce1bd5fc6fdc private final String name; private final Comparator comparator; diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index e0215f34f5f82cbd3a67f58a8a177fc886ccc72c..8e68e7c068fc819438ec9e08ca412faf38c661d8 100644 +index 14b102e8341d4cb10935e9d247d7451661a02017..a4bdfaaef7f4d340e7e818e7f5ed92f195d91a58 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -750,6 +750,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0252-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/server/0253-Add-ray-tracing-methods-to-LivingEntity.patch similarity index 98% rename from patches/server/0252-Add-ray-tracing-methods-to-LivingEntity.patch rename to patches/server/0253-Add-ray-tracing-methods-to-LivingEntity.patch index 4f70bb612..dbe67aaff 100644 --- a/patches/server/0252-Add-ray-tracing-methods-to-LivingEntity.patch +++ b/patches/server/0253-Add-ray-tracing-methods-to-LivingEntity.patch @@ -28,7 +28,7 @@ index 0cf818fceddd76e7704fdc6625456787856b2815..ccdee183f02ab55723e16f41efce55dc switch (enumDirection) { case DOWN: diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index da896f299072360a23cdfd025ed6f151a0441d4e..831e8c32c85a45daff36449f2d6ef57a522fa7cf 100644 +index de16969a25bd72b4420e5ecbdb477a1adc51f2d1..642b496926d8f6ef5ba5f12e44043d4d769f06ef 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3718,6 +3718,23 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0253-Expose-attack-cooldown-methods-for-Player.patch b/patches/server/0254-Expose-attack-cooldown-methods-for-Player.patch similarity index 100% rename from patches/server/0253-Expose-attack-cooldown-methods-for-Player.patch rename to patches/server/0254-Expose-attack-cooldown-methods-for-Player.patch diff --git a/patches/server/0254-Improve-death-events.patch b/patches/server/0255-Improve-death-events.patch similarity index 100% rename from patches/server/0254-Improve-death-events.patch rename to patches/server/0255-Improve-death-events.patch diff --git a/patches/server/0255-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/server/0256-Allow-chests-to-be-placed-with-NBT-data.patch similarity index 100% rename from patches/server/0255-Allow-chests-to-be-placed-with-NBT-data.patch rename to patches/server/0256-Allow-chests-to-be-placed-with-NBT-data.patch diff --git a/patches/server/0256-Mob-Pathfinding-API.patch b/patches/server/0257-Mob-Pathfinding-API.patch similarity index 100% rename from patches/server/0256-Mob-Pathfinding-API.patch rename to patches/server/0257-Mob-Pathfinding-API.patch diff --git a/patches/server/0257-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/patches/server/0258-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch similarity index 100% rename from patches/server/0257-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch rename to patches/server/0258-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch diff --git a/patches/server/0258-Prevent-chunk-loading-from-Fluid-Flowing.patch b/patches/server/0259-Prevent-chunk-loading-from-Fluid-Flowing.patch similarity index 100% rename from patches/server/0258-Prevent-chunk-loading-from-Fluid-Flowing.patch rename to patches/server/0259-Prevent-chunk-loading-from-Fluid-Flowing.patch diff --git a/patches/server/0259-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/patches/server/0260-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch similarity index 100% rename from patches/server/0259-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch rename to patches/server/0260-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch diff --git a/patches/server/0260-Prevent-mob-spawning-from-loading-generating-chunks.patch b/patches/server/0261-Prevent-mob-spawning-from-loading-generating-chunks.patch similarity index 100% rename from patches/server/0260-Prevent-mob-spawning-from-loading-generating-chunks.patch rename to patches/server/0261-Prevent-mob-spawning-from-loading-generating-chunks.patch diff --git a/patches/server/0261-Implement-furnace-cook-speed-multiplier-API.patch b/patches/server/0262-Implement-furnace-cook-speed-multiplier-API.patch similarity index 100% rename from patches/server/0261-Implement-furnace-cook-speed-multiplier-API.patch rename to patches/server/0262-Implement-furnace-cook-speed-multiplier-API.patch diff --git a/patches/server/0262-Catch-JsonParseException-in-Entity-and-TE-names.patch b/patches/server/0263-Catch-JsonParseException-in-Entity-and-TE-names.patch similarity index 100% rename from patches/server/0262-Catch-JsonParseException-in-Entity-and-TE-names.patch rename to patches/server/0263-Catch-JsonParseException-in-Entity-and-TE-names.patch diff --git a/patches/server/0263-Honor-EntityAgeable.ageLock.patch b/patches/server/0264-Honor-EntityAgeable.ageLock.patch similarity index 100% rename from patches/server/0263-Honor-EntityAgeable.ageLock.patch rename to patches/server/0264-Honor-EntityAgeable.ageLock.patch diff --git a/patches/server/0264-Configurable-connection-throttle-kick-message.patch b/patches/server/0265-Configurable-connection-throttle-kick-message.patch similarity index 100% rename from patches/server/0264-Configurable-connection-throttle-kick-message.patch rename to patches/server/0265-Configurable-connection-throttle-kick-message.patch diff --git a/patches/server/0265-Hook-into-CB-plugin-rewrites.patch b/patches/server/0266-Hook-into-CB-plugin-rewrites.patch similarity index 100% rename from patches/server/0265-Hook-into-CB-plugin-rewrites.patch rename to patches/server/0266-Hook-into-CB-plugin-rewrites.patch diff --git a/patches/server/0266-PreSpawnerSpawnEvent.patch b/patches/server/0267-PreSpawnerSpawnEvent.patch similarity index 100% rename from patches/server/0266-PreSpawnerSpawnEvent.patch rename to patches/server/0267-PreSpawnerSpawnEvent.patch diff --git a/patches/server/0267-Add-LivingEntity-getTargetEntity.patch b/patches/server/0268-Add-LivingEntity-getTargetEntity.patch similarity index 98% rename from patches/server/0267-Add-LivingEntity-getTargetEntity.patch rename to patches/server/0268-Add-LivingEntity-getTargetEntity.patch index e1ca7bb29..99a05da4e 100644 --- a/patches/server/0267-Add-LivingEntity-getTargetEntity.patch +++ b/patches/server/0268-Add-LivingEntity-getTargetEntity.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add LivingEntity#getTargetEntity diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index b4906b20b48badd4ebff662cb830b36f346b7977..9538c026f483cdfe2696e13208914eb25ad090b5 100644 +index b1af9e9a4e530854049d7907c099c169692b12ab..0d5157abac635da2fdfe25fb10d28e18ad94bd3a 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -116,6 +116,7 @@ import net.minecraft.world.level.storage.loot.LootTable; diff --git a/patches/server/0268-Add-sun-related-API.patch b/patches/server/0269-Add-sun-related-API.patch similarity index 100% rename from patches/server/0268-Add-sun-related-API.patch rename to patches/server/0269-Add-sun-related-API.patch diff --git a/patches/server/0269-Turtle-API.patch b/patches/server/0270-Turtle-API.patch similarity index 100% rename from patches/server/0269-Turtle-API.patch rename to patches/server/0270-Turtle-API.patch diff --git a/patches/server/0270-Call-player-spectator-target-events-and-improve-impl.patch b/patches/server/0271-Call-player-spectator-target-events-and-improve-impl.patch similarity index 100% rename from patches/server/0270-Call-player-spectator-target-events-and-improve-impl.patch rename to patches/server/0271-Call-player-spectator-target-events-and-improve-impl.patch diff --git a/patches/server/0271-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/patches/server/0272-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch similarity index 100% rename from patches/server/0271-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch rename to patches/server/0272-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch diff --git a/patches/server/0272-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0273-Add-Velocity-IP-Forwarding-Support.patch similarity index 99% rename from patches/server/0272-Add-Velocity-IP-Forwarding-Support.patch rename to patches/server/0273-Add-Velocity-IP-Forwarding-Support.patch index 3982d6fa4..0dcb53c7c 100644 --- a/patches/server/0272-Add-Velocity-IP-Forwarding-Support.patch +++ b/patches/server/0273-Add-Velocity-IP-Forwarding-Support.patch @@ -189,7 +189,7 @@ index 1b075033f0640433341957f6e26ebe25f18928ee..8b5eddce4845619603ccfeec158d97cb } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 3ffb9cb08dc3b71662364bd5553b895ddc0f9ab7..0b13ff4c656615b19a4cdffa7390c4dd01c5a82d 100644 +index 9d5ff8b10c991443ebecc63989b3ba68acf756ca..f13551ecc96ddaffc1b45dc210de1fc7ee119695 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -762,7 +762,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0273-Add-more-Witch-API.patch b/patches/server/0274-Add-more-Witch-API.patch similarity index 100% rename from patches/server/0273-Add-more-Witch-API.patch rename to patches/server/0274-Add-more-Witch-API.patch diff --git a/patches/server/0274-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/server/0275-Check-Drowned-for-Villager-Aggression-Config.patch similarity index 100% rename from patches/server/0274-Check-Drowned-for-Villager-Aggression-Config.patch rename to patches/server/0275-Check-Drowned-for-Villager-Aggression-Config.patch diff --git a/patches/server/0275-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/server/0276-Add-option-to-prevent-players-from-moving-into-unloa.patch similarity index 98% rename from patches/server/0275-Add-option-to-prevent-players-from-moving-into-unloa.patch rename to patches/server/0276-Add-option-to-prevent-players-from-moving-into-unloa.patch index c9bf5e12e..a53897608 100644 --- a/patches/server/0275-Add-option-to-prevent-players-from-moving-into-unloa.patch +++ b/patches/server/0276-Add-option-to-prevent-players-from-moving-into-unloa.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add option to prevent players from moving into unloaded diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 8e68e7c068fc819438ec9e08ca412faf38c661d8..a3da4721452597f7b2c3a505921df59f2ec7113d 100644 +index a4bdfaaef7f4d340e7e818e7f5ed92f195d91a58..9d95696c56682fb79a84ad7405e520b3484ec605 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -526,9 +526,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0276-Reset-players-airTicks-on-respawn.patch b/patches/server/0277-Reset-players-airTicks-on-respawn.patch similarity index 100% rename from patches/server/0276-Reset-players-airTicks-on-respawn.patch rename to patches/server/0277-Reset-players-airTicks-on-respawn.patch diff --git a/patches/server/0277-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/server/0278-Don-t-sleep-after-profile-lookups-if-not-needed.patch similarity index 100% rename from patches/server/0277-Don-t-sleep-after-profile-lookups-if-not-needed.patch rename to patches/server/0278-Don-t-sleep-after-profile-lookups-if-not-needed.patch diff --git a/patches/server/0278-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/server/0279-Improve-Server-Thread-Pool-and-Thread-Priorities.patch similarity index 91% rename from patches/server/0278-Improve-Server-Thread-Pool-and-Thread-Priorities.patch rename to patches/server/0279-Improve-Server-Thread-Pool-and-Thread-Priorities.patch index 1e32251a4..d60e33ca9 100644 --- a/patches/server/0278-Improve-Server-Thread-Pool-and-Thread-Priorities.patch +++ b/patches/server/0279-Improve-Server-Thread-Pool-and-Thread-Priorities.patch @@ -12,7 +12,7 @@ server threads Allow usage of a single thread executor by not using ForkJoin so single core CPU's. diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java -index d7e22ddf89619b58516ccef1d75a4c33df61b73c..70b8b86ed827217e536e35a690160adf9e974bb5 100644 +index 33ec7786cdf8c32e905d192fc8364418e47404d5..67567eb58beddc06eae4d8e7af3b3c0962405512 100644 --- a/src/main/java/net/minecraft/Util.java +++ b/src/main/java/net/minecraft/Util.java @@ -78,8 +78,8 @@ public class Util { @@ -23,10 +23,10 @@ index d7e22ddf89619b58516ccef1d75a4c33df61b73c..70b8b86ed827217e536e35a690160adf - private static final ExecutorService BACKGROUND_EXECUTOR = makeExecutor("Main"); + private static final ExecutorService BOOTSTRAP_EXECUTOR = makeExecutor("Bootstrap", -2); // Paper - add -2 priority + private static final ExecutorService BACKGROUND_EXECUTOR = makeExecutor("Main", -1); // Paper - add -1 priority - private static final ExecutorService IO_POOL = makeIoExecutor(); - public static LongSupplier timeSource = System::nanoTime; - public static final Ticker TICKER = new Ticker() { -@@ -121,14 +121,18 @@ public class Util { + // Paper start - don't submit BLOCKING PROFILE LOOKUPS to the world gen thread + public static final ExecutorService PROFILE_EXECUTOR = Executors.newFixedThreadPool(2, new java.util.concurrent.ThreadFactory() { + +@@ -137,14 +137,18 @@ public class Util { return Instant.now().toEpochMilli(); } @@ -49,7 +49,7 @@ index d7e22ddf89619b58516ccef1d75a4c33df61b73c..70b8b86ed827217e536e35a690160adf @Override protected void onTermination(Throwable throwable) { if (throwable != null) { -@@ -144,6 +148,7 @@ public class Util { +@@ -160,6 +164,7 @@ public class Util { return forkJoinWorkerThread; }, Util::onThreadException, true); } diff --git a/patches/server/0279-Optimize-World-Time-Updates.patch b/patches/server/0280-Optimize-World-Time-Updates.patch similarity index 100% rename from patches/server/0279-Optimize-World-Time-Updates.patch rename to patches/server/0280-Optimize-World-Time-Updates.patch diff --git a/patches/server/0280-Restore-custom-InventoryHolder-support.patch b/patches/server/0281-Restore-custom-InventoryHolder-support.patch similarity index 100% rename from patches/server/0280-Restore-custom-InventoryHolder-support.patch rename to patches/server/0281-Restore-custom-InventoryHolder-support.patch diff --git a/patches/server/0281-Use-Vanilla-Minecart-Speeds.patch b/patches/server/0282-Use-Vanilla-Minecart-Speeds.patch similarity index 100% rename from patches/server/0281-Use-Vanilla-Minecart-Speeds.patch rename to patches/server/0282-Use-Vanilla-Minecart-Speeds.patch diff --git a/patches/server/0282-Fix-SpongeAbsortEvent-handling.patch b/patches/server/0283-Fix-SpongeAbsortEvent-handling.patch similarity index 100% rename from patches/server/0282-Fix-SpongeAbsortEvent-handling.patch rename to patches/server/0283-Fix-SpongeAbsortEvent-handling.patch diff --git a/patches/server/0283-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/server/0284-Don-t-allow-digging-into-unloaded-chunks.patch similarity index 98% rename from patches/server/0283-Don-t-allow-digging-into-unloaded-chunks.patch rename to patches/server/0284-Don-t-allow-digging-into-unloaded-chunks.patch index 5507ce428..ccb2d302f 100644 --- a/patches/server/0283-Don-t-allow-digging-into-unloaded-chunks.patch +++ b/patches/server/0284-Don-t-allow-digging-into-unloaded-chunks.patch @@ -59,7 +59,7 @@ index 53717a4a2bfd841346c00b5f854899e23661122c..3fadf6b46cc722ad81cf810c0761cf71 this.level.destroyBlockProgress(this.player.getId(), pos, -1); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index a3da4721452597f7b2c3a505921df59f2ec7113d..290ff4431817e18433b04e4d9523485f131cbc72 100644 +index 9d95696c56682fb79a84ad7405e520b3484ec605..8c1329e62f02ddbb8e9f40e6bf8fcea68d92a498 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1598,6 +1598,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0284-Make-the-default-permission-message-configurable.patch b/patches/server/0285-Make-the-default-permission-message-configurable.patch similarity index 95% rename from patches/server/0284-Make-the-default-permission-message-configurable.patch rename to patches/server/0285-Make-the-default-permission-message-configurable.patch index 28c61fa05..5f0e175a1 100644 --- a/patches/server/0284-Make-the-default-permission-message-configurable.patch +++ b/patches/server/0285-Make-the-default-permission-message-configurable.patch @@ -18,7 +18,7 @@ index b506cd11b76901827cbe66f46db8df400f7015de..13a5062e539f6f43e6fe582318c36302 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 0b13ff4c656615b19a4cdffa7390c4dd01c5a82d..8dc5d79130949ec0b38737060124fe4421af1fe9 100644 +index f13551ecc96ddaffc1b45dc210de1fc7ee119695..1f3a4671527ebbc32ac8ec6b7f766c23bde1d2a3 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2608,6 +2608,16 @@ public final class CraftServer implements Server { diff --git a/patches/server/0285-Prevent-rayTrace-from-loading-chunks.patch b/patches/server/0286-Prevent-rayTrace-from-loading-chunks.patch similarity index 100% rename from patches/server/0285-Prevent-rayTrace-from-loading-chunks.patch rename to patches/server/0286-Prevent-rayTrace-from-loading-chunks.patch diff --git a/patches/server/0286-Handle-Large-Packets-disconnecting-client.patch b/patches/server/0287-Handle-Large-Packets-disconnecting-client.patch similarity index 100% rename from patches/server/0286-Handle-Large-Packets-disconnecting-client.patch rename to patches/server/0287-Handle-Large-Packets-disconnecting-client.patch diff --git a/patches/server/0287-force-entity-dismount-during-teleportation.patch b/patches/server/0288-force-entity-dismount-during-teleportation.patch similarity index 98% rename from patches/server/0287-force-entity-dismount-during-teleportation.patch rename to patches/server/0288-force-entity-dismount-during-teleportation.patch index fa324c4ab..96e9ef421 100644 --- a/patches/server/0287-force-entity-dismount-during-teleportation.patch +++ b/patches/server/0288-force-entity-dismount-during-teleportation.patch @@ -93,7 +93,7 @@ index 236b59f5119a4f91919ab93c8edd5269ea34b1ee..ce5bb09aef3c2d8a2d30f3887e4c7e3e if (this.valid) { Bukkit.getPluginManager().callEvent(event); diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 9538c026f483cdfe2696e13208914eb25ad090b5..7446b9d43647faa042fccb912833c2ef0d0261c4 100644 +index 0d5157abac635da2fdfe25fb10d28e18ad94bd3a..4a51a12cf57e4cbf10d9a7fd03c319573422c858 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3379,9 +3379,15 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0288-Add-more-Zombie-API.patch b/patches/server/0289-Add-more-Zombie-API.patch similarity index 100% rename from patches/server/0288-Add-more-Zombie-API.patch rename to patches/server/0289-Add-more-Zombie-API.patch diff --git a/patches/server/0289-Book-Size-Limits.patch b/patches/server/0290-Book-Size-Limits.patch similarity index 96% rename from patches/server/0289-Book-Size-Limits.patch rename to patches/server/0290-Book-Size-Limits.patch index 1b514cd45..baf0dc46f 100644 --- a/patches/server/0289-Book-Size-Limits.patch +++ b/patches/server/0290-Book-Size-Limits.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Book Size Limits Puts some limits on the size of books. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 290ff4431817e18433b04e4d9523485f131cbc72..214b84ff959b7b658db887aafa36431fa6a6b488 100644 +index 8c1329e62f02ddbb8e9f40e6bf8fcea68d92a498..77e8d224dd669e3ce8cd70c95b0aba6d1483cc90 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1049,6 +1049,45 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0290-Add-PlayerConnectionCloseEvent.patch b/patches/server/0291-Add-PlayerConnectionCloseEvent.patch similarity index 100% rename from patches/server/0290-Add-PlayerConnectionCloseEvent.patch rename to patches/server/0291-Add-PlayerConnectionCloseEvent.patch diff --git a/patches/server/0291-Prevent-Enderman-from-loading-chunks.patch b/patches/server/0292-Prevent-Enderman-from-loading-chunks.patch similarity index 100% rename from patches/server/0291-Prevent-Enderman-from-loading-chunks.patch rename to patches/server/0292-Prevent-Enderman-from-loading-chunks.patch diff --git a/patches/server/0292-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/server/0293-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch similarity index 100% rename from patches/server/0292-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch rename to patches/server/0293-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch diff --git a/patches/server/0293-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/server/0294-Workaround-for-vehicle-tracking-issue-on-disconnect.patch similarity index 100% rename from patches/server/0293-Workaround-for-vehicle-tracking-issue-on-disconnect.patch rename to patches/server/0294-Workaround-for-vehicle-tracking-issue-on-disconnect.patch diff --git a/patches/server/0294-Block-Entity-remove-from-being-called-on-Players.patch b/patches/server/0295-Block-Entity-remove-from-being-called-on-Players.patch similarity index 100% rename from patches/server/0294-Block-Entity-remove-from-being-called-on-Players.patch rename to patches/server/0295-Block-Entity-remove-from-being-called-on-Players.patch diff --git a/patches/server/0295-BlockDestroyEvent.patch b/patches/server/0296-BlockDestroyEvent.patch similarity index 100% rename from patches/server/0295-BlockDestroyEvent.patch rename to patches/server/0296-BlockDestroyEvent.patch diff --git a/patches/server/0296-Async-command-map-building.patch b/patches/server/0297-Async-command-map-building.patch similarity index 100% rename from patches/server/0296-Async-command-map-building.patch rename to patches/server/0297-Async-command-map-building.patch diff --git a/patches/server/0297-Implement-Brigadier-Mojang-API.patch b/patches/server/0298-Implement-Brigadier-Mojang-API.patch similarity index 98% rename from patches/server/0297-Implement-Brigadier-Mojang-API.patch rename to patches/server/0298-Implement-Brigadier-Mojang-API.patch index e7dbd2b1d..1b4b9515e 100644 --- a/patches/server/0297-Implement-Brigadier-Mojang-API.patch +++ b/patches/server/0298-Implement-Brigadier-Mojang-API.patch @@ -10,7 +10,7 @@ Adds CommandRegisteredEvent - Allows manipulating the CommandNode to add more children/metadata for the client diff --git a/build.gradle.kts b/build.gradle.kts -index d226f391e596e0303d0f8f29f594e0ddbe47bcd0..47005e625ba323b93855934b447566246509eabf 100644 +index 6dbac0f93481256dd57e76630ae9eea9d5c56849..e260462933a9f7065b2360e6bf9e4ee56069a705 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,6 +8,7 @@ plugins { @@ -81,7 +81,7 @@ index 4c9773997c63f7b2c8465b19810068f11367466b..a8f3a84615a640d2949d268ef1ac81a0 event.getPlayer().getServer().getPluginManager().callEvent(event); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 214b84ff959b7b658db887aafa36431fa6a6b488..c3d5fc95d4faa3dce9670d84c7057fa92170010d 100644 +index 77e8d224dd669e3ce8cd70c95b0aba6d1483cc90..35d65cf4af1990f2aea2767216cc1d838f7473b7 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -790,8 +790,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0298-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/patches/server/0299-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch similarity index 100% rename from patches/server/0298-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch rename to patches/server/0299-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch diff --git a/patches/server/0299-Limit-Client-Sign-length-more.patch b/patches/server/0300-Limit-Client-Sign-length-more.patch similarity index 97% rename from patches/server/0299-Limit-Client-Sign-length-more.patch rename to patches/server/0300-Limit-Client-Sign-length-more.patch index bb9014beb..a90e56253 100644 --- a/patches/server/0299-Limit-Client-Sign-length-more.patch +++ b/patches/server/0300-Limit-Client-Sign-length-more.patch @@ -22,7 +22,7 @@ it only impacts data sent from the client. Set -DPaper.maxSignLength=XX to change limit or -1 to disable diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index c3d5fc95d4faa3dce9670d84c7057fa92170010d..5384fe5c20141d1581ed31420b95d2b148e38d3e 100644 +index 35d65cf4af1990f2aea2767216cc1d838f7473b7..ed951f4645e8ab6c070ed267a665b81bca19fbbb 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -276,6 +276,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0300-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/patches/server/0301-Don-t-check-ConvertSigns-boolean-every-sign-save.patch similarity index 100% rename from patches/server/0300-Don-t-check-ConvertSigns-boolean-every-sign-save.patch rename to patches/server/0301-Don-t-check-ConvertSigns-boolean-every-sign-save.patch diff --git a/patches/server/0301-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0302-Optimize-Network-Manager-and-add-advanced-packet-sup.patch similarity index 100% rename from patches/server/0301-Optimize-Network-Manager-and-add-advanced-packet-sup.patch rename to patches/server/0302-Optimize-Network-Manager-and-add-advanced-packet-sup.patch diff --git a/patches/server/0302-Handle-Oversized-Tile-Entities-in-chunks.patch b/patches/server/0303-Handle-Oversized-Tile-Entities-in-chunks.patch similarity index 100% rename from patches/server/0302-Handle-Oversized-Tile-Entities-in-chunks.patch rename to patches/server/0303-Handle-Oversized-Tile-Entities-in-chunks.patch diff --git a/patches/server/0303-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/patches/server/0304-Set-Zombie-last-tick-at-start-of-drowning-process.patch similarity index 100% rename from patches/server/0303-Set-Zombie-last-tick-at-start-of-drowning-process.patch rename to patches/server/0304-Set-Zombie-last-tick-at-start-of-drowning-process.patch diff --git a/patches/server/0304-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/server/0305-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch similarity index 100% rename from patches/server/0304-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch rename to patches/server/0305-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch diff --git a/patches/server/0305-Entity-getEntitySpawnReason.patch b/patches/server/0306-Entity-getEntitySpawnReason.patch similarity index 98% rename from patches/server/0305-Entity-getEntitySpawnReason.patch rename to patches/server/0306-Entity-getEntitySpawnReason.patch index 7e756750c..e78b90f0a 100644 --- a/patches/server/0305-Entity-getEntitySpawnReason.patch +++ b/patches/server/0306-Entity-getEntitySpawnReason.patch @@ -10,7 +10,7 @@ persistenting Living Entity, SPAWNER for spawners, or DEFAULT since data was not stored. diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index f9b02224c455077ab37d60e830403681ca12ccc5..40a0f98acf26e104912ff2db71aab744a6c727cb 100644 +index bde271171b035633ff263b6c60e85f2db5264879..65eaf93c135871b3898cd418bfe3aca8368e092e 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1212,6 +1212,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0306-Update-entity-Metadata-for-all-tracked-players.patch b/patches/server/0307-Update-entity-Metadata-for-all-tracked-players.patch similarity index 96% rename from patches/server/0306-Update-entity-Metadata-for-all-tracked-players.patch rename to patches/server/0307-Update-entity-Metadata-for-all-tracked-players.patch index d6bdbb059..340a32e06 100644 --- a/patches/server/0306-Update-entity-Metadata-for-all-tracked-players.patch +++ b/patches/server/0307-Update-entity-Metadata-for-all-tracked-players.patch @@ -22,7 +22,7 @@ index d6f34adbdf45bbef4a39e629dd7cb6d7fcb5db0f..7881176a900daa3306c691454f688c1f this.broadcast.accept(packet); if (this.entity instanceof ServerPlayer) { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 5384fe5c20141d1581ed31420b95d2b148e38d3e..9f8f29f3908294738943e698badd002c80fa6569 100644 +index ed951f4645e8ab6c070ed267a665b81bca19fbbb..63f0b837b875ddd7bc85948eed013f627e202994 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2501,7 +2501,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0307-Fire-event-on-GS4-query.patch b/patches/server/0308-Fire-event-on-GS4-query.patch similarity index 100% rename from patches/server/0307-Fire-event-on-GS4-query.patch rename to patches/server/0308-Fire-event-on-GS4-query.patch diff --git a/patches/server/0308-Implement-PlayerPostRespawnEvent.patch b/patches/server/0309-Implement-PlayerPostRespawnEvent.patch similarity index 100% rename from patches/server/0308-Implement-PlayerPostRespawnEvent.patch rename to patches/server/0309-Implement-PlayerPostRespawnEvent.patch diff --git a/patches/server/0309-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/server/0310-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch similarity index 100% rename from patches/server/0309-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch rename to patches/server/0310-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch diff --git a/patches/server/0310-Server-Tick-Events.patch b/patches/server/0311-Server-Tick-Events.patch similarity index 100% rename from patches/server/0310-Server-Tick-Events.patch rename to patches/server/0311-Server-Tick-Events.patch diff --git a/patches/server/0311-PlayerDeathEvent-getItemsToKeep.patch b/patches/server/0312-PlayerDeathEvent-getItemsToKeep.patch similarity index 100% rename from patches/server/0311-PlayerDeathEvent-getItemsToKeep.patch rename to patches/server/0312-PlayerDeathEvent-getItemsToKeep.patch diff --git a/patches/server/0312-Optimize-Captured-TileEntity-Lookup.patch b/patches/server/0313-Optimize-Captured-TileEntity-Lookup.patch similarity index 100% rename from patches/server/0312-Optimize-Captured-TileEntity-Lookup.patch rename to patches/server/0313-Optimize-Captured-TileEntity-Lookup.patch diff --git a/patches/server/0313-Add-Heightmap-API.patch b/patches/server/0314-Add-Heightmap-API.patch similarity index 100% rename from patches/server/0313-Add-Heightmap-API.patch rename to patches/server/0314-Add-Heightmap-API.patch diff --git a/patches/server/0314-Mob-Spawner-API-Enhancements.patch b/patches/server/0315-Mob-Spawner-API-Enhancements.patch similarity index 100% rename from patches/server/0314-Mob-Spawner-API-Enhancements.patch rename to patches/server/0315-Mob-Spawner-API-Enhancements.patch diff --git a/patches/server/0315-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/server/0316-Fix-CB-call-to-changed-postToMainThread-method.patch similarity index 91% rename from patches/server/0315-Fix-CB-call-to-changed-postToMainThread-method.patch rename to patches/server/0316-Fix-CB-call-to-changed-postToMainThread-method.patch index 2e66f1158..93a9a539c 100644 --- a/patches/server/0315-Fix-CB-call-to-changed-postToMainThread-method.patch +++ b/patches/server/0316-Fix-CB-call-to-changed-postToMainThread-method.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix CB call to changed postToMainThread method diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 9f8f29f3908294738943e698badd002c80fa6569..f4ced406329413e47d3d088d629cd799a57d9abb 100644 +index 63f0b837b875ddd7bc85948eed013f627e202994..54a4d4061b90a13b79d1dc0fa327ab133754b458 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -467,7 +467,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0316-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/server/0317-Fix-sounds-when-item-frames-are-modified-MC-123450.patch similarity index 100% rename from patches/server/0316-Fix-sounds-when-item-frames-are-modified-MC-123450.patch rename to patches/server/0317-Fix-sounds-when-item-frames-are-modified-MC-123450.patch diff --git a/patches/server/0317-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/patches/server/0318-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch similarity index 95% rename from patches/server/0317-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch rename to patches/server/0318-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch index 27e4894f7..d8d7ede2a 100644 --- a/patches/server/0317-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch +++ b/patches/server/0318-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch @@ -29,7 +29,7 @@ index 7d1ca1dbd0c1f882b4c59fb6c56e9ba86d81ae42..97e964030a5cc449543252933f8a7b48 public boolean isDebugging() { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 8dc5d79130949ec0b38737060124fe4421af1fe9..5ca45150a429a01e7871c9fd4248034b942b70bf 100644 +index 1f3a4671527ebbc32ac8ec6b7f766c23bde1d2a3..0b1917ac2f30f9f5e0b3f7ec5fa4c38d0d501f92 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2071,7 +2071,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0318-Implement-CraftBlockSoundGroup.patch b/patches/server/0319-Implement-CraftBlockSoundGroup.patch similarity index 100% rename from patches/server/0318-Implement-CraftBlockSoundGroup.patch rename to patches/server/0319-Implement-CraftBlockSoundGroup.patch diff --git a/patches/server/0319-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/server/0320-Configurable-Keep-Spawn-Loaded-range-per-world.patch similarity index 99% rename from patches/server/0319-Configurable-Keep-Spawn-Loaded-range-per-world.patch rename to patches/server/0320-Configurable-Keep-Spawn-Loaded-range-per-world.patch index 531f7c450..81325986a 100644 --- a/patches/server/0319-Configurable-Keep-Spawn-Loaded-range-per-world.patch +++ b/patches/server/0320-Configurable-Keep-Spawn-Loaded-range-per-world.patch @@ -64,7 +64,7 @@ index 97e964030a5cc449543252933f8a7b4800833e69..40aa6abf0d3a814de194d754d5b136f3 // CraftBukkit start // this.updateMobSpawningFlags(); diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 40a0f98acf26e104912ff2db71aab744a6c727cb..af52ccf87e1c6901cc56ff01bda3750e808b736f 100644 +index 65eaf93c135871b3898cd418bfe3aca8368e092e..aa77a3dbbcb77fb6f3ad070b83426042dd284aa0 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -63,6 +63,7 @@ import net.minecraft.network.protocol.game.ClientboundSoundEntityPacket; diff --git a/patches/server/0320-ChunkMapDistance-CME.patch b/patches/server/0321-ChunkMapDistance-CME.patch similarity index 100% rename from patches/server/0320-ChunkMapDistance-CME.patch rename to patches/server/0321-ChunkMapDistance-CME.patch diff --git a/patches/server/0321-Chunk-debug-command.patch b/patches/server/0322-Chunk-debug-command.patch similarity index 100% rename from patches/server/0321-Chunk-debug-command.patch rename to patches/server/0322-Chunk-debug-command.patch diff --git a/patches/server/0322-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0323-Allow-Saving-of-Oversized-Chunks.patch similarity index 100% rename from patches/server/0322-Allow-Saving-of-Oversized-Chunks.patch rename to patches/server/0323-Allow-Saving-of-Oversized-Chunks.patch diff --git a/patches/server/0323-Expose-the-internal-current-tick.patch b/patches/server/0324-Expose-the-internal-current-tick.patch similarity index 90% rename from patches/server/0323-Expose-the-internal-current-tick.patch rename to patches/server/0324-Expose-the-internal-current-tick.patch index f1c4f7b95..f553afb47 100644 --- a/patches/server/0323-Expose-the-internal-current-tick.patch +++ b/patches/server/0324-Expose-the-internal-current-tick.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Expose the internal current tick diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 5ca45150a429a01e7871c9fd4248034b942b70bf..b395d3a20a1c71bfe18e7344b910f545630b7e92 100644 +index 0b1917ac2f30f9f5e0b3f7ec5fa4c38d0d501f92..183ab1a1bc7e761a034e1301e2563d07582dfa26 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2649,5 +2649,10 @@ public final class CraftServer implements Server { diff --git a/patches/server/0324-Fix-World-isChunkGenerated-calls.patch b/patches/server/0325-Fix-World-isChunkGenerated-calls.patch similarity index 99% rename from patches/server/0324-Fix-World-isChunkGenerated-calls.patch rename to patches/server/0325-Fix-World-isChunkGenerated-calls.patch index 6f1ffae9e..7d7f8203c 100644 --- a/patches/server/0324-Fix-World-isChunkGenerated-calls.patch +++ b/patches/server/0325-Fix-World-isChunkGenerated-calls.patch @@ -200,7 +200,7 @@ index e734d82c2863caca8abc6bb8bb82882e971c36a8..a96a6af2bcec3134b7caa32299bd07af } catch (Throwable throwable) { if (dataoutputstream != null) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index d795014028cfa9ebd6f986b8ddd3d6477f189fa7..65edea6420256384a108663761ac9619ba110a8e 100644 +index 7489ac7569454560adcae2005317d83bbe7e98c5..5c3744860ebbb54dc38200c1557d98f995de6c3f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -294,9 +294,23 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0325-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/server/0326-Show-blockstate-location-if-we-failed-to-read-it.patch similarity index 100% rename from patches/server/0325-Show-blockstate-location-if-we-failed-to-read-it.patch rename to patches/server/0326-Show-blockstate-location-if-we-failed-to-read-it.patch diff --git a/patches/server/0326-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/server/0327-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch similarity index 100% rename from patches/server/0326-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch rename to patches/server/0327-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch diff --git a/patches/server/0327-Configurable-projectile-relative-velocity.patch b/patches/server/0328-Configurable-projectile-relative-velocity.patch similarity index 100% rename from patches/server/0327-Configurable-projectile-relative-velocity.patch rename to patches/server/0328-Configurable-projectile-relative-velocity.patch diff --git a/patches/server/0328-offset-item-frame-ticking.patch b/patches/server/0329-offset-item-frame-ticking.patch similarity index 100% rename from patches/server/0328-offset-item-frame-ticking.patch rename to patches/server/0329-offset-item-frame-ticking.patch diff --git a/patches/server/0329-Fix-MC-158900.patch b/patches/server/0330-Fix-MC-158900.patch similarity index 100% rename from patches/server/0329-Fix-MC-158900.patch rename to patches/server/0330-Fix-MC-158900.patch diff --git a/patches/server/0330-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0331-Prevent-consuming-the-wrong-itemstack.patch similarity index 95% rename from patches/server/0330-Prevent-consuming-the-wrong-itemstack.patch rename to patches/server/0331-Prevent-consuming-the-wrong-itemstack.patch index cf43c5166..1e411abeb 100644 --- a/patches/server/0330-Prevent-consuming-the-wrong-itemstack.patch +++ b/patches/server/0331-Prevent-consuming-the-wrong-itemstack.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent consuming the wrong itemstack diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 7446b9d43647faa042fccb912833c2ef0d0261c4..b521be6552d4fbf115a2f829b68fc7c5fff72a9a 100644 +index 4a51a12cf57e4cbf10d9a7fd03c319573422c858..90f6fcb6c0a53133ecf7d9adbd5e526e29be3fa2 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3596,9 +3596,14 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0331-Dont-send-unnecessary-sign-update.patch b/patches/server/0332-Dont-send-unnecessary-sign-update.patch similarity index 92% rename from patches/server/0331-Dont-send-unnecessary-sign-update.patch rename to patches/server/0332-Dont-send-unnecessary-sign-update.patch index 8e9d2888d..65e408f78 100644 --- a/patches/server/0331-Dont-send-unnecessary-sign-update.patch +++ b/patches/server/0332-Dont-send-unnecessary-sign-update.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Dont send unnecessary sign update diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index f4ced406329413e47d3d088d629cd799a57d9abb..891bf788ae5fe9a01399737f095b9d0adf06a5fe 100644 +index 54a4d4061b90a13b79d1dc0fa327ab133754b458..ca5342785c49d459203087184baa341da6c93f1f 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3092,6 +3092,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0332-Add-option-to-disable-pillager-patrols.patch b/patches/server/0333-Add-option-to-disable-pillager-patrols.patch similarity index 100% rename from patches/server/0332-Add-option-to-disable-pillager-patrols.patch rename to patches/server/0333-Add-option-to-disable-pillager-patrols.patch diff --git a/patches/server/0333-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch b/patches/server/0334-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch similarity index 92% rename from patches/server/0333-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch rename to patches/server/0334-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch index 3c84ca770..a3bd2f610 100644 --- a/patches/server/0333-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch +++ b/patches/server/0334-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch @@ -7,7 +7,7 @@ Fixes an AssertionError when setting the player's item in hand to null or a new Fixes GH-2718 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 891bf788ae5fe9a01399737f095b9d0adf06a5fe..912e98d589f7469c6ea000d28f87e3fbe1ef3aab 100644 +index ca5342785c49d459203087184baa341da6c93f1f..fcbd099d77b4dec7a91da2b7fb219c300482a83b 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1791,6 +1791,10 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0334-Flat-bedrock-generator-settings.patch b/patches/server/0335-Flat-bedrock-generator-settings.patch similarity index 100% rename from patches/server/0334-Flat-bedrock-generator-settings.patch rename to patches/server/0335-Flat-bedrock-generator-settings.patch diff --git a/patches/server/0335-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0336-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch similarity index 100% rename from patches/server/0335-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch rename to patches/server/0336-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch diff --git a/patches/server/0336-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/server/0337-MC-145656-Fix-Follow-Range-Initial-Target.patch similarity index 100% rename from patches/server/0336-MC-145656-Fix-Follow-Range-Initial-Target.patch rename to patches/server/0337-MC-145656-Fix-Follow-Range-Initial-Target.patch diff --git a/patches/server/0337-Duplicate-UUID-Resolve-Option.patch b/patches/server/0338-Duplicate-UUID-Resolve-Option.patch similarity index 100% rename from patches/server/0337-Duplicate-UUID-Resolve-Option.patch rename to patches/server/0338-Duplicate-UUID-Resolve-Option.patch diff --git a/patches/server/0338-Optimize-Hoppers.patch b/patches/server/0339-Optimize-Hoppers.patch similarity index 100% rename from patches/server/0338-Optimize-Hoppers.patch rename to patches/server/0339-Optimize-Hoppers.patch diff --git a/patches/server/0339-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0340-PlayerDeathEvent-shouldDropExperience.patch similarity index 100% rename from patches/server/0339-PlayerDeathEvent-shouldDropExperience.patch rename to patches/server/0340-PlayerDeathEvent-shouldDropExperience.patch diff --git a/patches/server/0340-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0341-Prevent-bees-loading-chunks-checking-hive-position.patch similarity index 100% rename from patches/server/0340-Prevent-bees-loading-chunks-checking-hive-position.patch rename to patches/server/0341-Prevent-bees-loading-chunks-checking-hive-position.patch diff --git a/patches/server/0341-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0342-Don-t-load-Chunks-from-Hoppers-and-other-things.patch similarity index 100% rename from patches/server/0341-Don-t-load-Chunks-from-Hoppers-and-other-things.patch rename to patches/server/0342-Don-t-load-Chunks-from-Hoppers-and-other-things.patch diff --git a/patches/server/0342-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/server/0343-Guard-against-serializing-mismatching-chunk-coordina.patch similarity index 100% rename from patches/server/0342-Guard-against-serializing-mismatching-chunk-coordina.patch rename to patches/server/0343-Guard-against-serializing-mismatching-chunk-coordina.patch diff --git a/patches/server/0343-Optimise-IEntityAccess-getPlayerByUUID.patch b/patches/server/0344-Optimise-IEntityAccess-getPlayerByUUID.patch similarity index 94% rename from patches/server/0343-Optimise-IEntityAccess-getPlayerByUUID.patch rename to patches/server/0344-Optimise-IEntityAccess-getPlayerByUUID.patch index 48c682ae2..b4a66435d 100644 --- a/patches/server/0343-Optimise-IEntityAccess-getPlayerByUUID.patch +++ b/patches/server/0344-Optimise-IEntityAccess-getPlayerByUUID.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Optimise IEntityAccess#getPlayerByUUID Use the world entity 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 c20d6f1d328ec6946a00488880a296f582dcf212..48d561e757c266353e48abf2a2f06571aa5d4623 100644 +index aa77a3dbbcb77fb6f3ad070b83426042dd284aa0..9993b6a8f40896166c2f86befa7222c6e714da81 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -391,6 +391,14 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0344-Fix-items-not-falling-correctly.patch b/patches/server/0345-Fix-items-not-falling-correctly.patch similarity index 100% rename from patches/server/0344-Fix-items-not-falling-correctly.patch rename to patches/server/0345-Fix-items-not-falling-correctly.patch diff --git a/patches/server/0345-Lag-compensate-eating.patch b/patches/server/0346-Lag-compensate-eating.patch similarity index 97% rename from patches/server/0345-Lag-compensate-eating.patch rename to patches/server/0346-Lag-compensate-eating.patch index 5fc3b9633..696b8217e 100644 --- a/patches/server/0345-Lag-compensate-eating.patch +++ b/patches/server/0346-Lag-compensate-eating.patch @@ -7,7 +7,7 @@ When the server is lagging, players will wait longer when eating. Change to also use a time check instead if it passes. diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index b521be6552d4fbf115a2f829b68fc7c5fff72a9a..26f59e695ef68d1cf33e649ca370f8320d515201 100644 +index 90f6fcb6c0a53133ecf7d9adbd5e526e29be3fa2..dc885d9a20205bfa3b77e315ebe17287a6c3d4bf 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3539,6 +3539,11 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0346-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0347-Optimize-call-to-getFluid-for-explosions.patch similarity index 100% rename from patches/server/0346-Optimize-call-to-getFluid-for-explosions.patch rename to patches/server/0347-Optimize-call-to-getFluid-for-explosions.patch diff --git a/patches/server/0347-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/server/0348-Fix-last-firework-in-stack-not-having-effects-when-d.patch similarity index 100% rename from patches/server/0347-Fix-last-firework-in-stack-not-having-effects-when-d.patch rename to patches/server/0348-Fix-last-firework-in-stack-not-having-effects-when-d.patch diff --git a/patches/server/0348-Add-effect-to-block-break-naturally.patch b/patches/server/0349-Add-effect-to-block-break-naturally.patch similarity index 100% rename from patches/server/0348-Add-effect-to-block-break-naturally.patch rename to patches/server/0349-Add-effect-to-block-break-naturally.patch diff --git a/patches/server/0349-Entity-Activation-Range-2.0.patch b/patches/server/0350-Entity-Activation-Range-2.0.patch similarity index 99% rename from patches/server/0349-Entity-Activation-Range-2.0.patch rename to patches/server/0350-Entity-Activation-Range-2.0.patch index 6fe7e08dc..109b43cb5 100644 --- a/patches/server/0349-Entity-Activation-Range-2.0.patch +++ b/patches/server/0350-Entity-Activation-Range-2.0.patch @@ -14,7 +14,7 @@ Adds flying monsters to control ghast and phantoms Adds villagers as separate config diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 63a146cdeed5f01d63488d2e74ad0c80343f5077..b2a8faec6562d784b3f16fe968c778f9abfedeb5 100644 +index 9993b6a8f40896166c2f86befa7222c6e714da81..ff902ae5a96616bb70897d9326fc65a3261b07d9 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; diff --git a/patches/server/0350-Increase-Light-Queue-Size.patch b/patches/server/0351-Increase-Light-Queue-Size.patch similarity index 93% rename from patches/server/0350-Increase-Light-Queue-Size.patch rename to patches/server/0351-Increase-Light-Queue-Size.patch index c12922b67..cb48d2f26 100644 --- a/patches/server/0350-Increase-Light-Queue-Size.patch +++ b/patches/server/0351-Increase-Light-Queue-Size.patch @@ -14,7 +14,7 @@ light engine on shutdown... The queue size only puts a cap on max loss, doesn't solve that problem. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 3e0e9ae6eb0cdf3e2c53c894cc65277bc4e73b67..8de56cabd8fdc68e136d41c4d172f3574e21e57a 100644 +index 4a9addec6c1f08718902da7d3f3628a0900e4c1d..f7427ea6bf11ef837dd38d25cd3abed57de5e8de 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -777,7 +777,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 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 6c3e14ebc72f179848dfb93f17864843c8a12575..a08a996722095b01720fa985ca7165a41a932056 100644 +index 2531592ba605b15f16d7438829de51de65d7305c..cf0976f7352919197a322fb4f7f8e20c24509db5 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -2291,7 +2291,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0379-Don-t-tick-dead-players.patch b/patches/server/0380-Don-t-tick-dead-players.patch similarity index 100% rename from patches/server/0379-Don-t-tick-dead-players.patch rename to patches/server/0380-Don-t-tick-dead-players.patch diff --git a/patches/server/0380-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0381-Dead-Player-s-shouldn-t-be-able-to-move.patch similarity index 100% rename from patches/server/0380-Dead-Player-s-shouldn-t-be-able-to-move.patch rename to patches/server/0381-Dead-Player-s-shouldn-t-be-able-to-move.patch diff --git a/patches/server/0381-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0382-Optimize-Collision-to-not-load-chunks.patch similarity index 100% rename from patches/server/0381-Optimize-Collision-to-not-load-chunks.patch rename to patches/server/0382-Optimize-Collision-to-not-load-chunks.patch diff --git a/patches/server/0382-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0383-Don-t-move-existing-players-to-world-spawn.patch similarity index 100% rename from patches/server/0382-Don-t-move-existing-players-to-world-spawn.patch rename to patches/server/0383-Don-t-move-existing-players-to-world-spawn.patch diff --git a/patches/server/0383-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0384-Optimize-GoalSelector-Goal.Flag-Set-operations.patch similarity index 100% rename from patches/server/0383-Optimize-GoalSelector-Goal.Flag-Set-operations.patch rename to patches/server/0384-Optimize-GoalSelector-Goal.Flag-Set-operations.patch diff --git a/patches/server/0384-Improved-Watchdog-Support.patch b/patches/server/0385-Improved-Watchdog-Support.patch similarity index 99% rename from patches/server/0384-Improved-Watchdog-Support.patch rename to patches/server/0385-Improved-Watchdog-Support.patch index e23b48f83..d282e6eca 100644 --- a/patches/server/0384-Improved-Watchdog-Support.patch +++ b/patches/server/0385-Improved-Watchdog-Support.patch @@ -330,7 +330,7 @@ index 89f4ea65b20e773bd3782c41db3a2af7b5b405f3..3fe94e580d2aaae9616ba83c0d3a4468 final String msg = String.format("BlockEntity threw exception at %s:%s,%s,%s", LevelChunk.this.getLevel().getWorld().getName(), this.getPos().getX(), this.getPos().getY(), this.getPos().getZ()); net.minecraft.server.MinecraftServer.LOGGER.error(msg, throwable); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index bfbf43661acbdcda1417b1782579c603022a0adb..602838f3615e4fac1798a99bd2d322c0b2b94863 100644 +index 883ee423077b016846b99e9e8597b2a8e70af0d2..cd5a34fdd086d5b9d59897cc4319fe81ccdfebcc 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2071,7 +2071,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0385-Optimize-Pathfinding.patch b/patches/server/0386-Optimize-Pathfinding.patch similarity index 100% rename from patches/server/0385-Optimize-Pathfinding.patch rename to patches/server/0386-Optimize-Pathfinding.patch diff --git a/patches/server/0386-Reduce-Either-Optional-allocation.patch b/patches/server/0387-Reduce-Either-Optional-allocation.patch similarity index 100% rename from patches/server/0386-Reduce-Either-Optional-allocation.patch rename to patches/server/0387-Reduce-Either-Optional-allocation.patch diff --git a/patches/server/0387-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/server/0388-Reduce-memory-footprint-of-NBTTagCompound.patch similarity index 100% rename from patches/server/0387-Reduce-memory-footprint-of-NBTTagCompound.patch rename to patches/server/0388-Reduce-memory-footprint-of-NBTTagCompound.patch diff --git a/patches/server/0388-Prevent-opening-inventories-when-frozen.patch b/patches/server/0389-Prevent-opening-inventories-when-frozen.patch similarity index 100% rename from patches/server/0388-Prevent-opening-inventories-when-frozen.patch rename to patches/server/0389-Prevent-opening-inventories-when-frozen.patch diff --git a/patches/server/0389-Optimise-ArraySetSorted-removeIf.patch b/patches/server/0390-Optimise-ArraySetSorted-removeIf.patch similarity index 100% rename from patches/server/0389-Optimise-ArraySetSorted-removeIf.patch rename to patches/server/0390-Optimise-ArraySetSorted-removeIf.patch diff --git a/patches/server/0390-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0391-Don-t-run-entity-collision-code-if-not-needed.patch similarity index 94% rename from patches/server/0390-Don-t-run-entity-collision-code-if-not-needed.patch rename to patches/server/0391-Don-t-run-entity-collision-code-if-not-needed.patch index ae418d0c6..692a677c5 100644 --- a/patches/server/0390-Don-t-run-entity-collision-code-if-not-needed.patch +++ b/patches/server/0391-Don-t-run-entity-collision-code-if-not-needed.patch @@ -7,7 +7,7 @@ Will not run if max entity craming is disabled and the max collisions per entity is less than or equal to 0 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 12d90147d5d10f074380c0faeff2ceb399c7bda2..62be04836b57063b4c3dc3dfb05f2e556b062702 100644 +index 34509a40933eb48ad1fc745fa4ee7709cdd15b92..f9ec497b3212a2c2d87edc4350d8479c6c20abbd 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3312,10 +3312,16 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0391-Implement-Player-Client-Options-API.patch b/patches/server/0392-Implement-Player-Client-Options-API.patch similarity index 100% rename from patches/server/0391-Implement-Player-Client-Options-API.patch rename to patches/server/0392-Implement-Player-Client-Options-API.patch diff --git a/patches/server/0392-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0393-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch similarity index 100% rename from patches/server/0392-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch rename to patches/server/0393-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch diff --git a/patches/server/0393-Fix-Chunk-Post-Processing-deadlock-risk.patch b/patches/server/0394-Fix-Chunk-Post-Processing-deadlock-risk.patch similarity index 100% rename from patches/server/0393-Fix-Chunk-Post-Processing-deadlock-risk.patch rename to patches/server/0394-Fix-Chunk-Post-Processing-deadlock-risk.patch diff --git a/patches/server/0394-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/server/0395-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch similarity index 100% rename from patches/server/0394-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch rename to patches/server/0395-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch diff --git a/patches/server/0395-Load-Chunks-for-Login-Asynchronously.patch b/patches/server/0396-Load-Chunks-for-Login-Asynchronously.patch similarity index 98% rename from patches/server/0395-Load-Chunks-for-Login-Asynchronously.patch rename to patches/server/0396-Load-Chunks-for-Login-Asynchronously.patch index c391433ce..054bc1f7d 100644 --- a/patches/server/0395-Load-Chunks-for-Login-Asynchronously.patch +++ b/patches/server/0396-Load-Chunks-for-Login-Asynchronously.patch @@ -37,7 +37,7 @@ index be677d437d17b74c6188ce1bd5fc6fdc228fd92f..78fbb4c3e52e900956ae0811aaf934c8 public static final TicketType UNKNOWN = TicketType.create("unknown", Comparator.comparingLong(ChunkPos::toLong), 1); public static final TicketType PLUGIN = TicketType.create("plugin", (a, b) -> 0); // CraftBukkit diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 912e98d589f7469c6ea000d28f87e3fbe1ef3aab..766a5ce5d18aed80e37075f7cfc3b6cb9d33e63a 100644 +index fcbd099d77b4dec7a91da2b7fb219c300482a83b..ec82608da0d39a1b60d1595cee9aeae3efef9fac 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -238,6 +238,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser @@ -74,7 +74,7 @@ index 912e98d589f7469c6ea000d28f87e3fbe1ef3aab..766a5ce5d18aed80e37075f7cfc3b6cb this.server.getProfiler().push("keepAlive"); // Paper Start - give clients a longer time to respond to pings as per pre 1.12.2 timings diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -index b070624c7ee85b6692f1f44ded6c78139925b669..22a2380388ed9fd6d28edbfbbb5ed3f646217525 100644 +index 8b5eddce4845619603ccfeec158d97cb86568e0d..ec2825b6d276b6200c4bec5580d012f1eaed722e 100644 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java @@ -93,7 +93,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener diff --git a/patches/server/0396-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0397-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch similarity index 100% rename from patches/server/0396-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch rename to patches/server/0397-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch diff --git a/patches/server/0397-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0398-Add-PlayerAttackEntityCooldownResetEvent.patch similarity index 95% rename from patches/server/0397-Add-PlayerAttackEntityCooldownResetEvent.patch rename to patches/server/0398-Add-PlayerAttackEntityCooldownResetEvent.patch index e1c100d03..984cebcdf 100644 --- a/patches/server/0397-Add-PlayerAttackEntityCooldownResetEvent.patch +++ b/patches/server/0398-Add-PlayerAttackEntityCooldownResetEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerAttackEntityCooldownResetEvent diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 62be04836b57063b4c3dc3dfb05f2e556b062702..2021b9592a1a32981075d169a61aef2e7f827192 100644 +index f9ec497b3212a2c2d87edc4350d8479c6c20abbd..d6dc08d5501cc8b09cec3da107506760a99f5f81 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -2090,7 +2090,16 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0398-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0399-Don-t-fire-BlockFade-on-worldgen-threads.patch similarity index 100% rename from patches/server/0398-Don-t-fire-BlockFade-on-worldgen-threads.patch rename to patches/server/0399-Don-t-fire-BlockFade-on-worldgen-threads.patch diff --git a/patches/server/0399-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0400-Add-phantom-creative-and-insomniac-controls.patch similarity index 100% rename from patches/server/0399-Add-phantom-creative-and-insomniac-controls.patch rename to patches/server/0400-Add-phantom-creative-and-insomniac-controls.patch diff --git a/patches/server/0400-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/server/0401-Fix-numerous-item-duplication-issues-and-teleport-is.patch similarity index 100% rename from patches/server/0400-Fix-numerous-item-duplication-issues-and-teleport-is.patch rename to patches/server/0401-Fix-numerous-item-duplication-issues-and-teleport-is.patch diff --git a/patches/server/0401-Villager-Restocks-API.patch b/patches/server/0402-Villager-Restocks-API.patch similarity index 100% rename from patches/server/0401-Villager-Restocks-API.patch rename to patches/server/0402-Villager-Restocks-API.patch diff --git a/patches/server/0402-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0403-Validate-PickItem-Packet-and-kick-for-invalid.patch similarity index 95% rename from patches/server/0402-Validate-PickItem-Packet-and-kick-for-invalid.patch rename to patches/server/0403-Validate-PickItem-Packet-and-kick-for-invalid.patch index 26745ac49..6b21e3f04 100644 --- a/patches/server/0402-Validate-PickItem-Packet-and-kick-for-invalid.patch +++ b/patches/server/0403-Validate-PickItem-Packet-and-kick-for-invalid.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Validate PickItem Packet and kick for invalid diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 766a5ce5d18aed80e37075f7cfc3b6cb9d33e63a..1bf72668a7fab7fc9a327c2403faf2260ccddb31 100644 +index ec82608da0d39a1b60d1595cee9aeae3efef9fac..2c46a7853edda6f9b6a057e1e3ab0919dcd5436d 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -918,7 +918,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0403-Expose-game-version.patch b/patches/server/0404-Expose-game-version.patch similarity index 89% rename from patches/server/0403-Expose-game-version.patch rename to patches/server/0404-Expose-game-version.patch index 91eb7c28c..9809db40e 100644 --- a/patches/server/0403-Expose-game-version.patch +++ b/patches/server/0404-Expose-game-version.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Expose game version diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 602838f3615e4fac1798a99bd2d322c0b2b94863..3ebb0b615d337474f11bb00adcea32cb18de2706 100644 +index cd5a34fdd086d5b9d59897cc4319fe81ccdfebcc..22d9196d190bcf12ecea5cc3df8945277607b0a2 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -575,6 +575,13 @@ public final class CraftServer implements Server { diff --git a/patches/server/0404-Optimize-Voxel-Shape-Merging.patch b/patches/server/0405-Optimize-Voxel-Shape-Merging.patch similarity index 100% rename from patches/server/0404-Optimize-Voxel-Shape-Merging.patch rename to patches/server/0405-Optimize-Voxel-Shape-Merging.patch diff --git a/patches/server/0405-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0406-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch similarity index 93% rename from patches/server/0405-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch rename to patches/server/0406-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch index 7f53e3110..c60071ba3 100644 --- a/patches/server/0405-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch +++ b/patches/server/0406-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch @@ -17,7 +17,7 @@ keeping long lived large direct buffers in cache. Set system properly at server startup if not set already to help protect from this. diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 5e79ad04aed13462d1d187a71801aeb2628495e8..344d93f1d7f25a3f26064469e78dd698af66dc0d 100644 +index fcc959aaed86d1e1c6fe551e534bebbd0fb967a4..1b9e91b20dd9a9375a0a2a6a4d7a0bcdce9e7b1a 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -28,6 +28,7 @@ public class Main { diff --git a/patches/server/0406-misc-debugging-dumps.patch b/patches/server/0407-misc-debugging-dumps.patch similarity index 98% rename from patches/server/0406-misc-debugging-dumps.patch rename to patches/server/0407-misc-debugging-dumps.patch index 7a7755588..f8b80338d 100644 --- a/patches/server/0406-misc-debugging-dumps.patch +++ b/patches/server/0407-misc-debugging-dumps.patch @@ -74,7 +74,7 @@ index ec2825b6d276b6200c4bec5580d012f1eaed722e..e51c03e05c4407ad3a51e573a5e79b00 this.connection.send(new ClientboundDisconnectPacket(ichatmutablecomponent)); this.connection.disconnect(ichatmutablecomponent); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 3ebb0b615d337474f11bb00adcea32cb18de2706..af8269bc1bf737e80ab7bc9a353b262871af454a 100644 +index 22d9196d190bcf12ecea5cc3df8945277607b0a2..f7e8982819199dd3e3fd9a7fee1feca8a7626a13 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -998,6 +998,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0407-Prevent-teleporting-dead-entities.patch b/patches/server/0408-Prevent-teleporting-dead-entities.patch similarity index 92% rename from patches/server/0407-Prevent-teleporting-dead-entities.patch rename to patches/server/0408-Prevent-teleporting-dead-entities.patch index 58338e3da..bbb2ca663 100644 --- a/patches/server/0407-Prevent-teleporting-dead-entities.patch +++ b/patches/server/0408-Prevent-teleporting-dead-entities.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent teleporting dead entities diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 1bf72668a7fab7fc9a327c2403faf2260ccddb31..8c1800836497803cfcd8bca4ddd340003e4cc1d5 100644 +index 2c46a7853edda6f9b6a057e1e3ab0919dcd5436d..5157c257a3480b4f26d4a5830c36725af2d4bd4b 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1559,6 +1559,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0408-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0409-Deobfuscate-stacktraces-in-log-messages-crash-report.patch similarity index 100% rename from patches/server/0408-Deobfuscate-stacktraces-in-log-messages-crash-report.patch rename to patches/server/0409-Deobfuscate-stacktraces-in-log-messages-crash-report.patch diff --git a/patches/server/0409-Implement-Mob-Goal-API.patch b/patches/server/0410-Implement-Mob-Goal-API.patch similarity index 99% rename from patches/server/0409-Implement-Mob-Goal-API.patch rename to patches/server/0410-Implement-Mob-Goal-API.patch index df921cc1c..1896f7081 100644 --- a/patches/server/0409-Implement-Mob-Goal-API.patch +++ b/patches/server/0410-Implement-Mob-Goal-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Implement Mob Goal API diff --git a/build.gradle.kts b/build.gradle.kts -index 6def770d18acc25b9bda1917688039448b36309d..fa5c1be5e225ba5736ec0ef3f588f79eecce0c73 100644 +index a1a8c4778742584125d6084fa761b1bc86f6a842..a02f53c6ee0111e07d78a718a6ca0ec708f70cfc 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -37,6 +37,7 @@ dependencies { @@ -789,7 +789,7 @@ index 4379b9948f1eecfe6fd7dea98e298ad5f761019a..3f081183521603824430709886a9cc31 LOOK, JUMP, diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index af8269bc1bf737e80ab7bc9a353b262871af454a..f6adc73c6c1cdf0a182131b87edd103966212017 100644 +index f7e8982819199dd3e3fd9a7fee1feca8a7626a13..08a381e66471edab5c133af7dc7edb0731722ae7 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2677,5 +2677,11 @@ public final class CraftServer implements Server { diff --git a/patches/server/0410-Add-villager-reputation-API.patch b/patches/server/0411-Add-villager-reputation-API.patch similarity index 100% rename from patches/server/0410-Add-villager-reputation-API.patch rename to patches/server/0411-Add-villager-reputation-API.patch diff --git a/patches/server/0411-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0412-Option-for-maximum-exp-value-when-merging-orbs.patch similarity index 96% rename from patches/server/0411-Option-for-maximum-exp-value-when-merging-orbs.patch rename to patches/server/0412-Option-for-maximum-exp-value-when-merging-orbs.patch index e6d330bc6..4239e066f 100644 --- a/patches/server/0411-Option-for-maximum-exp-value-when-merging-orbs.patch +++ b/patches/server/0412-Option-for-maximum-exp-value-when-merging-orbs.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Option for maximum exp value when merging orbs diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index cd28e59602cba810c0c123f01b992f6eef0ea207..7fd92f0dd2f8a8bcd6a26e91966641c35d35bf91 100644 +index 22da112f45ddb20d113550eae67ac08eb2fcb727..f80bdb38cf377684382bb817fedbeb8d5aae4704 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -640,16 +640,30 @@ public class CraftEventFactory { diff --git a/patches/server/0412-ExperienceOrbMergeEvent.patch b/patches/server/0413-ExperienceOrbMergeEvent.patch similarity index 94% rename from patches/server/0412-ExperienceOrbMergeEvent.patch rename to patches/server/0413-ExperienceOrbMergeEvent.patch index 6f4951481..1ff06b677 100644 --- a/patches/server/0412-ExperienceOrbMergeEvent.patch +++ b/patches/server/0413-ExperienceOrbMergeEvent.patch @@ -9,7 +9,7 @@ Plugins can cancel this if they want to ensure experience orbs do not lose impor metadata such as spawn reason, or conditionally move data from source to target. diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 7fd92f0dd2f8a8bcd6a26e91966641c35d35bf91..1507a172d10986f717cbdaae9890e28c917cf4b3 100644 +index f80bdb38cf377684382bb817fedbeb8d5aae4704..9b94df9940040f51fdcc1af5c7da96117af9017e 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -650,7 +650,7 @@ public class CraftEventFactory { diff --git a/patches/server/0413-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0414-Fix-PotionEffect-ignores-icon-flag.patch similarity index 100% rename from patches/server/0413-Fix-PotionEffect-ignores-icon-flag.patch rename to patches/server/0414-Fix-PotionEffect-ignores-icon-flag.patch diff --git a/patches/server/0414-Optimize-brigadier-child-sorting-performance.patch b/patches/server/0415-Optimize-brigadier-child-sorting-performance.patch similarity index 100% rename from patches/server/0414-Optimize-brigadier-child-sorting-performance.patch rename to patches/server/0415-Optimize-brigadier-child-sorting-performance.patch diff --git a/patches/server/0415-Potential-bed-API.patch b/patches/server/0416-Potential-bed-API.patch similarity index 95% rename from patches/server/0415-Potential-bed-API.patch rename to patches/server/0416-Potential-bed-API.patch index f7b3635cf..d63e2bb9e 100644 --- a/patches/server/0415-Potential-bed-API.patch +++ b/patches/server/0416-Potential-bed-API.patch @@ -8,7 +8,7 @@ Adds a new method to fetch the location of a player's bed without generating any getPotentialBedLocation - Gets the last known location of a player's bed. This does not preform any check if the bed is still valid and does not load any chunks. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index 9d6c3cb06cf1096fc9bffe5123bf19df13fdded6..b68e1f8c9acb05ef38ec9d35ee68748c5a31abe7 100644 +index 3866c466fcc40f17f88063acb939f9091708a92f..3a14cc3d0d692c8bbc90de1b1c5731158b1323e5 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -12,6 +12,7 @@ import net.minecraft.nbt.CompoundTag; diff --git a/patches/server/0416-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0417-Wait-for-Async-Tasks-during-shutdown.patch similarity index 96% rename from patches/server/0416-Wait-for-Async-Tasks-during-shutdown.patch rename to patches/server/0417-Wait-for-Async-Tasks-during-shutdown.patch index ca7d3a480..4068078ec 100644 --- a/patches/server/0416-Wait-for-Async-Tasks-during-shutdown.patch +++ b/patches/server/0417-Wait-for-Async-Tasks-during-shutdown.patch @@ -22,7 +22,7 @@ index 407cfb88d3a6c9c699ca42df2642d9f6fad87cbd..df40ab29f928fa31ccedb9afb64da7e1 // CraftBukkit end if (this.getConnection() != null) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index f6adc73c6c1cdf0a182131b87edd103966212017..9ad5772fcb115d47cc4c0ff8d7f4ffeaa5b7edee 100644 +index 08a381e66471edab5c133af7dc7edb0731722ae7..0e4a3acef2f3e422a01e76757faa80c4005ef5ca 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1007,6 +1007,35 @@ public final class CraftServer implements Server { diff --git a/patches/server/0417-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0418-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch similarity index 100% rename from patches/server/0417-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch rename to patches/server/0418-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch diff --git a/patches/server/0418-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0419-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch similarity index 100% rename from patches/server/0418-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch rename to patches/server/0419-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch diff --git a/patches/server/0419-Reduce-MutableInt-allocations-from-light-engine.patch b/patches/server/0420-Reduce-MutableInt-allocations-from-light-engine.patch similarity index 100% rename from patches/server/0419-Reduce-MutableInt-allocations-from-light-engine.patch rename to patches/server/0420-Reduce-MutableInt-allocations-from-light-engine.patch diff --git a/patches/server/0420-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0421-Reduce-allocation-of-Vec3D-by-entity-tracker.patch similarity index 100% rename from patches/server/0420-Reduce-allocation-of-Vec3D-by-entity-tracker.patch rename to patches/server/0421-Reduce-allocation-of-Vec3D-by-entity-tracker.patch diff --git a/patches/server/0421-Ensure-safe-gateway-teleport.patch b/patches/server/0422-Ensure-safe-gateway-teleport.patch similarity index 100% rename from patches/server/0421-Ensure-safe-gateway-teleport.patch rename to patches/server/0422-Ensure-safe-gateway-teleport.patch diff --git a/patches/server/0422-Add-option-for-console-having-all-permissions.patch b/patches/server/0423-Add-option-for-console-having-all-permissions.patch similarity index 100% rename from patches/server/0422-Add-option-for-console-having-all-permissions.patch rename to patches/server/0423-Add-option-for-console-having-all-permissions.patch diff --git a/patches/server/0423-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch b/patches/server/0424-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch similarity index 100% rename from patches/server/0423-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch rename to patches/server/0424-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch diff --git a/patches/server/0424-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/0425-Use-distance-map-to-optimise-entity-tracker.patch similarity index 100% rename from patches/server/0424-Use-distance-map-to-optimise-entity-tracker.patch rename to patches/server/0425-Use-distance-map-to-optimise-entity-tracker.patch diff --git a/patches/server/0425-Optimize-ServerLevels-chunk-level-checking-methods.patch b/patches/server/0426-Optimize-ServerLevels-chunk-level-checking-methods.patch similarity index 97% rename from patches/server/0425-Optimize-ServerLevels-chunk-level-checking-methods.patch rename to patches/server/0426-Optimize-ServerLevels-chunk-level-checking-methods.patch index b71457af4..7c253c911 100644 --- a/patches/server/0425-Optimize-ServerLevels-chunk-level-checking-methods.patch +++ b/patches/server/0426-Optimize-ServerLevels-chunk-level-checking-methods.patch @@ -8,7 +8,7 @@ so inline where possible, and avoid the abstraction of the Either class. diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index a08a996722095b01720fa985ca7165a41a932056..13354b9e626ce7fec74cbaac68304a912517c40e 100644 +index cf0976f7352919197a322fb4f7f8e20c24509db5..443044aa09b80bdbbcd202b53d265c635b50015f 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -2250,19 +2250,22 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0426-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/patches/server/0427-Delay-Chunk-Unloads-based-on-Player-Movement.patch similarity index 100% rename from patches/server/0426-Delay-Chunk-Unloads-based-on-Player-Movement.patch rename to patches/server/0427-Delay-Chunk-Unloads-based-on-Player-Movement.patch diff --git a/patches/server/0427-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0428-Fix-villager-trading-demand-MC-163962.patch similarity index 100% rename from patches/server/0427-Fix-villager-trading-demand-MC-163962.patch rename to patches/server/0428-Fix-villager-trading-demand-MC-163962.patch diff --git a/patches/server/0428-Maps-shouldn-t-load-chunks.patch b/patches/server/0429-Maps-shouldn-t-load-chunks.patch similarity index 100% rename from patches/server/0428-Maps-shouldn-t-load-chunks.patch rename to patches/server/0429-Maps-shouldn-t-load-chunks.patch diff --git a/patches/server/0429-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0430-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch similarity index 100% rename from patches/server/0429-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch rename to patches/server/0430-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch diff --git a/patches/server/0430-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0431-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch similarity index 100% rename from patches/server/0430-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch rename to patches/server/0431-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch diff --git a/patches/server/0431-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0432-Fix-piston-physics-inconsistency-MC-188840.patch similarity index 100% rename from patches/server/0431-Fix-piston-physics-inconsistency-MC-188840.patch rename to patches/server/0432-Fix-piston-physics-inconsistency-MC-188840.patch diff --git a/patches/server/0432-Fix-sand-duping.patch b/patches/server/0433-Fix-sand-duping.patch similarity index 100% rename from patches/server/0432-Fix-sand-duping.patch rename to patches/server/0433-Fix-sand-duping.patch diff --git a/patches/server/0433-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0434-Fix-missing-chunks-due-to-integer-overflow.patch similarity index 100% rename from patches/server/0433-Fix-missing-chunks-due-to-integer-overflow.patch rename to patches/server/0434-Fix-missing-chunks-due-to-integer-overflow.patch diff --git a/patches/server/0434-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/server/0435-Prevent-position-desync-in-playerconnection-causing-.patch similarity index 94% rename from patches/server/0434-Prevent-position-desync-in-playerconnection-causing-.patch rename to patches/server/0435-Prevent-position-desync-in-playerconnection-causing-.patch index 2b4f2ab7d..ac3be39df 100644 --- a/patches/server/0434-Prevent-position-desync-in-playerconnection-causing-.patch +++ b/patches/server/0435-Prevent-position-desync-in-playerconnection-causing-.patch @@ -14,7 +14,7 @@ behaviour, we need to move all of this dangerous logic outside of the move call and into an appropriate place in the tick method. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 8c1800836497803cfcd8bca4ddd340003e4cc1d5..1049563602ead577f24bb4b698ffb2fb386cdf21 100644 +index 5157c257a3480b4f26d4a5830c36725af2d4bd4b..2daac5b9e7a9855a919024040bed4c065dce697a 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1373,6 +1373,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0435-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0436-Inventory-getHolder-method-without-block-snapshot.patch similarity index 100% rename from patches/server/0435-Inventory-getHolder-method-without-block-snapshot.patch rename to patches/server/0436-Inventory-getHolder-method-without-block-snapshot.patch diff --git a/patches/server/0436-Improve-Arrow-API.patch b/patches/server/0437-Improve-Arrow-API.patch similarity index 100% rename from patches/server/0436-Improve-Arrow-API.patch rename to patches/server/0437-Improve-Arrow-API.patch diff --git a/patches/server/0437-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0438-Add-and-implement-PlayerRecipeBookClickEvent.patch similarity index 95% rename from patches/server/0437-Add-and-implement-PlayerRecipeBookClickEvent.patch rename to patches/server/0438-Add-and-implement-PlayerRecipeBookClickEvent.patch index 7c474a670..764c4e8bb 100644 --- a/patches/server/0437-Add-and-implement-PlayerRecipeBookClickEvent.patch +++ b/patches/server/0438-Add-and-implement-PlayerRecipeBookClickEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add and implement PlayerRecipeBookClickEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 1049563602ead577f24bb4b698ffb2fb386cdf21..656b8d83d5f78ab32f7980e6aa5eacd61f1bc598 100644 +index 2daac5b9e7a9855a919024040bed4c065dce697a..b3fa92cc2ff977107f310a8d95c0d63aa446295e 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2997,9 +2997,14 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0438-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0439-Hide-sync-chunk-writes-behind-flag.patch similarity index 100% rename from patches/server/0438-Hide-sync-chunk-writes-behind-flag.patch rename to patches/server/0439-Hide-sync-chunk-writes-behind-flag.patch diff --git a/patches/server/0439-Add-permission-for-command-blocks.patch b/patches/server/0440-Add-permission-for-command-blocks.patch similarity index 98% rename from patches/server/0439-Add-permission-for-command-blocks.patch rename to patches/server/0440-Add-permission-for-command-blocks.patch index 86c9ce83e..776e9d251 100644 --- a/patches/server/0439-Add-permission-for-command-blocks.patch +++ b/patches/server/0440-Add-permission-for-command-blocks.patch @@ -18,7 +18,7 @@ index 312768054e02847bbc7d2ec7fa6198dad52b86d2..32a6b4d8e6c8f9c05cc7ca811c2188aa return false; } else if (this.player.blockActionRestricted(this.level, pos, this.gameModeForPlayer)) { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 656b8d83d5f78ab32f7980e6aa5eacd61f1bc598..32786e1c13ffda722aaabf518e2ace7f13e0bf96 100644 +index b3fa92cc2ff977107f310a8d95c0d63aa446295e..30d0c22d4576f0aef49bb9fb08ff3c9a8edf8d5a 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -829,7 +829,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0440-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0441-Ensure-Entity-AABB-s-are-never-invalid.patch similarity index 100% rename from patches/server/0440-Ensure-Entity-AABB-s-are-never-invalid.patch rename to patches/server/0441-Ensure-Entity-AABB-s-are-never-invalid.patch diff --git a/patches/server/0441-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0442-Fix-Per-World-Difficulty-Remembering-Difficulty.patch similarity index 98% rename from patches/server/0441-Fix-Per-World-Difficulty-Remembering-Difficulty.patch rename to patches/server/0442-Fix-Per-World-Difficulty-Remembering-Difficulty.patch index 4a5e1e0c0..d521f38ad 100644 --- a/patches/server/0441-Fix-Per-World-Difficulty-Remembering-Difficulty.patch +++ b/patches/server/0442-Fix-Per-World-Difficulty-Remembering-Difficulty.patch @@ -102,7 +102,7 @@ index 30d0c22d4576f0aef49bb9fb08ff3c9a8edf8d5a..41250053943118526ee36e296b19c1a6 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 9ad5772fcb115d47cc4c0ff8d7f4ffeaa5b7edee..97f80d43c7f88c9cae6bf2beb9ceb59743bcae60 100644 +index 0e4a3acef2f3e422a01e76757faa80c4005ef5ca..0da8bcdd6b0071742e852ecb1df18a3d123f94ef 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -947,8 +947,8 @@ public final class CraftServer implements Server { diff --git a/patches/server/0442-Paper-dumpitem-command.patch b/patches/server/0443-Paper-dumpitem-command.patch similarity index 100% rename from patches/server/0442-Paper-dumpitem-command.patch rename to patches/server/0443-Paper-dumpitem-command.patch diff --git a/patches/server/0443-Don-t-allow-null-UUID-s-for-chat.patch b/patches/server/0444-Don-t-allow-null-UUID-s-for-chat.patch similarity index 100% rename from patches/server/0443-Don-t-allow-null-UUID-s-for-chat.patch rename to patches/server/0444-Don-t-allow-null-UUID-s-for-chat.patch diff --git a/patches/server/0444-Improve-Legacy-Component-serialization-size.patch b/patches/server/0445-Improve-Legacy-Component-serialization-size.patch similarity index 100% rename from patches/server/0444-Improve-Legacy-Component-serialization-size.patch rename to patches/server/0445-Improve-Legacy-Component-serialization-size.patch diff --git a/patches/server/0445-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0446-Optimize-Bit-Operations-by-inlining.patch similarity index 100% rename from patches/server/0445-Optimize-Bit-Operations-by-inlining.patch rename to patches/server/0446-Optimize-Bit-Operations-by-inlining.patch diff --git a/patches/server/0446-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0447-Add-Plugin-Tickets-to-API-Chunk-Methods.patch similarity index 98% rename from patches/server/0446-Add-Plugin-Tickets-to-API-Chunk-Methods.patch rename to patches/server/0447-Add-Plugin-Tickets-to-API-Chunk-Methods.patch index a3c2f518e..45909ac8e 100644 --- a/patches/server/0446-Add-Plugin-Tickets-to-API-Chunk-Methods.patch +++ b/patches/server/0447-Add-Plugin-Tickets-to-API-Chunk-Methods.patch @@ -22,7 +22,7 @@ wants it to collect even faster, they can restore that setting back to 1 instead Not adding it to .getType() though to keep behavior consistent with vanilla for performance reasons. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 97f80d43c7f88c9cae6bf2beb9ceb59743bcae60..0efc62fce74e545ed87fa96c25f1178945c87ea5 100644 +index 0da8bcdd6b0071742e852ecb1df18a3d123f94ef..df8a2fa9d38fd07e12e42bf2506e4d750a8ecab4 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -356,7 +356,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0447-incremental-chunk-and-player-saving.patch b/patches/server/0448-incremental-chunk-and-player-saving.patch similarity index 99% rename from patches/server/0447-incremental-chunk-and-player-saving.patch rename to patches/server/0448-incremental-chunk-and-player-saving.patch index 76d3f4f4c..ede8ef131 100644 --- a/patches/server/0447-incremental-chunk-and-player-saving.patch +++ b/patches/server/0448-incremental-chunk-and-player-saving.patch @@ -5,7 +5,7 @@ Subject: [PATCH] incremental chunk and player saving diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index d40623b3ed69a0821057f82e6164b4c94b4a7087..54a155295ed2ee2386f180bf8f5d413984febe96 100644 +index 049ec7c3be31f957e0a662a16939d5ef1868a4e3..9ce0c366b81ee8468cfcca1bd9fb8ed49ffea0ba 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -851,7 +851,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 61e836ac09f91897e3edad17e4fa619a0b3f92f1..406c0b3ac5e6315789618075821e34fd7d3762f4 100644 +index 853929fb1ae428baf9f7cd3f49fdadd52e0c3401..ca2e1f7735352ece4a05a21539e5606b16322322 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -215,6 +215,7 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -29,7 +29,7 @@ index 61e836ac09f91897e3edad17e4fa619a0b3f92f1..406c0b3ac5e6315789618075821e34fd return new Throwable(entity + " Added to world at " + new java.util.Date()); } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index c2508c15eca1a0dbc1a368025651ec2a20b2cbb6..5ad9e0c4a00fee75a173904866cd7d210433a3e4 100644 +index 9310770edd38107211dafb94529d0edc73889e85..20816ccecd427ca747719dea5fd6c2d5544b71ff 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3278,6 +3278,20 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0583-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0584-added-option-to-disable-pathfinding-updates-on-block.patch similarity index 91% rename from patches/server/0583-added-option-to-disable-pathfinding-updates-on-block.patch rename to patches/server/0584-added-option-to-disable-pathfinding-updates-on-block.patch index 343f6700c..1954931c8 100644 --- a/patches/server/0583-added-option-to-disable-pathfinding-updates-on-block.patch +++ b/patches/server/0584-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 406c0b3ac5e6315789618075821e34fd7d3762f4..951d5fed0d688591fe6d38374a9fd340c8ab93cf 100644 +index ca2e1f7735352ece4a05a21539e5606b16322322..a5199e0a95e1bb85c06de612ed7a54bec215deae 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1489,6 +1489,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0584-Inline-shift-direction-fields.patch b/patches/server/0585-Inline-shift-direction-fields.patch similarity index 100% rename from patches/server/0584-Inline-shift-direction-fields.patch rename to patches/server/0585-Inline-shift-direction-fields.patch diff --git a/patches/server/0585-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0586-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 95% rename from patches/server/0585-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/server/0586-Allow-adding-items-to-BlockDropItemEvent.patch index f3c5cbca9..e71e9cff7 100644 --- a/patches/server/0585-Allow-adding-items-to-BlockDropItemEvent.patch +++ b/patches/server/0586-Allow-adding-items-to-BlockDropItemEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow adding items to BlockDropItemEvent diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 7893c10295abcd6ab2e3c4458c31f0b8914ba4c3..7570d5254b5807e967e7ab2560f091a9d601a876 100644 +index 9ccfe52a61b72addfa675af797ea4bafbff30bdb..82d8a8c2199673315c7b52e694f798cc59c5f96c 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -396,13 +396,30 @@ public class CraftEventFactory { diff --git a/patches/server/0586-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0587-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/server/0586-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/server/0587-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/server/0587-living-entity-allow-attribute-registration.patch b/patches/server/0588-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/server/0587-living-entity-allow-attribute-registration.patch rename to patches/server/0588-living-entity-allow-attribute-registration.patch diff --git a/patches/server/0588-fix-dead-slime-setSize-invincibility.patch b/patches/server/0589-fix-dead-slime-setSize-invincibility.patch similarity index 100% rename from patches/server/0588-fix-dead-slime-setSize-invincibility.patch rename to patches/server/0589-fix-dead-slime-setSize-invincibility.patch diff --git a/patches/server/0589-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0590-Merchant-getRecipes-should-return-an-immutable-list.patch similarity index 100% rename from patches/server/0589-Merchant-getRecipes-should-return-an-immutable-list.patch rename to patches/server/0590-Merchant-getRecipes-should-return-an-immutable-list.patch diff --git a/patches/server/0590-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0591-Add-support-for-hex-color-codes-in-console.patch similarity index 99% rename from patches/server/0590-Add-support-for-hex-color-codes-in-console.patch rename to patches/server/0591-Add-support-for-hex-color-codes-in-console.patch index af8cfa7f0..6805eaffe 100644 --- a/patches/server/0590-Add-support-for-hex-color-codes-in-console.patch +++ b/patches/server/0591-Add-support-for-hex-color-codes-in-console.patch @@ -282,7 +282,7 @@ index 0000000000000000000000000000000000000000..b4d0b7ecd56ab952319946854168c129 + +} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 9e943c5d3a5ee91bc8a3f77d14e1413d0a1ecdb7..d61acd95810f735245b15555f9bf2022e5bc3683 100644 +index 20d9fc16c4fffd6eaf4d8048dc93068a9e5d3b7c..67c2ad20d0c1d63dcd43d9570fbcb5b9a30f4ee1 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1670,7 +1670,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { return new IllegalStateException("No jar file system provider found"); }); @@ -17,7 +17,7 @@ index 70b8b86ed827217e536e35a690160adf9e974bb5..5f9e3d37c3ba79d26806374d73f87328 }; diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 378c0848db27a45c79acff43aa6068d1852a3beb..84d8edf3afe0a2a41092d8d2a0b940d1b949da8b 100644 +index 7f39a4955b4819e8a908f4cbf951d707c34fa4a8..b6af4e6b146cc6ceb769a0d1e0d253f0b0f844d2 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1341,7 +1341,7 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0689-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0690-Prevent-AFK-kick-while-watching-end-credits.patch similarity index 93% rename from patches/server/0689-Prevent-AFK-kick-while-watching-end-credits.patch rename to patches/server/0690-Prevent-AFK-kick-while-watching-end-credits.patch index 0a778bea7..53b8389ed 100644 --- a/patches/server/0689-Prevent-AFK-kick-while-watching-end-credits.patch +++ b/patches/server/0690-Prevent-AFK-kick-while-watching-end-credits.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent AFK kick while watching end credits. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 853e7edbb977394d2860ce3f63e4712c921bc741..b23e649f3833ef323643ba4c2b209a7ceca44e6f 100644 +index 9a9f4b985c01c8e076d26c22c37d090bb7348371..28c04f16ddabe33518634759d9a1ea3c7462cb91 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -413,7 +413,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0690-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0691-Allow-skipping-writing-of-comments-to-server.propert.patch similarity index 100% rename from patches/server/0690-Allow-skipping-writing-of-comments-to-server.propert.patch rename to patches/server/0691-Allow-skipping-writing-of-comments-to-server.propert.patch diff --git a/patches/server/0691-Add-PlayerSetSpawnEvent.patch b/patches/server/0692-Add-PlayerSetSpawnEvent.patch similarity index 100% rename from patches/server/0691-Add-PlayerSetSpawnEvent.patch rename to patches/server/0692-Add-PlayerSetSpawnEvent.patch diff --git a/patches/server/0692-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0693-Make-hoppers-respect-inventory-max-stack-size.patch similarity index 94% rename from patches/server/0692-Make-hoppers-respect-inventory-max-stack-size.patch rename to patches/server/0693-Make-hoppers-respect-inventory-max-stack-size.patch index b4d44f1e4..b4a083a5f 100644 --- a/patches/server/0692-Make-hoppers-respect-inventory-max-stack-size.patch +++ b/patches/server/0693-Make-hoppers-respect-inventory-max-stack-size.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Make hoppers respect inventory max stack size diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java -index 9cb783a3001291ddba44776c6bff0c6369684399..8ab1d401ed55d4cce55704317cbffe53ebc9f119 100644 +index a7ac6b528aecae528a17af157f8ec29371e4484c..ccad692aba2ed77259f6814d88f01b91ed9d229b 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java @@ -586,17 +586,19 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen diff --git a/patches/server/0693-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0694-Optimize-entity-tracker-passenger-checks.patch similarity index 100% rename from patches/server/0693-Optimize-entity-tracker-passenger-checks.patch rename to patches/server/0694-Optimize-entity-tracker-passenger-checks.patch diff --git a/patches/server/0694-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0695-Config-option-for-Piglins-guarding-chests.patch similarity index 100% rename from patches/server/0694-Config-option-for-Piglins-guarding-chests.patch rename to patches/server/0695-Config-option-for-Piglins-guarding-chests.patch diff --git a/patches/server/0695-Added-EntityDamageItemEvent.patch b/patches/server/0696-Added-EntityDamageItemEvent.patch similarity index 100% rename from patches/server/0695-Added-EntityDamageItemEvent.patch rename to patches/server/0696-Added-EntityDamageItemEvent.patch diff --git a/patches/server/0696-Optimize-indirect-passenger-iteration.patch b/patches/server/0697-Optimize-indirect-passenger-iteration.patch similarity index 100% rename from patches/server/0696-Optimize-indirect-passenger-iteration.patch rename to patches/server/0697-Optimize-indirect-passenger-iteration.patch diff --git a/patches/server/0697-Fix-block-drops-position-losing-precision-millions-o.patch b/patches/server/0698-Fix-block-drops-position-losing-precision-millions-o.patch similarity index 100% rename from patches/server/0697-Fix-block-drops-position-losing-precision-millions-o.patch rename to patches/server/0698-Fix-block-drops-position-losing-precision-millions-o.patch diff --git a/patches/server/0698-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0699-Configurable-item-frame-map-cursor-update-interval.patch similarity index 100% rename from patches/server/0698-Configurable-item-frame-map-cursor-update-interval.patch rename to patches/server/0699-Configurable-item-frame-map-cursor-update-interval.patch diff --git a/patches/server/0699-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0700-Make-EntityUnleashEvent-cancellable.patch similarity index 100% rename from patches/server/0699-Make-EntityUnleashEvent-cancellable.patch rename to patches/server/0700-Make-EntityUnleashEvent-cancellable.patch diff --git a/patches/server/0700-Clear-bucket-NBT-after-dispense.patch b/patches/server/0701-Clear-bucket-NBT-after-dispense.patch similarity index 100% rename from patches/server/0700-Clear-bucket-NBT-after-dispense.patch rename to patches/server/0701-Clear-bucket-NBT-after-dispense.patch diff --git a/patches/server/0701-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0702-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/server/0701-Change-EnderEye-target-without-changing-other-things.patch rename to patches/server/0702-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/server/0702-Add-BlockBreakBlockEvent.patch b/patches/server/0703-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/server/0702-Add-BlockBreakBlockEvent.patch rename to patches/server/0703-Add-BlockBreakBlockEvent.patch diff --git a/patches/server/0703-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0704-Option-to-prevent-NBT-copy-in-smithing-recipes.patch similarity index 100% rename from patches/server/0703-Option-to-prevent-NBT-copy-in-smithing-recipes.patch rename to patches/server/0704-Option-to-prevent-NBT-copy-in-smithing-recipes.patch diff --git a/patches/server/0704-More-CommandBlock-API.patch b/patches/server/0705-More-CommandBlock-API.patch similarity index 100% rename from patches/server/0704-More-CommandBlock-API.patch rename to patches/server/0705-More-CommandBlock-API.patch diff --git a/patches/server/0705-Add-missing-team-sidebar-display-slots.patch b/patches/server/0706-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/server/0705-Add-missing-team-sidebar-display-slots.patch rename to patches/server/0706-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/server/0706-Add-back-EntityPortalExitEvent.patch b/patches/server/0707-Add-back-EntityPortalExitEvent.patch similarity index 100% rename from patches/server/0706-Add-back-EntityPortalExitEvent.patch rename to patches/server/0707-Add-back-EntityPortalExitEvent.patch diff --git a/patches/server/0707-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0708-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 93% rename from patches/server/0707-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/server/0708-Add-methods-to-find-targets-for-lightning-strikes.patch index 34ab05cb3..e8be3377c 100644 --- a/patches/server/0707-Add-methods-to-find-targets-for-lightning-strikes.patch +++ b/patches/server/0708-Add-methods-to-find-targets-for-lightning-strikes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add methods to find targets for lightning strikes diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 86f3c9be119aba7ec447d6887f40c2671203fb25..5f35cfe1ab67cc77d4b7ad4e440bf1d4dc6642c6 100644 +index 8c61dc53f4874ab7013938abdf5d65a608369474..9b9653e2a88e63932884cfd392ac372a1b0da12b 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -775,6 +775,11 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -29,7 +29,7 @@ index 86f3c9be119aba7ec447d6887f40c2671203fb25..5f35cfe1ab67cc77d4b7ad4e440bf1d4 blockposition1 = blockposition1.above(2); } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index acd935f7b9652ae4e778d865e9be1f0bfe906fe0..7a2a8e1aeca2002378a40be5cef32238350086a7 100644 +index b79b0b78e3e69c2b5c9aa21cf63fe5cc8ea506ca..422655d6ab17d075d045df8e5ce1666c92f9321a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -691,6 +691,23 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0708-Get-entity-default-attributes.patch b/patches/server/0709-Get-entity-default-attributes.patch similarity index 100% rename from patches/server/0708-Get-entity-default-attributes.patch rename to patches/server/0709-Get-entity-default-attributes.patch diff --git a/patches/server/0709-Left-handed-API.patch b/patches/server/0710-Left-handed-API.patch similarity index 100% rename from patches/server/0709-Left-handed-API.patch rename to patches/server/0710-Left-handed-API.patch diff --git a/patches/server/0710-Add-advancement-display-API.patch b/patches/server/0711-Add-advancement-display-API.patch similarity index 100% rename from patches/server/0710-Add-advancement-display-API.patch rename to patches/server/0711-Add-advancement-display-API.patch diff --git a/patches/server/0711-Add-ItemFactory-getMonsterEgg-API.patch b/patches/server/0712-Add-ItemFactory-getMonsterEgg-API.patch similarity index 100% rename from patches/server/0711-Add-ItemFactory-getMonsterEgg-API.patch rename to patches/server/0712-Add-ItemFactory-getMonsterEgg-API.patch diff --git a/patches/server/0712-Add-critical-damage-API.patch b/patches/server/0713-Add-critical-damage-API.patch similarity index 100% rename from patches/server/0712-Add-critical-damage-API.patch rename to patches/server/0713-Add-critical-damage-API.patch diff --git a/patches/server/0713-Fix-issues-with-mob-conversion.patch b/patches/server/0714-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/server/0713-Fix-issues-with-mob-conversion.patch rename to patches/server/0714-Fix-issues-with-mob-conversion.patch diff --git a/patches/server/0714-Add-isCollidable-methods-to-various-places.patch b/patches/server/0715-Add-isCollidable-methods-to-various-places.patch similarity index 100% rename from patches/server/0714-Add-isCollidable-methods-to-various-places.patch rename to patches/server/0715-Add-isCollidable-methods-to-various-places.patch diff --git a/patches/server/0715-Goat-ram-API.patch b/patches/server/0716-Goat-ram-API.patch similarity index 100% rename from patches/server/0715-Goat-ram-API.patch rename to patches/server/0716-Goat-ram-API.patch diff --git a/patches/server/0716-Add-API-for-resetting-a-single-score.patch b/patches/server/0717-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/server/0716-Add-API-for-resetting-a-single-score.patch rename to patches/server/0717-Add-API-for-resetting-a-single-score.patch diff --git a/patches/server/0717-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0718-Add-Raw-Byte-Entity-Serialization.patch similarity index 100% rename from patches/server/0717-Add-Raw-Byte-Entity-Serialization.patch rename to patches/server/0718-Add-Raw-Byte-Entity-Serialization.patch diff --git a/patches/server/0718-Vanilla-command-permission-fixes.patch b/patches/server/0719-Vanilla-command-permission-fixes.patch similarity index 100% rename from patches/server/0718-Vanilla-command-permission-fixes.patch rename to patches/server/0719-Vanilla-command-permission-fixes.patch diff --git a/patches/server/0719-Make-CallbackExecutor-strict-again.patch b/patches/server/0720-Make-CallbackExecutor-strict-again.patch similarity index 100% rename from patches/server/0719-Make-CallbackExecutor-strict-again.patch rename to patches/server/0720-Make-CallbackExecutor-strict-again.patch diff --git a/patches/server/0720-Do-not-allow-the-server-to-unload-chunks-at-request-.patch b/patches/server/0721-Do-not-allow-the-server-to-unload-chunks-at-request-.patch similarity index 100% rename from patches/server/0720-Do-not-allow-the-server-to-unload-chunks-at-request-.patch rename to patches/server/0721-Do-not-allow-the-server-to-unload-chunks-at-request-.patch diff --git a/patches/server/0721-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0722-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch similarity index 97% rename from patches/server/0721-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch rename to patches/server/0722-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch index 8625d2dd2..a40966402 100644 --- a/patches/server/0721-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch +++ b/patches/server/0722-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 5f35cfe1ab67cc77d4b7ad4e440bf1d4dc6642c6..3fc394d82217a273dad07b44cc18a66e1e3886c6 100644 +index 9b9653e2a88e63932884cfd392ac372a1b0da12b..9d871a9dfeca169db3b598fe2ad5a23bfc88dd6f 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1333,9 +1333,13 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0722-Correctly-handle-recursion-for-chunkholder-updates.patch b/patches/server/0723-Correctly-handle-recursion-for-chunkholder-updates.patch similarity index 100% rename from patches/server/0722-Correctly-handle-recursion-for-chunkholder-updates.patch rename to patches/server/0723-Correctly-handle-recursion-for-chunkholder-updates.patch diff --git a/patches/server/0723-Fix-GameProfileCache-concurrency.patch b/patches/server/0724-Fix-GameProfileCache-concurrency.patch similarity index 98% rename from patches/server/0723-Fix-GameProfileCache-concurrency.patch rename to patches/server/0724-Fix-GameProfileCache-concurrency.patch index 1c8bd06db..400971f5f 100644 --- a/patches/server/0723-Fix-GameProfileCache-concurrency.patch +++ b/patches/server/0724-Fix-GameProfileCache-concurrency.patch @@ -7,7 +7,7 @@ Separate lookup and state access locks prevent lookups from stalling simple state access/write calls diff --git a/src/main/java/net/minecraft/server/players/GameProfileCache.java b/src/main/java/net/minecraft/server/players/GameProfileCache.java -index 2a4f8aa6697ed6144440970c9abaf9f6e1a2c2ce..8d86645ef264287d01203afd7bba516e78be5743 100644 +index 2347c7b44793aabe431b57bb1b44935fefbda6fe..4dff88bdf14675718572e4b3720c0250ce6e730e 100644 --- a/src/main/java/net/minecraft/server/players/GameProfileCache.java +++ b/src/main/java/net/minecraft/server/players/GameProfileCache.java @@ -62,6 +62,11 @@ public class GameProfileCache { diff --git a/patches/server/0724-Fix-chunks-refusing-to-unload-at-low-TPS.patch b/patches/server/0725-Fix-chunks-refusing-to-unload-at-low-TPS.patch similarity index 100% rename from patches/server/0724-Fix-chunks-refusing-to-unload-at-low-TPS.patch rename to patches/server/0725-Fix-chunks-refusing-to-unload-at-low-TPS.patch diff --git a/patches/server/0725-Do-not-allow-ticket-level-changes-while-unloading-pl.patch b/patches/server/0726-Do-not-allow-ticket-level-changes-while-unloading-pl.patch similarity index 100% rename from patches/server/0725-Do-not-allow-ticket-level-changes-while-unloading-pl.patch rename to patches/server/0726-Do-not-allow-ticket-level-changes-while-unloading-pl.patch diff --git a/patches/server/0726-Do-not-allow-ticket-level-changes-when-updating-chun.patch b/patches/server/0727-Do-not-allow-ticket-level-changes-when-updating-chun.patch similarity index 100% rename from patches/server/0726-Do-not-allow-ticket-level-changes-when-updating-chun.patch rename to patches/server/0727-Do-not-allow-ticket-level-changes-when-updating-chun.patch