diff --git a/patches/server/0065-Chunk-Save-Reattempt.patch b/patches/server/0065-Chunk-Save-Reattempt.patch deleted file mode 100644 index 120ee75594..0000000000 --- a/patches/server/0065-Chunk-Save-Reattempt.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Aikar -Date: Mon, 4 Mar 2013 23:46:10 -0500 -Subject: [PATCH] Chunk Save Reattempt - -We commonly have "Stream Closed" errors on chunk saving, so this code should re-try to save the chunk in the event of failure and hopefully prevent rollbacks. - -diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java -index b24e8255ab18eb5b2e4968aa62aa3d72ef33f0eb..12b7d50f49a2184aaf220a4a50a137b217c57124 100644 ---- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java -+++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java -@@ -296,7 +296,7 @@ public class RegionFile implements AutoCloseable { - return true; - } - } catch (IOException ioexception) { -- com.destroystokyo.paper.exception.ServerInternalException.reportInternalException(ioexception); // Paper - ServerExceptionEvent -+ com.destroystokyo.paper.util.SneakyThrow.sneaky(ioexception); // Paper - Chunk save reattempt; we want the upper try/catch to retry this - return false; - } - } -diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java -index 40f2f4d052add3b4270d29c843e49fb621e1bc8d..df099d4c7f101f50d40dae99b45c271b02712434 100644 ---- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java -+++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java -@@ -134,6 +134,11 @@ public final class RegionFileStorage implements AutoCloseable { - - protected void write(ChunkPos pos, @Nullable CompoundTag nbt) throws IOException { - RegionFile regionfile = this.getRegionFile(pos, false); // CraftBukkit -+ // Paper start - Chunk save reattempt -+ int attempts = 0; -+ Exception lastException = null; -+ while (attempts++ < 5) { try { -+ // Paper end - Chunk save reattempt - - if (nbt == null) { - regionfile.clear(pos); -@@ -158,7 +163,18 @@ public final class RegionFileStorage implements AutoCloseable { - dataoutputstream.close(); - } - } -+ // Paper start - Chunk save reattempt -+ return; -+ } catch (Exception ex) { -+ lastException = ex; -+ } -+ } - -+ if (lastException != null) { -+ com.destroystokyo.paper.exception.ServerInternalException.reportInternalException(lastException); -+ net.minecraft.server.MinecraftServer.LOGGER.error("Failed to save chunk {}", pos, lastException); -+ } -+ // Paper end - Chunk save reattempt - } - - public void close() throws IOException { diff --git a/patches/server/0066-Complete-resource-pack-API.patch b/patches/server/0065-Complete-resource-pack-API.patch similarity index 100% rename from patches/server/0066-Complete-resource-pack-API.patch rename to patches/server/0065-Complete-resource-pack-API.patch diff --git a/patches/server/0067-Default-loading-permissions.yml-before-plugins.patch b/patches/server/0066-Default-loading-permissions.yml-before-plugins.patch similarity index 95% rename from patches/server/0067-Default-loading-permissions.yml-before-plugins.patch rename to patches/server/0066-Default-loading-permissions.yml-before-plugins.patch index e933d73ae3..45510139a9 100644 --- a/patches/server/0067-Default-loading-permissions.yml-before-plugins.patch +++ b/patches/server/0066-Default-loading-permissions.yml-before-plugins.patch @@ -16,7 +16,7 @@ modify that. Under the previous logic, plugins were unable (cleanly) override pe A config option has been added for those who depend on the previous behavior, but I don't expect that. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index bb562ada45b828c79d83afdd1687edd32cbaf1dc..d581bfad059e60a693bc27285a723979e7d7dd34 100644 +index 3422b2978eb69c537c19abacbb10ce8a5423756a..248de665ebf0e1ddfb10616f6213fa344cd88d40 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -490,6 +490,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0068-Allow-Reloading-of-Custom-Permissions.patch b/patches/server/0067-Allow-Reloading-of-Custom-Permissions.patch similarity index 100% rename from patches/server/0068-Allow-Reloading-of-Custom-Permissions.patch rename to patches/server/0067-Allow-Reloading-of-Custom-Permissions.patch diff --git a/patches/server/0069-Remove-Metadata-on-reload.patch b/patches/server/0068-Remove-Metadata-on-reload.patch similarity index 93% rename from patches/server/0069-Remove-Metadata-on-reload.patch rename to patches/server/0068-Remove-Metadata-on-reload.patch index e5592929ff..61752107c6 100644 --- a/patches/server/0069-Remove-Metadata-on-reload.patch +++ b/patches/server/0068-Remove-Metadata-on-reload.patch @@ -7,7 +7,7 @@ Metadata is not meant to persist reload as things break badly with non primitive This will remove metadata on reload so it does not crash everything if a plugin uses it. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 2b4c1c3cc4b740d5aceb483c4066f23433c175d9..c6ea35f752c9a0bf9e5e07e3b501fd3fe8c30084 100644 +index a8ee4d5b932e42367df9e74dacd0e3f1fdbe7d11..c6a0765e6cfbe90444b91a19039483070600df6d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1005,8 +1005,16 @@ public final class CraftServer implements Server { diff --git a/patches/server/0070-Handle-Item-Meta-Inconsistencies.patch b/patches/server/0069-Handle-Item-Meta-Inconsistencies.patch similarity index 99% rename from patches/server/0070-Handle-Item-Meta-Inconsistencies.patch rename to patches/server/0069-Handle-Item-Meta-Inconsistencies.patch index e6681a5fd8..fd76315859 100644 --- a/patches/server/0070-Handle-Item-Meta-Inconsistencies.patch +++ b/patches/server/0069-Handle-Item-Meta-Inconsistencies.patch @@ -149,7 +149,7 @@ index 101eea3452c9e387e770b716543c3a4f17b9a737..aea09533fada5bd3d42e2cc147921167 static Map getEnchantments(net.minecraft.world.item.ItemStack item) { diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index 1c943638bfbda8281d2c9038e9024591823e2b5e..b2683d6efd53b03d7043098b19a1504885a5b3c7 100644 +index b02149d371b3b65537655f8e9713428e19bbc180..d9bbeb08cb58b1fbea5c6aab8f926236639e031d 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -6,6 +6,7 @@ import com.google.common.collect.ImmutableList; diff --git a/patches/server/0071-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/patches/server/0070-Configurable-Non-Player-Arrow-Despawn-Rate.patch similarity index 100% rename from patches/server/0071-Configurable-Non-Player-Arrow-Despawn-Rate.patch rename to patches/server/0070-Configurable-Non-Player-Arrow-Despawn-Rate.patch diff --git a/patches/server/0072-Add-World-Util-Methods.patch b/patches/server/0071-Add-World-Util-Methods.patch similarity index 100% rename from patches/server/0072-Add-World-Util-Methods.patch rename to patches/server/0071-Add-World-Util-Methods.patch diff --git a/patches/server/0073-Custom-replacement-for-eaten-items.patch b/patches/server/0072-Custom-replacement-for-eaten-items.patch similarity index 100% rename from patches/server/0073-Custom-replacement-for-eaten-items.patch rename to patches/server/0072-Custom-replacement-for-eaten-items.patch diff --git a/patches/server/0074-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/patches/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch similarity index 100% rename from patches/server/0074-handle-NaN-health-absorb-values-and-repair-bad-data.patch rename to patches/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch diff --git a/patches/server/0075-Use-a-Shared-Random-for-Entities.patch b/patches/server/0074-Use-a-Shared-Random-for-Entities.patch similarity index 98% rename from patches/server/0075-Use-a-Shared-Random-for-Entities.patch rename to patches/server/0074-Use-a-Shared-Random-for-Entities.patch index 6cc939258e..d26d24c577 100644 --- a/patches/server/0075-Use-a-Shared-Random-for-Entities.patch +++ b/patches/server/0074-Use-a-Shared-Random-for-Entities.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Use a Shared Random for Entities Reduces memory usage and provides ensures more randomness, Especially since a lot of garbage entity objects get created. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 0c2389e73e98ec48ed636f616a36e6e1cefa7b93..27a0f0651ac961c06626df1e4beb5525b4dacd48 100644 +index 10195d04c9ca9e5f79e9c423fba5dc33fa538f3a..30abcdfd4c18781563bed93642778424b4f9a417 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -184,6 +184,79 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0076-Configurable-spawn-chances-for-skeleton-horses.patch b/patches/server/0075-Configurable-spawn-chances-for-skeleton-horses.patch similarity index 100% rename from patches/server/0076-Configurable-spawn-chances-for-skeleton-horses.patch rename to patches/server/0075-Configurable-spawn-chances-for-skeleton-horses.patch diff --git a/patches/server/0077-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/patches/server/0076-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch similarity index 98% rename from patches/server/0077-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch rename to patches/server/0076-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch index 7afaf0c0af..dbfa5d5506 100644 --- a/patches/server/0077-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch +++ b/patches/server/0076-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch @@ -18,7 +18,7 @@ index 43c7014b51f1f46a0e52f0595e85636767ed92ff..0db5bd55b738baa51f5f2790d398a22b gameprofilerfiller.push(() -> { String s = String.valueOf(worldserver); diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index e623f8e75ec895d18d854a1f2c0dbe41a67dffc8..50296ff319fd6f97e27ec1cb6bdcd7b85a6ce926 100644 +index d0501f4f122f502f5d7501830acc2150eef6a850..25415bd1aaa769bb655432193dcea65640f63115 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -228,6 +228,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe diff --git a/patches/server/0078-Entity-AddTo-RemoveFrom-World-Events.patch b/patches/server/0077-Entity-AddTo-RemoveFrom-World-Events.patch similarity index 100% rename from patches/server/0078-Entity-AddTo-RemoveFrom-World-Events.patch rename to patches/server/0077-Entity-AddTo-RemoveFrom-World-Events.patch diff --git a/patches/server/0079-Configurable-Chunk-Inhabited-Time.patch b/patches/server/0078-Configurable-Chunk-Inhabited-Time.patch similarity index 100% rename from patches/server/0079-Configurable-Chunk-Inhabited-Time.patch rename to patches/server/0078-Configurable-Chunk-Inhabited-Time.patch diff --git a/patches/server/0080-EntityPathfindEvent.patch b/patches/server/0079-EntityPathfindEvent.patch similarity index 100% rename from patches/server/0080-EntityPathfindEvent.patch rename to patches/server/0079-EntityPathfindEvent.patch diff --git a/patches/server/0081-Sanitise-RegionFileCache-and-make-configurable.patch b/patches/server/0080-Sanitise-RegionFileCache-and-make-configurable.patch similarity index 93% rename from patches/server/0081-Sanitise-RegionFileCache-and-make-configurable.patch rename to patches/server/0080-Sanitise-RegionFileCache-and-make-configurable.patch index 2693eaeb7c..c8504969b8 100644 --- a/patches/server/0081-Sanitise-RegionFileCache-and-make-configurable.patch +++ b/patches/server/0080-Sanitise-RegionFileCache-and-make-configurable.patch @@ -11,7 +11,7 @@ The implementation uses a LinkedHashMap as an LRU cache (modified from HashMap). The maximum size of the RegionFileCache is also made configurable. diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java -index df099d4c7f101f50d40dae99b45c271b02712434..491035aaefff4ee96435ec5d3f9417e28eae0796 100644 +index 40f2f4d052add3b4270d29c843e49fb621e1bc8d..54803d561d98b0d3fd8aa2060a7a184a00dd9da6 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java @@ -39,7 +39,7 @@ public final class RegionFileStorage implements AutoCloseable { diff --git a/patches/server/0082-Do-not-load-chunks-for-Pathfinding.patch b/patches/server/0081-Do-not-load-chunks-for-Pathfinding.patch similarity index 100% rename from patches/server/0082-Do-not-load-chunks-for-Pathfinding.patch rename to patches/server/0081-Do-not-load-chunks-for-Pathfinding.patch diff --git a/patches/server/0083-Add-PlayerUseUnknownEntityEvent.patch b/patches/server/0082-Add-PlayerUseUnknownEntityEvent.patch similarity index 100% rename from patches/server/0083-Add-PlayerUseUnknownEntityEvent.patch rename to patches/server/0082-Add-PlayerUseUnknownEntityEvent.patch diff --git a/patches/server/0084-Configurable-random-tick-rates-for-blocks.patch b/patches/server/0083-Configurable-random-tick-rates-for-blocks.patch similarity index 100% rename from patches/server/0084-Configurable-random-tick-rates-for-blocks.patch rename to patches/server/0083-Configurable-random-tick-rates-for-blocks.patch diff --git a/patches/server/0085-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/patches/server/0084-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch similarity index 100% rename from patches/server/0085-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch rename to patches/server/0084-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch diff --git a/patches/server/0086-Optimize-DataBits.patch b/patches/server/0085-Optimize-DataBits.patch similarity index 100% rename from patches/server/0086-Optimize-DataBits.patch rename to patches/server/0085-Optimize-DataBits.patch diff --git a/patches/server/0087-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/patches/server/0086-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch similarity index 100% rename from patches/server/0087-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch rename to patches/server/0086-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch diff --git a/patches/server/0088-Configurable-Player-Collision.patch b/patches/server/0087-Configurable-Player-Collision.patch similarity index 98% rename from patches/server/0088-Configurable-Player-Collision.patch rename to patches/server/0087-Configurable-Player-Collision.patch index 73cc39e758..e8bd9c9ec1 100644 --- a/patches/server/0088-Configurable-Player-Collision.patch +++ b/patches/server/0087-Configurable-Player-Collision.patch @@ -43,7 +43,7 @@ index 0db5bd55b738baa51f5f2790d398a22b802ae070..351dbb35a9ba0ce52cd5e182ef6dd8c3 if (io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper != null) io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper.pluginsEnabled(); // Paper - Remap plugins this.server.getPluginManager().callEvent(new ServerLoadEvent(ServerLoadEvent.LoadType.STARTUP)); diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 50b1e493a9adfa687dc22c66044c6aa243340b3f..d0d2b687ec851e3fa08864897774897a1fcd7df8 100644 +index 7782f26764ef79968b1e2f5e1f27f1162ed122de..005e63978a306c695e21b26498937a3b81fb2b38 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -159,6 +159,7 @@ public abstract class PlayerList { diff --git a/patches/server/0089-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/patches/server/0088-Add-handshake-event-to-allow-plugins-to-handle-clien.patch similarity index 100% rename from patches/server/0089-Add-handshake-event-to-allow-plugins-to-handle-clien.patch rename to patches/server/0088-Add-handshake-event-to-allow-plugins-to-handle-clien.patch diff --git a/patches/server/0090-Configurable-RCON-IP-address.patch b/patches/server/0089-Configurable-RCON-IP-address.patch similarity index 96% rename from patches/server/0090-Configurable-RCON-IP-address.patch rename to patches/server/0089-Configurable-RCON-IP-address.patch index 2d1bfec9fe..21e0b530fd 100644 --- a/patches/server/0090-Configurable-RCON-IP-address.patch +++ b/patches/server/0089-Configurable-RCON-IP-address.patch @@ -9,7 +9,7 @@ For servers with multiple IP's, ability to bind to a specific interface. public net.minecraft.server.dedicated.Settings getStringRaw(Ljava/lang/String;)Ljava/lang/String; diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java -index 341123c078e97862ca8895534e85c324f256f4d6..47835226b61b726c750fe192fd94d3f8ba47565c 100644 +index 353cc3622c7a802bf130146964610e66eb431d64..83d279a66484dfeef3ce34bef3d1c8f221c67f6d 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java @@ -110,6 +110,8 @@ public class DedicatedServerProperties extends Settings pendingBlockEntityTickers = Lists.newArrayList(); private boolean tickingBlockEntities; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 9a79b948264150d0f7a843a8ddd2ea9245ae66f3..44ecb821c528d10f38c8c85298c8257e92e3c41c 100644 +index 0ced83dba344ec55df0a0c992437dbb162426518..ea90a64810e2f0669d862b5b6deba0905380051f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -168,6 +168,48 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0124-Enforce-Sync-Player-Saves.patch b/patches/server/0123-Enforce-Sync-Player-Saves.patch similarity index 91% rename from patches/server/0124-Enforce-Sync-Player-Saves.patch rename to patches/server/0123-Enforce-Sync-Player-Saves.patch index bbf020dcb3..c0c144111c 100644 --- a/patches/server/0124-Enforce-Sync-Player-Saves.patch +++ b/patches/server/0123-Enforce-Sync-Player-Saves.patch @@ -7,7 +7,7 @@ Saving players async is extremely dangerous. This will force it to main the same way we handle async chunk loads. diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index d0d2b687ec851e3fa08864897774897a1fcd7df8..f9ffae36beb13db416432068d8ee00de21d0c1fe 100644 +index 005e63978a306c695e21b26498937a3b81fb2b38..6341127b5b0230da7417ab2f8c36bf963742d788 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -997,10 +997,12 @@ public abstract class PlayerList { diff --git a/patches/server/0125-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/server/0124-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch similarity index 99% rename from patches/server/0125-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch rename to patches/server/0124-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch index 122c225e01..50161ad69f 100644 --- a/patches/server/0125-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch +++ b/patches/server/0124-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch @@ -127,7 +127,7 @@ index 7f3ac3e8631e30c968ef664f994ad208d05eb4a3..b9160ebca0d11dbbf96da5f0f5810d30 @Override diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 4a6f9a8b7db8d0e1c3cca5a0a4856d38cb38b94e..7a648a8c3f25397e1c883a42648b21a05901513f 100644 +index f8f4fa56881efabada7ec966d74db0a174907614..6c29a05e91a6bac634ca3e5394b90112b65cdbd6 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1835,7 +1835,7 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -317,7 +317,7 @@ index 7341e14645eac007312889776a29d16fc390c5bf..119ea31f6e15185b6d6171053f790e39 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java -index 3dc11c82e4ccdb57a5e7510bddc5247869075d3e..1c3aacda9242444c0c7bd92cb391e6fff963bb79 100644 +index 161301924f78593c6f398d4ca41dd80bf26b8d58..e0ff8e8ed03a6a78c9fd8e4630c8b95600bee10a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java @@ -426,7 +426,7 @@ public final class CraftEntityTypes { diff --git a/patches/server/0126-Cap-Entity-Collisions.patch b/patches/server/0125-Cap-Entity-Collisions.patch similarity index 96% rename from patches/server/0126-Cap-Entity-Collisions.patch rename to patches/server/0125-Cap-Entity-Collisions.patch index fe97d68719..abbc967c00 100644 --- a/patches/server/0126-Cap-Entity-Collisions.patch +++ b/patches/server/0125-Cap-Entity-Collisions.patch @@ -12,7 +12,7 @@ just as it does in Vanilla, but entity pushing logic will be capped. You can set this to 0 to disable collisions. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 27a0f0651ac961c06626df1e4beb5525b4dacd48..2b5d1bc6d3b3fd04bcbf4984035a00b9151cf2ee 100644 +index 30abcdfd4c18781563bed93642778424b4f9a417..9b0ae983caa12ea50284d9945a7f312429852795 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -405,6 +405,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0127-Remove-CraftScheduler-Async-Task-Debugger.patch b/patches/server/0126-Remove-CraftScheduler-Async-Task-Debugger.patch similarity index 100% rename from patches/server/0127-Remove-CraftScheduler-Async-Task-Debugger.patch rename to patches/server/0126-Remove-CraftScheduler-Async-Task-Debugger.patch diff --git a/patches/server/0128-Properly-handle-async-calls-to-restart-the-server.patch b/patches/server/0127-Properly-handle-async-calls-to-restart-the-server.patch similarity index 99% rename from patches/server/0128-Properly-handle-async-calls-to-restart-the-server.patch rename to patches/server/0127-Properly-handle-async-calls-to-restart-the-server.patch index d16361057c..7f67872d21 100644 --- a/patches/server/0128-Properly-handle-async-calls-to-restart-the-server.patch +++ b/patches/server/0127-Properly-handle-async-calls-to-restart-the-server.patch @@ -64,7 +64,7 @@ index 12c8a4f79abf2c2c15bd271cff4c4ca800e0625a..d69d759de22726f4a825cb5e485670ae if (waitForShutdown) { try { diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index f9ffae36beb13db416432068d8ee00de21d0c1fe..1f3dc7f2376854be577cb6742aa5d87d898b9882 100644 +index 6341127b5b0230da7417ab2f8c36bf963742d788..0829f5cb4e795bc44cf04bdf1b88af6b22c9cf72 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -1110,8 +1110,15 @@ public abstract class PlayerList { diff --git a/patches/server/0129-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/patches/server/0128-Add-option-to-make-parrots-stay-on-shoulders-despite.patch similarity index 100% rename from patches/server/0129-Add-option-to-make-parrots-stay-on-shoulders-despite.patch rename to patches/server/0128-Add-option-to-make-parrots-stay-on-shoulders-despite.patch diff --git a/patches/server/0130-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/server/0129-Add-configuration-option-to-prevent-player-names-fro.patch similarity index 100% rename from patches/server/0130-Add-configuration-option-to-prevent-player-names-fro.patch rename to patches/server/0129-Add-configuration-option-to-prevent-player-names-fro.patch diff --git a/patches/server/0131-provide-a-configurable-option-to-disable-creeper-lin.patch b/patches/server/0130-provide-a-configurable-option-to-disable-creeper-lin.patch similarity index 100% rename from patches/server/0131-provide-a-configurable-option-to-disable-creeper-lin.patch rename to patches/server/0130-provide-a-configurable-option-to-disable-creeper-lin.patch diff --git a/patches/server/0132-Item-canEntityPickup.patch b/patches/server/0131-Item-canEntityPickup.patch similarity index 100% rename from patches/server/0132-Item-canEntityPickup.patch rename to patches/server/0131-Item-canEntityPickup.patch diff --git a/patches/server/0133-PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/server/0132-PlayerPickupItemEvent-setFlyAtPlayer.patch similarity index 100% rename from patches/server/0133-PlayerPickupItemEvent-setFlyAtPlayer.patch rename to patches/server/0132-PlayerPickupItemEvent-setFlyAtPlayer.patch diff --git a/patches/server/0134-PlayerAttemptPickupItemEvent.patch b/patches/server/0133-PlayerAttemptPickupItemEvent.patch similarity index 100% rename from patches/server/0134-PlayerAttemptPickupItemEvent.patch rename to patches/server/0133-PlayerAttemptPickupItemEvent.patch diff --git a/patches/server/0135-Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/server/0134-Do-not-submit-profile-lookups-to-worldgen-threads.patch similarity index 100% rename from patches/server/0135-Do-not-submit-profile-lookups-to-worldgen-threads.patch rename to patches/server/0134-Do-not-submit-profile-lookups-to-worldgen-threads.patch diff --git a/patches/server/0136-Basic-PlayerProfile-API.patch b/patches/server/0135-Basic-PlayerProfile-API.patch similarity index 100% rename from patches/server/0136-Basic-PlayerProfile-API.patch rename to patches/server/0135-Basic-PlayerProfile-API.patch diff --git a/patches/server/0137-Add-UnknownCommandEvent.patch b/patches/server/0136-Add-UnknownCommandEvent.patch similarity index 98% rename from patches/server/0137-Add-UnknownCommandEvent.patch rename to patches/server/0136-Add-UnknownCommandEvent.patch index 652711b606..aba283df9e 100644 --- a/patches/server/0137-Add-UnknownCommandEvent.patch +++ b/patches/server/0136-Add-UnknownCommandEvent.patch @@ -78,7 +78,7 @@ index 603d0fa7f9690a09dca3c744bc4f90ac31132b90..2008fd542eaf1c2fac776ae1751c227a return null; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index cc71aac4de75eafd7b7128b06b46d0439b77c486..2d1f92f75e83aacd39440d2619befdf6cd545af4 100644 +index 267df83abe7f677d48d63432f9dba64781e777e2..a2b62970a5f50d4465db96ba12d8690e72bef95f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -950,7 +950,13 @@ public final class CraftServer implements Server { diff --git a/patches/server/0138-Shoulder-Entities-Release-API.patch b/patches/server/0137-Shoulder-Entities-Release-API.patch similarity index 100% rename from patches/server/0138-Shoulder-Entities-Release-API.patch rename to patches/server/0137-Shoulder-Entities-Release-API.patch diff --git a/patches/server/0139-Profile-Lookup-Events.patch b/patches/server/0138-Profile-Lookup-Events.patch similarity index 100% rename from patches/server/0139-Profile-Lookup-Events.patch rename to patches/server/0138-Profile-Lookup-Events.patch diff --git a/patches/server/0140-Block-player-logins-during-server-shutdown.patch b/patches/server/0139-Block-player-logins-during-server-shutdown.patch similarity index 100% rename from patches/server/0140-Block-player-logins-during-server-shutdown.patch rename to patches/server/0139-Block-player-logins-during-server-shutdown.patch diff --git a/patches/server/0141-Entity-fromMobSpawner.patch b/patches/server/0140-Entity-fromMobSpawner.patch similarity index 97% rename from patches/server/0141-Entity-fromMobSpawner.patch rename to patches/server/0140-Entity-fromMobSpawner.patch index c03cb1fa0d..dc193e5905 100644 --- a/patches/server/0141-Entity-fromMobSpawner.patch +++ b/patches/server/0140-Entity-fromMobSpawner.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Entity#fromMobSpawner() diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 2b5d1bc6d3b3fd04bcbf4984035a00b9151cf2ee..aa70b6437cabdd875cec446db4bcf2422ab2cbc6 100644 +index 9b0ae983caa12ea50284d9945a7f312429852795..c22b1ef0751d244310dee880565eef83bdb61114 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -406,6 +406,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0142-Improve-the-Saddle-API-for-Horses.patch b/patches/server/0141-Improve-the-Saddle-API-for-Horses.patch similarity index 100% rename from patches/server/0142-Improve-the-Saddle-API-for-Horses.patch rename to patches/server/0141-Improve-the-Saddle-API-for-Horses.patch diff --git a/patches/server/0143-ensureServerConversions-API.patch b/patches/server/0142-ensureServerConversions-API.patch similarity index 100% rename from patches/server/0143-ensureServerConversions-API.patch rename to patches/server/0142-ensureServerConversions-API.patch diff --git a/patches/server/0144-Implement-getI18NDisplayName.patch b/patches/server/0143-Implement-getI18NDisplayName.patch similarity index 100% rename from patches/server/0144-Implement-getI18NDisplayName.patch rename to patches/server/0143-Implement-getI18NDisplayName.patch diff --git a/patches/server/0145-ProfileWhitelistVerifyEvent.patch b/patches/server/0144-ProfileWhitelistVerifyEvent.patch similarity index 97% rename from patches/server/0145-ProfileWhitelistVerifyEvent.patch rename to patches/server/0144-ProfileWhitelistVerifyEvent.patch index 988ef567ab..335095baa9 100644 --- a/patches/server/0145-ProfileWhitelistVerifyEvent.patch +++ b/patches/server/0144-ProfileWhitelistVerifyEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] ProfileWhitelistVerifyEvent diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 1f3dc7f2376854be577cb6742aa5d87d898b9882..5cb84271abdabc0f2d44ad9425828431f8818a47 100644 +index 0829f5cb4e795bc44cf04bdf1b88af6b22c9cf72..f4e08c6b20ba64402b8587bde3e01eedcc9c2568 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -590,9 +590,9 @@ public abstract class PlayerList { diff --git a/patches/server/0146-Fix-this-stupid-bullshit.patch b/patches/server/0145-Fix-this-stupid-bullshit.patch similarity index 96% rename from patches/server/0146-Fix-this-stupid-bullshit.patch rename to patches/server/0145-Fix-this-stupid-bullshit.patch index b2c28f452f..066446b1cb 100644 --- a/patches/server/0146-Fix-this-stupid-bullshit.patch +++ b/patches/server/0145-Fix-this-stupid-bullshit.patch @@ -31,7 +31,7 @@ index 9abd1dea58ffc612114d5fd8e8944d4aa8c68236..4840893082cbcd9b00f79149df1a7805 Bootstrap.isBootstrapped = true; Instant instant = Instant.now(); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index b2044a90a4f3b3e16227915269527c4ea47e0747..3dd6beb874df92056c127e2436576adb125d4ed1 100644 +index 1a254cb043ae57afac80c3cfcf0a130089061ee3..2a95a42ade0e82a509f08e2bec7f0c64f55b185c 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -249,10 +249,12 @@ public class Main { diff --git a/patches/server/0147-LivingEntity-setKiller.patch b/patches/server/0146-LivingEntity-setKiller.patch similarity index 100% rename from patches/server/0147-LivingEntity-setKiller.patch rename to patches/server/0146-LivingEntity-setKiller.patch diff --git a/patches/server/0148-Ocelot-despawns-should-honor-nametags-and-leash.patch b/patches/server/0147-Ocelot-despawns-should-honor-nametags-and-leash.patch similarity index 100% rename from patches/server/0148-Ocelot-despawns-should-honor-nametags-and-leash.patch rename to patches/server/0147-Ocelot-despawns-should-honor-nametags-and-leash.patch diff --git a/patches/server/0149-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/patches/server/0148-Reset-spawner-timer-when-spawner-event-is-cancelled.patch similarity index 100% rename from patches/server/0149-Reset-spawner-timer-when-spawner-event-is-cancelled.patch rename to patches/server/0148-Reset-spawner-timer-when-spawner-event-is-cancelled.patch diff --git a/patches/server/0150-Allow-specifying-a-custom-authentication-servers-dow.patch b/patches/server/0149-Allow-specifying-a-custom-authentication-servers-dow.patch similarity index 100% rename from patches/server/0150-Allow-specifying-a-custom-authentication-servers-dow.patch rename to patches/server/0149-Allow-specifying-a-custom-authentication-servers-dow.patch diff --git a/patches/server/0151-Add-PlayerJumpEvent.patch b/patches/server/0150-Add-PlayerJumpEvent.patch similarity index 100% rename from patches/server/0151-Add-PlayerJumpEvent.patch rename to patches/server/0150-Add-PlayerJumpEvent.patch diff --git a/patches/server/0152-handle-ServerboundKeepAlivePacket-async.patch b/patches/server/0151-handle-ServerboundKeepAlivePacket-async.patch similarity index 100% rename from patches/server/0152-handle-ServerboundKeepAlivePacket-async.patch rename to patches/server/0151-handle-ServerboundKeepAlivePacket-async.patch diff --git a/patches/server/0153-Expose-client-protocol-version-and-virtual-host.patch b/patches/server/0152-Expose-client-protocol-version-and-virtual-host.patch similarity index 100% rename from patches/server/0153-Expose-client-protocol-version-and-virtual-host.patch rename to patches/server/0152-Expose-client-protocol-version-and-virtual-host.patch diff --git a/patches/server/0154-revert-serverside-behavior-of-keepalives.patch b/patches/server/0153-revert-serverside-behavior-of-keepalives.patch similarity index 100% rename from patches/server/0154-revert-serverside-behavior-of-keepalives.patch rename to patches/server/0153-revert-serverside-behavior-of-keepalives.patch diff --git a/patches/server/0155-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/patches/server/0154-Send-attack-SoundEffects-only-to-players-who-can-see.patch similarity index 100% rename from patches/server/0155-Send-attack-SoundEffects-only-to-players-who-can-see.patch rename to patches/server/0154-Send-attack-SoundEffects-only-to-players-who-can-see.patch diff --git a/patches/server/0156-Add-PlayerArmorChangeEvent.patch b/patches/server/0155-Add-PlayerArmorChangeEvent.patch similarity index 100% rename from patches/server/0156-Add-PlayerArmorChangeEvent.patch rename to patches/server/0155-Add-PlayerArmorChangeEvent.patch diff --git a/patches/server/0157-Prevent-logins-from-being-processed-when-the-player-.patch b/patches/server/0156-Prevent-logins-from-being-processed-when-the-player-.patch similarity index 100% rename from patches/server/0157-Prevent-logins-from-being-processed-when-the-player-.patch rename to patches/server/0156-Prevent-logins-from-being-processed-when-the-player-.patch diff --git a/patches/server/0158-Fix-MC-117075-Block-entity-unload-lag-spike.patch b/patches/server/0157-Fix-MC-117075-Block-entity-unload-lag-spike.patch similarity index 100% rename from patches/server/0158-Fix-MC-117075-Block-entity-unload-lag-spike.patch rename to patches/server/0157-Fix-MC-117075-Block-entity-unload-lag-spike.patch diff --git a/patches/server/0159-use-CB-BlockState-implementations-for-captured-block.patch b/patches/server/0158-use-CB-BlockState-implementations-for-captured-block.patch similarity index 100% rename from patches/server/0159-use-CB-BlockState-implementations-for-captured-block.patch rename to patches/server/0158-use-CB-BlockState-implementations-for-captured-block.patch diff --git a/patches/server/0160-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/server/0159-API-to-get-a-BlockState-without-a-snapshot.patch similarity index 100% rename from patches/server/0160-API-to-get-a-BlockState-without-a-snapshot.patch rename to patches/server/0159-API-to-get-a-BlockState-without-a-snapshot.patch diff --git a/patches/server/0161-AsyncTabCompleteEvent.patch b/patches/server/0160-AsyncTabCompleteEvent.patch similarity index 99% rename from patches/server/0161-AsyncTabCompleteEvent.patch rename to patches/server/0160-AsyncTabCompleteEvent.patch index 2436de2911..e02cf2d105 100644 --- a/patches/server/0161-AsyncTabCompleteEvent.patch +++ b/patches/server/0160-AsyncTabCompleteEvent.patch @@ -80,7 +80,7 @@ index 414077a1fed2955bd64ac7091af1daeda2a92e2c..79d9a58c66382fd94ab5f6020285e341 this.server.getCommands().getDispatcher().getCompletionSuggestions(parseresults).thenAccept((suggestions) -> { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 2d1f92f75e83aacd39440d2619befdf6cd545af4..1dd440057cb1d8acce7bfaa7ab1814937a4c63af 100644 +index a2b62970a5f50d4465db96ba12d8690e72bef95f..35ec2e57ed0b5b7263862a45afbed4857537e412 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2297,7 +2297,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0162-PlayerPickupExperienceEvent.patch b/patches/server/0161-PlayerPickupExperienceEvent.patch similarity index 100% rename from patches/server/0162-PlayerPickupExperienceEvent.patch rename to patches/server/0161-PlayerPickupExperienceEvent.patch diff --git a/patches/server/0163-Ability-to-apply-mending-to-XP-API.patch b/patches/server/0162-Ability-to-apply-mending-to-XP-API.patch similarity index 100% rename from patches/server/0163-Ability-to-apply-mending-to-XP-API.patch rename to patches/server/0162-Ability-to-apply-mending-to-XP-API.patch diff --git a/patches/server/0164-PlayerNaturallySpawnCreaturesEvent.patch b/patches/server/0163-PlayerNaturallySpawnCreaturesEvent.patch similarity index 100% rename from patches/server/0164-PlayerNaturallySpawnCreaturesEvent.patch rename to patches/server/0163-PlayerNaturallySpawnCreaturesEvent.patch diff --git a/patches/server/0165-Add-setPlayerProfile-API-for-Skulls.patch b/patches/server/0164-Add-setPlayerProfile-API-for-Skulls.patch similarity index 100% rename from patches/server/0165-Add-setPlayerProfile-API-for-Skulls.patch rename to patches/server/0164-Add-setPlayerProfile-API-for-Skulls.patch diff --git a/patches/server/0166-PreCreatureSpawnEvent.patch b/patches/server/0165-PreCreatureSpawnEvent.patch similarity index 100% rename from patches/server/0166-PreCreatureSpawnEvent.patch rename to patches/server/0165-PreCreatureSpawnEvent.patch diff --git a/patches/server/0167-Fill-Profile-Property-Events.patch b/patches/server/0166-Fill-Profile-Property-Events.patch similarity index 100% rename from patches/server/0167-Fill-Profile-Property-Events.patch rename to patches/server/0166-Fill-Profile-Property-Events.patch diff --git a/patches/server/0168-Add-PlayerAdvancementCriterionGrantEvent.patch b/patches/server/0167-Add-PlayerAdvancementCriterionGrantEvent.patch similarity index 100% rename from patches/server/0168-Add-PlayerAdvancementCriterionGrantEvent.patch rename to patches/server/0167-Add-PlayerAdvancementCriterionGrantEvent.patch diff --git a/patches/server/0169-Add-ArmorStand-Item-Meta.patch b/patches/server/0168-Add-ArmorStand-Item-Meta.patch similarity index 99% rename from patches/server/0169-Add-ArmorStand-Item-Meta.patch rename to patches/server/0168-Add-ArmorStand-Item-Meta.patch index 7e6ae430c9..9c2b77fa50 100644 --- a/patches/server/0169-Add-ArmorStand-Item-Meta.patch +++ b/patches/server/0168-Add-ArmorStand-Item-Meta.patch @@ -225,7 +225,7 @@ index c4f12f96e39cb6189799a796b4cb2cb4f0b92392..ecce5d0da946ca279c5608068442cc53 + // Paper end } diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java -index 46025e3ffdc21f14403186094f893dff6316ba5e..50faaaa48dffcaf53823caed1e3f7263cd5c441f 100644 +index debab9859e89a87adc74ced592501ad06c236031..6cc54035af870b75f45d836e5b60f5d9240dd7d0 100644 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java +++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java @@ -365,6 +365,7 @@ public class ItemMetaTest { diff --git a/patches/server/0170-Extend-Player-Interact-cancellation.patch b/patches/server/0169-Extend-Player-Interact-cancellation.patch similarity index 100% rename from patches/server/0170-Extend-Player-Interact-cancellation.patch rename to patches/server/0169-Extend-Player-Interact-cancellation.patch diff --git a/patches/server/0171-Tameable-getOwnerUniqueId-API.patch b/patches/server/0170-Tameable-getOwnerUniqueId-API.patch similarity index 100% rename from patches/server/0171-Tameable-getOwnerUniqueId-API.patch rename to patches/server/0170-Tameable-getOwnerUniqueId-API.patch diff --git a/patches/server/0172-Toggleable-player-crits.patch b/patches/server/0171-Toggleable-player-crits.patch similarity index 100% rename from patches/server/0172-Toggleable-player-crits.patch rename to patches/server/0171-Toggleable-player-crits.patch diff --git a/patches/server/0173-Disable-Explicit-Network-Manager-Flushing.patch b/patches/server/0172-Disable-Explicit-Network-Manager-Flushing.patch similarity index 100% rename from patches/server/0173-Disable-Explicit-Network-Manager-Flushing.patch rename to patches/server/0172-Disable-Explicit-Network-Manager-Flushing.patch diff --git a/patches/server/0174-Implement-extended-PaperServerListPingEvent.patch b/patches/server/0173-Implement-extended-PaperServerListPingEvent.patch similarity index 100% rename from patches/server/0174-Implement-extended-PaperServerListPingEvent.patch rename to patches/server/0173-Implement-extended-PaperServerListPingEvent.patch diff --git a/patches/server/0175-Add-more-fields-to-AsyncPreLoginEvent.patch b/patches/server/0174-Add-more-fields-to-AsyncPreLoginEvent.patch similarity index 100% rename from patches/server/0175-Add-more-fields-to-AsyncPreLoginEvent.patch rename to patches/server/0174-Add-more-fields-to-AsyncPreLoginEvent.patch diff --git a/patches/server/0176-Player.setPlayerProfile-API.patch b/patches/server/0175-Player.setPlayerProfile-API.patch similarity index 99% rename from patches/server/0176-Player.setPlayerProfile-API.patch rename to patches/server/0175-Player.setPlayerProfile-API.patch index fd09301185..155a82385a 100644 --- a/patches/server/0176-Player.setPlayerProfile-API.patch +++ b/patches/server/0175-Player.setPlayerProfile-API.patch @@ -27,7 +27,7 @@ index 4a62c1abc6f3c48bbda40325b4ce46632db3f28d..bab8c53041afb9606db55923e5466eab playerName = gameprofile.getName(); uniqueId = gameprofile.getId(); diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 5cb84271abdabc0f2d44ad9425828431f8818a47..a929c809dc1dcb2bdab4db0d2a8ca794189e93d9 100644 +index f4e08c6b20ba64402b8587bde3e01eedcc9c2568..ac5607fb1ac771f16b14d71e08a8d4183a39a002 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -799,10 +799,16 @@ public abstract class PlayerList { diff --git a/patches/server/0177-getPlayerUniqueId-API.patch b/patches/server/0176-getPlayerUniqueId-API.patch similarity index 94% rename from patches/server/0177-getPlayerUniqueId-API.patch rename to patches/server/0176-getPlayerUniqueId-API.patch index c4f1f1285d..5214138b6e 100644 --- a/patches/server/0177-getPlayerUniqueId-API.patch +++ b/patches/server/0176-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 1dd440057cb1d8acce7bfaa7ab1814937a4c63af..6bb1d3f3548c382379323059457844978438f802 100644 +index 35ec2e57ed0b5b7263862a45afbed4857537e412..64742de1ec4611809a11f685536f4aaa71201ea2 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1891,6 +1891,25 @@ public final class CraftServer implements Server { diff --git a/patches/server/0178-Improved-Async-Task-Scheduler.patch b/patches/server/0177-Improved-Async-Task-Scheduler.patch similarity index 100% rename from patches/server/0178-Improved-Async-Task-Scheduler.patch rename to patches/server/0177-Improved-Async-Task-Scheduler.patch diff --git a/patches/server/0179-Make-legacy-ping-handler-more-reliable.patch b/patches/server/0178-Make-legacy-ping-handler-more-reliable.patch similarity index 100% rename from patches/server/0179-Make-legacy-ping-handler-more-reliable.patch rename to patches/server/0178-Make-legacy-ping-handler-more-reliable.patch diff --git a/patches/server/0180-Call-PaperServerListPingEvent-for-legacy-pings.patch b/patches/server/0179-Call-PaperServerListPingEvent-for-legacy-pings.patch similarity index 100% rename from patches/server/0180-Call-PaperServerListPingEvent-for-legacy-pings.patch rename to patches/server/0179-Call-PaperServerListPingEvent-for-legacy-pings.patch diff --git a/patches/server/0181-Flag-to-disable-the-channel-limit.patch b/patches/server/0180-Flag-to-disable-the-channel-limit.patch similarity index 100% rename from patches/server/0181-Flag-to-disable-the-channel-limit.patch rename to patches/server/0180-Flag-to-disable-the-channel-limit.patch diff --git a/patches/server/0182-Add-openSign-method-to-HumanEntity.patch b/patches/server/0181-Add-openSign-method-to-HumanEntity.patch similarity index 100% rename from patches/server/0182-Add-openSign-method-to-HumanEntity.patch rename to patches/server/0181-Add-openSign-method-to-HumanEntity.patch diff --git a/patches/server/0183-Configurable-sprint-interruption-on-attack.patch b/patches/server/0182-Configurable-sprint-interruption-on-attack.patch similarity index 100% rename from patches/server/0183-Configurable-sprint-interruption-on-attack.patch rename to patches/server/0182-Configurable-sprint-interruption-on-attack.patch diff --git a/patches/server/0184-EndermanEscapeEvent.patch b/patches/server/0183-EndermanEscapeEvent.patch similarity index 100% rename from patches/server/0184-EndermanEscapeEvent.patch rename to patches/server/0183-EndermanEscapeEvent.patch diff --git a/patches/server/0185-Enderman.teleportRandomly.patch b/patches/server/0184-Enderman.teleportRandomly.patch similarity index 100% rename from patches/server/0185-Enderman.teleportRandomly.patch rename to patches/server/0184-Enderman.teleportRandomly.patch diff --git a/patches/server/0186-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/server/0185-Expand-World.spawnParticle-API-and-add-Builder.patch similarity index 100% rename from patches/server/0186-Expand-World.spawnParticle-API-and-add-Builder.patch rename to patches/server/0185-Expand-World.spawnParticle-API-and-add-Builder.patch diff --git a/patches/server/0187-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/server/0186-Fix-exploit-that-allowed-colored-signs-to-be-created.patch similarity index 100% rename from patches/server/0187-Fix-exploit-that-allowed-colored-signs-to-be-created.patch rename to patches/server/0186-Fix-exploit-that-allowed-colored-signs-to-be-created.patch diff --git a/patches/server/0188-EndermanAttackPlayerEvent.patch b/patches/server/0187-EndermanAttackPlayerEvent.patch similarity index 100% rename from patches/server/0188-EndermanAttackPlayerEvent.patch rename to patches/server/0187-EndermanAttackPlayerEvent.patch diff --git a/patches/server/0189-WitchConsumePotionEvent.patch b/patches/server/0188-WitchConsumePotionEvent.patch similarity index 100% rename from patches/server/0189-WitchConsumePotionEvent.patch rename to patches/server/0188-WitchConsumePotionEvent.patch diff --git a/patches/server/0190-WitchThrowPotionEvent.patch b/patches/server/0189-WitchThrowPotionEvent.patch similarity index 100% rename from patches/server/0190-WitchThrowPotionEvent.patch rename to patches/server/0189-WitchThrowPotionEvent.patch diff --git a/patches/server/0191-WitchReadyPotionEvent.patch b/patches/server/0190-WitchReadyPotionEvent.patch similarity index 100% rename from patches/server/0191-WitchReadyPotionEvent.patch rename to patches/server/0190-WitchReadyPotionEvent.patch diff --git a/patches/server/0192-ItemStack-getMaxItemUseDuration.patch b/patches/server/0191-ItemStack-getMaxItemUseDuration.patch similarity index 100% rename from patches/server/0192-ItemStack-getMaxItemUseDuration.patch rename to patches/server/0191-ItemStack-getMaxItemUseDuration.patch diff --git a/patches/server/0193-Add-EntityTeleportEndGatewayEvent.patch b/patches/server/0192-Add-EntityTeleportEndGatewayEvent.patch similarity index 95% rename from patches/server/0193-Add-EntityTeleportEndGatewayEvent.patch rename to patches/server/0192-Add-EntityTeleportEndGatewayEvent.patch index 48430a9c1c..6431091971 100644 --- a/patches/server/0193-Add-EntityTeleportEndGatewayEvent.patch +++ b/patches/server/0192-Add-EntityTeleportEndGatewayEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add EntityTeleportEndGatewayEvent diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index aa70b6437cabdd875cec446db4bcf2422ab2cbc6..46cb5722be10182af7af41f733405ab5fe137576 100644 +index c22b1ef0751d244310dee880565eef83bdb61114..7001d4f1da527ed3cfd548eebccfcdc284b6a2ee 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3430,8 +3430,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0194-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/patches/server/0193-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch similarity index 100% rename from patches/server/0194-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch rename to patches/server/0193-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch diff --git a/patches/server/0195-Improve-CraftEntity-and-CraftPlayer-equals-and-hashC.patch b/patches/server/0194-Improve-CraftEntity-and-CraftPlayer-equals-and-hashC.patch similarity index 100% rename from patches/server/0195-Improve-CraftEntity-and-CraftPlayer-equals-and-hashC.patch rename to patches/server/0194-Improve-CraftEntity-and-CraftPlayer-equals-and-hashC.patch diff --git a/patches/server/0196-Configurable-LootPool-luck-formula.patch b/patches/server/0195-Configurable-LootPool-luck-formula.patch similarity index 100% rename from patches/server/0196-Configurable-LootPool-luck-formula.patch rename to patches/server/0195-Configurable-LootPool-luck-formula.patch diff --git a/patches/server/0197-Print-Error-details-when-failing-to-save-player-data.patch b/patches/server/0196-Print-Error-details-when-failing-to-save-player-data.patch similarity index 100% rename from patches/server/0197-Print-Error-details-when-failing-to-save-player-data.patch rename to patches/server/0196-Print-Error-details-when-failing-to-save-player-data.patch diff --git a/patches/server/0198-Make-shield-blocking-delay-configurable.patch b/patches/server/0197-Make-shield-blocking-delay-configurable.patch similarity index 96% rename from patches/server/0198-Make-shield-blocking-delay-configurable.patch rename to patches/server/0197-Make-shield-blocking-delay-configurable.patch index e1dfd5efbf..87567dd988 100644 --- a/patches/server/0198-Make-shield-blocking-delay-configurable.patch +++ b/patches/server/0197-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 08322f6147b78d140a2e0d6c3189ee95270c3c71..9e21f77689eb246ad72cdbd7ee19211dcb2ed738 100644 +index a03583daf6cac850c154e0e89dc3fa00a844903f..349aa25d6e52190534ea68a31b6e2ae29a689944 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -4102,12 +4102,24 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0199-Improve-EntityShootBowEvent.patch b/patches/server/0198-Improve-EntityShootBowEvent.patch similarity index 100% rename from patches/server/0199-Improve-EntityShootBowEvent.patch rename to patches/server/0198-Improve-EntityShootBowEvent.patch diff --git a/patches/server/0200-PlayerReadyArrowEvent.patch b/patches/server/0199-PlayerReadyArrowEvent.patch similarity index 100% rename from patches/server/0200-PlayerReadyArrowEvent.patch rename to patches/server/0199-PlayerReadyArrowEvent.patch diff --git a/patches/server/0201-Add-entity-knockback-events.patch b/patches/server/0200-Add-entity-knockback-events.patch similarity index 99% rename from patches/server/0201-Add-entity-knockback-events.patch rename to patches/server/0200-Add-entity-knockback-events.patch index 3e29b55d3e..d13ddac4e7 100644 --- a/patches/server/0201-Add-entity-knockback-events.patch +++ b/patches/server/0200-Add-entity-knockback-events.patch @@ -11,7 +11,7 @@ Co-authored-by: aerulion Co-authored-by: Jake Potrebic diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 46cb5722be10182af7af41f733405ab5fe137576..ab7740d1753cd8540189c77053e5ca1f71c1b024 100644 +index 7001d4f1da527ed3cfd548eebccfcdc284b6a2ee..9f503da8895e85991f3d5e8f62c7aa065c61c93c 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2051,7 +2051,21 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -38,7 +38,7 @@ index 46cb5722be10182af7af41f733405ab5fe137576..ab7740d1753cd8540189c77053e5ca1f } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 9e21f77689eb246ad72cdbd7ee19211dcb2ed738..61124dfec84792fa23ce1b0f03cbd97b1a6bde5b 100644 +index 349aa25d6e52190534ea68a31b6e2ae29a689944..6b599427c2d61d4475af0f5af8294308940cf0c9 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1563,7 +1563,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0202-Expand-Explosions-API.patch b/patches/server/0201-Expand-Explosions-API.patch similarity index 100% rename from patches/server/0202-Expand-Explosions-API.patch rename to patches/server/0201-Expand-Explosions-API.patch diff --git a/patches/server/0203-LivingEntity-Active-Item-API.patch b/patches/server/0202-LivingEntity-Active-Item-API.patch similarity index 100% rename from patches/server/0203-LivingEntity-Active-Item-API.patch rename to patches/server/0202-LivingEntity-Active-Item-API.patch diff --git a/patches/server/0204-RangedEntity-API.patch b/patches/server/0203-RangedEntity-API.patch similarity index 100% rename from patches/server/0204-RangedEntity-API.patch rename to patches/server/0203-RangedEntity-API.patch diff --git a/patches/server/0205-Add-config-to-disable-ender-dragon-legacy-check.patch b/patches/server/0204-Add-config-to-disable-ender-dragon-legacy-check.patch similarity index 100% rename from patches/server/0205-Add-config-to-disable-ender-dragon-legacy-check.patch rename to patches/server/0204-Add-config-to-disable-ender-dragon-legacy-check.patch diff --git a/patches/server/0206-Implement-World.getEntity-UUID-API.patch b/patches/server/0205-Implement-World.getEntity-UUID-API.patch similarity index 91% rename from patches/server/0206-Implement-World.getEntity-UUID-API.patch rename to patches/server/0205-Implement-World.getEntity-UUID-API.patch index 7ed2037b31..ad1944ffb4 100644 --- a/patches/server/0206-Implement-World.getEntity-UUID-API.patch +++ b/patches/server/0205-Implement-World.getEntity-UUID-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Implement World.getEntity(UUID) API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index a4f140fefaac7e74b6c9834e6b532f20e80b9ab9..0f8a5ad8853052c51989570df10a75bb5b3a1f68 100644 +index 195e698eadc7ce916b4bcfe04849501ee4a39aad..5cc7cb42bd6c456ca0f3d62666083c9fd0516ffa 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1129,6 +1129,15 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0207-InventoryCloseEvent-Reason-API.patch b/patches/server/0206-InventoryCloseEvent-Reason-API.patch similarity index 99% rename from patches/server/0207-InventoryCloseEvent-Reason-API.patch rename to patches/server/0206-InventoryCloseEvent-Reason-API.patch index 5432df8ae8..5307753ead 100644 --- a/patches/server/0207-InventoryCloseEvent-Reason-API.patch +++ b/patches/server/0206-InventoryCloseEvent-Reason-API.patch @@ -29,7 +29,7 @@ index f0fc08bcc2988277b6a5e3107e6fc5c89bb67b93..e03032b96e8f44ef83f52dcf3dc5a885 } // Spigot End diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index cded42f7af776d2596db9b33fabef91ea9b3b64e..075437bbca3ec82cf1a1cbf66f1af6966f519211 100644 +index 8fd3802d8e293e35478666bd4e921d58e1ce5b41..8a3b570034d2ec7916b80b89186c0664e7bc73dd 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -933,7 +933,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0208-Vex-get-setSummoner-API.patch b/patches/server/0207-Vex-get-setSummoner-API.patch similarity index 100% rename from patches/server/0208-Vex-get-setSummoner-API.patch rename to patches/server/0207-Vex-get-setSummoner-API.patch diff --git a/patches/server/0209-add-more-information-to-Entity.toString.patch b/patches/server/0208-add-more-information-to-Entity.toString.patch similarity index 95% rename from patches/server/0209-add-more-information-to-Entity.toString.patch rename to patches/server/0208-add-more-information-to-Entity.toString.patch index ec05b0c235..8541967ffd 100644 --- a/patches/server/0209-add-more-information-to-Entity.toString.patch +++ b/patches/server/0208-add-more-information-to-Entity.toString.patch @@ -6,7 +6,7 @@ Subject: [PATCH] add more information to Entity.toString() UUID, ticks lived, valid, dead diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index ab7740d1753cd8540189c77053e5ca1f71c1b024..659ed49cebb8ed2a6e1c88fb1e4d95f0520820d4 100644 +index 9f503da8895e85991f3d5e8f62c7aa065c61c93c..e67d8da5be50e07cb0473b7bfe6d381da044155a 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3407,7 +3407,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0210-EnderDragon-Events.patch b/patches/server/0209-EnderDragon-Events.patch similarity index 100% rename from patches/server/0210-EnderDragon-Events.patch rename to patches/server/0209-EnderDragon-Events.patch diff --git a/patches/server/0211-PlayerElytraBoostEvent.patch b/patches/server/0210-PlayerElytraBoostEvent.patch similarity index 100% rename from patches/server/0211-PlayerElytraBoostEvent.patch rename to patches/server/0210-PlayerElytraBoostEvent.patch diff --git a/patches/server/0212-PlayerLaunchProjectileEvent.patch b/patches/server/0211-PlayerLaunchProjectileEvent.patch similarity index 100% rename from patches/server/0212-PlayerLaunchProjectileEvent.patch rename to patches/server/0211-PlayerLaunchProjectileEvent.patch diff --git a/patches/server/0213-Improve-BlockPosition-inlining.patch b/patches/server/0212-Improve-BlockPosition-inlining.patch similarity index 100% rename from patches/server/0213-Improve-BlockPosition-inlining.patch rename to patches/server/0212-Improve-BlockPosition-inlining.patch diff --git a/patches/server/0214-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/server/0213-Option-to-prevent-armor-stands-from-doing-entity-loo.patch similarity index 100% rename from patches/server/0214-Option-to-prevent-armor-stands-from-doing-entity-loo.patch rename to patches/server/0213-Option-to-prevent-armor-stands-from-doing-entity-loo.patch diff --git a/patches/server/0215-Vanished-players-don-t-have-rights.patch b/patches/server/0214-Vanished-players-don-t-have-rights.patch similarity index 100% rename from patches/server/0215-Vanished-players-don-t-have-rights.patch rename to patches/server/0214-Vanished-players-don-t-have-rights.patch diff --git a/patches/server/0216-Allow-disabling-armor-stand-ticking.patch b/patches/server/0215-Allow-disabling-armor-stand-ticking.patch similarity index 100% rename from patches/server/0216-Allow-disabling-armor-stand-ticking.patch rename to patches/server/0215-Allow-disabling-armor-stand-ticking.patch diff --git a/patches/server/0217-SkeletonHorse-Additions.patch b/patches/server/0216-SkeletonHorse-Additions.patch similarity index 100% rename from patches/server/0217-SkeletonHorse-Additions.patch rename to patches/server/0216-SkeletonHorse-Additions.patch diff --git a/patches/server/0218-Expand-ArmorStand-API.patch b/patches/server/0217-Expand-ArmorStand-API.patch similarity index 100% rename from patches/server/0218-Expand-ArmorStand-API.patch rename to patches/server/0217-Expand-ArmorStand-API.patch diff --git a/patches/server/0219-AnvilDamageEvent.patch b/patches/server/0218-AnvilDamageEvent.patch similarity index 94% rename from patches/server/0219-AnvilDamageEvent.patch rename to patches/server/0218-AnvilDamageEvent.patch index 8e5891eb7c..2364b6084c 100644 --- a/patches/server/0219-AnvilDamageEvent.patch +++ b/patches/server/0218-AnvilDamageEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] AnvilDamageEvent diff --git a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java -index ab59f5cdd5ce76a0408f4b6ce907e7be103d7950..126565e673e94b9c66aa4547596bbf198c57c7ad 100644 +index 14e1b077f9de9ad616db6714a6268e6ffff28343..dff005cc860fc5ff0759d6e35502deebd00943ed 100644 --- a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java +++ b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java @@ -111,6 +111,16 @@ public class AnvilMenu extends ItemCombinerMenu { diff --git a/patches/server/0220-Add-TNTPrimeEvent.patch b/patches/server/0219-Add-TNTPrimeEvent.patch similarity index 100% rename from patches/server/0220-Add-TNTPrimeEvent.patch rename to patches/server/0219-Add-TNTPrimeEvent.patch diff --git a/patches/server/0221-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/server/0220-Break-up-and-make-tab-spam-limits-configurable.patch similarity index 100% rename from patches/server/0221-Break-up-and-make-tab-spam-limits-configurable.patch rename to patches/server/0220-Break-up-and-make-tab-spam-limits-configurable.patch diff --git a/patches/server/0222-Fix-NBT-type-issues.patch b/patches/server/0221-Fix-NBT-type-issues.patch similarity index 100% rename from patches/server/0222-Fix-NBT-type-issues.patch rename to patches/server/0221-Fix-NBT-type-issues.patch diff --git a/patches/server/0223-Remove-unnecessary-itemmeta-handling.patch b/patches/server/0222-Remove-unnecessary-itemmeta-handling.patch similarity index 100% rename from patches/server/0223-Remove-unnecessary-itemmeta-handling.patch rename to patches/server/0222-Remove-unnecessary-itemmeta-handling.patch diff --git a/patches/server/0224-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/server/0223-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch similarity index 100% rename from patches/server/0224-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch rename to patches/server/0223-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch diff --git a/patches/server/0225-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/server/0224-Add-Early-Warning-Feature-to-WatchDog.patch similarity index 99% rename from patches/server/0225-Add-Early-Warning-Feature-to-WatchDog.patch rename to patches/server/0224-Add-Early-Warning-Feature-to-WatchDog.patch index bb4db1eb5d..5b529f749d 100644 --- a/patches/server/0225-Add-Early-Warning-Feature-to-WatchDog.patch +++ b/patches/server/0224-Add-Early-Warning-Feature-to-WatchDog.patch @@ -33,7 +33,7 @@ index 7c2b2dbc03bf4c3308a3e2a34260fee56d646488..5080c8296112aa093ca5450cad1d54c4 com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - 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 6bb1d3f3548c382379323059457844978438f802..6d08b753c04a78e4ec07eaf8ff6c3b9daaf91f64 100644 +index 64742de1ec4611809a11f685536f4aaa71201ea2..65856f97a5e6f2cbfec94585d65ec5ae27004f37 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -965,6 +965,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0226-Use-ConcurrentHashMap-in-JsonList.patch b/patches/server/0225-Use-ConcurrentHashMap-in-JsonList.patch similarity index 98% rename from patches/server/0226-Use-ConcurrentHashMap-in-JsonList.patch rename to patches/server/0225-Use-ConcurrentHashMap-in-JsonList.patch index 657e75580e..75fd866138 100644 --- a/patches/server/0226-Use-ConcurrentHashMap-in-JsonList.patch +++ b/patches/server/0225-Use-ConcurrentHashMap-in-JsonList.patch @@ -23,7 +23,7 @@ Modified isEmpty to use the isEmpty() method instead of the slightly confusing s The point of this is readability, but does have a side-benefit of a small microptimization diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index c9c3ebcb7239bf01617a89f03cd0ad12dd0b2c34..f2c7fba1f474618eb68a804d2dc7fc8d70c8ff6f 100644 +index 06338f5fa552a390db05a90b5cc796a70104ada0..8bb2749f751839f7dfd8fb62f676bd54ec8b1b09 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -593,7 +593,7 @@ public abstract class PlayerList { diff --git a/patches/server/0227-Use-a-Queue-for-Queueing-Commands.patch b/patches/server/0226-Use-a-Queue-for-Queueing-Commands.patch similarity index 100% rename from patches/server/0227-Use-a-Queue-for-Queueing-Commands.patch rename to patches/server/0226-Use-a-Queue-for-Queueing-Commands.patch diff --git a/patches/server/0228-Ability-to-get-block-entities-from-a-chunk-without-s.patch b/patches/server/0227-Ability-to-get-block-entities-from-a-chunk-without-s.patch similarity index 100% rename from patches/server/0228-Ability-to-get-block-entities-from-a-chunk-without-s.patch rename to patches/server/0227-Ability-to-get-block-entities-from-a-chunk-without-s.patch diff --git a/patches/server/0229-Optimize-BlockPosition-helper-methods.patch b/patches/server/0228-Optimize-BlockPosition-helper-methods.patch similarity index 100% rename from patches/server/0229-Optimize-BlockPosition-helper-methods.patch rename to patches/server/0228-Optimize-BlockPosition-helper-methods.patch diff --git a/patches/server/0230-Restore-vanilla-default-mob-spawn-range-and-water-an.patch b/patches/server/0229-Restore-vanilla-default-mob-spawn-range-and-water-an.patch similarity index 100% rename from patches/server/0230-Restore-vanilla-default-mob-spawn-range-and-water-an.patch rename to patches/server/0229-Restore-vanilla-default-mob-spawn-range-and-water-an.patch diff --git a/patches/server/0231-Slime-Pathfinder-Events.patch b/patches/server/0230-Slime-Pathfinder-Events.patch similarity index 100% rename from patches/server/0231-Slime-Pathfinder-Events.patch rename to patches/server/0230-Slime-Pathfinder-Events.patch diff --git a/patches/server/0232-Configurable-speed-for-water-flowing-over-lava.patch b/patches/server/0231-Configurable-speed-for-water-flowing-over-lava.patch similarity index 100% rename from patches/server/0232-Configurable-speed-for-water-flowing-over-lava.patch rename to patches/server/0231-Configurable-speed-for-water-flowing-over-lava.patch diff --git a/patches/server/0233-Optimize-CraftBlockData-Creation.patch b/patches/server/0232-Optimize-CraftBlockData-Creation.patch similarity index 100% rename from patches/server/0233-Optimize-CraftBlockData-Creation.patch rename to patches/server/0232-Optimize-CraftBlockData-Creation.patch diff --git a/patches/server/0234-Optimize-MappedRegistry.patch b/patches/server/0233-Optimize-MappedRegistry.patch similarity index 100% rename from patches/server/0234-Optimize-MappedRegistry.patch rename to patches/server/0233-Optimize-MappedRegistry.patch diff --git a/patches/server/0235-Add-PhantomPreSpawnEvent.patch b/patches/server/0234-Add-PhantomPreSpawnEvent.patch similarity index 100% rename from patches/server/0235-Add-PhantomPreSpawnEvent.patch rename to patches/server/0234-Add-PhantomPreSpawnEvent.patch diff --git a/patches/server/0236-Add-More-Creeper-API.patch b/patches/server/0235-Add-More-Creeper-API.patch similarity index 100% rename from patches/server/0236-Add-More-Creeper-API.patch rename to patches/server/0235-Add-More-Creeper-API.patch diff --git a/patches/server/0237-Inventory-removeItemAnySlot.patch b/patches/server/0236-Inventory-removeItemAnySlot.patch similarity index 100% rename from patches/server/0237-Inventory-removeItemAnySlot.patch rename to patches/server/0236-Inventory-removeItemAnySlot.patch diff --git a/patches/server/0238-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/patches/server/0237-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch similarity index 92% rename from patches/server/0238-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch rename to patches/server/0237-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch index ab27482cc1..658a8370ad 100644 --- a/patches/server/0238-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch +++ b/patches/server/0237-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 0f8a5ad8853052c51989570df10a75bb5b3a1f68..58bece6427afd9e0341e2cf065adc0b04cd8a0e2 100644 +index 5cc7cb42bd6c456ca0f3d62666083c9fd0516ffa..c3874468dc5bcdbe08e473760b028223b3ed8bb1 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -430,7 +430,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0239-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/server/0238-Add-ray-tracing-methods-to-LivingEntity.patch similarity index 97% rename from patches/server/0239-Add-ray-tracing-methods-to-LivingEntity.patch rename to patches/server/0238-Add-ray-tracing-methods-to-LivingEntity.patch index e9b2e45d29..c5fccadff5 100644 --- a/patches/server/0239-Add-ray-tracing-methods-to-LivingEntity.patch +++ b/patches/server/0238-Add-ray-tracing-methods-to-LivingEntity.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add ray tracing methods to LivingEntity diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 61124dfec84792fa23ce1b0f03cbd97b1a6bde5b..30343efb680edf3dc355498b04c5db9ebecbf270 100644 +index 6b599427c2d61d4475af0f5af8294308940cf0c9..6a46d57d4941b1abbac4c2609272feb3fb8e45e6 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -4113,6 +4113,19 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0240-Expose-attack-cooldown-methods-for-Player.patch b/patches/server/0239-Expose-attack-cooldown-methods-for-Player.patch similarity index 92% rename from patches/server/0240-Expose-attack-cooldown-methods-for-Player.patch rename to patches/server/0239-Expose-attack-cooldown-methods-for-Player.patch index 93104eea2c..b4bdf91b2a 100644 --- a/patches/server/0240-Expose-attack-cooldown-methods-for-Player.patch +++ b/patches/server/0239-Expose-attack-cooldown-methods-for-Player.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Expose attack cooldown methods for Player diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 01d257d1fe33b3d38e155b69436173a8a3c828e2..ca3e3aa01ee5f1b926478817636e6b94bf3176fd 100644 +index b8a453e3e54a205d703bb1f4602686606c0f0f4d..549bc20645706faa65f6307d295cb028f53b2607 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2995,6 +2995,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0241-Improve-death-events.patch b/patches/server/0240-Improve-death-events.patch similarity index 98% rename from patches/server/0241-Improve-death-events.patch rename to patches/server/0240-Improve-death-events.patch index a1b7400225..9060d69916 100644 --- a/patches/server/0241-Improve-death-events.patch +++ b/patches/server/0240-Improve-death-events.patch @@ -19,7 +19,7 @@ public net.minecraft.world.entity.LivingEntity getDeathSound()Lnet/minecraft/sou public net.minecraft.world.entity.LivingEntity getSoundVolume()F diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 29b836a75b835f0d5233db419fc5ca8dde885fdb..2bd97344502a63173de923542f27759d7e98b6cc 100644 +index 8a3b570034d2ec7916b80b89186c0664e7bc73dd..ca32fad1fbb5eeb0b6fb8c74f645277e92f63c33 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -296,6 +296,10 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { @@ -79,7 +79,7 @@ index 29b836a75b835f0d5233db419fc5ca8dde885fdb..2bd97344502a63173de923542f27759d } } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 30343efb680edf3dc355498b04c5db9ebecbf270..781568c0aef7556fd4422574d31c0ad790f0afa7 100644 +index 6a46d57d4941b1abbac4c2609272feb3fb8e45e6..d1a65777767f503275d41ed48db887eedafe6324 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -295,6 +295,7 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -420,7 +420,7 @@ index 2caba38a50b7ea535337a3540aa5272d4a9f1878..e20565cf256aacd012a1722c5ebbf901 // CraftBukkit end this.gameEvent(GameEvent.ENTITY_DIE); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index ca3e3aa01ee5f1b926478817636e6b94bf3176fd..66446d549444316ca89051a0da99583dc4ef80fe 100644 +index 549bc20645706faa65f6307d295cb028f53b2607..c74b3abba82679594d9f3966979771c16e5f98f3 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2532,7 +2532,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0242-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/server/0241-Allow-chests-to-be-placed-with-NBT-data.patch similarity index 100% rename from patches/server/0242-Allow-chests-to-be-placed-with-NBT-data.patch rename to patches/server/0241-Allow-chests-to-be-placed-with-NBT-data.patch diff --git a/patches/server/0243-Mob-Pathfinding-API.patch b/patches/server/0242-Mob-Pathfinding-API.patch similarity index 100% rename from patches/server/0243-Mob-Pathfinding-API.patch rename to patches/server/0242-Mob-Pathfinding-API.patch diff --git a/patches/server/0244-Prevent-various-interactions-from-causing-chunk-load.patch b/patches/server/0243-Prevent-various-interactions-from-causing-chunk-load.patch similarity index 100% rename from patches/server/0244-Prevent-various-interactions-from-causing-chunk-load.patch rename to patches/server/0243-Prevent-various-interactions-from-causing-chunk-load.patch diff --git a/patches/server/0245-Prevent-mob-spawning-from-loading-generating-chunks.patch b/patches/server/0244-Prevent-mob-spawning-from-loading-generating-chunks.patch similarity index 100% rename from patches/server/0245-Prevent-mob-spawning-from-loading-generating-chunks.patch rename to patches/server/0244-Prevent-mob-spawning-from-loading-generating-chunks.patch diff --git a/patches/server/0246-Implement-furnace-cook-speed-multiplier-API.patch b/patches/server/0245-Implement-furnace-cook-speed-multiplier-API.patch similarity index 100% rename from patches/server/0246-Implement-furnace-cook-speed-multiplier-API.patch rename to patches/server/0245-Implement-furnace-cook-speed-multiplier-API.patch diff --git a/patches/server/0247-Honor-EntityAgeable.ageLock.patch b/patches/server/0246-Honor-EntityAgeable.ageLock.patch similarity index 100% rename from patches/server/0247-Honor-EntityAgeable.ageLock.patch rename to patches/server/0246-Honor-EntityAgeable.ageLock.patch diff --git a/patches/server/0248-Configurable-connection-throttle-kick-message.patch b/patches/server/0247-Configurable-connection-throttle-kick-message.patch similarity index 100% rename from patches/server/0248-Configurable-connection-throttle-kick-message.patch rename to patches/server/0247-Configurable-connection-throttle-kick-message.patch diff --git a/patches/server/0249-Prevent-chunk-loading-from-Fluid-Flowing.patch b/patches/server/0248-Prevent-chunk-loading-from-Fluid-Flowing.patch similarity index 100% rename from patches/server/0249-Prevent-chunk-loading-from-Fluid-Flowing.patch rename to patches/server/0248-Prevent-chunk-loading-from-Fluid-Flowing.patch diff --git a/patches/server/0250-PreSpawnerSpawnEvent.patch b/patches/server/0249-PreSpawnerSpawnEvent.patch similarity index 100% rename from patches/server/0250-PreSpawnerSpawnEvent.patch rename to patches/server/0249-PreSpawnerSpawnEvent.patch diff --git a/patches/server/0251-Add-LivingEntity-getTargetEntity.patch b/patches/server/0250-Add-LivingEntity-getTargetEntity.patch similarity index 98% rename from patches/server/0251-Add-LivingEntity-getTargetEntity.patch rename to patches/server/0250-Add-LivingEntity-getTargetEntity.patch index de209ef73f..7a6786a2ee 100644 --- a/patches/server/0251-Add-LivingEntity-getTargetEntity.patch +++ b/patches/server/0250-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 781568c0aef7556fd4422574d31c0ad790f0afa7..8f6f73fd6f1fce3b78e472f454e0a34043a00125 100644 +index d1a65777767f503275d41ed48db887eedafe6324..7ba5e60eae4fc230c86956ed8ee895c9e1585d42 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -4177,6 +4177,38 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0252-Add-sun-related-API.patch b/patches/server/0251-Add-sun-related-API.patch similarity index 94% rename from patches/server/0252-Add-sun-related-API.patch rename to patches/server/0251-Add-sun-related-API.patch index 7d7d5d8da5..d8ad64f351 100644 --- a/patches/server/0252-Add-sun-related-API.patch +++ b/patches/server/0251-Add-sun-related-API.patch @@ -7,7 +7,7 @@ Subject: [PATCH] Add sun related API public net.minecraft.world.entity.Mob isSunBurnTick()Z diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 58bece6427afd9e0341e2cf065adc0b04cd8a0e2..e6a7359d120b2361669a407b92357ea1a6b9a2a8 100644 +index c3874468dc5bcdbe08e473760b028223b3ed8bb1..0e074cabe81a7135773c59dbdd5607247fa8bf16 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -754,6 +754,13 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0253-Turtle-API.patch b/patches/server/0252-Turtle-API.patch similarity index 100% rename from patches/server/0253-Turtle-API.patch rename to patches/server/0252-Turtle-API.patch diff --git a/patches/server/0254-Call-player-spectator-target-events-and-improve-impl.patch b/patches/server/0253-Call-player-spectator-target-events-and-improve-impl.patch similarity index 96% rename from patches/server/0254-Call-player-spectator-target-events-and-improve-impl.patch rename to patches/server/0253-Call-player-spectator-target-events-and-improve-impl.patch index e23eee6ec8..a5b2f09843 100644 --- a/patches/server/0254-Call-player-spectator-target-events-and-improve-impl.patch +++ b/patches/server/0253-Call-player-spectator-target-events-and-improve-impl.patch @@ -19,7 +19,7 @@ spectate the target entity. Co-authored-by: Spottedleaf diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 2bd97344502a63173de923542f27759d7e98b6cc..c533098740bbf5d8e27011fa9593a0fa274e6600 100644 +index ca32fad1fbb5eeb0b6fb8c74f645277e92f63c33..419476f7ee7c55552655ef0098da0ddbc2434361 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -2441,6 +2441,21 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0255-Add-more-Witch-API.patch b/patches/server/0254-Add-more-Witch-API.patch similarity index 100% rename from patches/server/0255-Add-more-Witch-API.patch rename to patches/server/0254-Add-more-Witch-API.patch diff --git a/patches/server/0256-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/server/0255-Check-Drowned-for-Villager-Aggression-Config.patch similarity index 100% rename from patches/server/0256-Check-Drowned-for-Villager-Aggression-Config.patch rename to patches/server/0255-Check-Drowned-for-Villager-Aggression-Config.patch diff --git a/patches/server/0257-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/server/0256-Add-option-to-prevent-players-from-moving-into-unloa.patch similarity index 100% rename from patches/server/0257-Add-option-to-prevent-players-from-moving-into-unloa.patch rename to patches/server/0256-Add-option-to-prevent-players-from-moving-into-unloa.patch diff --git a/patches/server/0258-Reset-players-airTicks-on-respawn.patch b/patches/server/0257-Reset-players-airTicks-on-respawn.patch similarity index 90% rename from patches/server/0258-Reset-players-airTicks-on-respawn.patch rename to patches/server/0257-Reset-players-airTicks-on-respawn.patch index 601a3944c0..1755009e76 100644 --- a/patches/server/0258-Reset-players-airTicks-on-respawn.patch +++ b/patches/server/0257-Reset-players-airTicks-on-respawn.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Reset players airTicks on respawn diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index c533098740bbf5d8e27011fa9593a0fa274e6600..cef054ba95ed7d2b0e2ee575edae3e94b77f58b6 100644 +index 419476f7ee7c55552655ef0098da0ddbc2434361..90587b5acee5c2d854604b53ef83c5f7d8c87a08 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -3052,6 +3052,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0259-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/server/0258-Don-t-sleep-after-profile-lookups-if-not-needed.patch similarity index 100% rename from patches/server/0259-Don-t-sleep-after-profile-lookups-if-not-needed.patch rename to patches/server/0258-Don-t-sleep-after-profile-lookups-if-not-needed.patch diff --git a/patches/server/0260-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/server/0259-Improve-Server-Thread-Pool-and-Thread-Priorities.patch similarity index 98% rename from patches/server/0260-Improve-Server-Thread-Pool-and-Thread-Priorities.patch rename to patches/server/0259-Improve-Server-Thread-Pool-and-Thread-Priorities.patch index 71b311db27..c65945b955 100644 --- a/patches/server/0260-Improve-Server-Thread-Pool-and-Thread-Priorities.patch +++ b/patches/server/0259-Improve-Server-Thread-Pool-and-Thread-Priorities.patch @@ -94,7 +94,7 @@ index 8cac2075077b1d9c2b01e09c99780ff9e204abb2..bf2833c92eca6491699b4a89410e4e46 return new TracingExecutor(executorService); } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index eb0adba0178a88243946e0c7f39503aa8c7d8feb..3669a2943b01e0e9add41df1ff38afd1cd40e96b 100644 +index c4d8918a7accbe5eb3035b4ec3b423f30c613d60..b54c1ecf3384fba741fa6334caee498b83887508 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -332,6 +332,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 1efb42f7ad357f9b4185dea79106ccd38c9f5325..c618934b5cf66d9625c7be2ac114f1a1ca629d33 100644 +index 2a95a42ade0e82a509f08e2bec7f0c64f55b185c..6eb053f88860ce8693a7baa35eddc9e3fccaced3 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -203,11 +203,20 @@ public class Main { diff --git a/patches/server/0312-Add-ThrownEggHatchEvent.patch b/patches/server/0311-Add-ThrownEggHatchEvent.patch similarity index 100% rename from patches/server/0312-Add-ThrownEggHatchEvent.patch rename to patches/server/0311-Add-ThrownEggHatchEvent.patch diff --git a/patches/server/0313-Entity-Jump-API.patch b/patches/server/0312-Entity-Jump-API.patch similarity index 97% rename from patches/server/0313-Entity-Jump-API.patch rename to patches/server/0312-Entity-Jump-API.patch index e9ef901729..c4fbb06bf0 100644 --- a/patches/server/0313-Entity-Jump-API.patch +++ b/patches/server/0312-Entity-Jump-API.patch @@ -7,7 +7,7 @@ Subject: [PATCH] Entity Jump API public net.minecraft.world.entity.LivingEntity jumping diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index ba78e8b73793292830f3260f9a12c50c698bb881..a874913997c80c8f47f395e2ef4bb959aaa3e76d 100644 +index caf74116e44a9e3269cec9b65708e604403ffc77..559c949f5ddf086877a798a7e8eb492c329b62c8 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3538,8 +3538,10 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0314-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0313-Add-option-to-nerf-pigmen-from-nether-portals.patch similarity index 96% rename from patches/server/0314-Add-option-to-nerf-pigmen-from-nether-portals.patch rename to patches/server/0313-Add-option-to-nerf-pigmen-from-nether-portals.patch index 85acae1cfa..a5fe2fd06d 100644 --- a/patches/server/0314-Add-option-to-nerf-pigmen-from-nether-portals.patch +++ b/patches/server/0313-Add-option-to-nerf-pigmen-from-nether-portals.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add option to nerf pigmen from nether portals diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index e7b4809aa7220597ae92cf8f941f61e874d45d46..01ea0f81aecbf642d238e6cf6409df2cc83000f3 100644 +index 49310b11116259193a93aca37da9c6a6949eb948..8cea6fccdea8965e372983ab3cf8ba61911e439f 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -407,6 +407,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0315-Make-the-GUI-graph-fancier.patch b/patches/server/0314-Make-the-GUI-graph-fancier.patch similarity index 100% rename from patches/server/0315-Make-the-GUI-graph-fancier.patch rename to patches/server/0314-Make-the-GUI-graph-fancier.patch diff --git a/patches/server/0316-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0315-add-hand-to-BlockMultiPlaceEvent.patch similarity index 93% rename from patches/server/0316-add-hand-to-BlockMultiPlaceEvent.patch rename to patches/server/0315-add-hand-to-BlockMultiPlaceEvent.patch index f5cef45e8c..b9b59dc0c9 100644 --- a/patches/server/0316-add-hand-to-BlockMultiPlaceEvent.patch +++ b/patches/server/0315-add-hand-to-BlockMultiPlaceEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] add hand to BlockMultiPlaceEvent diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 199abd66d2113e7bc8c478fe8e4f6657d2e12304..0627e3be754dbf8201f3212cf823e2f8cb77cdeb 100644 +index b537b3ac2ed238c01ec76ccc7941a09bfc959c10..74f33aeb6193080446ebbcc5242d95c3b1c97823 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -411,13 +411,18 @@ public class CraftEventFactory { diff --git a/patches/server/0317-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0316-Validate-tripwire-hook-placement-before-update.patch similarity index 100% rename from patches/server/0317-Validate-tripwire-hook-placement-before-update.patch rename to patches/server/0316-Validate-tripwire-hook-placement-before-update.patch diff --git a/patches/server/0318-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0317-Add-option-to-allow-iron-golems-to-spawn-in-air.patch similarity index 100% rename from patches/server/0318-Add-option-to-allow-iron-golems-to-spawn-in-air.patch rename to patches/server/0317-Add-option-to-allow-iron-golems-to-spawn-in-air.patch diff --git a/patches/server/0319-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0318-Configurable-chance-of-villager-zombie-infection.patch similarity index 100% rename from patches/server/0319-Configurable-chance-of-villager-zombie-infection.patch rename to patches/server/0318-Configurable-chance-of-villager-zombie-infection.patch diff --git a/patches/server/0320-Optimise-Chunk-getFluid.patch b/patches/server/0319-Optimise-Chunk-getFluid.patch similarity index 100% rename from patches/server/0320-Optimise-Chunk-getFluid.patch rename to patches/server/0319-Optimise-Chunk-getFluid.patch diff --git a/patches/server/0321-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0320-Set-spigots-verbose-world-setting-to-false-by-def.patch similarity index 100% rename from patches/server/0321-Set-spigots-verbose-world-setting-to-false-by-def.patch rename to patches/server/0320-Set-spigots-verbose-world-setting-to-false-by-def.patch diff --git a/patches/server/0322-Add-tick-times-API-and-mspt-command.patch b/patches/server/0321-Add-tick-times-API-and-mspt-command.patch similarity index 100% rename from patches/server/0322-Add-tick-times-API-and-mspt-command.patch rename to patches/server/0321-Add-tick-times-API-and-mspt-command.patch diff --git a/patches/server/0323-Expose-MinecraftServer-isRunning.patch b/patches/server/0322-Expose-MinecraftServer-isRunning.patch similarity index 100% rename from patches/server/0323-Expose-MinecraftServer-isRunning.patch rename to patches/server/0322-Expose-MinecraftServer-isRunning.patch diff --git a/patches/server/0324-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0323-Add-Raw-Byte-ItemStack-Serialization.patch similarity index 100% rename from patches/server/0324-Add-Raw-Byte-ItemStack-Serialization.patch rename to patches/server/0323-Add-Raw-Byte-ItemStack-Serialization.patch diff --git a/patches/server/0325-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0324-Pillager-patrol-spawn-settings-and-per-player-option.patch similarity index 98% rename from patches/server/0325-Pillager-patrol-spawn-settings-and-per-player-option.patch rename to patches/server/0324-Pillager-patrol-spawn-settings-and-per-player-option.patch index 31c97db07b..da308c4970 100644 --- a/patches/server/0325-Pillager-patrol-spawn-settings-and-per-player-option.patch +++ b/patches/server/0324-Pillager-patrol-spawn-settings-and-per-player-option.patch @@ -10,7 +10,7 @@ When not per player it will use the Vanilla mechanic of one delay per world and the world age for the start day. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 099a9aa7e64da22e720fa527cac8750991ee8562..ea8279637a2af4d18c9decbf3342b058edeffd73 100644 +index 00d55b6c5879b706d84ed6b913431e728730da81..a4c6f458703cdd794d2825e81ce00e5af63d21bd 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -297,6 +297,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0326-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0325-Remote-Connections-shouldn-t-hold-up-shutdown.patch similarity index 100% rename from patches/server/0326-Remote-Connections-shouldn-t-hold-up-shutdown.patch rename to patches/server/0325-Remote-Connections-shouldn-t-hold-up-shutdown.patch diff --git a/patches/server/0327-Do-not-allow-Vexes-to-load-chunks.patch b/patches/server/0326-Do-not-allow-Vexes-to-load-chunks.patch similarity index 100% rename from patches/server/0327-Do-not-allow-Vexes-to-load-chunks.patch rename to patches/server/0326-Do-not-allow-Vexes-to-load-chunks.patch diff --git a/patches/server/0328-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0327-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch similarity index 100% rename from patches/server/0328-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch rename to patches/server/0327-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch diff --git a/patches/server/0329-Don-t-tick-dead-players.patch b/patches/server/0328-Don-t-tick-dead-players.patch similarity index 91% rename from patches/server/0329-Don-t-tick-dead-players.patch rename to patches/server/0328-Don-t-tick-dead-players.patch index 511d5ca037..a283819a3e 100644 --- a/patches/server/0329-Don-t-tick-dead-players.patch +++ b/patches/server/0328-Don-t-tick-dead-players.patch @@ -7,7 +7,7 @@ Causes sync chunk loads and who knows what all else. This is safe because Spectators are skipped in unloaded chunks too in vanilla. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index ea8279637a2af4d18c9decbf3342b058edeffd73..965ca28a8877f5e541741c45bace7075d15a77d7 100644 +index a4c6f458703cdd794d2825e81ce00e5af63d21bd..9f3a7ba170b729fad228e212436f15bb8169f906 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -993,7 +993,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0330-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0329-Dead-Player-s-shouldn-t-be-able-to-move.patch similarity index 100% rename from patches/server/0330-Dead-Player-s-shouldn-t-be-able-to-move.patch rename to patches/server/0329-Dead-Player-s-shouldn-t-be-able-to-move.patch diff --git a/patches/server/0331-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0330-Don-t-move-existing-players-to-world-spawn.patch similarity index 93% rename from patches/server/0331-Don-t-move-existing-players-to-world-spawn.patch rename to patches/server/0330-Don-t-move-existing-players-to-world-spawn.patch index 4c51963248..e7da8ffb65 100644 --- a/patches/server/0331-Don-t-move-existing-players-to-world-spawn.patch +++ b/patches/server/0330-Don-t-move-existing-players-to-world-spawn.patch @@ -13,7 +13,7 @@ By skipping this, we avoid potential for a large spike on server start. public net.minecraft.server.level.ServerPlayer fudgeSpawnLocation(Lnet/minecraft/server/level/ServerLevel;)V diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 965ca28a8877f5e541741c45bace7075d15a77d7..adbc8e74f0b454403bc682de11bd0342e9bb6c2c 100644 +index 9f3a7ba170b729fad228e212436f15bb8169f906..5437ccea0205c23435de3584b26ee5a48afc5d1b 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -419,7 +419,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { @@ -35,7 +35,7 @@ index 965ca28a8877f5e541741c45bace7075d15a77d7..adbc8e74f0b454403bc682de11bd0342 this.gameMode.setLevel((ServerLevel) world); } diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 2cfc2213e3036585dc4723eecf747e1c37d53b72..ad4f5a4e00b9b517841acd0b4ff5088e45451bf4 100644 +index 2f48182fea64a82857cbb93dc94f7019ac55215a..e137278f9dc02eefaaf7071a3219436a94cfcfac 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -226,6 +226,7 @@ public abstract class PlayerList { diff --git a/patches/server/0332-Optimize-Pathfinding.patch b/patches/server/0331-Optimize-Pathfinding.patch similarity index 100% rename from patches/server/0332-Optimize-Pathfinding.patch rename to patches/server/0331-Optimize-Pathfinding.patch diff --git a/patches/server/0333-Reduce-Either-Optional-allocation.patch b/patches/server/0332-Reduce-Either-Optional-allocation.patch similarity index 100% rename from patches/server/0333-Reduce-Either-Optional-allocation.patch rename to patches/server/0332-Reduce-Either-Optional-allocation.patch diff --git a/patches/server/0334-Reduce-memory-footprint-of-CompoundTag.patch b/patches/server/0333-Reduce-memory-footprint-of-CompoundTag.patch similarity index 100% rename from patches/server/0334-Reduce-memory-footprint-of-CompoundTag.patch rename to patches/server/0333-Reduce-memory-footprint-of-CompoundTag.patch diff --git a/patches/server/0335-Prevent-opening-inventories-when-frozen.patch b/patches/server/0334-Prevent-opening-inventories-when-frozen.patch similarity index 97% rename from patches/server/0335-Prevent-opening-inventories-when-frozen.patch rename to patches/server/0334-Prevent-opening-inventories-when-frozen.patch index de2065861e..bcbb0054b2 100644 --- a/patches/server/0335-Prevent-opening-inventories-when-frozen.patch +++ b/patches/server/0334-Prevent-opening-inventories-when-frozen.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent opening inventories when frozen diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index adbc8e74f0b454403bc682de11bd0342e9bb6c2c..363175d3325c012f31ba84060bb0bfac694f6ab8 100644 +index 5437ccea0205c23435de3584b26ee5a48afc5d1b..0c68c0a9ec9b353b353eff0c36af2993df5f59b3 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -938,7 +938,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0336-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0335-Don-t-run-entity-collision-code-if-not-needed.patch similarity index 96% rename from patches/server/0336-Don-t-run-entity-collision-code-if-not-needed.patch rename to patches/server/0335-Don-t-run-entity-collision-code-if-not-needed.patch index 3f5d224512..2ee05c9c08 100644 --- a/patches/server/0336-Don-t-run-entity-collision-code-if-not-needed.patch +++ b/patches/server/0335-Don-t-run-entity-collision-code-if-not-needed.patch @@ -12,7 +12,7 @@ The entity's current team collision rule causes them to NEVER collide. Co-authored-by: Owen1212055 <23108066+Owen1212055@users.noreply.github.com> diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index a874913997c80c8f47f395e2ef4bb959aaa3e76d..b01e472a8a5f05e586bfa35e33abfd3875518ab3 100644 +index 559c949f5ddf086877a798a7e8eb492c329b62c8..428881b560f30cd7804dfc660a62f0ec94bd7f4c 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3682,10 +3682,24 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0337-Implement-Player-Client-Options-API.patch b/patches/server/0336-Implement-Player-Client-Options-API.patch similarity index 100% rename from patches/server/0337-Implement-Player-Client-Options-API.patch rename to patches/server/0336-Implement-Player-Client-Options-API.patch diff --git a/patches/server/0338-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0337-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch similarity index 100% rename from patches/server/0338-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch rename to patches/server/0337-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch diff --git a/patches/server/0339-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch b/patches/server/0338-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch similarity index 100% rename from patches/server/0339-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch rename to patches/server/0338-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch diff --git a/patches/server/0340-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0339-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch similarity index 98% rename from patches/server/0340-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch rename to patches/server/0339-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch index abd396810f..6c67ce040e 100644 --- a/patches/server/0340-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch +++ b/patches/server/0339-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch @@ -84,7 +84,7 @@ index ac5725230b04bc1a333863e251fe86580f909ea9..54de4e701adea123c0fdfb5787e95169 } // Paper end - Entity#getEntitySpawnReason diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 01ea0f81aecbf642d238e6cf6409df2cc83000f3..416e76f2124aba0c9ad6e6ecb052e73a8b743f37 100644 +index 8cea6fccdea8965e372983ab3cf8ba61911e439f..dce9bdf371ebbfd4407ac7ca940df29777384232 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2503,27 +2503,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0341-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0340-Add-PlayerAttackEntityCooldownResetEvent.patch similarity index 95% rename from patches/server/0341-Add-PlayerAttackEntityCooldownResetEvent.patch rename to patches/server/0340-Add-PlayerAttackEntityCooldownResetEvent.patch index 9d2516951e..83513aec23 100644 --- a/patches/server/0341-Add-PlayerAttackEntityCooldownResetEvent.patch +++ b/patches/server/0340-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 b01e472a8a5f05e586bfa35e33abfd3875518ab3..33d969e09372930e740a8a4a84e5503284df9c28 100644 +index 428881b560f30cd7804dfc660a62f0ec94bd7f4c..06cac1b4c9e97cade7dd6e7971ca06e934b495ac 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -2353,7 +2353,17 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0342-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0341-Don-t-fire-BlockFade-on-worldgen-threads.patch similarity index 100% rename from patches/server/0342-Don-t-fire-BlockFade-on-worldgen-threads.patch rename to patches/server/0341-Don-t-fire-BlockFade-on-worldgen-threads.patch diff --git a/patches/server/0343-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0342-Add-phantom-creative-and-insomniac-controls.patch similarity index 100% rename from patches/server/0343-Add-phantom-creative-and-insomniac-controls.patch rename to patches/server/0342-Add-phantom-creative-and-insomniac-controls.patch diff --git a/patches/server/0344-Fix-item-duplication-and-teleport-issues.patch b/patches/server/0343-Fix-item-duplication-and-teleport-issues.patch similarity index 98% rename from patches/server/0344-Fix-item-duplication-and-teleport-issues.patch rename to patches/server/0343-Fix-item-duplication-and-teleport-issues.patch index 9ba828b0c5..8b468ae1a2 100644 --- a/patches/server/0344-Fix-item-duplication-and-teleport-issues.patch +++ b/patches/server/0343-Fix-item-duplication-and-teleport-issues.patch @@ -16,7 +16,7 @@ So even if something NEW comes up, it would be impossible to drop the same item twice because the source was destroyed. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 416e76f2124aba0c9ad6e6ecb052e73a8b743f37..8b4ded85500379bd7dafba51a91732dc56b815e6 100644 +index dce9bdf371ebbfd4407ac7ca940df29777384232..5ed8a86b6525992a3e8ffa63feef82e29180f0e9 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2631,11 +2631,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -68,7 +68,7 @@ index 416e76f2124aba0c9ad6e6ecb052e73a8b743f37..8b4ded85500379bd7dafba51a91732dc Iterator iterator = this.getPassengers().iterator(); diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 33d969e09372930e740a8a4a84e5503284df9c28..4d39aa2fdc311acb34d7b674365141b995c324b7 100644 +index 06cac1b4c9e97cade7dd6e7971ca06e934b495ac..911dcfb9b34d94e38db71c17022b8a8c1e707eb7 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1765,9 +1765,9 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0345-Villager-Restocks-API.patch b/patches/server/0344-Villager-Restocks-API.patch similarity index 100% rename from patches/server/0345-Villager-Restocks-API.patch rename to patches/server/0344-Villager-Restocks-API.patch diff --git a/patches/server/0346-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0345-Validate-PickItem-Packet-and-kick-for-invalid.patch similarity index 100% rename from patches/server/0346-Validate-PickItem-Packet-and-kick-for-invalid.patch rename to patches/server/0345-Validate-PickItem-Packet-and-kick-for-invalid.patch diff --git a/patches/server/0347-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0346-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch similarity index 93% rename from patches/server/0347-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch rename to patches/server/0346-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch index e325a1d810..d9be497c9d 100644 --- a/patches/server/0347-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch +++ b/patches/server/0346-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 c618934b5cf66d9625c7be2ac114f1a1ca629d33..124aeebbbae7dc8cea1260bf3134a339c2e152ed 100644 +index 6eb053f88860ce8693a7baa35eddc9e3fccaced3..29838b7c28409776e124641878def8d6d87630f5 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -27,6 +27,7 @@ public class Main { diff --git a/patches/server/0348-misc-debugging-dumps.patch b/patches/server/0347-misc-debugging-dumps.patch similarity index 98% rename from patches/server/0348-misc-debugging-dumps.patch rename to patches/server/0347-misc-debugging-dumps.patch index c5ae682c05..5ef4a9efba 100644 --- a/patches/server/0348-misc-debugging-dumps.patch +++ b/patches/server/0347-misc-debugging-dumps.patch @@ -105,7 +105,7 @@ index 5457358bc76889153036818fdfd70a043ec4e40f..880e5c52746e9e3a9a1f42ec6461be54 this.connection.disconnect(ServerConfigurationPacketListenerImpl.DISCONNECT_REASON_INVALID_DATA); } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index c40331c2be3a3cfb156c3faa5f6a9fd3cb237077..6b042419af11730b0159c030ea1881dcfbb37dcd 100644 +index e9391811dc6ff954bdf1854e1e33e96931bcd2ac..e5a534c3cae53811899d33664b0a985c2442582c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1051,6 +1051,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0349-Prevent-teleporting-dead-entities.patch b/patches/server/0348-Prevent-teleporting-dead-entities.patch similarity index 100% rename from patches/server/0349-Prevent-teleporting-dead-entities.patch rename to patches/server/0348-Prevent-teleporting-dead-entities.patch diff --git a/patches/server/0350-Implement-Mob-Goal-API.patch b/patches/server/0349-Implement-Mob-Goal-API.patch similarity index 99% rename from patches/server/0350-Implement-Mob-Goal-API.patch rename to patches/server/0349-Implement-Mob-Goal-API.patch index 18883d8d15..d4a5da1492 100644 --- a/patches/server/0350-Implement-Mob-Goal-API.patch +++ b/patches/server/0349-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 40afa9e2cfb4518e9050ccac739aec3215f95d56..fd687af4923208272b01fc03fe9b65867e49dd6e 100644 +index cb100e337521fd278893ec775606f128717105f7..d253682a020cc5cb41c9fdae48adf5c85258be62 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -54,6 +54,7 @@ dependencies { diff --git a/patches/server/0351-Add-villager-reputation-API.patch b/patches/server/0350-Add-villager-reputation-API.patch similarity index 100% rename from patches/server/0351-Add-villager-reputation-API.patch rename to patches/server/0350-Add-villager-reputation-API.patch diff --git a/patches/server/0352-ExperienceOrb-merging-stacking-API-and-fixes.patch b/patches/server/0351-ExperienceOrb-merging-stacking-API-and-fixes.patch similarity index 98% rename from patches/server/0352-ExperienceOrb-merging-stacking-API-and-fixes.patch rename to patches/server/0351-ExperienceOrb-merging-stacking-API-and-fixes.patch index 76581b9350..41ff454c98 100644 --- a/patches/server/0352-ExperienceOrb-merging-stacking-API-and-fixes.patch +++ b/patches/server/0351-ExperienceOrb-merging-stacking-API-and-fixes.patch @@ -77,7 +77,7 @@ index 5a7d314ec0562e472f5dc45924a7b24841cff126..650e4a01cecc4cc08e7ff9ebcc4c3670 public java.util.UUID getTriggerEntityId() { return getHandle().triggerEntityId; diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 6b094f8bdf1f25d5c2e108eb88d95aed4a41f6f3..cb708c5ce9e81005d638f03e398e7f0f2b9f7521 100644 +index f482fc14e171129f9fa60113b1223b2db79ec6ec..b8e1a7251f9fa09f03b00b387013af1c623a1e52 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -712,15 +712,29 @@ public class CraftEventFactory { diff --git a/patches/server/0353-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0352-Fix-PotionEffect-ignores-icon-flag.patch similarity index 100% rename from patches/server/0353-Fix-PotionEffect-ignores-icon-flag.patch rename to patches/server/0352-Fix-PotionEffect-ignores-icon-flag.patch diff --git a/patches/server/0354-Potential-bed-API.patch b/patches/server/0353-Potential-bed-API.patch similarity index 100% rename from patches/server/0354-Potential-bed-API.patch rename to patches/server/0353-Potential-bed-API.patch diff --git a/patches/server/0355-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0354-Wait-for-Async-Tasks-during-shutdown.patch similarity index 97% rename from patches/server/0355-Wait-for-Async-Tasks-during-shutdown.patch rename to patches/server/0354-Wait-for-Async-Tasks-during-shutdown.patch index 1780ba8fb2..77c0ef6db8 100644 --- a/patches/server/0355-Wait-for-Async-Tasks-during-shutdown.patch +++ b/patches/server/0354-Wait-for-Async-Tasks-during-shutdown.patch @@ -22,7 +22,7 @@ index 52cf2b4de3f544790f6372cbfffb0429ea311818..3d2c70ab9938555c976588b0a98901d5 // CraftBukkit end if (io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper != null) io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper.shutdown(); // Paper - Plugin remapping diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 8339da59b7a73411f45b77f6eb93e8ad65a1ef48..d1be64bec1985ff04bf61ed65f18b043e771657c 100644 +index 4108eebafddc9c271be8c6eb5afbdca70e5fbb89..ca8eb3216c4331a95ab44f923f6b49641662505f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1062,6 +1062,32 @@ public final class CraftServer implements Server { diff --git a/patches/server/0356-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0355-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch similarity index 100% rename from patches/server/0356-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch rename to patches/server/0355-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch diff --git a/patches/server/0357-Add-option-for-console-having-all-permissions.patch b/patches/server/0356-Add-option-for-console-having-all-permissions.patch similarity index 100% rename from patches/server/0357-Add-option-for-console-having-all-permissions.patch rename to patches/server/0356-Add-option-for-console-having-all-permissions.patch diff --git a/patches/server/0358-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0357-Fix-villager-trading-demand-MC-163962.patch similarity index 100% rename from patches/server/0358-Fix-villager-trading-demand-MC-163962.patch rename to patches/server/0357-Fix-villager-trading-demand-MC-163962.patch diff --git a/patches/server/0359-Maps-shouldn-t-load-chunks.patch b/patches/server/0358-Maps-shouldn-t-load-chunks.patch similarity index 100% rename from patches/server/0359-Maps-shouldn-t-load-chunks.patch rename to patches/server/0358-Maps-shouldn-t-load-chunks.patch diff --git a/patches/server/0360-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0359-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch similarity index 100% rename from patches/server/0360-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch rename to patches/server/0359-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch diff --git a/patches/server/0361-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0360-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch similarity index 100% rename from patches/server/0361-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch rename to patches/server/0360-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch diff --git a/patches/server/0362-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0361-Fix-piston-physics-inconsistency-MC-188840.patch similarity index 100% rename from patches/server/0362-Fix-piston-physics-inconsistency-MC-188840.patch rename to patches/server/0361-Fix-piston-physics-inconsistency-MC-188840.patch diff --git a/patches/server/0363-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0362-Fix-missing-chunks-due-to-integer-overflow.patch similarity index 100% rename from patches/server/0363-Fix-missing-chunks-due-to-integer-overflow.patch rename to patches/server/0362-Fix-missing-chunks-due-to-integer-overflow.patch diff --git a/patches/server/0364-Prevent-position-desync-causing-tp-exploit.patch b/patches/server/0363-Prevent-position-desync-causing-tp-exploit.patch similarity index 100% rename from patches/server/0364-Prevent-position-desync-causing-tp-exploit.patch rename to patches/server/0363-Prevent-position-desync-causing-tp-exploit.patch diff --git a/patches/server/0365-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0364-Inventory-getHolder-method-without-block-snapshot.patch similarity index 100% rename from patches/server/0365-Inventory-getHolder-method-without-block-snapshot.patch rename to patches/server/0364-Inventory-getHolder-method-without-block-snapshot.patch diff --git a/patches/server/0366-Add-PlayerRecipeBookClickEvent.patch b/patches/server/0365-Add-PlayerRecipeBookClickEvent.patch similarity index 100% rename from patches/server/0366-Add-PlayerRecipeBookClickEvent.patch rename to patches/server/0365-Add-PlayerRecipeBookClickEvent.patch diff --git a/patches/server/0367-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0366-Hide-sync-chunk-writes-behind-flag.patch similarity index 93% rename from patches/server/0367-Hide-sync-chunk-writes-behind-flag.patch rename to patches/server/0366-Hide-sync-chunk-writes-behind-flag.patch index c0da32d0ed..8703d3b68a 100644 --- a/patches/server/0367-Hide-sync-chunk-writes-behind-flag.patch +++ b/patches/server/0366-Hide-sync-chunk-writes-behind-flag.patch @@ -9,7 +9,7 @@ on harddrives. -DPaper.enable-sync-chunk-writes=true to enable diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java -index 47835226b61b726c750fe192fd94d3f8ba47565c..52e61f75f922a075ccc745198f4ba6ad8fa58ea2 100644 +index 83d279a66484dfeef3ce34bef3d1c8f221c67f6d..a2633780619d73c29a23cb8b6a208ca9ba549fb0 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java @@ -146,7 +146,7 @@ public class DedicatedServerProperties extends Settings diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 8b4ded85500379bd7dafba51a91732dc56b815e6..65144603a545903b8f11ee1b2b1ac2795af81381 100644 +index 5ed8a86b6525992a3e8ffa63feef82e29180f0e9..9833c1876a6fdce15326f10ff9a44ab3587eaf32 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -678,8 +678,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0370-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0369-Fix-Per-World-Difficulty-Remembering-Difficulty.patch similarity index 98% rename from patches/server/0370-Fix-Per-World-Difficulty-Remembering-Difficulty.patch rename to patches/server/0369-Fix-Per-World-Difficulty-Remembering-Difficulty.patch index 80a0903dda..a0949c9fb2 100644 --- a/patches/server/0370-Fix-Per-World-Difficulty-Remembering-Difficulty.patch +++ b/patches/server/0369-Fix-Per-World-Difficulty-Remembering-Difficulty.patch @@ -104,7 +104,7 @@ index ca8eb3216c4331a95ab44f923f6b49641662505f..9905555f249db72649bde8401835dd81 for (SpawnCategory spawnCategory : SpawnCategory.values()) { if (CraftSpawnCategory.isValidForLimits(spawnCategory)) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index e6a7359d120b2361669a407b92357ea1a6b9a2a8..93d1c641a6fa063f3c5a4b9b2d9a15071ae7de01 100644 +index 0e074cabe81a7135773c59dbdd5607247fa8bf16..f3ebea4d228d53057e2480a59eda5774eba03bb4 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1169,7 +1169,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0371-Paper-dumpitem-command.patch b/patches/server/0370-Paper-dumpitem-command.patch similarity index 100% rename from patches/server/0371-Paper-dumpitem-command.patch rename to patches/server/0370-Paper-dumpitem-command.patch diff --git a/patches/server/0372-Improve-Legacy-Component-serialization-size.patch b/patches/server/0371-Improve-Legacy-Component-serialization-size.patch similarity index 100% rename from patches/server/0372-Improve-Legacy-Component-serialization-size.patch rename to patches/server/0371-Improve-Legacy-Component-serialization-size.patch diff --git a/patches/server/0373-Add-BlockStateMeta-clearBlockState.patch b/patches/server/0372-Add-BlockStateMeta-clearBlockState.patch similarity index 100% rename from patches/server/0373-Add-BlockStateMeta-clearBlockState.patch rename to patches/server/0372-Add-BlockStateMeta-clearBlockState.patch diff --git a/patches/server/0374-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0373-Convert-legacy-attributes-in-Item-Meta.patch similarity index 100% rename from patches/server/0374-Convert-legacy-attributes-in-Item-Meta.patch rename to patches/server/0373-Convert-legacy-attributes-in-Item-Meta.patch diff --git a/patches/server/0375-Do-not-accept-invalid-client-settings.patch b/patches/server/0374-Do-not-accept-invalid-client-settings.patch similarity index 100% rename from patches/server/0375-Do-not-accept-invalid-client-settings.patch rename to patches/server/0374-Do-not-accept-invalid-client-settings.patch diff --git a/patches/server/0376-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/server/0375-Improve-fix-EntityTargetLivingEntityEvent.patch similarity index 100% rename from patches/server/0376-Improve-fix-EntityTargetLivingEntityEvent.patch rename to patches/server/0375-Improve-fix-EntityTargetLivingEntityEvent.patch diff --git a/patches/server/0377-Add-entity-liquid-API.patch b/patches/server/0376-Add-entity-liquid-API.patch similarity index 100% rename from patches/server/0377-Add-entity-liquid-API.patch rename to patches/server/0376-Add-entity-liquid-API.patch diff --git a/patches/server/0378-Add-PrepareResultEvent.patch b/patches/server/0377-Add-PrepareResultEvent.patch similarity index 100% rename from patches/server/0378-Add-PrepareResultEvent.patch rename to patches/server/0377-Add-PrepareResultEvent.patch diff --git a/patches/server/0379-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0378-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch similarity index 100% rename from patches/server/0379-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch rename to patches/server/0378-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch diff --git a/patches/server/0380-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0379-Fix-arrows-never-despawning-MC-125757.patch similarity index 100% rename from patches/server/0380-Fix-arrows-never-despawning-MC-125757.patch rename to patches/server/0379-Fix-arrows-never-despawning-MC-125757.patch diff --git a/patches/server/0381-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0380-Thread-Safe-Vanilla-Command-permission-checking.patch similarity index 100% rename from patches/server/0381-Thread-Safe-Vanilla-Command-permission-checking.patch rename to patches/server/0380-Thread-Safe-Vanilla-Command-permission-checking.patch diff --git a/patches/server/0382-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0381-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch similarity index 100% rename from patches/server/0382-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch rename to patches/server/0381-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch diff --git a/patches/server/0383-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0382-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch similarity index 100% rename from patches/server/0383-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch rename to patches/server/0382-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch diff --git a/patches/server/0384-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0383-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch similarity index 100% rename from patches/server/0384-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch rename to patches/server/0383-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch diff --git a/patches/server/0385-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0384-Optimize-NetworkManager-Exception-Handling.patch similarity index 100% rename from patches/server/0385-Optimize-NetworkManager-Exception-Handling.patch rename to patches/server/0384-Optimize-NetworkManager-Exception-Handling.patch diff --git a/patches/server/0386-Fix-some-rails-connecting-improperly.patch b/patches/server/0385-Fix-some-rails-connecting-improperly.patch similarity index 100% rename from patches/server/0386-Fix-some-rails-connecting-improperly.patch rename to patches/server/0385-Fix-some-rails-connecting-improperly.patch diff --git a/patches/server/0387-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0386-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch similarity index 100% rename from patches/server/0387-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch rename to patches/server/0386-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch diff --git a/patches/server/0388-Brand-support.patch b/patches/server/0387-Brand-support.patch similarity index 96% rename from patches/server/0388-Brand-support.patch rename to patches/server/0387-Brand-support.patch index 7ca0f729af..30d4a00324 100644 --- a/patches/server/0388-Brand-support.patch +++ b/patches/server/0387-Brand-support.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Brand support diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index fd0fd75ed3e75cbdcc1abd56905ace176b871c25..b614be746f1b3c6470eddeb86bb1d4a976b84fcc 100644 +index 8c80a852ed00c2bf79bb68da9d535af425893deb..02ad5331783097d97473ef2a1f2e28b07baae8e4 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -322,6 +322,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { @@ -57,7 +57,7 @@ index b9fbaddcc8239bf737fdea51790f678306e511eb..9a8b08d4b70b8890961e4af7ce6e870a } catch (Exception ex) { ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 5ca3025700b3e8995ae003b73dd53e580c95b889..93caaea4832f2cf7102b43c24afaea55e11ae4c1 100644 +index 8cfcd8797d056be07b09ec9627bc35bf75eb0d2d..f0872343921628714aa503c52089115ae814ae7d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -3156,6 +3156,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0389-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0388-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from patches/server/0389-Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/server/0388-Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/patches/server/0390-Don-t-require-FACING-data.patch b/patches/server/0389-Don-t-require-FACING-data.patch similarity index 100% rename from patches/server/0390-Don-t-require-FACING-data.patch rename to patches/server/0389-Don-t-require-FACING-data.patch diff --git a/patches/server/0391-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0390-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch similarity index 100% rename from patches/server/0391-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch rename to patches/server/0390-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch diff --git a/patches/server/0392-Add-moon-phase-API.patch b/patches/server/0391-Add-moon-phase-API.patch similarity index 100% rename from patches/server/0392-Add-moon-phase-API.patch rename to patches/server/0391-Add-moon-phase-API.patch diff --git a/patches/server/0393-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0392-Do-not-let-the-server-load-chunks-from-newer-version.patch similarity index 100% rename from patches/server/0393-Do-not-let-the-server-load-chunks-from-newer-version.patch rename to patches/server/0392-Do-not-let-the-server-load-chunks-from-newer-version.patch diff --git a/patches/server/0394-Prevent-headless-pistons-from-being-created.patch b/patches/server/0393-Prevent-headless-pistons-from-being-created.patch similarity index 100% rename from patches/server/0394-Prevent-headless-pistons-from-being-created.patch rename to patches/server/0393-Prevent-headless-pistons-from-being-created.patch diff --git a/patches/server/0395-Add-BellRingEvent.patch b/patches/server/0394-Add-BellRingEvent.patch similarity index 100% rename from patches/server/0395-Add-BellRingEvent.patch rename to patches/server/0394-Add-BellRingEvent.patch diff --git a/patches/server/0396-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0395-Add-zombie-targets-turtle-egg-config.patch similarity index 100% rename from patches/server/0396-Add-zombie-targets-turtle-egg-config.patch rename to patches/server/0395-Add-zombie-targets-turtle-egg-config.patch diff --git a/patches/server/0397-Buffer-joins-to-world.patch b/patches/server/0396-Buffer-joins-to-world.patch similarity index 100% rename from patches/server/0397-Buffer-joins-to-world.patch rename to patches/server/0396-Buffer-joins-to-world.patch diff --git a/patches/server/0398-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0397-Fix-hex-colors-not-working-in-some-kick-messages.patch similarity index 100% rename from patches/server/0398-Fix-hex-colors-not-working-in-some-kick-messages.patch rename to patches/server/0397-Fix-hex-colors-not-working-in-some-kick-messages.patch diff --git a/patches/server/0399-Add-more-Evoker-API.patch b/patches/server/0398-Add-more-Evoker-API.patch similarity index 100% rename from patches/server/0399-Add-more-Evoker-API.patch rename to patches/server/0398-Add-more-Evoker-API.patch diff --git a/patches/server/0400-Add-methods-to-get-translation-keys.patch b/patches/server/0399-Add-methods-to-get-translation-keys.patch similarity index 100% rename from patches/server/0400-Add-methods-to-get-translation-keys.patch rename to patches/server/0399-Add-methods-to-get-translation-keys.patch diff --git a/patches/server/0401-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0400-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from patches/server/0401-Create-HoverEvent-from-ItemStack-Entity.patch rename to patches/server/0400-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/patches/server/0402-Cache-block-data-strings.patch b/patches/server/0401-Cache-block-data-strings.patch similarity index 100% rename from patches/server/0402-Cache-block-data-strings.patch rename to patches/server/0401-Cache-block-data-strings.patch diff --git a/patches/server/0403-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0402-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch similarity index 100% rename from patches/server/0403-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch rename to patches/server/0402-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch diff --git a/patches/server/0404-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0403-Add-additional-open-container-api-to-HumanEntity.patch similarity index 100% rename from patches/server/0404-Add-additional-open-container-api-to-HumanEntity.patch rename to patches/server/0403-Add-additional-open-container-api-to-HumanEntity.patch diff --git a/patches/server/0405-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0404-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch similarity index 100% rename from patches/server/0405-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch rename to patches/server/0404-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch diff --git a/patches/server/0406-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0405-Extend-block-drop-capture-to-capture-all-items-added.patch similarity index 100% rename from patches/server/0406-Extend-block-drop-capture-to-capture-all-items-added.patch rename to patches/server/0405-Extend-block-drop-capture-to-capture-all-items-added.patch diff --git a/patches/server/0407-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0406-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch similarity index 100% rename from patches/server/0407-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch rename to patches/server/0406-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch diff --git a/patches/server/0408-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0407-Lazily-track-plugin-scoreboards-by-default.patch similarity index 100% rename from patches/server/0408-Lazily-track-plugin-scoreboards-by-default.patch rename to patches/server/0407-Lazily-track-plugin-scoreboards-by-default.patch diff --git a/patches/server/0409-Entity-isTicking.patch b/patches/server/0408-Entity-isTicking.patch similarity index 100% rename from patches/server/0409-Entity-isTicking.patch rename to patches/server/0408-Entity-isTicking.patch diff --git a/patches/server/0410-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0409-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch similarity index 100% rename from patches/server/0410-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch rename to patches/server/0409-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch diff --git a/patches/server/0411-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0410-Fix-Concurrency-issue-in-ShufflingList.patch similarity index 100% rename from patches/server/0411-Fix-Concurrency-issue-in-ShufflingList.patch rename to patches/server/0410-Fix-Concurrency-issue-in-ShufflingList.patch diff --git a/patches/server/0412-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0411-Reset-Ender-Crystals-on-Dragon-Spawn.patch similarity index 100% rename from patches/server/0412-Reset-Ender-Crystals-on-Dragon-Spawn.patch rename to patches/server/0411-Reset-Ender-Crystals-on-Dragon-Spawn.patch diff --git a/patches/server/0413-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0412-Fix-for-large-move-vectors-crashing-server.patch similarity index 100% rename from patches/server/0413-Fix-for-large-move-vectors-crashing-server.patch rename to patches/server/0412-Fix-for-large-move-vectors-crashing-server.patch diff --git a/patches/server/0414-Optimise-getType-calls.patch b/patches/server/0413-Optimise-getType-calls.patch similarity index 100% rename from patches/server/0414-Optimise-getType-calls.patch rename to patches/server/0413-Optimise-getType-calls.patch diff --git a/patches/server/0415-Villager-resetOffers.patch b/patches/server/0414-Villager-resetOffers.patch similarity index 100% rename from patches/server/0415-Villager-resetOffers.patch rename to patches/server/0414-Villager-resetOffers.patch diff --git a/patches/server/0416-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0415-Retain-block-place-order-when-capturing-blockstates.patch similarity index 100% rename from patches/server/0416-Retain-block-place-order-when-capturing-blockstates.patch rename to patches/server/0415-Retain-block-place-order-when-capturing-blockstates.patch diff --git a/patches/server/0417-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0416-Fix-item-locations-dropped-from-campfires.patch similarity index 100% rename from patches/server/0417-Fix-item-locations-dropped-from-campfires.patch rename to patches/server/0416-Fix-item-locations-dropped-from-campfires.patch diff --git a/patches/server/0418-Fix-bell-block-entity-memory-leak.patch b/patches/server/0417-Fix-bell-block-entity-memory-leak.patch similarity index 100% rename from patches/server/0418-Fix-bell-block-entity-memory-leak.patch rename to patches/server/0417-Fix-bell-block-entity-memory-leak.patch diff --git a/patches/server/0419-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0418-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch similarity index 100% rename from patches/server/0419-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch rename to patches/server/0418-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch diff --git a/patches/server/0420-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0419-Add-getOfflinePlayerIfCached-String.patch similarity index 100% rename from patches/server/0420-Add-getOfflinePlayerIfCached-String.patch rename to patches/server/0419-Add-getOfflinePlayerIfCached-String.patch diff --git a/patches/server/0421-Add-ignore-discounts-API.patch b/patches/server/0420-Add-ignore-discounts-API.patch similarity index 100% rename from patches/server/0421-Add-ignore-discounts-API.patch rename to patches/server/0420-Add-ignore-discounts-API.patch diff --git a/patches/server/0422-Toggle-for-removing-existing-dragon.patch b/patches/server/0421-Toggle-for-removing-existing-dragon.patch similarity index 100% rename from patches/server/0422-Toggle-for-removing-existing-dragon.patch rename to patches/server/0421-Toggle-for-removing-existing-dragon.patch diff --git a/patches/server/0423-Fix-client-lag-on-advancement-loading.patch b/patches/server/0422-Fix-client-lag-on-advancement-loading.patch similarity index 100% rename from patches/server/0423-Fix-client-lag-on-advancement-loading.patch rename to patches/server/0422-Fix-client-lag-on-advancement-loading.patch diff --git a/patches/server/0424-Item-no-age-no-player-pickup.patch b/patches/server/0423-Item-no-age-no-player-pickup.patch similarity index 100% rename from patches/server/0424-Item-no-age-no-player-pickup.patch rename to patches/server/0423-Item-no-age-no-player-pickup.patch diff --git a/patches/server/0425-Beacon-API-custom-effect-ranges.patch b/patches/server/0424-Beacon-API-custom-effect-ranges.patch similarity index 100% rename from patches/server/0425-Beacon-API-custom-effect-ranges.patch rename to patches/server/0424-Beacon-API-custom-effect-ranges.patch diff --git a/patches/server/0426-Add-API-for-quit-reason.patch b/patches/server/0425-Add-API-for-quit-reason.patch similarity index 98% rename from patches/server/0426-Add-API-for-quit-reason.patch rename to patches/server/0425-Add-API-for-quit-reason.patch index 56cd117fd4..c4ca4510d4 100644 --- a/patches/server/0426-Add-API-for-quit-reason.patch +++ b/patches/server/0425-Add-API-for-quit-reason.patch @@ -28,7 +28,7 @@ index 134810ac91d828d67759cd1ed56f11b71e292917..ba41646a5edb57c4d9766df08bbc5701 Connection.LOGGER.debug("Failed to sent packet", throwable); if (this.getSending() == PacketFlow.CLIENTBOUND) { diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 80198c2f6419a3358f41df15dd7bbeb642d37585..0236a3db9b839f871a11b16615ab982069ebe34b 100644 +index 02ad5331783097d97473ef2a1f2e28b07baae8e4..46de03e961438faaf44b8bd39aed7535daef1bf9 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -323,6 +323,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0427-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0426-Add-Wandering-Trader-spawn-rate-config-options.patch similarity index 100% rename from patches/server/0427-Add-Wandering-Trader-spawn-rate-config-options.patch rename to patches/server/0426-Add-Wandering-Trader-spawn-rate-config-options.patch diff --git a/patches/server/0428-Add-Destroy-Speed-API.patch b/patches/server/0427-Add-Destroy-Speed-API.patch similarity index 100% rename from patches/server/0428-Add-Destroy-Speed-API.patch rename to patches/server/0427-Add-Destroy-Speed-API.patch diff --git a/patches/server/0429-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0428-Fix-Player-spawnParticle-x-y-z-precision-loss.patch similarity index 93% rename from patches/server/0429-Fix-Player-spawnParticle-x-y-z-precision-loss.patch rename to patches/server/0428-Fix-Player-spawnParticle-x-y-z-precision-loss.patch index 1934d75706..c5e4b9749f 100644 --- a/patches/server/0429-Fix-Player-spawnParticle-x-y-z-precision-loss.patch +++ b/patches/server/0428-Fix-Player-spawnParticle-x-y-z-precision-loss.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix Player spawnParticle x/y/z precision loss diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 93caaea4832f2cf7102b43c24afaea55e11ae4c1..a88d94d51520521144799b9abc4bbde0596082e0 100644 +index f0872343921628714aa503c52089115ae814ae7d..87d1b609dbd145290427840a365f45e9c1a1eb61 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2724,7 +2724,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0430-Add-LivingEntity-clearActiveItem.patch b/patches/server/0429-Add-LivingEntity-clearActiveItem.patch similarity index 100% rename from patches/server/0430-Add-LivingEntity-clearActiveItem.patch rename to patches/server/0429-Add-LivingEntity-clearActiveItem.patch diff --git a/patches/server/0431-Add-PlayerItemCooldownEvent.patch b/patches/server/0430-Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/server/0431-Add-PlayerItemCooldownEvent.patch rename to patches/server/0430-Add-PlayerItemCooldownEvent.patch diff --git a/patches/server/0432-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0431-Significantly-improve-performance-of-the-end-generat.patch similarity index 100% rename from patches/server/0432-Significantly-improve-performance-of-the-end-generat.patch rename to patches/server/0431-Significantly-improve-performance-of-the-end-generat.patch diff --git a/patches/server/0433-More-lightning-API.patch b/patches/server/0432-More-lightning-API.patch similarity index 100% rename from patches/server/0433-More-lightning-API.patch rename to patches/server/0432-More-lightning-API.patch diff --git a/patches/server/0434-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0433-Climbing-should-not-bypass-cramming-gamerule.patch similarity index 100% rename from patches/server/0434-Climbing-should-not-bypass-cramming-gamerule.patch rename to patches/server/0433-Climbing-should-not-bypass-cramming-gamerule.patch diff --git a/patches/server/0435-Add-missing-default-perms-for-commands.patch b/patches/server/0434-Add-missing-default-perms-for-commands.patch similarity index 100% rename from patches/server/0435-Add-missing-default-perms-for-commands.patch rename to patches/server/0434-Add-missing-default-perms-for-commands.patch diff --git a/patches/server/0436-Add-PlayerShearBlockEvent.patch b/patches/server/0435-Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/server/0436-Add-PlayerShearBlockEvent.patch rename to patches/server/0435-Add-PlayerShearBlockEvent.patch diff --git a/patches/server/0437-Limit-recipe-packets.patch b/patches/server/0436-Limit-recipe-packets.patch similarity index 100% rename from patches/server/0437-Limit-recipe-packets.patch rename to patches/server/0436-Limit-recipe-packets.patch diff --git a/patches/server/0438-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0437-Fix-CraftSound-backwards-compatibility.patch similarity index 100% rename from patches/server/0438-Fix-CraftSound-backwards-compatibility.patch rename to patches/server/0437-Fix-CraftSound-backwards-compatibility.patch diff --git a/patches/server/0439-Player-Chunk-Load-Unload-Events.patch b/patches/server/0438-Player-Chunk-Load-Unload-Events.patch similarity index 100% rename from patches/server/0439-Player-Chunk-Load-Unload-Events.patch rename to patches/server/0438-Player-Chunk-Load-Unload-Events.patch diff --git a/patches/server/0440-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0439-Optimize-Dynamic-get-Missing-Keys.patch similarity index 100% rename from patches/server/0440-Optimize-Dynamic-get-Missing-Keys.patch rename to patches/server/0439-Optimize-Dynamic-get-Missing-Keys.patch diff --git a/patches/server/0441-Expose-LivingEntity-hurt-direction.patch b/patches/server/0440-Expose-LivingEntity-hurt-direction.patch similarity index 96% rename from patches/server/0441-Expose-LivingEntity-hurt-direction.patch rename to patches/server/0440-Expose-LivingEntity-hurt-direction.patch index 86eb7976a7..604bb654f0 100644 --- a/patches/server/0441-Expose-LivingEntity-hurt-direction.patch +++ b/patches/server/0440-Expose-LivingEntity-hurt-direction.patch @@ -18,7 +18,7 @@ index 917ac21794f1aabc6e95ab2fff2ea7547b9778a8..78bb666dbc5ccd84820e1c7b38224951 public Vec3 currentImpulseImpactPos; @Nullable diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index 9022555db0df8c269fc039c895422cf36c08097e..cb56c75be83e839bafdae4356f85d33499d01d8a 100644 +index 8012ee71e1ce9f174eb5c4ac9eb8372b81e0a78c..42c41cd4b280839a35f77e04d0dc6a06d262d8f3 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -125,6 +125,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { diff --git a/patches/server/0442-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0441-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from patches/server/0442-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/server/0441-Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/patches/server/0443-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch b/patches/server/0442-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch similarity index 100% rename from patches/server/0443-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch rename to patches/server/0442-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch diff --git a/patches/server/0444-Add-TargetHitEvent.patch b/patches/server/0443-Add-TargetHitEvent.patch similarity index 100% rename from patches/server/0444-Add-TargetHitEvent.patch rename to patches/server/0443-Add-TargetHitEvent.patch diff --git a/patches/server/0445-MC-4-Fix-item-position-desync.patch b/patches/server/0444-MC-4-Fix-item-position-desync.patch similarity index 100% rename from patches/server/0445-MC-4-Fix-item-position-desync.patch rename to patches/server/0444-MC-4-Fix-item-position-desync.patch diff --git a/patches/server/0446-Additional-Block-Material-API.patch b/patches/server/0445-Additional-Block-Material-API.patch similarity index 100% rename from patches/server/0446-Additional-Block-Material-API.patch rename to patches/server/0445-Additional-Block-Material-API.patch diff --git a/patches/server/0447-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/server/0446-API-to-get-Material-from-Boats-and-Minecarts.patch similarity index 100% rename from patches/server/0447-API-to-get-Material-from-Boats-and-Minecarts.patch rename to patches/server/0446-API-to-get-Material-from-Boats-and-Minecarts.patch diff --git a/patches/server/0448-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0447-Allow-disabling-mob-spawner-spawn-egg-transformation.patch similarity index 100% rename from patches/server/0448-Allow-disabling-mob-spawner-spawn-egg-transformation.patch rename to patches/server/0447-Allow-disabling-mob-spawner-spawn-egg-transformation.patch diff --git a/patches/server/0449-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0448-Fix-Not-a-string-Map-Conversion-spam.patch similarity index 100% rename from patches/server/0449-Fix-Not-a-string-Map-Conversion-spam.patch rename to patches/server/0448-Fix-Not-a-string-Map-Conversion-spam.patch diff --git a/patches/server/0450-Add-PlayerFlowerPotManipulateEvent.patch b/patches/server/0449-Add-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/server/0450-Add-PlayerFlowerPotManipulateEvent.patch rename to patches/server/0449-Add-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/server/0451-Fix-interact-event-not-being-called-sometimes.patch b/patches/server/0450-Fix-interact-event-not-being-called-sometimes.patch similarity index 100% rename from patches/server/0451-Fix-interact-event-not-being-called-sometimes.patch rename to patches/server/0450-Fix-interact-event-not-being-called-sometimes.patch diff --git a/patches/server/0452-Zombie-API-breaking-doors.patch b/patches/server/0451-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/server/0452-Zombie-API-breaking-doors.patch rename to patches/server/0451-Zombie-API-breaking-doors.patch diff --git a/patches/server/0453-Fix-nerfed-slime-when-splitting.patch b/patches/server/0452-Fix-nerfed-slime-when-splitting.patch similarity index 100% rename from patches/server/0453-Fix-nerfed-slime-when-splitting.patch rename to patches/server/0452-Fix-nerfed-slime-when-splitting.patch diff --git a/patches/server/0454-Add-EntityLoadCrossbowEvent.patch b/patches/server/0453-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/server/0454-Add-EntityLoadCrossbowEvent.patch rename to patches/server/0453-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/server/0455-Add-WorldGameRuleChangeEvent.patch b/patches/server/0454-Add-WorldGameRuleChangeEvent.patch similarity index 100% rename from patches/server/0455-Add-WorldGameRuleChangeEvent.patch rename to patches/server/0454-Add-WorldGameRuleChangeEvent.patch diff --git a/patches/server/0456-Add-ServerResourcesReloadedEvent.patch b/patches/server/0455-Add-ServerResourcesReloadedEvent.patch similarity index 100% rename from patches/server/0456-Add-ServerResourcesReloadedEvent.patch rename to patches/server/0455-Add-ServerResourcesReloadedEvent.patch diff --git a/patches/server/0457-Add-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0456-Add-world-settings-for-mobs-picking-up-loot.patch similarity index 100% rename from patches/server/0457-Add-world-settings-for-mobs-picking-up-loot.patch rename to patches/server/0456-Add-world-settings-for-mobs-picking-up-loot.patch diff --git a/patches/server/0458-Add-BlockFailedDispenseEvent.patch b/patches/server/0457-Add-BlockFailedDispenseEvent.patch similarity index 100% rename from patches/server/0458-Add-BlockFailedDispenseEvent.patch rename to patches/server/0457-Add-BlockFailedDispenseEvent.patch diff --git a/patches/server/0459-Add-PlayerLecternPageChangeEvent.patch b/patches/server/0458-Add-PlayerLecternPageChangeEvent.patch similarity index 100% rename from patches/server/0459-Add-PlayerLecternPageChangeEvent.patch rename to patches/server/0458-Add-PlayerLecternPageChangeEvent.patch diff --git a/patches/server/0460-Add-PlayerLoomPatternSelectEvent.patch b/patches/server/0459-Add-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from patches/server/0460-Add-PlayerLoomPatternSelectEvent.patch rename to patches/server/0459-Add-PlayerLoomPatternSelectEvent.patch diff --git a/patches/server/0461-Configurable-door-breaking-difficulty.patch b/patches/server/0460-Configurable-door-breaking-difficulty.patch similarity index 100% rename from patches/server/0461-Configurable-door-breaking-difficulty.patch rename to patches/server/0460-Configurable-door-breaking-difficulty.patch diff --git a/patches/server/0462-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0461-Empty-commands-shall-not-be-dispatched.patch similarity index 100% rename from patches/server/0462-Empty-commands-shall-not-be-dispatched.patch rename to patches/server/0461-Empty-commands-shall-not-be-dispatched.patch diff --git a/patches/server/0463-Remove-stale-POIs.patch b/patches/server/0462-Remove-stale-POIs.patch similarity index 100% rename from patches/server/0463-Remove-stale-POIs.patch rename to patches/server/0462-Remove-stale-POIs.patch diff --git a/patches/server/0464-Fix-villager-boat-exploit.patch b/patches/server/0463-Fix-villager-boat-exploit.patch similarity index 100% rename from patches/server/0464-Fix-villager-boat-exploit.patch rename to patches/server/0463-Fix-villager-boat-exploit.patch diff --git a/patches/server/0465-Add-sendOpLevel-API.patch b/patches/server/0464-Add-sendOpLevel-API.patch similarity index 96% rename from patches/server/0465-Add-sendOpLevel-API.patch rename to patches/server/0464-Add-sendOpLevel-API.patch index 4c6369b5e6..26dede1fac 100644 --- a/patches/server/0465-Add-sendOpLevel-API.patch +++ b/patches/server/0464-Add-sendOpLevel-API.patch @@ -32,7 +32,7 @@ index fbe10666c4ec6caa95aa38a6f99ccca700e9a4d2..061bba184c8bc2569ce1d413435ec136 public boolean isWhiteListed(GameProfile profile) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index a88d94d51520521144799b9abc4bbde0596082e0..dbb25f5cc8cf03654faf2386826965f049737897 100644 +index 87d1b609dbd145290427840a365f45e9c1a1eb61..44046e5936f06b3e46078cffe3a4667034e8f33c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -684,6 +684,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0466-Add-RegistryAccess-for-managing-Registries.patch b/patches/server/0465-Add-RegistryAccess-for-managing-Registries.patch similarity index 100% rename from patches/server/0466-Add-RegistryAccess-for-managing-Registries.patch rename to patches/server/0465-Add-RegistryAccess-for-managing-Registries.patch diff --git a/patches/server/0467-Add-StructuresLocateEvent.patch b/patches/server/0466-Add-StructuresLocateEvent.patch similarity index 100% rename from patches/server/0467-Add-StructuresLocateEvent.patch rename to patches/server/0466-Add-StructuresLocateEvent.patch diff --git a/patches/server/0468-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0467-Collision-option-for-requiring-a-player-participant.patch similarity index 100% rename from patches/server/0468-Collision-option-for-requiring-a-player-participant.patch rename to patches/server/0467-Collision-option-for-requiring-a-player-participant.patch diff --git a/patches/server/0469-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0468-Return-chat-component-with-empty-text-instead-of-thr.patch similarity index 100% rename from patches/server/0469-Return-chat-component-with-empty-text-instead-of-thr.patch rename to patches/server/0468-Return-chat-component-with-empty-text-instead-of-thr.patch diff --git a/patches/server/0470-Make-schedule-command-per-world.patch b/patches/server/0469-Make-schedule-command-per-world.patch similarity index 100% rename from patches/server/0470-Make-schedule-command-per-world.patch rename to patches/server/0469-Make-schedule-command-per-world.patch diff --git a/patches/server/0471-Configurable-max-leash-distance.patch b/patches/server/0470-Configurable-max-leash-distance.patch similarity index 100% rename from patches/server/0471-Configurable-max-leash-distance.patch rename to patches/server/0470-Configurable-max-leash-distance.patch diff --git a/patches/server/0472-Add-BlockPreDispenseEvent.patch b/patches/server/0471-Add-BlockPreDispenseEvent.patch similarity index 100% rename from patches/server/0472-Add-BlockPreDispenseEvent.patch rename to patches/server/0471-Add-BlockPreDispenseEvent.patch diff --git a/patches/server/0473-Add-PlayerChangeBeaconEffectEvent.patch b/patches/server/0472-Add-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/server/0473-Add-PlayerChangeBeaconEffectEvent.patch rename to patches/server/0472-Add-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/server/0474-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0473-Add-toggle-for-always-placing-the-dragon-egg.patch similarity index 100% rename from patches/server/0474-Add-toggle-for-always-placing-the-dragon-egg.patch rename to patches/server/0473-Add-toggle-for-always-placing-the-dragon-egg.patch diff --git a/patches/server/0475-Add-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0474-Add-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/server/0475-Add-PlayerStonecutterRecipeSelectEvent.patch rename to patches/server/0474-Add-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/server/0476-Expand-EntityUnleashEvent.patch b/patches/server/0475-Expand-EntityUnleashEvent.patch similarity index 100% rename from patches/server/0476-Expand-EntityUnleashEvent.patch rename to patches/server/0475-Expand-EntityUnleashEvent.patch diff --git a/patches/server/0477-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0476-Reset-shield-blocking-on-dimension-change.patch similarity index 92% rename from patches/server/0477-Reset-shield-blocking-on-dimension-change.patch rename to patches/server/0476-Reset-shield-blocking-on-dimension-change.patch index 6054c7c0be..1e1175064f 100644 --- a/patches/server/0477-Reset-shield-blocking-on-dimension-change.patch +++ b/patches/server/0476-Reset-shield-blocking-on-dimension-change.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Reset shield blocking on dimension change diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 0236a3db9b839f871a11b16615ab982069ebe34b..2b91b321f6652e10d6809d57e9f0ac1c5fb150f1 100644 +index 46de03e961438faaf44b8bd39aed7535daef1bf9..5571e89876317e7b4b304bb1ec9c31078d0f69ee 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1613,6 +1613,11 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0478-Add-DragonEggFormEvent.patch b/patches/server/0477-Add-DragonEggFormEvent.patch similarity index 100% rename from patches/server/0478-Add-DragonEggFormEvent.patch rename to patches/server/0477-Add-DragonEggFormEvent.patch diff --git a/patches/server/0479-Add-EntityMoveEvent.patch b/patches/server/0478-Add-EntityMoveEvent.patch similarity index 100% rename from patches/server/0479-Add-EntityMoveEvent.patch rename to patches/server/0478-Add-EntityMoveEvent.patch diff --git a/patches/server/0480-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0479-added-option-to-disable-pathfinding-updates-on-block.patch similarity index 100% rename from patches/server/0480-added-option-to-disable-pathfinding-updates-on-block.patch rename to patches/server/0479-added-option-to-disable-pathfinding-updates-on-block.patch diff --git a/patches/server/0481-Inline-shift-direction-fields.patch b/patches/server/0480-Inline-shift-direction-fields.patch similarity index 100% rename from patches/server/0481-Inline-shift-direction-fields.patch rename to patches/server/0480-Inline-shift-direction-fields.patch diff --git a/patches/server/0482-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0481-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/server/0482-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/server/0481-Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/server/0483-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0482-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/server/0483-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/server/0482-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/server/0484-living-entity-allow-attribute-registration.patch b/patches/server/0483-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/server/0484-living-entity-allow-attribute-registration.patch rename to patches/server/0483-living-entity-allow-attribute-registration.patch diff --git a/patches/server/0485-fix-dead-slime-setSize-invincibility.patch b/patches/server/0484-fix-dead-slime-setSize-invincibility.patch similarity index 100% rename from patches/server/0485-fix-dead-slime-setSize-invincibility.patch rename to patches/server/0484-fix-dead-slime-setSize-invincibility.patch diff --git a/patches/server/0486-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0485-Merchant-getRecipes-should-return-an-immutable-list.patch similarity index 100% rename from patches/server/0486-Merchant-getRecipes-should-return-an-immutable-list.patch rename to patches/server/0485-Merchant-getRecipes-should-return-an-immutable-list.patch diff --git a/patches/server/0487-Expose-Tracked-Players.patch b/patches/server/0486-Expose-Tracked-Players.patch similarity index 100% rename from patches/server/0487-Expose-Tracked-Players.patch rename to patches/server/0486-Expose-Tracked-Players.patch diff --git a/patches/server/0487-Improve-ServerGUI.patch b/patches/server/0487-Improve-ServerGUI.patch new file mode 100644 index 0000000000..48a151cd82 --- /dev/null +++ b/patches/server/0487-Improve-ServerGUI.patch @@ -0,0 +1,432 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: AlexProgrammerDE <40795980+AlexProgrammerDE@users.noreply.github.com> +Date: Sat, 3 Oct 2020 08:27:40 +0200 +Subject: [PATCH] Improve ServerGUI + +- Added logo to server frame +- Show tps in the server stats + +diff --git a/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java b/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java +index f93373d28d741e1f8a53e07b4e328ce9c4e1657f..12b327eea95e0de9e9c39b7d039badee8ec46508 100644 +--- a/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java ++++ b/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java +@@ -58,9 +58,22 @@ public class RAMDetails extends JList { + public void update() { + GraphData data = RAMGraph.DATA.peekLast(); + Vector vector = new Vector<>(); ++ ++ // Follows CraftServer#getTPS ++ double[] tps = new double[] { ++ server.tps1.getAverage(), ++ server.tps5.getAverage(), ++ server.tps15.getAverage() ++ }; ++ String[] tpsAvg = new String[tps.length]; ++ ++ for ( int g = 0; g < tps.length; g++) { ++ tpsAvg[g] = format( tps[g] ); ++ } + vector.add("Memory use: " + (data.getUsedMem() / 1024L / 1024L) + " mb (" + (data.getFree() * 100L / data.getMax()) + "% free)"); + vector.add("Heap: " + (data.getTotal() / 1024L / 1024L) + " / " + (data.getMax() / 1024L / 1024L) + " mb"); + vector.add("Avg tick: " + DECIMAL_FORMAT.format((double)this.server.getAverageTickTimeNanos() / (double) TimeUtil.NANOSECONDS_PER_MILLISECOND) + " ms"); ++ vector.add("TPS from last 1m, 5m, 15m: " + String.join(", ", tpsAvg)); + setListData(vector); + } + +@@ -71,4 +84,8 @@ public class RAMDetails extends JList { + } + return ((double) total / (double) tickTimes.length) * 1.0E-6D; + } ++ ++ private static String format(double tps) { ++ return ( ( tps > 21.0 ) ? "*" : "" ) + Math.min( Math.round( tps * 100.0 ) / 100.0, 20.0 ); ++ } + } +diff --git a/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java b/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java +index 8b570b0c3967a22c085f390110cb29cbd9c8feff..4d3fe4f56e0b264fa030409919caf52d5f421d46 100644 +--- a/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java ++++ b/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java +@@ -59,6 +59,15 @@ public class MinecraftServerGui extends JComponent { + jframe.pack(); + jframe.setLocationRelativeTo((Component) null); + jframe.setVisible(true); ++ jframe.setName("Minecraft server"); // Paper - Improve ServerGUI ++ ++ // Paper start - Improve ServerGUI ++ try { ++ jframe.setIconImage(javax.imageio.ImageIO.read(Objects.requireNonNull(MinecraftServerGui.class.getClassLoader().getResourceAsStream("logo.png")))); ++ } catch (java.io.IOException ignore) { ++ } ++ // Paper end - Improve ServerGUI ++ + jframe.addWindowListener(new WindowAdapter() { + public void windowClosing(WindowEvent windowevent) { + if (!servergui.isClosing.getAndSet(true)) { +diff --git a/src/main/java/net/minecraft/server/gui/StatsComponent.java b/src/main/java/net/minecraft/server/gui/StatsComponent.java +index 6e9c6d556ed55325e36d191fc9d1508c00879671..096c89bd01cec2abd151bf6fffc4847d1bcd548f 100644 +--- a/src/main/java/net/minecraft/server/gui/StatsComponent.java ++++ b/src/main/java/net/minecraft/server/gui/StatsComponent.java +@@ -34,10 +34,19 @@ public class StatsComponent extends JComponent { + + private void tick() { + long l = Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory(); ++ // Paper start - Improve ServerGUI ++ double[] tps = org.bukkit.Bukkit.getTPS(); ++ String[] tpsAvg = new String[tps.length]; ++ ++ for ( int g = 0; g < tps.length; g++) { ++ tpsAvg[g] = format( tps[g] ); ++ } + this.msgs[0] = "Memory use: " + l / 1024L / 1024L + " mb (" + Runtime.getRuntime().freeMemory() * 100L / Runtime.getRuntime().maxMemory() + "% free)"; + this.msgs[1] = "Avg tick: " + + DECIMAL_FORMAT.format((double)this.server.getAverageTickTimeNanos() / (double)TimeUtil.NANOSECONDS_PER_MILLISECOND) + + " ms"; ++ this.msgs[2] = "TPS from last 1m, 5m, 15m: " + String.join(", ", tpsAvg); ++ // Paper end - Improve ServerGUI + this.values[this.vp++ & 0xFF] = (int)(l * 100L / Runtime.getRuntime().maxMemory()); + this.repaint(); + } +@@ -66,4 +75,10 @@ public class StatsComponent extends JComponent { + public void close() { + this.timer.stop(); + } ++ ++ // Paper start - Improve ServerGUI ++ private static String format(double tps) { ++ return (( tps > 21.0 ) ? "*" : "") + Math.min(Math.round(tps * 100.0) / 100.0, 20.0); // only print * at 21, we commonly peak to 20.02 as the tick sleep is not accurate enough, stop the noise ++ } ++ // Paper end - Improve ServerGUI + } +diff --git a/src/main/resources/logo.png b/src/main/resources/logo.png +new file mode 100644 +index 0000000000000000000000000000000000000000..8b924977b7886df9ab8790b1e4ff9b1c04a2af45 +GIT binary patch +literal 16900 +zcmaf)RZtymu&!}kXmDLfg1h^|-QC?ixG&s2I0Sch5AG1$U4m2?7EFMOsQs1p)$M^xuU52LS<5tyS|A0z!B~T1;5Y)8HZp +zUh9YE!*I`C!>au1!lt}?^7%)ymXa9F0E8%U6cA@Hs@r2|t2YjT?MMEK&sF!xR;P(1 +zJxFf8OgT_&`%_^18f74-j~9B>_v*F_4QG7P$=~I&{g0k-!dKZ;dhG_Yv84aKQ7`JU +zJ^ehid=1+b=_P#o97{5v??~H!^zyIS&U_=f-+Z&XS28Q#IuJUNE}ApzE+z8$!_(s%I3_!)=jTdGmXzz2p&3&czvSwVkj_PR|SM`xDjT-m<)@wFKtJ!fY +z+A9f&c$RQF&Z%Ui9@S9nRjlxMs@)Z5_OxNu^|5JS^tNFPeEv!Mp+fj^Yc}Scf482J +z_jv2_UYgabd?1AMePOH(|ApkUIjM`|sON7?4||4r>}#l#)Nj}LPNV67U-a5cAqgk9 +z4hA)b1i?G`_{?Is2NgH3=G*Y_oV4G*#y>w?4I7fSpx2h|vD&hsqdFVmofnVkNpM8o +zEDOkF7WVse0CrXXeH^X&Y+X5Ugeg(@8XVq_7ngH%kQ4q8to@(w`VD%+t{VjBlZzMA{89 +z;%$e2aiD==VT$}%!%lBbY3xicyog$jB!Djxd7vpR6bXArR{Oqv(5MfWsJg3Yy +zcUpf*M1f-z9ik)^?H|-}` +zxbJl0Xc<(adaW`;Xc^eA&$kJ4EZWH)dOO+mFzw;MBfNjA5<1ZP>E3RWzD|&L1WdK! +z2k&T-AdM3|);yD$reQ{x9G{_#6R5f}9%tdjf-W#_wS$qa(*X;ot*Gkja`g1Q_eN^= +z`0%;Ho3r-6zU-m(+)f%v8KxzXfn20UBXua$j&hd^L+a{0lv^F@IS92IL#!_sffCl2&zHVp_~j(J1np!W5n69+~xPAJ6}_zBa%4jtFt9W +z{@f*=wRJ|ZitBopGm@A{J`xa&M +z)PY`TF0^X2?f!}827nOWNuI-}Ne-gU_A_rT89Qjihq3d_{Ugx}ge|kRq}v@?<-}sM1htR5<=} +zI1L1)$lG(bP|&c#@>`Np6h0xGHe-S%SWq_O*_rH`M&)M5xj9Un#*HS!PqE5 +zISo-XF(NX8c$<8iK|uH&>qt?Q&-b}D+Tgr7t>MFp&WJTZFnPZ1>|RTVqu7iauEwTX +zVJi3CHpH3>2eq__Ox+k#@Bzl=K|7STdhX7MT{c8Ce71~q9Y&PXH}*iaRuCUgMZj4H +z)QyHub +z_qnc(rzc$MCNk878`Sofx_>n{BwDNL?TS=$RO_S6!R*Ey=`(aG@LbB{HGQ+@MqP=h +zu&0VvO0ab!36xlai&*>Xc+6_xPmdSo9TasQ3?*TY!)%lYzD(AZ0HWie+au=#fiLo& +zU+O6Y`-6UchQAZ*C2TI_f~f(2hrMt6KE)jP36+(ZZfle23Dx>Inkk_7xY0&pkp)+N +z%^^0b-mA7bkD<)a8%J{cvSRJ2S;}#v9g(doR}TQ3QGy%7T$YWkQuW{|T0eu$!D%Gg +zhIpru$xwR_h!F-%c~|@zigH-C2m=8{D8VNnCdFPc6Rfz(8f#dDmuUW@`u=TQn?l6ex-ha;(`` +zrS1uS-(@|j8cS+#fW*WdM9k{Fbp6f|!@JL%Gh}@yEWnTjE-DYfVpx0s5?hF9Qzi@Lf>~6Pm?DX{;HP^Q242(r1D1_=jrbppWF;PQk_!Ls +zS?3Zy6SOYNhA^`C9Gr`$aM+kF+PqIpNc~b)YOTag^;@K{!LHyR#-D?kKh>QZn&JHs +z(S}LQ;l-T8IWrlT$vDeig`Pf3fs);`cyZgTesw;vUk*#=1ZlB5zS``R@)U;`I^|DW +z?`Wu5^KI6hZo2(M-a~zF#>3kiX?zjyY=f@)xk3s24jF8WN!RqnV5qMC{5IS-?p~l` +z*Od<2Atam`NRWyKlq2%T>WdXRFci|p)_QD!{us*BG6#&@1J>-ygf`d(+Yt%AR?$|m +zG2&h}ZNhe;3iL&t-&Bo~bSQvwc_uqFF*q*u<%r&3Io&Jc +z8X3Bs8jXqH@NHmV7BRmCYCHHs=Nrep*-}>qojz9eD&96O%Es8n$%gaSnOL~VE%6i@ +z&N;!@pfy%G7dw?+2y1|uMDE?45uzNTNB_7>aX);UvtG>N2^CK4jXJOIypMJdF8LKU +zTYqIdp7&|wl19M2-A~xsFLDE9e-nocdK3)_YdtcQ)W%k7bx|ihJbIc=Z5ZyZ^yh9L +zz(%H87tSJzNkw!4yq5hajBkYU#kO&cksLk7!K-`GO(iyvT=U{|HBlNQU1VB|)w$-~ +z!`vE~Br`P8J<1%ly9{1OIZc%XlCTOPAdcit!jhpR;%=Zn+J^5sT)?#vtC4a+pY5iB +zJDz5Ru-Z>~+fH$VWPdd~FVQ(AT}O25HPC_wANYArttZij2ISLx>m75xSQO6+R*;0g +zmeuq!90F_}HX%kFZpuj4@q)SDa3k?+Bb2PrSZjTt%acFjLT3$4HPduPZ4Sfv?#~)_ +z*x>rvxpNnXh2P;_1YzBnVcqa9VK{mn1MhEaK>}|FhPXm?dB28(cqh2Ag&XIAnbGh%w38mufD688Vg0{`stk3i+PA1e~X7W%o(N09G +z(V+dK5Ra`6>fQc$6V4g$Mc;jTrbmt|ZcfPDi&luFxnBGk{2GGnMACo~C5VWy9A^BK +z%9O|VK>O{=o7e@%H==p}Gh9?4J3)S(^K@|@-bpGMlMM#a6u}N>;hDZ{$m0w+?{P+i +zv!bb`WN0Gnx5bB0s;!iJeK(?O@&xo_Yr==8dbs9N^gw0u(XKa5#%g4gLt%5d9^x&bUp+ +zI*CuQXb^F)LGcsTq00ke&-aZbA7b?Ow}kNZFJJuWYsoo#JJ +zd^|iHd;0^2Lk8)L=de&2-C9OWIvMMW>WH|w6peAk$qJ4MH%Wu;|h=~A6+4h{@J3knK0*pJ@vag9^60=vvWcI&Lb_(VX2 +zy)N7VOA=(g{REg_f)&_ekDo9i1vl8j0R0zl47}1}4kDqz)m%np1-97YCtxX^_8Eb1U&2>fjdHvFw8)9n=PT=mS{*wNJdpIN5Au>lfU5v4<160teocH-d>QHxOk-7@IW}47m1u$uA~w=(B0jA`kk+l2DCPaOxmP~ndvI$ +zYkm8H%IFn;s^>pUrvz6NLyr<`Ro3Korg8A+&kfO!G6vn2h>XJTf5yvnnk!b`Vn06= +zO|u}x(#U)>eRZq|c{Ep6$&^P+2{n)IUvm+$hJWpRp@dc$Pc5;};;;?#x;>0!Q&lV! +z`h5GsX89Y7O)`a6U8!1!!`XBAGrQC|6pr$y?Yi~{n@H;dTYvsSV}Guzrbl=`^4UoI +z8~S7M#L3iCl4D&LZY7p{pxhZgK`flMwzluNP~zogXL!BoNYnrwRFOn1!FLoBg%hgK +zT2%$)cYHjmbW$l?<>3q586J5ELJKn1OZfwK6zZEGypC8YxWSi_nBA+Z_&{j*y_tMb +z6C6(s<>8a1YQkTymwXrrI?Xm2Z(XHsp-_~6s;*Hc@MZxKw?mh=jIMvB--jM9zQDT5 +z_##%J(qN!>z*rOmA{Oc8*IOL7NzRt42R1uBo;?F>^ndx{qY!eko1xoqPknBbx`jeg +zBK1!If?!CHwgxmCjWr7V)0^wAxV{-lm1HGp@U)MCwN_MeX3LZ*jEL+Um3h1ahneA%41;uV#JudJYWnF4<o}yV;v9^YzeZ9DJPbxV +zCaJz8JMuzS|;y@^GISocc73^ZoFw_q)lcpJX%zS +z?3#&5BtAW>(BMlU0{VA<|F{5pf0gcm5ueT^9u0&(YN^<63?O&=!S{pn(` +zLg_%W?ebF_1IK2E8}fXKJRN7Sd1NEd3=zE}{Ff-55EeRtg*n1;E66aMQp_*vt;2W-BHy(2b;Flg4sLL8j`MDJ +zAbfu?@{0+Il12eRII46kiNKmt05>iU=h +z$)Irsw!hHw5wf7*gjxln_O`c8!(m4}pSsbqKLIVrd=!}5jW}+WPlzQ;+_e-& +z?Dy<48J&+h3*@LUmFxqzh_g>rb^`iEl)hiDf5($dZZJpaL!%i&d@Buf3+M~(|w0IKfQ +za3X0Srk%nLvE~Ab9|gBtt2_H<(fw_Zha@}t^K>=dbE+8{uYX2|#N=bmI)Wc;T*rwV +zwd5A@i2kamPB6hHF1AG?W!pUo_~vz+3wdlN<%QSGe!5}^qJ59h?#udS@qUf7 +zv-9ZWcl%ZgYEV62Ov?klP4Ypq+COVB +zzbpQbKJ4p#FTFlCeU?M~M)FWg!L^__)A~q8ym6&0c0f4_^d1Qsf;q;YQPHwFTKQaY +z@}^_vfdLrw7oSN5$O~22BEUPFgd#kF2FBsIH_Toz2Nw=v^=tZBu!NT|Lp7qp(fZ&&7q@7C0rFJD6; +z(%|4PztN>6GF#&@{I1tbNIIaALQ8ulFL8_Y1vGk-QMPKSZe0HpMtxgqkoct%kuq`w +z#x-}Cb*!ytPr?%+STtAMUu{{K-N%@g062$UWI7UOQm3=mc9wknbhD2qEj-!b^P +z%oYhuwx~lumz_3B^a7bYyyq-71@Fw*7ULPhNJocwr5CvLRsE<~sh>maF=R1p!hO** +zh+7MfH?17kb@`xEls`270@5OICG>$(UstdYt%lJ^wwiJK8I1@$5SE2?UF-^CtL8@; +zs4{#zGZBM@8f^QW&S9I{2Bl9>kdJkdQs6??R6c{5q%l*?6D-aNSM(>Zc4);q<1&7n +zVSb1AZyvYG&77Xtb`dpP1hGZw+U_-uc%-;be&gSUcbi*hJ9V!?LnI5O4d&1TOrlrE +z11&b|=uC!5&O5GB^zm!T#ncJ-bmy8|`YuXV_zy3)jPFmR0m +zFLy&N`z42~p5XU|+fn|GAIE2AfPi3JbxB>QXQ+7$3m_ug7v}~qfMAh#5*_)0mSKO^ +z)R>_thix1PNC=^T>X5@o5Ik^s!>_0nb%0+Qu?l@fMu||fRMI8(eq@a06~$a6goXp4 +zTc(!CW&GU`Z?7*~C%0!|`Po;Y-B>bq8(=^Pt0w>CW3cOKf|^OmN3o|I)zb~mlpR!VZRWgf3r$DjB6U@% +zJ!v9xOZ<+LBarT*ahaknq^miC#W^ANPQ%<$&RHDpEBCU_M(sbvsugC-mYh-fO{Sw9 +z2eEARzci;On#5;xRA{kHL-zc9^rxh(B6&XXZ*i0bo|+5(tR}B*i$>CjH@i(J`<5N< +zm*!QawcKB`2qVVWN|!2bmCj+qMz_>lyQe41Uc6GYo8|ZmgRouOWH<`fPtitAzEwsVe{gYe@!;OmfY1hA^J^GP2Zh7jc0#tW +zV;K{f-a2?ll{FjAo&kmu**_ByBXvrN+H7%pUgwrk*v>}T<%nfg$(O1#f`vAf;$Wwj +zK4OU>ekZ7*cXG`zK^{1Jk?6U1Z!$nXMaDUqNo}Oc<%5yn3pWZ=j1+|nlh9DXMmgJp +zw$>=#X^n__>Lz7RpGg`FbOM{jMF-I&Mx~Gtq{nwcJ*VwE0OFOdSNksknPO9!AjUy9a^u}; +zl{GfA#HVPd@8C*|vf;gcdLXrJL?MukrGr%c^ +z`dR^O=T^5*G@CU0fpX=d2?dv}l#Z}rvrURI+yrK9#ndWZg69>4-LW#tEa5!`s{Zgq +z8R@zhQOojaXAAXjJW6}a5>uV1LhgG$u5JQ_EBF0C=A-S5S2BuoH^CBy68!ST^VMKp +z5t!x0xnCI*Lk$t%?=aM?bAC5Sk&8&Qiu@hZj7DiJ;6#WZd1Z764c#+#;>O(U9%lfW +z>suxqZ)SVz&lYoFmEAcgM7u2vPU$2e-Hjzv>AJy1PeOk$DMk`K`~^i^seLl#HX2s@ +z&vS?_kECyji(-+eKdk1750r)$2U(RhTgkZT@l<$kC`GSck-TzG(h{pKG1aJhxkqgZ +zItykNw;mTU?xiP8Q;PAKW4yNPGkd;&0<^_8y4rHh6AzZ1@@Og1z$t3+RoVK`LOEWpvj)dqZ+bn-ZI_R@g2TDm +zUOXS$8{AioF8c*Kd%YqEKoqkyqA= +z;h>9H=F|lLAffO3sj^3_YLHV~t7o60Afgf+&g?fx9El~tAP}$YS=MFe#gI{HMPF+3A4XgD2y6V7pZ8*{ +zm8;APEKL9wC2F|aO=CXGJo^TSmQpb}X_X3Im%nsfn-Yr)Ip(;&N*#Ay_m3?ila&Xh +zA6V?kP!$WD1kP``H7hg@QY|w7?54~1UuB*oXqD_ePJg`i3GPV0EM`;%joWPh;8C{7 +zYdmIemNAl|da??P+nTE06i%eXK303w@_~!CLz4QEZFdnUm~0^2U*Dh4GePdBsTQhV +zsihVr6*e(LETK(_Y=c5vXJenfn3=4BLe-LG|E6?ccR#tlx)pG=|6cC;SaBt^!li5R +zcPgX&c2MsDL}~N-O+3=a0$|oiwZm$c)<&SyI4_0A@|JEcP=7FY3^?#Of0zNSfD^&A$%$p{mSW|9&i*6 +zj(_qDpxvBQ=^ptttH-vj$9~Va*80<33lpe5w3*6)d5BABGb>2&T7!J8KM%t$O}n*W +zJo+7yk8gR<_bN{XJ|u{lon5UfZc>HMFjulERk&KL*jqG{qadfz)xhuQcg|aymb_Y? +zVYhel3JJX|M+K*)DQMX1IZ`*_*vfscZkpLiT)9gL=cKs}uA(KzRP<4d8#RxOLcE#D +zJP9@OB>kt#JaeOXaqm4Kc^GYiehxcy4(-(f*^`-a9<3OAl0lXjMU1hK=(Co4O{$8%UM|E#&*;l(B?QsiT24bqlr*B{Z7V`VuFjMMHlGAysOT^==1z=5qZQ_2R +z-1qLb)#p6A6j}B#jg`CWg~=F5uJg4=mk4 +zMbEFlbNEc>OXUCT5piF*6@<3E+@D1YQ`=LOmdxBa$alJ^s;X9Vnwl%91RCi4CyD~~ +zEfY~;r~^+zF4y_)m=yu>0s3+B%|pI?8RS^ct^$kP#XRzE>S#R+#~GhIc~p)Cii4cW +z9H*m(D~n23;e5HIw0*7&$Qv-cSkS?#GB%E4^9a4Zdg>n0VB=s|P>wkUFR@1Py;++p +zX;6LW6tT+67ZSct6f1(Z{;9<&8!$Q%dsr@?heJCLyu$kE{QNwMcpba!S7M2R5q^_F +z1m`x@%z~KAD3f^-kF`7BW3BU>kYEeLw+hLBNDUxD$O}Z7ySX3c +zb)wd!i4k24wW1_C2@tbyw%f-8qhJmP`&caiZ`w$^LAjZS5Sn#m^9yX>OCkC~g$Cc7>RooBAs^cU +zIlTk#)OXQ82-Til1rliQ85sNCA>X3OzZ4b&8XPSua_&2S?i?lbG}vKCBGdB|nXS>g +zJ0*+o--w^syM8BpvQ@ycNTP2WG0U^*#8-MC0N=cB;m&`}!LXiv%vI8XM1O%D865l( +z{g6XRuw=jeOMjz9WK|@yzj!yA9i}KA0|SHG1bi12L)S{x7e=_kAN~FN)m7xbSP^arS9Rd{|t-bdQUEl`8{54zNMvQ +zmVu~1GPeH>P7JxwZV*CX5cIQzmo3E{siDMziZ%E7Tl9Q4KN4`#}D9_*vX?k}pO!=)gn7_4Bb4bJT +zqDaOnV(7U1_j;to@cwADU9mBc-@BdBUmAHSzyI{7YGVPi_y~b*r-e;$%CQnDe?9;8 +zfw~{4mSb>(|FgeRQE<@@i1>JZxfuACaFBgBIQO3(xsqo~Se?tnEhWOPgi|!6k69%H +zBXMEw6q@;gX1q%5b}P&*(QhwjwHm7%kJPg>aV1XSsKm6t<)rE6*j;x$hUQ|hu`kT) +zV+}ADC0AEh_W-HRr1Y}-%^FExK~@Y^t(ANZuuEJ`p#^k<`-MWnN77L2@X=9jV+>R; +zXOQ`#-WMm65hugihkOgXY4OID(WpNU{=B$ZDs8X^hCKKCdranviTkKK>$2J_;-Ga6 +z>WBEX7GD$0K(CoP7J96eYCwj_U5&HrOXJSWm=N0MQ^#7X5>(8zV6XiWLH3_ZhnV9@qF1Eb95#jw+CTK +zcnC_X6?w!ouwb8!t?ZeXbU*`_*tn=L1`tKaPq~o#XH-LT(pdaeEr(+5o7_BF^YP^9 +z=s=xqrRelm)Z^rj$VCV;RnXkG!NaMn=)gAL=kN77LMYwzIqFtY;-;Q!9U{UKkl*Z; +zxmwdAck=k)YYlsT2UM!0spVa*x7IFL)Qt{!?hIJJcZxQPc`eiw~~Oj@Tz_oM0xtx3Lb{5kxu +zyBD?uz>WN#g_E*U&crG80;MCX-DnFuJuz_nIeOw6$6c?&s+F|L2zU?5G!ekeS!llo +zFPgW-3Pcj`}O?5W?ab_h%Gy97f=v~(o +zy&qFFhNcAIGR5-l!~O!ti+&6tBv?y$VCZ!G*COZC^Rd=v3DD{VK&YZV`0rM0q-=5@nOTtcx@ +z-`GfyVTF_)=xoTY-xG)BHAl-#;@k>0Kap5G)B~X77JGh`U;(W#+Xleny2|+?3X~v9 +z@j4(Oa(GxV=hv@n1U4Y(PY6pg$c&Ot;)efq)~zTw>;uHy`pS!hYaNUHxEYhbgRg4R +z+}+}7o`g)4OPEQ|;tiYeawTA$%HmQyClOH{QqjoI$3uxnpv;6|Hoy*8NC^3e-^$N* +zqqby_w*0S5T>t%`@v?z_`@m;FByBE`COSJ7m_~uq^-Bim*HTzq_chCA9jeHpXN(2n +zwRqW7h)`1w=SY~Q#F+#wWc43wU)ql>D-{W#MMi*+Rc<(sqj$1IsI?*Vo~~JX4iGFY +zSjVn{Ia}(<$;mhGkK6li&$laGUX5+PgyS=U#yks+rN3QUeb1{R0P)Mr;duDNP0Yns +zOl80yG--mz(9cLJmrW%6skc}}J*KYlL*%B2MMfm>8W3{uoeA1tCC=;U0l+}4z>%rz1`1Gu3qlk(DUqGWSub-M#qTbUB+d9M069OLgJ6ct8Id?;aM)g-r9s^V6BrQ}Q;SCiP`udh7DC +zQX$nG;n1i3pom{#4@R?{E?z&>^3sL?I2rH<%HigVl9la73e4N^TR>PE}F +zsi3VDlCxI}2NOm!ndIQSbW~gNZ4rN(jki^a>Fbq! +zqTN5 +zzb`nx8&_h%Jrt7lQxR^o;6yE0jUGfj6BHagGKnEIbC?*Yeh-mN_p6 +zlPomN>R(3=k&0Ki-xElR=54S +ziifTvyozV0-H|T?}miG^F_wtBpw#IDTI~O&zZ=pp6zI7~U;(eX9v~ +z%_Rrklp$gbO-9{o@iq>QY$8+WLWjtqUprlw=!9l&&i<-B;;B?gDuUYF04x={Q|PYo +z11qyPuIW6^msVN_PE8KdAMXa}bHL6LC^fQ9sh369#H1cfF?JZ}v`b#V$&6F1HA?9- +z8rMp!9QAw;KUupJE(75s%Q_j;=twh?gcLwR?pti!=J%3LhEmj*cmxEL#xOjNHpVeK +zJkF%}PF#r=gweO>TUjCt`~eJ7()chG!YE-`x^-8vG;ltjSQ*{>Exm{gthe@Wqr_;) +z0wt5sLc;HhZgRcM=_rjYuGPk6qTcdMHcs}#u#-NnrJ>ijEn2POpi%bVAyH$%NC@JW +z!9x#~LZ0#)=w{X8oW39GR&eJl^`<7%yQQ1IMRYe1(f#2jGXHCzX6=QT%WeN8>DptC +zHdSdtJVzrAI(JAmUV3k0>(|f-Xp$15@*N%7K>n%=8xkhRkB3QAUtf=ah{(e3zoSSq +z_gFfN{zLz`jCqlr&;1O+r(+F_Z0oUu;MXftO1`Y +z9;O;>OCXbj;jbt_S7jVfllzmVYhq*#nMM~j1j#8VFg%#?vdErxSYKI2XR#z#^jrF| +z60VzCe$K!`P7W(fGZ`zDbu=Gj|Fluc!xb3b3?KS{Jm5T)ZILV)F5q8zrZN3x1!?Fl +zj24#65txQAH>pypq52gcF^Lw8LkW1LoMwVHld&c-soCEOJ`7#g5|?z#rkMgkK7BD? +zv5)5fIFMR6Y+7b6;Ou);_P~PlRc2e$)>HPum(WG>M&1%61LbYx=>T1OuOHP=A_2Ml +zUJa0_6*NB&eSM@;e}$dm67YWg_RVCo!)>o6Rkzh4GG20Rk8#RK+5)kj +zy-EvI3s#yE&SmNou7&*UrnmOiQ_-c!M98x?rSX}WW}0I7mNW&~u)Vo_w^FUmMKUp> +z8k)=i)!=z!;!K+sl(Lhz*Vd$PEuCsaMon#-vS>REEy6K+i5a(<$=x(75fa)xG@=%o +zR1GQOG=s!5g(EG{JieFH*|kCh7=CEGG~xLSIY@MDuIiAnc`G2Ge{P@B(m6G +z!ibqfOA9p9!7d%@C@Z6Oj!J3yF%OjokW8F{Y}gut?pbEsRm(4LL??RqN~(!1fsK#O +zx=08kW?ie)L(K_4s$=P~flB)?RT~0m>*m4)K}Eg&^ysOF8lN +zUHK0Q90oI&{$mRN4;~O7eZ2)RYWiOSNUxax118K@axIASH?!$hWNTeE-m< +z9|d2NgO0N~GYHc0yR$}HApgS_*(Si(CRarIKe5r*$mNd^46r(X7=_aLFxEIYsbgvH +znrzh|J#4IY*379ZTcw$}tG6{QE7PnE4Rz`3%NtHKG_U~aaSk@Sx>k@6ej8+~c|Yc1 +zO&By$u_ANpr;D`5D&%W#Fdl9`BhvdZ5`UZwLv{1Hpy9lA>ut_To&@^KV8eBInUrO5 +zh52}zCbS}L24&AucCm_(e?;?E_ef|R)nd$k+BOlW94v|UU~blRLjQ0ZP-4r2%|3Mn +z>o)c|#p9v2Mo^cLhvg|xC^b2rL@3y2qYKOs?@M}`_`2q==9(4=kTk_PZBIhX-PBrZ +zr~4n>by9I>XJ-@K+>o8|G;Pd^cW)?r)m~#|TJhd}QmeX{jlF$FjtCHM4zkU<60>Zs +z%Hys(I^Fbs!^Li)<*(mdMDF~twQ_bC9DMnUdoO<&F-3^A3(9GW4BH?t7v#5rXa(*RMsaFXpk@rOtgnql#(8*wa~=>H&U=;wN0Q<% +z=~0Qf+>{j>5oC?u{)Ajpd<^k1GgPzB2_X=HLz81#(ra*Wz}OO-za_H(wqrv+ +zz0y`v?a{P}lFJz=@BUy(A)pd~b{ghG$JJ7r@AlNxR+>kt6nYMil7}v99Ja?<@UZ3T +zeP1&kMRSM{5+R84Gc9j#ct$;ly+^es_n)lXhG>_EcB%`8iYCWLpCv8)3~8MaxHrGc +zWH36`!Flt6p(JJsBEPqrE&gHZ?iZtxyx?@fgPx*GS)go(Nf7>mW01|;SB);nF)3s-o4wF7D!)tc}@L$K1~NQb +z#Yr2Tunx+&wm$nlh2CtbCg8*b5`pf^Y+pukoQ>UqK#>9GQek~Po6Bh899xq^a4oaN +z9sDuzXNM=T^ExFYu?oyxI-}8y%D;slDQ*$`e5+$KKq!pF-*Qc6*L_WdXk^K$IEown +zc`-GIjJQlcjeh%cL}$EWcnajL%v-BuW@70M(BzzY-<$NJlWQg2rNIpwvZO(rx6c;G +z_UBD)7Cj+GP^Rw?)N_Nikx*qcIPWa%MBy?TL-6TWG;|5d3z|f%7il*;Ac9f={o-sOWXfH2ow& +z+F%t%kw65bbTBi=kaCFWiK~y^%2iyKohma@H`Ql2SmxhqN|;zqx3*C&8_FG(8wPqn +z80VlP%Gr)DvZLLlMf_OsXDo*4wm909tv4{~9yF8NS%e&sJ#dPsVWzk;(a?)XK|KjU +zmKml2h#A~>%-bFxM<7`wSX>`I?z8$Ca++fy%HqqV=8QYYD~bl^Hz_tBVxFF`f!?T6 +z!OC4>a={OOkbTFV#ew8k2GrG${kNo(rcXXA_NWUqI*@?8f!7jnu3$bUg%u}bhY5Q));;cCAc0gS +zHeTk{K!dAfJ6}@_zTLUn#qe2z2>ZdYkePg(!A+9v>R>`9$hU~PuED*xe7hANwC~xc +zzMc7YMmZr7Iy0P~w;nbL>dml8nV{FL;+xs}qjWkGV5~K1I6DPEC&#K9z5E?@9vBT9 +zvo#L&#*9687;Wd0D#-M4&3F8(7sFq)qrj$;8%`og3#@6+hSB^|^UtXtP#SOBvdY^G +znH{rdVJq%P=QxzF3KPx3etK`XD%|1rVH#OZ35YdYtyAh8`vg5MWd_yI4)jPAmo4j_!3e<(RzCocf`Y+$BAs988hq->eMY}S?z>|#t_c*3a#|wBAi{r! +z{dW0rO)!J3t~1!Um(@E{ATxo*eW!!k$}$1~;aQ@PPH8`A%_SDxVmA)U!Hw)$KXA7$ +zqdYbaY15D(b-OI$URl0+-TYf+!wm}Fwiu|ApRr6t288`7`y!ZbjuZgH`OF0cwYAez +zqSFt2_caUMO6L4Xk>1Be-C +zNHX4bgVd8eU&h^$7@$FnL%%Qp$e+fZ(4dAotr#y7!RrZ>u)-F!F&*jOE8kA5rqU|| +zkg!kLmDxaol3FWgZ=YGJwHYE#cf7j}8z24RotEJKC)?r64}@x}^89m-1nf0~ +z*_bz@JP+Ml3hd*HWuOR@sNVh74L-Sw?LaYKwKo+rvy}#|aFc!~jT1o|KFR)cI+)Bn +z7Gg?S>|0zfR!%gT?WBBV*!!8j6W>|lJse7F&5>m#;ooWbRQhP@izf8nK?3n;AClTI +z6#M340iQgXluMzeY19}<(0FQ=O$wq@ql-?Y9&<2A-S>4Nw#z1Z-(eOaL`iCMI&1sAHP4i1wfU%}{TH10ti=qYU +zDz0-eM;$$6p`VP-jrsMCM}MB&A!(m3WE#f9F_{oZS)?8^0-?^g11w23S(X*2v9^k* +zKU)$N`g+?WLff<~UDFNP<{vgF`ivNrY!#|!D3|%nvN;axyiKQdEH}n|UAvW!JH2@P +z6TzqIA6}zL<{b4pMQp)4ffz(REKD*y3@}3^xF7ui{>6upo0Tm&dOIrt&>JXx_VQrn +z?-nhZdK!u;m!%$urT+S%i$tA>aj?l1`%j#jH%{|kdYyAos^NAM25jH<6TePW$nes= +z1!HeZ;$v}XEv4u4(RnINU~U}A*?wwCqU9m|k--nxsx^vf5AeRn$pVh?0Mnuc`C!uLu2;Vg{7)wfw`U +zX;*Wa;BHUq-TwcZ=lb=LAJ!W;9=uX-aQwln)6svvPf%SQ<1JdhQIPpzpQJ_KDid+% +z!(xv_|7G`-+M9p4uk#~(Mx)cG<|di_EPs|%wf~Qb+;nQM%q9N4&z7FNB6Z+G+^+MR +zj)|=QD8BER{dSeRdtd$LH*1N?VC!qI+*y}-;)|d!tvt|0N +zm5Vlct%>!zH1~C#{PXnRXO%R17-p8ep7o3QUvcWms)tYH$`9TvKIF>&@BVzZ?VI=h +zpErH+ydwvGOs@R*Hs)&kpXVngrCvTXb;0-d@xj~oPM7_l|L;HY`3dlY6p$IBU;poR +XXyugpZ1#qMfq}u()z4*}Q$iB}^Bg|U + +literal 0 +HcmV?d00001 + diff --git a/patches/server/0488-Improve-ServerGUI.patch b/patches/server/0488-Improve-ServerGUI.patch deleted file mode 100644 index 8dde1d1a9b..0000000000 --- a/patches/server/0488-Improve-ServerGUI.patch +++ /dev/null @@ -1,431 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: AlexProgrammerDE <40795980+AlexProgrammerDE@users.noreply.github.com> -Date: Sat, 3 Oct 2020 08:27:40 +0200 -Subject: [PATCH] Improve ServerGUI - -- Added logo to server frame -- Show tps in the server stats - -diff --git a/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java b/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java -index f93373d28d741e1f8a53e07b4e328ce9c4e1657f..12b327eea95e0de9e9c39b7d039badee8ec46508 100644 ---- a/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java -+++ b/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java -@@ -58,9 +58,22 @@ public class RAMDetails extends JList { - public void update() { - GraphData data = RAMGraph.DATA.peekLast(); - Vector vector = new Vector<>(); -+ -+ // Follows CraftServer#getTPS -+ double[] tps = new double[] { -+ server.tps1.getAverage(), -+ server.tps5.getAverage(), -+ server.tps15.getAverage() -+ }; -+ String[] tpsAvg = new String[tps.length]; -+ -+ for ( int g = 0; g < tps.length; g++) { -+ tpsAvg[g] = format( tps[g] ); -+ } - vector.add("Memory use: " + (data.getUsedMem() / 1024L / 1024L) + " mb (" + (data.getFree() * 100L / data.getMax()) + "% free)"); - vector.add("Heap: " + (data.getTotal() / 1024L / 1024L) + " / " + (data.getMax() / 1024L / 1024L) + " mb"); - vector.add("Avg tick: " + DECIMAL_FORMAT.format((double)this.server.getAverageTickTimeNanos() / (double) TimeUtil.NANOSECONDS_PER_MILLISECOND) + " ms"); -+ vector.add("TPS from last 1m, 5m, 15m: " + String.join(", ", tpsAvg)); - setListData(vector); - } - -@@ -71,4 +84,8 @@ public class RAMDetails extends JList { - } - return ((double) total / (double) tickTimes.length) * 1.0E-6D; - } -+ -+ private static String format(double tps) { -+ return ( ( tps > 21.0 ) ? "*" : "" ) + Math.min( Math.round( tps * 100.0 ) / 100.0, 20.0 ); -+ } - } -diff --git a/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java b/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java -index 8b570b0c3967a22c085f390110cb29cbd9c8feff..4d3fe4f56e0b264fa030409919caf52d5f421d46 100644 ---- a/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java -+++ b/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java -@@ -59,6 +59,15 @@ public class MinecraftServerGui extends JComponent { - jframe.pack(); - jframe.setLocationRelativeTo((Component) null); - jframe.setVisible(true); -+ jframe.setName("Minecraft server"); // Paper - Improve ServerGUI -+ -+ // Paper start - Improve ServerGUI -+ try { -+ jframe.setIconImage(javax.imageio.ImageIO.read(Objects.requireNonNull(MinecraftServerGui.class.getClassLoader().getResourceAsStream("logo.png")))); -+ } catch (java.io.IOException ignore) { -+ } -+ // Paper end - Improve ServerGUI -+ - jframe.addWindowListener(new WindowAdapter() { - public void windowClosing(WindowEvent windowevent) { - if (!servergui.isClosing.getAndSet(true)) { -diff --git a/src/main/java/net/minecraft/server/gui/StatsComponent.java b/src/main/java/net/minecraft/server/gui/StatsComponent.java -index 6e9c6d556ed55325e36d191fc9d1508c00879671..096c89bd01cec2abd151bf6fffc4847d1bcd548f 100644 ---- a/src/main/java/net/minecraft/server/gui/StatsComponent.java -+++ b/src/main/java/net/minecraft/server/gui/StatsComponent.java -@@ -34,10 +34,19 @@ public class StatsComponent extends JComponent { - - private void tick() { - long l = Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory(); -+ // Paper start - Improve ServerGUI -+ double[] tps = org.bukkit.Bukkit.getTPS(); -+ String[] tpsAvg = new String[tps.length]; -+ -+ for ( int g = 0; g < tps.length; g++) { -+ tpsAvg[g] = format( tps[g] ); -+ } - this.msgs[0] = "Memory use: " + l / 1024L / 1024L + " mb (" + Runtime.getRuntime().freeMemory() * 100L / Runtime.getRuntime().maxMemory() + "% free)"; - this.msgs[1] = "Avg tick: " - + DECIMAL_FORMAT.format((double)this.server.getAverageTickTimeNanos() / (double)TimeUtil.NANOSECONDS_PER_MILLISECOND) - + " ms"; -+ this.msgs[2] = "TPS from last 1m, 5m, 15m: " + String.join(", ", tpsAvg); -+ // Paper end - Improve ServerGUI - this.values[this.vp++ & 0xFF] = (int)(l * 100L / Runtime.getRuntime().maxMemory()); - this.repaint(); - } -@@ -66,4 +75,10 @@ public class StatsComponent extends JComponent { - public void close() { - this.timer.stop(); - } -+ -+ // Paper start - Improve ServerGUI -+ private static String format(double tps) { -+ return (( tps > 21.0 ) ? "*" : "") + Math.min(Math.round(tps * 100.0) / 100.0, 20.0); // only print * at 21, we commonly peak to 20.02 as the tick sleep is not accurate enough, stop the noise -+ } -+ // Paper end - Improve ServerGUI - } -diff --git a/src/main/resources/logo.png b/src/main/resources/logo.png -new file mode 100644 -index 0000000000000000000000000000000000000000..8b924977b7886df9ab8790b1e4ff9b1c04a2af45 -GIT binary patch -literal 16900 -zcmaicV|1Ng^k&Q(Hn!T>_Kj`Zc4OO48rwD-Gw*(Xv_UIGaL4*?7e3`t5-R2lSh^xqd84Cs4}W^FDQn9zijsF13M{zVR~<`0dB -z;hww3Rk_uLO*yyZ^N(arMN#SjFcHEi60E_fZug`IjtJ^LVtno=lKj+Jze{_WszRIN1X*HUTCH>C_wc;+D)6YYT -z*RWmTUi`Puu_Uwkj6-qwu_Ue*kO&$%=o%J?6*rej_Ock3znkGIb6 -zWm&yS2Z9LS7slFgUx+?ilDgQBdj7`ruw|IVzJ@wV{&tD)G@SPTMW@9Wl5lcsuU~6` -z7raw|%Or|@Pnlh`7!!rA1H$`p;zz}+92Tp2bFmKDAL`nrC>)<{qBHso -zvJ6|o^vMxL?frh4XZ`3WdH7s_NI0p@{EElbnX*!yp;Vtx&K&w$&to`sW -z79>enm;xWhu;ZKKIN}-h!eBKZM6j$9~*Q(SlE*i_bHS0o#tPY -z5-j+ww|x>h9%`RLUixM!e%f0qVAe5GH83X6?!#^_j-M@lO@*-aD%NMF2;Hg^Wgh@}elrPA3o_&(- -zeNyws4es~%;K1o+pfG(Z!G-nFWzl7)ejRNxY?M~uI=I&MYuz@4>GLH*ptjlQJ`LYr -z*KIIVzBhKHIDwe`X2hc@gsdjzXxX%b<_#kc$vIHFi2)-XM1=fs(`g?0)M{lcJXwp< -zBgIdDXM&n-=+_%;1a?sE$oeN{r%w=8tFfAlQopAk -z%wrVN=r>)oZ0w7^M~Xi~qp6lEaABgF(ck7V3Un;@cg|ODuD7@fw~OZ;^TQV -z$&4AiUj}-4;o`6JV$Y4C2G -z8hVweUdzl78hWzD|&J_)oRr2JdJP -zA&lca);^P(q@hQb9-kqNXVo9An7Q3NoAtyRQw-@JUDD$oluryjE -z3{zzbZhStP-K;xw@Yxf-B=4h(p=4f`k8p2DH$>qQLPR!szD!2|vJ}J`C6=EoRwG^+ -z;`ZDv1SGVO+?IqSxpxSM^_V~@2E+~dZQdl+oz;TP1MX+XXwugMy?Z5AoZ7#R33Y@T -zM)w4;9L0szO3>6i#4fV3q49@wu&`zcvQ!d8!m*dpn&7pp0Y=;QbiyOzhC7)Ki7tDt -zXaIqysWqx53ZgHlO)|YRDG**$7&F{0a8VEECY`3;yx)F>2;4Xr&gC;Iqiqx;orWkF -z8xk0Ty-mK&z`^~Fbs#S;;Qd@1ZFJh4R`+H>Wx$xgn>^oka;w9~QfR>rS7lYHG?D#o -z6Jo`Qg_-DP -zX@kdURs~L5?afF*73QF!=HQ?vIysP;FNCMBfA*}*&%$eDHh5L|y~D=C^v8(wdtcYZ -z)8Q|56BuZ~3~KpF-oKg|5Uf@Ac15Z>sP<9hpm(E>^cgr8dMxGhn7mnWA+JPK+EGR; -zCfK+V1&Xi1M6CUFIA+oJqr(aF3W_=ph7h;IVlqq&xJ=d(CqczQwL>f*A$gJW_|iZw -z&>!^cGyI)UH(_%jFMta0ci8K;?^D#C4_`@%@wP6R4qvs8y@ecdj|*ia7Exg3*BpG4 -z%Dqav(-_hWolzv04-3Ygs)Z~U$`R?hQq2Is2`RWS%z4?!GF2CryzMjCEFg_Y%K+yz -zG8tm;0X{;XG5?BBT|pMZ296(fGUtoF_$Ryrso&s;Cc!g3a;pYOn-tjPvW+1)iAQ)I -zaPyG(wl0MZUqz_Z!4+oEh$t>QIaiZ+J1|fQdfugliOCAg+6D!~3<-k#gA8N#Rk3@5 -z&u3Yevetsi3m`sm2Ntt>FV(PfME~wR=LFu+2@Noy&wr###hgP3mjy&H03re#97OQ% -zsZ;NtktNoC?s@G44Num-@G1zw*?jMf)dA`SWJHyI-Lp=m -zyv8V97L8$~?>Sf(&Ee27TQvEf=-_%~EL56_n`*ZRVS`=4Ka4&HGjr9P8e3rf;8BK& -z&0s~H!Z|V-mPt9vUj?5&%Sa@;XK~`TS$ylgW4|1h&I!<9c6_zoDdR2)FLErHw%Sow -zwc_2ZKizcAMchMvZ^6OY8)uiUt&RwA(`3@dzgihQ1MSrNi;ruq-C+?oVa@U0x -z(>^4ei3Bedg+!LX52G(u@W4P&3sdv45%OawU(*aQat~OuEf?Hi6Zi>__qCd)nw0_j -zvUwA_6WQ5tnFsl_AZNz8L8L*=L4?0A>inj9l&C`AC71u=H -z?bu{Q_=al@1+|F&El|te2eQB@?#+g(D(LjFx>w=0X;CJ|CQc@tuin_)Rd$KH$Y9P9 -z${MAq+Ns2`>_SLAfKm9~%?U2bK6>hiDEbdUD#NMd$hR*wFx8TxWVY3Za -zM&tRPhR$htT-*KlZT-SGBy4YD;6aZfAz^Jt1`=ABifztn#D_;u)2WTa-Bo^EKL;=o -zDc6Ov2x3ybU1B6gkFjv-UvyFl^(EFkIb4ht2Z(*io4 -zW(6^Rp7OMxVh73mYH?bkbxgXB=+TL>U^8OY>=P$oXPkGAmF?6#80T -z+e?24uzuJC8?nCu`7)ef&Nu8x+`0%wOB9wmZ^(+|&$!T80~3uj?NRH)aNhf~#vN9e -zem1VW#bKd$SZ4ufS0-pzoJ%P7UWdT@8yg`1+kpYLV153t;UJy~P8@7sO+#{ePIXcSgw}v2XayA<>Jxh}D)tMOGRgJY0QEJs` -z{>aB;ssVeqKi-6L#(PnBpPuOu<4Rf*GWVk8BdMCd} -zc^_!LU3n2YWBEk1?0<%f@MkB;t#h0%&cixNCZn@Lft$eDVl6z=l@Ga}k<7cF5n!!o -zXet^Q3;AyG!j)+$=3U>7D5cEf)=YMZ)jSZ?)!6EoSa3kU!3W2Xn`K`PqR|ML`Ju!A)|K2`l1>ErJG>o*qIC72B&jHYe36od@P! -zi)qQ9Y7g*>N;Y4;sSLlPxvM;q-Tzw2m;Zx=x>{mk0;Ed5zA?Hb1FrDGc6-;m+iSFU -zc22aC&R^-iyw5vE$D?GWWo7A5o@@>d3_uD92sGM_-tlsdQ?ZbAnF4LsSxDj&0TFgO -zFbB*@;0<;Y0es>tB&~M12_up)gRS(Ce{seFR$9$~MC8~S%gCTV+2AIiH`gndEW2~H -z`z|RK5KuxIccy|!;Bkm8puw0EcWFE{ij71G*o4( -z0~y!3%z_nq1kdh3x<;XVQS{_v?Q3|H1so1Z#CL|Zm2Z&7-mTO?&1?U-oogOAE4Cm{ -z`d4o(XCnWH-J^hx&?7X^xHns&B`u2*skUy`s~w=0252bVaZy(}U?e5?u>fG!UbYaS -z4Gz$YBX|~|U$??YUR+zxw2g5F_OJB7viI^}qx|ouEswnc0o{D4T~~|912EVr9)4P& -zS=*@uBmgy>GC)sz_8A$Iga2y-R#LKP$zyVe7P=4Vrn@Q)Fp6mG;Nall=^07<{OPT~ -zPDD~5M}Py>^H&ikOMCrXaXjFMyNuyNg$gXaPOE4z3=$o3Jt(guFuvAQbA?*MR;Dx}r~+zsgJ -zzCtQ*$r?UAKNl$E39K|(pdcV17*;zU{VtG7{)QDicnC&XAit07AxkJs2xbNxkEh-l -ztI=-hZ#0{5e0{huHk5pMKFXUdk-_HT=8j~#**>ze%L-Vq--ELbc7OqlEqqgfDL$7| -z^zia3^m~7il#>&4bK{s6W!C%o9eQ_nw_LRXoq&)qk2e`~Carh!_+@C+^?4E@nB?8v -zrP(B~aF_-3_5wx4#3EgX2f|T2iDX6dBot9e+}zxz-+7y;fop?^#LWumnJ%(ER<|F> -z44(0)x_-m7iZI17bV#w5<;|{V>IZ-R+z|XI2d!L0M$z{_~PzI|b} -z_>I9TkwT-USfkDEyuoB7YJe7^SUeW*JCd>d31w)Viag>w -zE)Hcnu_U(A@CEh^w;UM0IVsDf+yNUB)lCpiM=a>2dMSVx95URpuHBLGh>h8fgM&77%eeba~6*@>lA8=;7iEw2QP4d^IvP -z8fpiWc?lq5kxp*C)nS|HY^i2ov(x?A!{1u(mk%xyJ_nmAsx{Zt=LV=Ta0-O}2|y4O -z5yIAhMw5|xp3lvw|Ps$0W*KZd^Wlj=W@{AaG=^es3_){Y~Jis`IYYiWN~ho|DLil1qRD5 -zN6xAlvXG=U-8`VKVHr!k-;5Bi)EfnJRTtvY$;jR$#e%~lxMV?xboY;JA{IT_^y}D0 -zw1mJ8tVoSO-(}absB6M8b$Zqe)Ok0$OkaA#I -z48@e8TAlv;PmB6dbP|{7<%qt@Ea>I;PRL4)=M`_G!A40Y$Xy1Mum)I0#!3<77H4)u -zI6c{)TUsy&o^*@2H9Bp>QJA#S8$`zN?+@z^IIQL|VxYEQfVw~Oc}Wq!FS`G2T=aDu -z-DMYe(1$x=331oN(i#yV%?Q)lcY`}FpGRp*74@@$fX%pE+dAGOh5QRhJ&mcaXOhk4 -zLi_pirw^Zws;d9n^#IE8T1ypZDX|crNABquU?iL2;Ql%4Vg5cNBt}OJdbLKnEi|`g2q%v70%eM&7 -z5gdFefu8Ix3n54MC -zW40SGT11ajrrm5AI24T?-2$|VMsU%VX}AMmt>Pr~B}#An{>%QG>_1FQYV^)CExzx2 -z&7E_9c!fpiCLci|F3H*eM2DQQRtQp4>V2RP=KX3ZVw#OXuFxj$VDmM&HQD{*dc7301976VQyI69%EFvxxn>qC&Lo-`%ImvM -zCv>AXKPcD26Z_;m`1pw)uF6Mp=RnShU^yM81!?jbl!v#-kSa#RLhSOG0?yp1YB6Jr -zW=GrO|0zIRSHiH?DYiO+$EpdMkwz#4I6V(J12-W0+dAo4J*?nDQrFI<*}a92Y%1bU -z`RC_4tyg7>R(8{ -zA8*g?PWv##WoF+p0bJe>whg#+(1_+A+)9HS$|n?k;(r=Le*vR;57rn)2& -zEkD8KBSZm#3Drt?t!*#s#>0+yUNysIKRg=t`KSOcSHieiUP0z8F_$tZ(ciPnq_o~@ -z%-{zhbs{i7 -zt~8q8%WO|MF(FE_ye*bl_-@NcA!S9$IMb6x0`e_oNF!hy5a)H^H)5)t(}ek4a1Nc~FF4@f;5aO%aB&3O%B8NuMWWCzYb`d> -zQ-&3)G|5M|pzcLy>pA(p=?3&XKn+v0^`HNsS?M0eb+60BxF|&Y{?>MI^x``)Vp}1V -z;<0N$BUc(0=p=y>zD3k_I~ -zMC>T|rn!T!wN%lqT@ -z&Afsj|04$m&CH2M?F|6yeqb+e`&JWTP^~~z(;c>5;z6RuFKe)%3j|YzeZB9c)5E08 -zvX9?L9%?PT7Vu(RAIXR}s*=I*@Qp<*vA{&7B2uwdBH$_I`33U5di9weG|3 -zx-Iy`1L`R>G-q<+w-{f5qc<7ls}^cT4Y^Qi+meHXFIDgqkt0wpdBZGY?LB+q9&o`T -zd18L5%R+44Ml^UNbEw58BXP#{+I#J1$;VGO`#6Grd<=RWgP+T+ktE6H^>C;%(}szj -zK;wt^oW!yG4Fz=zm4zKw@$Wdo`VJm=879kp$F&$uMP_qiKSB4L@SV)g55F9Rb=3ocrK>iqIRR9n!X0Do*Ldi{9M&^sg&T_TZz~>`tbXc$p%%BI% -z#MahUA?U0t#2ZA4_41*w&52#TXU^_G4)$#uGOnpIb{Gs?Bge_xP|beH;cUSBec^gk -zu;a`And#3j5LZ)LALL9lQ0{$A?tzx&K6M(;#M))7n&`7KTkT>KvjI7O4?mTa;X`81yn7WAir6 -z^Dv#2{~#3{X=5gyP*2v`3yoLJl)--n2rC2}*3n8(L~4ohHzT6QbyEu{!K3q#&p9Lp -z?3#RrZR0JWoh5V%Au%m2?uSB&RO!i99khjDd#7P;NaxJ<_f>mYXQOtXqBZifoWn1d5WC&hmG;&Gv(>!l)|)selJ-m-pz9Og@*rA -z%Xl~n+gHI_Rjy513U_dEaq-~ZLm%H7RpVbREoW=Zu*D?n%JFyy6(v}{RCOy -z>_wu--o5bv-4rRuWG0oN3a2+(f)C6nR0%>9HdI1mB`d{jE6Q4vSf>>{@~N-bGMc6~ -zn=1MB2?XIjZuOC!s@-pN5{60UUw-L4f1L-3Ohud?4)I$4Y&#w^A*ij(1$$3|Vskv} -z#YKCOBnHKh5QN8fd|k)wI{^HZj_1!`{L&>R(m@P^tYk*J)5>eCrio9{j>kWLDCGrM -z*O<)utCbjQiH>aHzD!~>SNyzV|B?uyizaR*!v`(g6N5ks=aSqWHk#wzbQOx2Ehc(>s -zfl`oSK+EzLOKDeK?n#pu;5qF1g-8bXyN##%K`x2R14CxOh8w&P-kz4U}>3Q=A& -zwAa>sCXe?|fR^Y+S9_jW;=!_GK`1Bc2HY6Y)*s}A##+#}239~LV&Q~wL&4n_6^@vW -z;nGUYJ$5-C#kJr2EtD&Ty$t-H)#GyT->}39LWB1gdo%LwqR8{YbRBL*-FCEc5iY{; -z#TpZ~y8yolNKuWi&enqz%<*)Y)j#ff)9q1ezkI|N7|zr3b=T|b>+m?)d% -zKJ;1@L~w8ZQn0MxZS*{ew-;Ohn^Jl!+U{m|QvgB~tai**t#d>0E=CMjN*SZ+36QnO -z4NrSN!Cd>9SLf?=!Hjh+ek}c}ND_U`vvi9(MS>7nGZ*lPm%4(7(bhfuTHod8y%;N{YO_KMV}N<7D)x5snD;XG -zzCOH#WK2$4mAvQWFCCZW#F8TRInJ+=$6eR`V~dES6+!6-=6lkVCHyCW^Bb-$@=b%3 -zi%hxQwAp^EOp|zR61~UikJsM89qE@P3@X5J>+K)hO6K`Z$80UqhLV&|mVt3wQ#G4H -zi4>T}s*jr9pkN+B@=LbuMW8^kzEFQde*yOdnXiUws9u#OD8dYzm?0F`qCm7pBCNNz -zOJB@PR!5?2&9Zw_Jg~i=TwmStKiYq1_@$ -zZKB*^u}y2o({7rV#Nl+8$2T5 -zthMF3X`+*;4Q-~&-*4NzrU=7>#}h=jB}<^tsAch7Ac~Vq;V7 -ziknpCHOP}_P8F&VE%6e`WG~EVa?$ra`knKZrYWbIZ_w@4vO+{B!(Pb&!YhY8pCfe= -zjxF8x>Zh3;#gw`fu})grVJcf=Ohg_Xc9m?(57$!NXQ#N%;Q{V}EjtmA$m<@Ie2(h2j9T2Xq=0<2R#daW&$ -z85=lCIqjn+?h$SF4u|?#DOOKg9>2c{9GSdlh{<(WR;Mb+bxH>u95roevUiqSmcdG* -zEL`{Qv+mA#hjLxuC*l?ROBgDsPYkDNU%;m09$2^ni=SVA=kS_) -z_h->URCbhQr89T-a-Gg9Dk?P`CT8-=f%@A28AYMmma&Ks#DNDsr^|eI%nHBQ0Nps* -z<{@u^G-9krSD|^{Vm?_nRkW_T!;E*n95To#4sxn;9FH2W%&T043S^Vg_Bk^^&J9*H -z=-^Zd6GYUG(CMkA?hy<&4Tc5fn4$3ys+ZiGw!07qHH1zPDzAJY;{8Oj#B1-LTAZ>D -zKqX)c%j0#o|H%z2zdkxYKaV6<&nEMgP`q%2&v+2dsa++rFeWoOnf$VkCAY6|8|kw{ -zdwe(maC?oeGlx#HVClH?)W&QZ`+=l3PIeQ%9cb~nWxJ9)YD|MPt`v?0-3bMcbZ<2Z -zG7xSnH{QoOr#C@?R{C$168|JMfCxcPAVuEhewgQpYO@AfbP3Fw+|Vi7h~L@$6ydj5 -zyf7_h9Rp$0Gii0mkT9xddqw>hIVCXV203~$D~swIj_)TV=zX)@-tK6Hb66mM;EywH -zsMV;{!i^8fvae3b)iz7_f6$4yU2i-b%Bh|o@eU2$RD^G(AtWlyl0^8dxd<9 -zCi_xU0%&wFugtmc%-uOk=xMY?lR%{7BQRZ~b8}1<=DQI)v2*#3|70VNVV*?SK4O}0 -z-HEICfCoyTwy@{F=Ac>4KISQEgQLDcj|>j}hzn(*RSn -zZw&u6!^Z2~7ae&u`+{IHYm_vxJJ@RRZ!LoCjQ2ecK6E;AqeyJZxfuAC -zaFBgBIQO4DawgA~vN)BCS%`;S38kn@9kWOTMq)$V$+z&4nDQvH*{(1#N58$C)v2#; -zJW|ch#FaXRBNNj6mX)HNV{_ScADWB7#Jn(Th}B15lvrI|-2fj-=SL1AY -zQrI&y#`tyxRIyenc$G7)m}|d;5&h;8q8?ap1~7v{vEXIAhojO|^XI$6=K!f+>;5yx -zJJXiq*Z?mW;Ak{?4<=)9$$a@6Q*=1_%}Nx&bGA3oqS%{I)k3y{#DALAzrPw)h(FU -zj}8a8Xte($dBpT -z_ZLeg50aO#zhmy?M*+dS#c4NyP>CZSyS+OOi>@2;)lr;&A$)(OEO;kV+bz6O57by -zyW>9>Ij2^Du|A83(r~$46%S7?Ancv(6R -zJK?TL+k$9p$KMJgY}hdrTzyS}0it==hvU?8YM**7M}l@-W{&s26~NM6 -z#U8(RCX-=6Lw%{$D&=aKSfE%aJ<__RASP1DaZcJPva<-yi3NH#t$OuNk6wlp&CD~1 -zanJ|7AhF;l{a^)Qhr_9Bo;2ZG8=}0whx#r7zZ6W`Fs5 -zJEbvhZVJVsORu$w4Y1HyT1E4?Vka&kS*mSpBuKM>OAT~3W;g7KLGzfQWF~QJ1)H6S -zFCOXwP_auqzKSygLBPB}EH;Q1gXb@Wm*lZWfM<8NWGZM_*$8Ze)0+^IpqCyco5T+P -z>!edzc-RMsx%H6~4%a*u{&6!V2Xf)f8oOKEEtBAhvI#TkSv+Ago-TMSQ(2q}=S0FP -zL(1v}1vp6Ya1@zfO!}Dq3ke|~@mmFXu2dHEQWpO$6X$;c8V@V*w>NACSkmSKF-THX -zXc85Wu2(uhx0b@}vaeA-YhO(oJ!8ZlugSxzOn{tnI7h@dCB`UVE~EEY_ww_|qDlb| -zQh0>qvDy{uar91x0J$!N&ch{3*B*?y730`NAZJT0IXU?T1Oo1Zc+QnB&!+ZYLh%_v -zV;)6DQs1sEzvoxu0r{lou-yG%CgwotYzFK>vqr!e>KRehvaz@y)fTge`_wgV2*|2H -zVl|vbxEx$3ymn~uGqN65%FYqJ<_)*Uqs49;KY2h*(Xa?Tk7AFfl-xf>irJoUyL*;0 -z19&1GQV*5Ni~#kTnaq0ymCiLjk_=0q&=&|cG{r57n*6NwV6zJl5K*ED&DsZy8iEL_rr -zgsLXr6cN9-S7dCo0TeKI3ByoGNNBIG{4b4m4=LB^FstU0B?!6TBZ1v~zn%e*Xk=B) -z@_rySE6iHcIxSfbe^sRAkjZKFfR!7A5uNa|Q%HSV{);)`X_I$=Rz#g9)RV -zjIuDE+A6IDHt@Noy^%sCnU|?kL3tCMU12QN7688MFeYr;%^{CT)BqX<4rY8gFNo(^2<+x6~@> -z0Y;8%xJK3sk3si!JoTyNPRqf>i>%mkw_b{g-~}-aAljQww_S1L53kdn=uMDZM5$#ndk -z&22o*u=b&^trc3UMGkzzrL*~$;t?gd{w8WCC+z$)6{fY`v4CL%;?|JZtR3}&oLz8* -zT?G#HsX)xAYvWho@h=pJpzsjcWp0%LD4s08onG)Nb4)MY=8K^XfVvcKVvP||0{idF -zr>Wx=dX&);ID@-|u5Y#BAa0c8rW_t)Xfo4c@By|jKCCPsr7DjJ6t;eTIrmF;CpM`~(ysWB=S@seY-cC;IYp7eGp3%$l} -z)oc?3jDrN<0qs>+yfj#>o^%eHp8`K^wUK{qUM_Xl#K;;VHK+>&$DqLQV1~BoxLuBrt&0}DAhEKn_^ER` -zz-29QNvC|8F%an87xNYKcn*LCu89T8nVkc&?~&O83)5GbY)slt*#=)i7s;A_C=2r7N7+fk`X1KngTDCyUEafq@X5m_z1=DeiD@Q38P{+Ou8AdwgrjC5 -zajlbj!7Ae^jZ~9GGnmvF%|dV*Siz7~1$lG}zFHP5%BV8TD09lQN!w79WRZ;`=PM(z -z0;YT`0PcRb5SM~SQ_OKjwTc~?W_G_IPe||U$;Um2U%fe+7X>%Nvy!xcXUbbT1miw0 -z=$X7_W&m0ay!h~`ae>C68mu@al*ia7R0saqO=sn$tE@ww372nWLhU^>%{WE>Eoln8 -zaeH(5Zly+xlW1Z@B{Z2HqS52V*oh`BC}k&quf19RS}N6$l#0qGWzl9DQkZ@85(#UMH4E) -z!&hPrOmR$HRF*}2C{e3A#U3h9d)gN68^|>O9=TO4Ga~u#5kl0}_*QP9IxEl~Ce;Vj -zS3zvyQ+p-TKYiV8z>J$akDBH=i$W7}&)8|aN%_17$7$H|;eKWRKgAtrMwoyE;#kJp -z>iJ{R+d4p$2q2;Y5EBQ7>@E&mk*MzVW>!EDsQ9Pd1Icl|=0d^U2HU!hP6MLe0bwp2 -zA=U!|OQM?{{^8dU?o^&w|I~Y5fw~zw)IT&*mzBRUy1Ljo^-=Z`fvN|N_JgxG~k*Hc%03VftQZkoi*AD{-11-bt2%}_=-R;7ZY`jOzsFyAEWb! -zVJNLPL#@4|8iv-c@m4Lu!^Uc7?VOsDWty>@T6^QN67|~9P?w&boWVpR2)d)gI@s*$ -zT0uPct)H#x^_Y(_q2El&g2<(pF8niAzCde(;c)XAp3awn@Z)3{qMO$l1?#O_cXL+a -zB+yS96Q;w{xIBw9%-h2xp$%a(D0`Noi$$31BbukCM_lu$4sG_+rWsH9U`eD0eY3t3 -z@`vkyB5OW$_NhyNPE(&_JPvYO1XVd%SiaJPVza|ZguGogD*p`OzJ!Odk4wR7o=G7; -zQFEN*_9WQcO`Vliy5G@VCnZ;Qb~fJ44e1$o^Tw=L_lA;Z-8Dw0CC}X_m5Q_J*xP61 -z2tVQGAnU9PA@k;{9QL{c=-~c_joC`W*8qxTI)7}foE-)SU;g6SD;S1P5oGCta0DrC -zGXz?khB$Fn{Ycwuk%t&RTyJ!Mz8mnC0U+AYu}PkaA-t-gE*25%;RVKNKyWz!scpu6 -zZDKFBX5S4#lCQK!Ip%UxMsP%cC4T!8d`;mo#M{(B)h;Ilk3UVA`-O^+JuQDuUnt-K -z=jEH2NuzvVs7mGT0rJ;Nz54;;pVk-{O`o<8h5~yAG9cx)%sJ+#d0-B8j!9{+{>1@9 -zYiz-m^g@6wE8^*umZD0JhIN!|&Ok-?2XhJ@B|oI&FfS^$rs90JhlZBoJW`e5b9j^- -zWO>uD9oB-o4QKEBn$akVeT1MeUX-s%#m~lPXZR!_h7SU~%Y_rx{QlrO`$o+{oUb!PIS+x5N -z+{O+YLa6?IE1#&A?RMZ&J}!O!vj>Os^y>J_BMi^Cu8;>FP)!5eagStg`4k8`f<9)s -zLv>uniXJHc5tD}2a*xO+UycHT8lGykAS#tq7H&?$Q|yXO#aH{77;M;}%#Rn*u_i#Q#=kFoCjB -zxM)O)sW@_wx=K{lJ|iyESH0iv9Nr111eP3eEA!SenTb%U12{RS*7qj0=;%^Kd#QiJ -ziYTEU=jFY{zWsSqmqmw<7L@5T1o7NxWhht`9gu$(b|QZnjVAE)D;lyC=>~hv=8piE3T9#-QVKCSaq-q&xr*zuRbfKtru+;Kkp5Si5+<6{tz}rp -zigZWmiiYYR#xdxCbhhJz=wN$k9zPcR8H;AJErv2><3*Bm51h&CEJlpT9yo5`1`w{pnaAJ%0k=ISmg0E -zo$J6^H1-w0!^WV5w|yx36dtal`WN}DGpD-gqYjDTfjIaLtR}xxCDSo6v=}KHRM^9@ -z&T;nw5x5ee(K3%Z3QQF%sMId_cIRpr&3g$f><9ZoX7X_c7g4f{y)mf(?;`TLI@jLv -z?N)ryzDJ)LsBZU+VnRH0X1E}KJ!}%#n_-hEY9w -z`8(=7Fd9^wGY;{_ggJK@ZR?yW!1!^^d;F^x%}=DG(7K8XMm$L~K*Np|t>vZmA5%Y| -zINrWxnZFq_J7&ksTGEluekfNRCX$8u^xk+?w8Q1iII^7LA8Wc=uh=>E34C14fN(+~ -zjb&LKSzG|ur8^cG=n*d|U)DK;5`-D7c>o{;1qb8{cYdL5^ll*Y29ag^ZWs(}{Dq?& -z7Vt6fu%BVSoqvD;RYW!I!KS^e-kCz_2@FvAByt<`2mpvxlE{aWp)% -z7->KZs4&!M+Z9|_;(QrbPRGNC2zLU&;bq*v@zaDlNR7 -zR!OB(0w7?XvMI3w1tc_A&fY$=RO&K>9q)K{?KeL9#X2nl`k!ouFF)XFC@Tui*%L4~ -zwNvTu3}=K5TH;uDS!^k3d+!l_hx$f?(hkYU(6NBYx@mz*Y6dZ7D@JF^5^p{aiT5zv -z;Xjc--#|sw407DGZz<4^FBXBq5F)zwTQ|65$~FTfyft2wOiY&QG(ydKoz#wa?YKny -z)9C@EX0c#XN}}K5dNFdMNo^+Os>0sS^c;E5Ky4zm)q;>J{J+z3sdUj)7tN@@gZSf7 -zJ|wiD$oI`e{Xe-gDV9P_(x}i7AaPVJn&m~NMi(84-RGbXy6@{lY?h66ze7!6Ee=i! -zInre-6PCHrI9+8v4+)Zge*esLVEy0*)t)o|)801Zf98hgQ=EZH2bpZ=)5NN_2yjw# -zP8Ewr(5WN{8DJpt*e!|G(gvZ5Pxywag$Agdns%%4+IH>|FMw9b -zKb<-v)*Cb*Ao~hb;B*`Ee&trZYBi`{$ru%gmKbuXcPNb3lD3H3Jimki7;BEFp{bxX -zFJ7Rk<~$d5(AGs1%w=$DDrj&3=?C4wX`U{m8^^=Z8R3YTB_A>ZAOkmldWl -zwo0ZyTNCB`dfUZA+chm*()HWtA2!JQ3>g${8%Vr% -zasf==&095e)fG}M%iIsk{PaQ>2|D59ppz^2pExvb9Ou9EI^`kN!0aXr*u3p0ex0b4 -z=AnHH#@v>`#o*LjN-yB0^^l)H2Nm=yD3|>1aNigv$f`s680kxF8B%d>SUG)YF0R~W -z$TI5rvll2~&q4RSwu3})*@1!~z4l}@NsY#MwV(2Y=hbLZh-ce*Eq3<#rZ -zxra}au9h@`-JaCDeW|)St?N40z`g~4rjZ?xu=?#W;cJyHNPXCV2DuxD%N1A2hAlFH -zwTJm(6XPn#dA&{dq>&yd{5Lp=pa<%$*em=~TdQ%rn_v#5`>I!IS>M^uNpl#N|wC@HMBcRTMT#SL;d7 -z<(&BuA6dLkkx|8fWw@PXzCeCBgDx@HJs@)L+j8y~gZ)7)${p-|O7{G? -z&|M6FI|A*^d_U+Of-3`+w(c~-YsQby|NH)g|G7xv|Nek^|Jex)g~z+)I0xPC0460S -LFIp>X81%mY^Bg|U - -literal 0 -HcmV?d00001 - diff --git a/patches/server/0489-fix-converting-txt-to-json-file.patch b/patches/server/0488-fix-converting-txt-to-json-file.patch similarity index 100% rename from patches/server/0489-fix-converting-txt-to-json-file.patch rename to patches/server/0488-fix-converting-txt-to-json-file.patch diff --git a/patches/server/0490-Add-worldborder-events.patch b/patches/server/0489-Add-worldborder-events.patch similarity index 100% rename from patches/server/0490-Add-worldborder-events.patch rename to patches/server/0489-Add-worldborder-events.patch diff --git a/patches/server/0491-Add-PlayerNameEntityEvent.patch b/patches/server/0490-Add-PlayerNameEntityEvent.patch similarity index 100% rename from patches/server/0491-Add-PlayerNameEntityEvent.patch rename to patches/server/0490-Add-PlayerNameEntityEvent.patch diff --git a/patches/server/0492-Add-recipe-to-cook-events.patch b/patches/server/0491-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/server/0492-Add-recipe-to-cook-events.patch rename to patches/server/0491-Add-recipe-to-cook-events.patch diff --git a/patches/server/0493-Add-Block-isValidTool.patch b/patches/server/0492-Add-Block-isValidTool.patch similarity index 100% rename from patches/server/0493-Add-Block-isValidTool.patch rename to patches/server/0492-Add-Block-isValidTool.patch diff --git a/patches/server/0494-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0493-Allow-using-signs-inside-spawn-protection.patch similarity index 100% rename from patches/server/0494-Allow-using-signs-inside-spawn-protection.patch rename to patches/server/0493-Allow-using-signs-inside-spawn-protection.patch diff --git a/patches/server/0495-Expand-world-key-API.patch b/patches/server/0494-Expand-world-key-API.patch similarity index 100% rename from patches/server/0495-Expand-world-key-API.patch rename to patches/server/0494-Expand-world-key-API.patch diff --git a/patches/server/0496-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0495-Add-fast-alternative-constructor-for-Rotations.patch similarity index 100% rename from patches/server/0496-Add-fast-alternative-constructor-for-Rotations.patch rename to patches/server/0495-Add-fast-alternative-constructor-for-Rotations.patch diff --git a/patches/server/0497-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0496-Drop-carried-item-when-player-has-disconnected.patch similarity index 100% rename from patches/server/0497-Drop-carried-item-when-player-has-disconnected.patch rename to patches/server/0496-Drop-carried-item-when-player-has-disconnected.patch diff --git a/patches/server/0498-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0497-forced-whitelist-use-configurable-kick-message.patch similarity index 100% rename from patches/server/0498-forced-whitelist-use-configurable-kick-message.patch rename to patches/server/0497-forced-whitelist-use-configurable-kick-message.patch diff --git a/patches/server/0499-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0498-Don-t-ignore-result-of-PlayerEditBookEvent.patch similarity index 100% rename from patches/server/0499-Don-t-ignore-result-of-PlayerEditBookEvent.patch rename to patches/server/0498-Don-t-ignore-result-of-PlayerEditBookEvent.patch diff --git a/patches/server/0500-Expose-protocol-version.patch b/patches/server/0499-Expose-protocol-version.patch similarity index 100% rename from patches/server/0500-Expose-protocol-version.patch rename to patches/server/0499-Expose-protocol-version.patch diff --git a/patches/server/0501-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0500-Enhance-console-tab-completions-for-brigadier-comman.patch similarity index 100% rename from patches/server/0501-Enhance-console-tab-completions-for-brigadier-comman.patch rename to patches/server/0500-Enhance-console-tab-completions-for-brigadier-comman.patch diff --git a/patches/server/0502-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0501-Fix-PlayerItemConsumeEvent-cancelling-properly.patch similarity index 100% rename from patches/server/0502-Fix-PlayerItemConsumeEvent-cancelling-properly.patch rename to patches/server/0501-Fix-PlayerItemConsumeEvent-cancelling-properly.patch diff --git a/patches/server/0503-Add-bypass-host-check.patch b/patches/server/0502-Add-bypass-host-check.patch similarity index 100% rename from patches/server/0503-Add-bypass-host-check.patch rename to patches/server/0502-Add-bypass-host-check.patch diff --git a/patches/server/0504-Set-area-affect-cloud-rotation.patch b/patches/server/0503-Set-area-affect-cloud-rotation.patch similarity index 100% rename from patches/server/0504-Set-area-affect-cloud-rotation.patch rename to patches/server/0503-Set-area-affect-cloud-rotation.patch diff --git a/patches/server/0505-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0504-add-isDeeplySleeping-to-HumanEntity.patch similarity index 90% rename from patches/server/0505-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/server/0504-add-isDeeplySleeping-to-HumanEntity.patch index 0bb0024480..645f1201ea 100644 --- a/patches/server/0505-add-isDeeplySleeping-to-HumanEntity.patch +++ b/patches/server/0504-add-isDeeplySleeping-to-HumanEntity.patch @@ -5,7 +5,7 @@ Subject: [PATCH] add isDeeplySleeping to HumanEntity diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index cb56c75be83e839bafdae4356f85d33499d01d8a..1e49eae80730aa9d2e49cd92759d899deb49fb90 100644 +index 42c41cd4b280839a35f77e04d0dc6a06d262d8f3..d5c4184e0d93eabc699661829ff4bf9b46d27142 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -132,6 +132,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { diff --git a/patches/server/0506-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0505-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/server/0506-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/server/0505-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/server/0507-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0506-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/server/0507-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/server/0506-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/server/0508-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0507-fix-PigZombieAngerEvent-cancellation.patch similarity index 100% rename from patches/server/0508-fix-PigZombieAngerEvent-cancellation.patch rename to patches/server/0507-fix-PigZombieAngerEvent-cancellation.patch diff --git a/patches/server/0509-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0508-fix-PlayerItemHeldEvent-firing-twice.patch similarity index 100% rename from patches/server/0509-fix-PlayerItemHeldEvent-firing-twice.patch rename to patches/server/0508-fix-PlayerItemHeldEvent-firing-twice.patch diff --git a/patches/server/0510-Add-PlayerDeepSleepEvent.patch b/patches/server/0509-Add-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/server/0510-Add-PlayerDeepSleepEvent.patch rename to patches/server/0509-Add-PlayerDeepSleepEvent.patch diff --git a/patches/server/0511-More-World-API.patch b/patches/server/0510-More-World-API.patch similarity index 100% rename from patches/server/0511-More-World-API.patch rename to patches/server/0510-More-World-API.patch diff --git a/patches/server/0512-Add-PlayerBedFailEnterEvent.patch b/patches/server/0511-Add-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/server/0512-Add-PlayerBedFailEnterEvent.patch rename to patches/server/0511-Add-PlayerBedFailEnterEvent.patch diff --git a/patches/server/0513-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0512-Implement-methods-to-convert-between-Component-and-B.patch similarity index 100% rename from patches/server/0513-Implement-methods-to-convert-between-Component-and-B.patch rename to patches/server/0512-Implement-methods-to-convert-between-Component-and-B.patch diff --git a/patches/server/0514-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch b/patches/server/0513-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch similarity index 94% rename from patches/server/0514-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch rename to patches/server/0513-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch index 519b566ff9..852f5276ee 100644 --- a/patches/server/0514-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch +++ b/patches/server/0513-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Expand PlayerRespawnEvent, fix passed parameter issues Co-authored-by: Jake Potrebic diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 2b91b321f6652e10d6809d57e9f0ac1c5fb150f1..57253e59b6330be6176d3aa42f8f575ad1995bca 100644 +index 5571e89876317e7b4b304bb1ec9c31078d0f69ee..563b20033a5280091f93ab72a8600369035b6a0a 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1456,7 +1456,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0515-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0514-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/server/0515-Introduce-beacon-activation-deactivation-events.patch rename to patches/server/0514-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/server/0516-Add-Channel-initialization-listeners.patch b/patches/server/0515-Add-Channel-initialization-listeners.patch similarity index 100% rename from patches/server/0516-Add-Channel-initialization-listeners.patch rename to patches/server/0515-Add-Channel-initialization-listeners.patch diff --git a/patches/server/0517-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0516-Send-empty-commands-if-tab-completion-is-disabled.patch similarity index 100% rename from patches/server/0517-Send-empty-commands-if-tab-completion-is-disabled.patch rename to patches/server/0516-Send-empty-commands-if-tab-completion-is-disabled.patch diff --git a/patches/server/0518-Add-more-WanderingTrader-API.patch b/patches/server/0517-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/server/0518-Add-more-WanderingTrader-API.patch rename to patches/server/0517-Add-more-WanderingTrader-API.patch diff --git a/patches/server/0519-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0518-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/server/0519-Add-EntityBlockStorage-clearEntities.patch rename to patches/server/0518-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/server/0520-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0519-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/server/0520-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/server/0519-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/server/0521-Add-HiddenPotionEffect-API.patch b/patches/server/0520-Add-HiddenPotionEffect-API.patch similarity index 100% rename from patches/server/0521-Add-HiddenPotionEffect-API.patch rename to patches/server/0520-Add-HiddenPotionEffect-API.patch diff --git a/patches/server/0522-Inventory-close.patch b/patches/server/0521-Inventory-close.patch similarity index 100% rename from patches/server/0522-Inventory-close.patch rename to patches/server/0521-Inventory-close.patch diff --git a/patches/server/0523-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0522-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/server/0523-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/server/0522-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/server/0524-Add-basic-Datapack-API.patch b/patches/server/0523-Add-basic-Datapack-API.patch similarity index 100% rename from patches/server/0524-Add-basic-Datapack-API.patch rename to patches/server/0523-Add-basic-Datapack-API.patch diff --git a/patches/server/0525-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0524-Add-environment-variable-to-disable-server-gui.patch similarity index 100% rename from patches/server/0525-Add-environment-variable-to-disable-server-gui.patch rename to patches/server/0524-Add-environment-variable-to-disable-server-gui.patch diff --git a/patches/server/0526-Expand-PlayerGameModeChangeEvent.patch b/patches/server/0525-Expand-PlayerGameModeChangeEvent.patch similarity index 98% rename from patches/server/0526-Expand-PlayerGameModeChangeEvent.patch rename to patches/server/0525-Expand-PlayerGameModeChangeEvent.patch index 0198d74688..ea2b448cf1 100644 --- a/patches/server/0526-Expand-PlayerGameModeChangeEvent.patch +++ b/patches/server/0525-Expand-PlayerGameModeChangeEvent.patch @@ -45,7 +45,7 @@ index 7f09119bc7d661e08a960dd2bd46006efe752d3e..d1da3600dc07107309b20ebe6e7c0c4d } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 7c4f7a17f34802962c74bb8c5a732861d1a759c6..d26c2b8fd241216d4411254c16012f8141f2856c 100644 +index 563b20033a5280091f93ab72a8600369035b6a0a..bbbf48a43c48ba0db7ee74a8b9a1f1beeb211f68 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -2335,10 +2335,18 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { @@ -147,7 +147,7 @@ index 2bd2f1cdf3467cacee55094d43bd3eccf61b9aa7..c3b4b800c5a34afa03ed7c31e14f26ca } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index dbb25f5cc8cf03654faf2386826965f049737897..a6a2ed03ae781809b50fd793265977db0918a259 100644 +index 44046e5936f06b3e46078cffe3a4667034e8f33c..98e80b178551895eaec042c29068dcfdf6d07125 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1671,7 +1671,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0527-ItemStack-repair-check-API.patch b/patches/server/0526-ItemStack-repair-check-API.patch similarity index 100% rename from patches/server/0527-ItemStack-repair-check-API.patch rename to patches/server/0526-ItemStack-repair-check-API.patch diff --git a/patches/server/0528-More-Enchantment-API.patch b/patches/server/0527-More-Enchantment-API.patch similarity index 100% rename from patches/server/0528-More-Enchantment-API.patch rename to patches/server/0527-More-Enchantment-API.patch diff --git a/patches/server/0529-Move-range-check-for-block-placing-up.patch b/patches/server/0528-Move-range-check-for-block-placing-up.patch similarity index 100% rename from patches/server/0529-Move-range-check-for-block-placing-up.patch rename to patches/server/0528-Move-range-check-for-block-placing-up.patch diff --git a/patches/server/0530-Add-Mob-lookAt-API.patch b/patches/server/0529-Add-Mob-lookAt-API.patch similarity index 100% rename from patches/server/0530-Add-Mob-lookAt-API.patch rename to patches/server/0529-Add-Mob-lookAt-API.patch diff --git a/patches/server/0531-Correctly-check-if-bucket-dispenses-will-succeed-for.patch b/patches/server/0530-Correctly-check-if-bucket-dispenses-will-succeed-for.patch similarity index 100% rename from patches/server/0531-Correctly-check-if-bucket-dispenses-will-succeed-for.patch rename to patches/server/0530-Correctly-check-if-bucket-dispenses-will-succeed-for.patch diff --git a/patches/server/0532-Add-Unix-domain-socket-support.patch b/patches/server/0531-Add-Unix-domain-socket-support.patch similarity index 100% rename from patches/server/0532-Add-Unix-domain-socket-support.patch rename to patches/server/0531-Add-Unix-domain-socket-support.patch diff --git a/patches/server/0533-Add-EntityInsideBlockEvent.patch b/patches/server/0532-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/server/0533-Add-EntityInsideBlockEvent.patch rename to patches/server/0532-Add-EntityInsideBlockEvent.patch diff --git a/patches/server/0534-Improve-item-default-attribute-API.patch b/patches/server/0533-Improve-item-default-attribute-API.patch similarity index 100% rename from patches/server/0534-Improve-item-default-attribute-API.patch rename to patches/server/0533-Improve-item-default-attribute-API.patch diff --git a/patches/server/0535-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0534-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 100% rename from patches/server/0535-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/server/0534-Add-cause-to-Weather-ThunderChangeEvents.patch diff --git a/patches/server/0536-More-Lidded-Block-API.patch b/patches/server/0535-More-Lidded-Block-API.patch similarity index 100% rename from patches/server/0536-More-Lidded-Block-API.patch rename to patches/server/0535-More-Lidded-Block-API.patch diff --git a/patches/server/0537-Limit-item-frame-cursors-on-maps.patch b/patches/server/0536-Limit-item-frame-cursors-on-maps.patch similarity index 100% rename from patches/server/0537-Limit-item-frame-cursors-on-maps.patch rename to patches/server/0536-Limit-item-frame-cursors-on-maps.patch diff --git a/patches/server/0538-Add-PlayerKickEvent-causes.patch b/patches/server/0537-Add-PlayerKickEvent-causes.patch similarity index 99% rename from patches/server/0538-Add-PlayerKickEvent-causes.patch rename to patches/server/0537-Add-PlayerKickEvent-causes.patch index 60d07ed41d..38dde8a325 100644 --- a/patches/server/0538-Add-PlayerKickEvent-causes.patch +++ b/patches/server/0537-Add-PlayerKickEvent-causes.patch @@ -495,7 +495,7 @@ index 9e2ad78b12cadbf0e2bda1e12fe844120529c347..6a7d7fad990fc44fdda6849d43dad141 } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index a6a2ed03ae781809b50fd793265977db0918a259..43d46239295ea16808383fbdb4d94da0b85e4fad 100644 +index 98e80b178551895eaec042c29068dcfdf6d07125..8b142874a8977676740f61a0e7277d767fab56e0 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -280,7 +280,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0539-Add-PufferFishStateChangeEvent.patch b/patches/server/0538-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/server/0539-Add-PufferFishStateChangeEvent.patch rename to patches/server/0538-Add-PufferFishStateChangeEvent.patch diff --git a/patches/server/0540-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0539-Fix-PlayerBucketEmptyEvent-result-itemstack.patch similarity index 100% rename from patches/server/0540-Fix-PlayerBucketEmptyEvent-result-itemstack.patch rename to patches/server/0539-Fix-PlayerBucketEmptyEvent-result-itemstack.patch diff --git a/patches/server/0541-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0540-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch similarity index 100% rename from patches/server/0541-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch rename to patches/server/0540-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch diff --git a/patches/server/0542-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0541-Add-option-to-fix-items-merging-through-walls.patch similarity index 100% rename from patches/server/0542-Add-option-to-fix-items-merging-through-walls.patch rename to patches/server/0541-Add-option-to-fix-items-merging-through-walls.patch diff --git a/patches/server/0543-Add-BellRevealRaiderEvent.patch b/patches/server/0542-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/server/0543-Add-BellRevealRaiderEvent.patch rename to patches/server/0542-Add-BellRevealRaiderEvent.patch diff --git a/patches/server/0544-Fix-invulnerable-end-crystals.patch b/patches/server/0543-Fix-invulnerable-end-crystals.patch similarity index 100% rename from patches/server/0544-Fix-invulnerable-end-crystals.patch rename to patches/server/0543-Fix-invulnerable-end-crystals.patch diff --git a/patches/server/0545-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0544-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/server/0545-Add-ElderGuardianAppearanceEvent.patch rename to patches/server/0544-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/server/0546-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0545-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch similarity index 100% rename from patches/server/0546-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch rename to patches/server/0545-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch diff --git a/patches/server/0547-Line-Of-Sight-Changes.patch b/patches/server/0546-Line-Of-Sight-Changes.patch similarity index 100% rename from patches/server/0547-Line-Of-Sight-Changes.patch rename to patches/server/0546-Line-Of-Sight-Changes.patch diff --git a/patches/server/0548-add-per-world-spawn-limits.patch b/patches/server/0547-add-per-world-spawn-limits.patch similarity index 100% rename from patches/server/0548-add-per-world-spawn-limits.patch rename to patches/server/0547-add-per-world-spawn-limits.patch diff --git a/patches/server/0549-Fix-potions-splash-events.patch b/patches/server/0548-Fix-potions-splash-events.patch similarity index 100% rename from patches/server/0549-Fix-potions-splash-events.patch rename to patches/server/0548-Fix-potions-splash-events.patch diff --git a/patches/server/0550-Add-more-LimitedRegion-API.patch b/patches/server/0549-Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/server/0550-Add-more-LimitedRegion-API.patch rename to patches/server/0549-Add-more-LimitedRegion-API.patch diff --git a/patches/server/0551-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0550-Fix-PlayerDropItemEvent-using-wrong-item.patch similarity index 97% rename from patches/server/0551-Fix-PlayerDropItemEvent-using-wrong-item.patch rename to patches/server/0550-Fix-PlayerDropItemEvent-using-wrong-item.patch index 009c771fe8..62881137b2 100644 --- a/patches/server/0551-Fix-PlayerDropItemEvent-using-wrong-item.patch +++ b/patches/server/0550-Fix-PlayerDropItemEvent-using-wrong-item.patch @@ -31,7 +31,7 @@ index c81fd3e1108fb0a02f9240263404af2b968c8494..0d9de4c61c7b26a6ff37c12fde629161 } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 254d9eede5a9a57280643284175df2e061aa78ea..09798fc2d2d847f3ec705a2640f25ac08ca69f92 100644 +index bbbf48a43c48ba0db7ee74a8b9a1f1beeb211f68..286876246559eb38d6aa591c79afceb63d561aeb 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -2744,7 +2744,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0552-Missing-Entity-API.patch b/patches/server/0551-Missing-Entity-API.patch similarity index 100% rename from patches/server/0552-Missing-Entity-API.patch rename to patches/server/0551-Missing-Entity-API.patch diff --git a/patches/server/0553-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0552-Fix-return-value-of-Block-applyBoneMeal-always-being.patch similarity index 100% rename from patches/server/0553-Fix-return-value-of-Block-applyBoneMeal-always-being.patch rename to patches/server/0552-Fix-return-value-of-Block-applyBoneMeal-always-being.patch diff --git a/patches/server/0554-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0553-Use-getChunkIfLoadedImmediately-in-places.patch similarity index 100% rename from patches/server/0554-Use-getChunkIfLoadedImmediately-in-places.patch rename to patches/server/0553-Use-getChunkIfLoadedImmediately-in-places.patch diff --git a/patches/server/0555-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0554-Fix-commands-from-signs-not-firing-command-events.patch similarity index 100% rename from patches/server/0555-Fix-commands-from-signs-not-firing-command-events.patch rename to patches/server/0554-Fix-commands-from-signs-not-firing-command-events.patch diff --git a/patches/server/0556-Add-PlayerArmSwingEvent.patch b/patches/server/0555-Add-PlayerArmSwingEvent.patch similarity index 100% rename from patches/server/0556-Add-PlayerArmSwingEvent.patch rename to patches/server/0555-Add-PlayerArmSwingEvent.patch diff --git a/patches/server/0557-Fix-kick-event-leave-message-not-being-sent.patch b/patches/server/0556-Fix-kick-event-leave-message-not-being-sent.patch similarity index 98% rename from patches/server/0557-Fix-kick-event-leave-message-not-being-sent.patch rename to patches/server/0556-Fix-kick-event-leave-message-not-being-sent.patch index 6d4ff398db..01fed42d62 100644 --- a/patches/server/0557-Fix-kick-event-leave-message-not-being-sent.patch +++ b/patches/server/0556-Fix-kick-event-leave-message-not-being-sent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix kick event leave message not being sent diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 09798fc2d2d847f3ec705a2640f25ac08ca69f92..87652ea4f3950c2161b3405dcfef03bd196f1237 100644 +index 286876246559eb38d6aa591c79afceb63d561aeb..98979f82a14c057bd0640b598d5832c620333d1e 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -318,7 +318,6 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0558-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0557-Don-t-apply-cramming-damage-to-players.patch similarity index 93% rename from patches/server/0558-Don-t-apply-cramming-damage-to-players.patch rename to patches/server/0557-Don-t-apply-cramming-damage-to-players.patch index c3598bbd22..55a1fe08a5 100644 --- a/patches/server/0558-Don-t-apply-cramming-damage-to-players.patch +++ b/patches/server/0557-Don-t-apply-cramming-damage-to-players.patch @@ -11,7 +11,7 @@ It does not make a lot of sense to damage players if they get crammed, For those who really want it a config option is provided. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 87652ea4f3950c2161b3405dcfef03bd196f1237..f0655e6c9c0f60b57912a76448706d49ce774dce 100644 +index 98979f82a14c057bd0640b598d5832c620333d1e..b3fb9d8942b0c56d343656c45ec96d22c00b5def 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1814,7 +1814,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0559-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0558-Rate-options-and-timings-for-sensors-and-behaviors.patch similarity index 100% rename from patches/server/0559-Rate-options-and-timings-for-sensors-and-behaviors.patch rename to patches/server/0558-Rate-options-and-timings-for-sensors-and-behaviors.patch diff --git a/patches/server/0560-Add-missing-forceDrop-toggles.patch b/patches/server/0559-Add-missing-forceDrop-toggles.patch similarity index 100% rename from patches/server/0560-Add-missing-forceDrop-toggles.patch rename to patches/server/0559-Add-missing-forceDrop-toggles.patch diff --git a/patches/server/0561-Stinger-API.patch b/patches/server/0560-Stinger-API.patch similarity index 100% rename from patches/server/0561-Stinger-API.patch rename to patches/server/0560-Stinger-API.patch diff --git a/patches/server/0562-Add-System.out-err-catcher.patch b/patches/server/0561-Add-System.out-err-catcher.patch similarity index 100% rename from patches/server/0562-Add-System.out-err-catcher.patch rename to patches/server/0561-Add-System.out-err-catcher.patch diff --git a/patches/server/0563-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0562-Prevent-AFK-kick-while-watching-end-credits.patch similarity index 100% rename from patches/server/0563-Prevent-AFK-kick-while-watching-end-credits.patch rename to patches/server/0562-Prevent-AFK-kick-while-watching-end-credits.patch diff --git a/patches/server/0564-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0563-Allow-skipping-writing-of-comments-to-server.propert.patch similarity index 100% rename from patches/server/0564-Allow-skipping-writing-of-comments-to-server.propert.patch rename to patches/server/0563-Allow-skipping-writing-of-comments-to-server.propert.patch diff --git a/patches/server/0565-Add-PlayerSetSpawnEvent.patch b/patches/server/0564-Add-PlayerSetSpawnEvent.patch similarity index 98% rename from patches/server/0565-Add-PlayerSetSpawnEvent.patch rename to patches/server/0564-Add-PlayerSetSpawnEvent.patch index 3dd1d604fe..51b865e2ee 100644 --- a/patches/server/0565-Add-PlayerSetSpawnEvent.patch +++ b/patches/server/0564-Add-PlayerSetSpawnEvent.patch @@ -49,7 +49,7 @@ index a2d0699e8427b2262a2396495111125eccafbb66..15db9368227dbc29d07d74e85bd126b3 } } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index b8804881f983cc91ab8e92ba2447151f1e5af9fc..b0391056c5308292131de1d8d2a86a552a9d94e2 100644 +index b3fb9d8942b0c56d343656c45ec96d22c00b5def..0cd75ffc8952baacb391ea8ee67fd1e8d0a42264 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1690,7 +1690,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { @@ -187,7 +187,7 @@ index db26b5a0464bd6087eeacaf6dd61eba37365df92..9117c035d5a6ff114b028fad3380ceb1 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 43d46239295ea16808383fbdb4d94da0b85e4fad..3f89cbc48828f36cf6ff02b9de6cd378b2fde4f2 100644 +index 8b142874a8977676740f61a0e7277d767fab56e0..907b61ff0cde1024508157a45bef7cb50b812393 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1420,9 +1420,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0566-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0565-Make-hoppers-respect-inventory-max-stack-size.patch similarity index 100% rename from patches/server/0566-Make-hoppers-respect-inventory-max-stack-size.patch rename to patches/server/0565-Make-hoppers-respect-inventory-max-stack-size.patch diff --git a/patches/server/0567-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0566-Optimize-entity-tracker-passenger-checks.patch similarity index 100% rename from patches/server/0567-Optimize-entity-tracker-passenger-checks.patch rename to patches/server/0566-Optimize-entity-tracker-passenger-checks.patch diff --git a/patches/server/0568-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0567-Config-option-for-Piglins-guarding-chests.patch similarity index 100% rename from patches/server/0568-Config-option-for-Piglins-guarding-chests.patch rename to patches/server/0567-Config-option-for-Piglins-guarding-chests.patch diff --git a/patches/server/0569-Add-EntityDamageItemEvent.patch b/patches/server/0568-Add-EntityDamageItemEvent.patch similarity index 100% rename from patches/server/0569-Add-EntityDamageItemEvent.patch rename to patches/server/0568-Add-EntityDamageItemEvent.patch diff --git a/patches/server/0570-Optimize-indirect-passenger-iteration.patch b/patches/server/0569-Optimize-indirect-passenger-iteration.patch similarity index 100% rename from patches/server/0570-Optimize-indirect-passenger-iteration.patch rename to patches/server/0569-Optimize-indirect-passenger-iteration.patch diff --git a/patches/server/0571-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0570-Configurable-item-frame-map-cursor-update-interval.patch similarity index 100% rename from patches/server/0571-Configurable-item-frame-map-cursor-update-interval.patch rename to patches/server/0570-Configurable-item-frame-map-cursor-update-interval.patch diff --git a/patches/server/0572-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0571-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/server/0572-Change-EnderEye-target-without-changing-other-things.patch rename to patches/server/0571-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/server/0573-Add-BlockBreakBlockEvent.patch b/patches/server/0572-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/server/0573-Add-BlockBreakBlockEvent.patch rename to patches/server/0572-Add-BlockBreakBlockEvent.patch diff --git a/patches/server/0574-Option-to-prevent-data-components-copy-in-smithing-r.patch b/patches/server/0573-Option-to-prevent-data-components-copy-in-smithing-r.patch similarity index 100% rename from patches/server/0574-Option-to-prevent-data-components-copy-in-smithing-r.patch rename to patches/server/0573-Option-to-prevent-data-components-copy-in-smithing-r.patch diff --git a/patches/server/0575-More-CommandBlock-API.patch b/patches/server/0574-More-CommandBlock-API.patch similarity index 100% rename from patches/server/0575-More-CommandBlock-API.patch rename to patches/server/0574-More-CommandBlock-API.patch diff --git a/patches/server/0576-Add-missing-team-sidebar-display-slots.patch b/patches/server/0575-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/server/0576-Add-missing-team-sidebar-display-slots.patch rename to patches/server/0575-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/server/0577-Add-back-EntityPortalExitEvent.patch b/patches/server/0576-Add-back-EntityPortalExitEvent.patch similarity index 100% rename from patches/server/0577-Add-back-EntityPortalExitEvent.patch rename to patches/server/0576-Add-back-EntityPortalExitEvent.patch diff --git a/patches/server/0578-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0577-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 100% rename from patches/server/0578-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/server/0577-Add-methods-to-find-targets-for-lightning-strikes.patch diff --git a/patches/server/0579-Get-entity-default-attributes.patch b/patches/server/0578-Get-entity-default-attributes.patch similarity index 100% rename from patches/server/0579-Get-entity-default-attributes.patch rename to patches/server/0578-Get-entity-default-attributes.patch diff --git a/patches/server/0580-Left-handed-API.patch b/patches/server/0579-Left-handed-API.patch similarity index 100% rename from patches/server/0580-Left-handed-API.patch rename to patches/server/0579-Left-handed-API.patch diff --git a/patches/server/0581-Add-more-advancement-API.patch b/patches/server/0580-Add-more-advancement-API.patch similarity index 100% rename from patches/server/0581-Add-more-advancement-API.patch rename to patches/server/0580-Add-more-advancement-API.patch diff --git a/patches/server/0582-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0581-Add-ItemFactory-getSpawnEgg-API.patch similarity index 100% rename from patches/server/0582-Add-ItemFactory-getSpawnEgg-API.patch rename to patches/server/0581-Add-ItemFactory-getSpawnEgg-API.patch diff --git a/patches/server/0583-Add-critical-damage-API.patch b/patches/server/0582-Add-critical-damage-API.patch similarity index 100% rename from patches/server/0583-Add-critical-damage-API.patch rename to patches/server/0582-Add-critical-damage-API.patch diff --git a/patches/server/0584-Fix-issues-with-mob-conversion.patch b/patches/server/0583-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/server/0584-Fix-issues-with-mob-conversion.patch rename to patches/server/0583-Fix-issues-with-mob-conversion.patch diff --git a/patches/server/0585-Add-hasCollision-methods-to-various-places.patch b/patches/server/0584-Add-hasCollision-methods-to-various-places.patch similarity index 100% rename from patches/server/0585-Add-hasCollision-methods-to-various-places.patch rename to patches/server/0584-Add-hasCollision-methods-to-various-places.patch diff --git a/patches/server/0586-Goat-ram-API.patch b/patches/server/0585-Goat-ram-API.patch similarity index 100% rename from patches/server/0586-Goat-ram-API.patch rename to patches/server/0585-Goat-ram-API.patch diff --git a/patches/server/0587-Add-API-for-resetting-a-single-score.patch b/patches/server/0586-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/server/0587-Add-API-for-resetting-a-single-score.patch rename to patches/server/0586-Add-API-for-resetting-a-single-score.patch diff --git a/patches/server/0588-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0587-Add-Raw-Byte-Entity-Serialization.patch similarity index 100% rename from patches/server/0588-Add-Raw-Byte-Entity-Serialization.patch rename to patches/server/0587-Add-Raw-Byte-Entity-Serialization.patch diff --git a/patches/server/0589-Vanilla-command-permission-fixes.patch b/patches/server/0588-Vanilla-command-permission-fixes.patch similarity index 100% rename from patches/server/0589-Vanilla-command-permission-fixes.patch rename to patches/server/0588-Vanilla-command-permission-fixes.patch diff --git a/patches/server/0590-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0589-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch similarity index 97% rename from patches/server/0590-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch rename to patches/server/0589-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch index b51374cebe..e2742c73ce 100644 --- a/patches/server/0590-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch +++ b/patches/server/0589-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch @@ -28,7 +28,7 @@ index 50d4bd6223eb92c640a61ee61af862e794fbb519..a870349f1de975e46fe831ff32394d6d } // Spigot End diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index fe39d0ab5e99818356d4e1a600af4bdd3eb03b70..6f0955d58da2df5ffc4b81fc5c7b7c3846d65f52 100644 +index 0cd75ffc8952baacb391ea8ee67fd1e8d0a42264..430a7269852c8f03542382aafad989977be96197 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1983,6 +1983,18 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0591-Fix-GameProfileCache-concurrency.patch b/patches/server/0590-Fix-GameProfileCache-concurrency.patch similarity index 100% rename from patches/server/0591-Fix-GameProfileCache-concurrency.patch rename to patches/server/0590-Fix-GameProfileCache-concurrency.patch diff --git a/patches/server/0592-Improve-and-expand-AsyncCatcher.patch b/patches/server/0591-Improve-and-expand-AsyncCatcher.patch similarity index 100% rename from patches/server/0592-Improve-and-expand-AsyncCatcher.patch rename to patches/server/0591-Improve-and-expand-AsyncCatcher.patch diff --git a/patches/server/0593-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0592-Add-paper-mobcaps-and-paper-playermobcaps.patch similarity index 100% rename from patches/server/0593-Add-paper-mobcaps-and-paper-playermobcaps.patch rename to patches/server/0592-Add-paper-mobcaps-and-paper-playermobcaps.patch diff --git a/patches/server/0594-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0593-Sanitize-ResourceLocation-error-logging.patch similarity index 100% rename from patches/server/0594-Sanitize-ResourceLocation-error-logging.patch rename to patches/server/0593-Sanitize-ResourceLocation-error-logging.patch diff --git a/patches/server/0595-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0594-Manually-inline-methods-in-BlockPosition.patch similarity index 100% rename from patches/server/0595-Manually-inline-methods-in-BlockPosition.patch rename to patches/server/0594-Manually-inline-methods-in-BlockPosition.patch diff --git a/patches/server/0596-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0595-Name-craft-scheduler-threads-according-to-the-plugin.patch similarity index 100% rename from patches/server/0596-Name-craft-scheduler-threads-according-to-the-plugin.patch rename to patches/server/0595-Name-craft-scheduler-threads-according-to-the-plugin.patch diff --git a/patches/server/0597-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0596-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch similarity index 100% rename from patches/server/0597-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch rename to patches/server/0596-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch diff --git a/patches/server/0598-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0597-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch similarity index 100% rename from patches/server/0598-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch rename to patches/server/0597-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch diff --git a/patches/server/0599-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch b/patches/server/0598-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch similarity index 100% rename from patches/server/0599-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch rename to patches/server/0598-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch diff --git a/patches/server/0600-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0599-Oprimise-map-impl-for-tracked-players.patch similarity index 100% rename from patches/server/0600-Oprimise-map-impl-for-tracked-players.patch rename to patches/server/0599-Oprimise-map-impl-for-tracked-players.patch diff --git a/patches/server/0601-Add-missing-InventoryType.patch b/patches/server/0600-Add-missing-InventoryType.patch similarity index 100% rename from patches/server/0601-Add-missing-InventoryType.patch rename to patches/server/0600-Add-missing-InventoryType.patch diff --git a/patches/server/0602-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0601-Optimise-BlockSoil-nearby-water-lookup.patch similarity index 100% rename from patches/server/0602-Optimise-BlockSoil-nearby-water-lookup.patch rename to patches/server/0601-Optimise-BlockSoil-nearby-water-lookup.patch diff --git a/patches/server/0603-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0602-Fix-merchant-inventory-not-closing-on-entity-removal.patch similarity index 100% rename from patches/server/0603-Fix-merchant-inventory-not-closing-on-entity-removal.patch rename to patches/server/0602-Fix-merchant-inventory-not-closing-on-entity-removal.patch diff --git a/patches/server/0604-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0603-Check-requirement-before-suggesting-root-nodes.patch similarity index 100% rename from patches/server/0604-Check-requirement-before-suggesting-root-nodes.patch rename to patches/server/0603-Check-requirement-before-suggesting-root-nodes.patch diff --git a/patches/server/0605-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0604-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch similarity index 100% rename from patches/server/0605-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch rename to patches/server/0604-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch diff --git a/patches/server/0606-Add-packet-limiter-config.patch b/patches/server/0605-Add-packet-limiter-config.patch similarity index 100% rename from patches/server/0606-Add-packet-limiter-config.patch rename to patches/server/0605-Add-packet-limiter-config.patch diff --git a/patches/server/0607-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0606-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch similarity index 100% rename from patches/server/0607-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch rename to patches/server/0606-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch diff --git a/patches/server/0608-Ensure-valid-vehicle-status.patch b/patches/server/0607-Ensure-valid-vehicle-status.patch similarity index 91% rename from patches/server/0608-Ensure-valid-vehicle-status.patch rename to patches/server/0607-Ensure-valid-vehicle-status.patch index 30b9aa81a9..7440d5c859 100644 --- a/patches/server/0608-Ensure-valid-vehicle-status.patch +++ b/patches/server/0607-Ensure-valid-vehicle-status.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Ensure valid vehicle status diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 6f0955d58da2df5ffc4b81fc5c7b7c3846d65f52..3b5ff5eaed200d07cadf069d5657c9aeab8db90b 100644 +index 430a7269852c8f03542382aafad989977be96197..20592a302333f1927ca088e8002cd76a8b10ca17 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -698,7 +698,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0609-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0608-Prevent-softlocked-end-exit-portal-generation.patch similarity index 100% rename from patches/server/0609-Prevent-softlocked-end-exit-portal-generation.patch rename to patches/server/0608-Prevent-softlocked-end-exit-portal-generation.patch diff --git a/patches/server/0610-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0609-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch similarity index 100% rename from patches/server/0610-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch rename to patches/server/0609-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch diff --git a/patches/server/0611-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0610-Don-t-log-debug-logging-being-disabled.patch similarity index 100% rename from patches/server/0611-Don-t-log-debug-logging-being-disabled.patch rename to patches/server/0610-Don-t-log-debug-logging-being-disabled.patch diff --git a/patches/server/0612-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0611-fix-various-menus-with-empty-level-accesses.patch similarity index 100% rename from patches/server/0612-fix-various-menus-with-empty-level-accesses.patch rename to patches/server/0611-fix-various-menus-with-empty-level-accesses.patch diff --git a/patches/server/0613-Preserve-overstacked-loot.patch b/patches/server/0612-Preserve-overstacked-loot.patch similarity index 100% rename from patches/server/0613-Preserve-overstacked-loot.patch rename to patches/server/0612-Preserve-overstacked-loot.patch diff --git a/patches/server/0614-Update-head-rotation-in-missing-places.patch b/patches/server/0613-Update-head-rotation-in-missing-places.patch similarity index 100% rename from patches/server/0614-Update-head-rotation-in-missing-places.patch rename to patches/server/0613-Update-head-rotation-in-missing-places.patch diff --git a/patches/server/0615-prevent-unintended-light-block-manipulation.patch b/patches/server/0614-prevent-unintended-light-block-manipulation.patch similarity index 100% rename from patches/server/0615-prevent-unintended-light-block-manipulation.patch rename to patches/server/0614-prevent-unintended-light-block-manipulation.patch diff --git a/patches/server/0616-Fix-CraftCriteria-defaults-map.patch b/patches/server/0615-Fix-CraftCriteria-defaults-map.patch similarity index 100% rename from patches/server/0616-Fix-CraftCriteria-defaults-map.patch rename to patches/server/0615-Fix-CraftCriteria-defaults-map.patch diff --git a/patches/server/0617-Fix-upstreams-block-state-factories.patch b/patches/server/0616-Fix-upstreams-block-state-factories.patch similarity index 100% rename from patches/server/0617-Fix-upstreams-block-state-factories.patch rename to patches/server/0616-Fix-upstreams-block-state-factories.patch diff --git a/patches/server/0618-Configurable-feature-seeds.patch b/patches/server/0617-Configurable-feature-seeds.patch similarity index 100% rename from patches/server/0618-Configurable-feature-seeds.patch rename to patches/server/0617-Configurable-feature-seeds.patch diff --git a/patches/server/0619-Add-root-admin-user-detection.patch b/patches/server/0618-Add-root-admin-user-detection.patch similarity index 100% rename from patches/server/0619-Add-root-admin-user-detection.patch rename to patches/server/0618-Add-root-admin-user-detection.patch diff --git a/patches/server/0620-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0619-don-t-attempt-to-teleport-dead-entities.patch similarity index 100% rename from patches/server/0620-don-t-attempt-to-teleport-dead-entities.patch rename to patches/server/0619-don-t-attempt-to-teleport-dead-entities.patch diff --git a/patches/server/0621-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0620-Prevent-excessive-velocity-through-repeated-crits.patch similarity index 100% rename from patches/server/0621-Prevent-excessive-velocity-through-repeated-crits.patch rename to patches/server/0620-Prevent-excessive-velocity-through-repeated-crits.patch diff --git a/patches/server/0622-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0621-Remove-client-side-code-using-deprecated-for-removal.patch similarity index 100% rename from patches/server/0622-Remove-client-side-code-using-deprecated-for-removal.patch rename to patches/server/0621-Remove-client-side-code-using-deprecated-for-removal.patch diff --git a/patches/server/0623-Fix-Spigot-growth-modifiers.patch b/patches/server/0622-Fix-Spigot-growth-modifiers.patch similarity index 100% rename from patches/server/0623-Fix-Spigot-growth-modifiers.patch rename to patches/server/0622-Fix-Spigot-growth-modifiers.patch diff --git a/patches/server/0624-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0623-Prevent-ContainerOpenersCounter-openCount-from-going.patch similarity index 100% rename from patches/server/0624-Prevent-ContainerOpenersCounter-openCount-from-going.patch rename to patches/server/0623-Prevent-ContainerOpenersCounter-openCount-from-going.patch diff --git a/patches/server/0625-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0624-Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/server/0625-Add-PlayerItemFrameChangeEvent.patch rename to patches/server/0624-Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/server/0626-Optimize-HashMapPalette.patch b/patches/server/0625-Optimize-HashMapPalette.patch similarity index 100% rename from patches/server/0626-Optimize-HashMapPalette.patch rename to patches/server/0625-Optimize-HashMapPalette.patch diff --git a/patches/server/0627-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0626-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch similarity index 100% rename from patches/server/0627-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch rename to patches/server/0626-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch diff --git a/patches/server/0628-Add-more-Campfire-API.patch b/patches/server/0627-Add-more-Campfire-API.patch similarity index 100% rename from patches/server/0628-Add-more-Campfire-API.patch rename to patches/server/0627-Add-more-Campfire-API.patch diff --git a/patches/server/0630-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0628-Forward-CraftEntity-in-teleport-command.patch similarity index 100% rename from patches/server/0630-Forward-CraftEntity-in-teleport-command.patch rename to patches/server/0628-Forward-CraftEntity-in-teleport-command.patch diff --git a/patches/server/0631-Improve-scoreboard-entries.patch b/patches/server/0629-Improve-scoreboard-entries.patch similarity index 100% rename from patches/server/0631-Improve-scoreboard-entries.patch rename to patches/server/0629-Improve-scoreboard-entries.patch diff --git a/patches/server/0632-Entity-powdered-snow-API.patch b/patches/server/0630-Entity-powdered-snow-API.patch similarity index 100% rename from patches/server/0632-Entity-powdered-snow-API.patch rename to patches/server/0630-Entity-powdered-snow-API.patch diff --git a/patches/server/0633-Add-API-for-item-entity-health.patch b/patches/server/0631-Add-API-for-item-entity-health.patch similarity index 100% rename from patches/server/0633-Add-API-for-item-entity-health.patch rename to patches/server/0631-Add-API-for-item-entity-health.patch diff --git a/patches/server/0634-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0632-Configurable-max-block-light-for-monster-spawning.patch similarity index 100% rename from patches/server/0634-Configurable-max-block-light-for-monster-spawning.patch rename to patches/server/0632-Configurable-max-block-light-for-monster-spawning.patch diff --git a/patches/server/0635-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0633-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch similarity index 100% rename from patches/server/0635-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch rename to patches/server/0633-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch diff --git a/patches/server/0636-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0634-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/server/0636-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/server/0634-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/server/0637-Bucketable-API.patch b/patches/server/0635-Bucketable-API.patch similarity index 100% rename from patches/server/0637-Bucketable-API.patch rename to patches/server/0635-Bucketable-API.patch diff --git a/patches/server/0638-Validate-usernames.patch b/patches/server/0636-Validate-usernames.patch similarity index 100% rename from patches/server/0638-Validate-usernames.patch rename to patches/server/0636-Validate-usernames.patch diff --git a/patches/server/0639-Make-water-animal-spawn-height-configurable.patch b/patches/server/0637-Make-water-animal-spawn-height-configurable.patch similarity index 100% rename from patches/server/0639-Make-water-animal-spawn-height-configurable.patch rename to patches/server/0637-Make-water-animal-spawn-height-configurable.patch diff --git a/patches/server/0640-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0638-Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 100% rename from patches/server/0640-Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/server/0638-Expose-vanilla-BiomeProvider-from-WorldInfo.patch diff --git a/patches/server/0641-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0639-Add-config-option-for-worlds-affected-by-time-cmd.patch similarity index 100% rename from patches/server/0641-Add-config-option-for-worlds-affected-by-time-cmd.patch rename to patches/server/0639-Add-config-option-for-worlds-affected-by-time-cmd.patch diff --git a/patches/server/0642-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch b/patches/server/0640-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch similarity index 100% rename from patches/server/0642-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch rename to patches/server/0640-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch diff --git a/patches/server/0643-Multiple-Entries-with-Scoreboards.patch b/patches/server/0641-Multiple-Entries-with-Scoreboards.patch similarity index 100% rename from patches/server/0643-Multiple-Entries-with-Scoreboards.patch rename to patches/server/0641-Multiple-Entries-with-Scoreboards.patch diff --git a/patches/server/0644-Reset-placed-block-on-exception.patch b/patches/server/0642-Reset-placed-block-on-exception.patch similarity index 100% rename from patches/server/0644-Reset-placed-block-on-exception.patch rename to patches/server/0642-Reset-placed-block-on-exception.patch diff --git a/patches/server/0645-Add-configurable-height-for-slime-spawn.patch b/patches/server/0643-Add-configurable-height-for-slime-spawn.patch similarity index 100% rename from patches/server/0645-Add-configurable-height-for-slime-spawn.patch rename to patches/server/0643-Add-configurable-height-for-slime-spawn.patch diff --git a/patches/server/0646-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0644-Fix-xp-reward-for-baby-zombies.patch similarity index 100% rename from patches/server/0646-Fix-xp-reward-for-baby-zombies.patch rename to patches/server/0644-Fix-xp-reward-for-baby-zombies.patch diff --git a/patches/server/0647-Multi-Block-Change-API-Implementation.patch b/patches/server/0645-Multi-Block-Change-API-Implementation.patch similarity index 97% rename from patches/server/0647-Multi-Block-Change-API-Implementation.patch rename to patches/server/0645-Multi-Block-Change-API-Implementation.patch index 657277a804..7f0a67630e 100644 --- a/patches/server/0647-Multi-Block-Change-API-Implementation.patch +++ b/patches/server/0645-Multi-Block-Change-API-Implementation.patch @@ -24,7 +24,7 @@ index 926ff9be3d9e3f5d620e4c7ccb22b9f64865ff8c..1a37654aff9a9c86c9f7af10a1cf7213 buf.writeLong(this.sectionPos.asLong()); buf.writeVarInt(this.positions.length); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 3f89cbc48828f36cf6ff02b9de6cd378b2fde4f2..e9e895b885e6e45df45246f3988d6e62a1b3d960 100644 +index 907b61ff0cde1024508157a45bef7cb50b812393..13f17ea2164972df50359af9af14262d0821c2a6 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -937,6 +937,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0648-Fix-NotePlayEvent.patch b/patches/server/0646-Fix-NotePlayEvent.patch similarity index 100% rename from patches/server/0648-Fix-NotePlayEvent.patch rename to patches/server/0646-Fix-NotePlayEvent.patch diff --git a/patches/server/0649-Freeze-Tick-Lock-API.patch b/patches/server/0647-Freeze-Tick-Lock-API.patch similarity index 100% rename from patches/server/0649-Freeze-Tick-Lock-API.patch rename to patches/server/0647-Freeze-Tick-Lock-API.patch diff --git a/patches/server/0650-More-PotionEffectType-API.patch b/patches/server/0648-More-PotionEffectType-API.patch similarity index 100% rename from patches/server/0650-More-PotionEffectType-API.patch rename to patches/server/0648-More-PotionEffectType-API.patch diff --git a/patches/server/0651-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0649-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch similarity index 100% rename from patches/server/0651-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch rename to patches/server/0649-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch diff --git a/patches/server/0652-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0650-API-for-creating-command-sender-which-forwards-feedb.patch similarity index 100% rename from patches/server/0652-API-for-creating-command-sender-which-forwards-feedb.patch rename to patches/server/0650-API-for-creating-command-sender-which-forwards-feedb.patch diff --git a/patches/server/0653-Add-missing-structure-set-seed-configs.patch b/patches/server/0651-Add-missing-structure-set-seed-configs.patch similarity index 100% rename from patches/server/0653-Add-missing-structure-set-seed-configs.patch rename to patches/server/0651-Add-missing-structure-set-seed-configs.patch diff --git a/patches/server/0654-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0652-Fix-cancelled-powdered-snow-bucket-placement.patch similarity index 100% rename from patches/server/0654-Fix-cancelled-powdered-snow-bucket-placement.patch rename to patches/server/0652-Fix-cancelled-powdered-snow-bucket-placement.patch diff --git a/patches/server/0655-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0653-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch similarity index 100% rename from patches/server/0655-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch rename to patches/server/0653-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch diff --git a/patches/server/0656-Add-GameEvent-tags.patch b/patches/server/0654-Add-GameEvent-tags.patch similarity index 100% rename from patches/server/0656-Add-GameEvent-tags.patch rename to patches/server/0654-Add-GameEvent-tags.patch diff --git a/patches/server/0657-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0655-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch similarity index 100% rename from patches/server/0657-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch rename to patches/server/0655-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch diff --git a/patches/server/0658-Furnace-RecipesUsed-API.patch b/patches/server/0656-Furnace-RecipesUsed-API.patch similarity index 100% rename from patches/server/0658-Furnace-RecipesUsed-API.patch rename to patches/server/0656-Furnace-RecipesUsed-API.patch diff --git a/patches/server/0659-Configurable-sculk-sensor-listener-range.patch b/patches/server/0657-Configurable-sculk-sensor-listener-range.patch similarity index 100% rename from patches/server/0659-Configurable-sculk-sensor-listener-range.patch rename to patches/server/0657-Configurable-sculk-sensor-listener-range.patch diff --git a/patches/server/0660-Add-missing-block-data-API.patch b/patches/server/0658-Add-missing-block-data-API.patch similarity index 100% rename from patches/server/0660-Add-missing-block-data-API.patch rename to patches/server/0658-Add-missing-block-data-API.patch diff --git a/patches/server/0661-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0659-Option-to-have-default-CustomSpawners-in-custom-worl.patch similarity index 100% rename from patches/server/0661-Option-to-have-default-CustomSpawners-in-custom-worl.patch rename to patches/server/0659-Option-to-have-default-CustomSpawners-in-custom-worl.patch diff --git a/patches/server/0662-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0660-Put-world-into-worldlist-before-initing-the-world.patch similarity index 100% rename from patches/server/0662-Put-world-into-worldlist-before-initing-the-world.patch rename to patches/server/0660-Put-world-into-worldlist-before-initing-the-world.patch diff --git a/patches/server/0663-Custom-Potion-Mixes.patch b/patches/server/0661-Custom-Potion-Mixes.patch similarity index 100% rename from patches/server/0663-Custom-Potion-Mixes.patch rename to patches/server/0661-Custom-Potion-Mixes.patch diff --git a/patches/server/0664-Force-close-world-loading-screen.patch b/patches/server/0662-Force-close-world-loading-screen.patch similarity index 100% rename from patches/server/0664-Force-close-world-loading-screen.patch rename to patches/server/0662-Force-close-world-loading-screen.patch diff --git a/patches/server/0665-Fix-falling-block-spawn-methods.patch b/patches/server/0663-Fix-falling-block-spawn-methods.patch similarity index 100% rename from patches/server/0665-Fix-falling-block-spawn-methods.patch rename to patches/server/0663-Fix-falling-block-spawn-methods.patch diff --git a/patches/server/0666-Expose-furnace-minecart-push-values.patch b/patches/server/0664-Expose-furnace-minecart-push-values.patch similarity index 100% rename from patches/server/0666-Expose-furnace-minecart-push-values.patch rename to patches/server/0664-Expose-furnace-minecart-push-values.patch diff --git a/patches/server/0667-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0665-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch similarity index 100% rename from patches/server/0667-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch rename to patches/server/0665-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch diff --git a/patches/server/0668-More-Projectile-API.patch b/patches/server/0666-More-Projectile-API.patch similarity index 100% rename from patches/server/0668-More-Projectile-API.patch rename to patches/server/0666-More-Projectile-API.patch diff --git a/patches/server/0669-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0667-Fix-swamp-hut-cat-generation-deadlock.patch similarity index 100% rename from patches/server/0669-Fix-swamp-hut-cat-generation-deadlock.patch rename to patches/server/0667-Fix-swamp-hut-cat-generation-deadlock.patch diff --git a/patches/server/0670-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0668-Don-t-allow-vehicle-movement-from-players-while-tele.patch similarity index 100% rename from patches/server/0670-Don-t-allow-vehicle-movement-from-players-while-tele.patch rename to patches/server/0668-Don-t-allow-vehicle-movement-from-players-while-tele.patch diff --git a/patches/server/0671-Implement-getComputedBiome-API.patch b/patches/server/0669-Implement-getComputedBiome-API.patch similarity index 100% rename from patches/server/0671-Implement-getComputedBiome-API.patch rename to patches/server/0669-Implement-getComputedBiome-API.patch diff --git a/patches/server/0672-Make-some-itemstacks-nonnull.patch b/patches/server/0670-Make-some-itemstacks-nonnull.patch similarity index 100% rename from patches/server/0672-Make-some-itemstacks-nonnull.patch rename to patches/server/0670-Make-some-itemstacks-nonnull.patch diff --git a/patches/server/0673-Implement-enchantWithLevels-API.patch b/patches/server/0671-Implement-enchantWithLevels-API.patch similarity index 100% rename from patches/server/0673-Implement-enchantWithLevels-API.patch rename to patches/server/0671-Implement-enchantWithLevels-API.patch diff --git a/patches/server/0674-Fix-saving-in-unloadWorld.patch b/patches/server/0672-Fix-saving-in-unloadWorld.patch similarity index 100% rename from patches/server/0674-Fix-saving-in-unloadWorld.patch rename to patches/server/0672-Fix-saving-in-unloadWorld.patch diff --git a/patches/server/0675-Buffer-OOB-setBlock-calls.patch b/patches/server/0673-Buffer-OOB-setBlock-calls.patch similarity index 100% rename from patches/server/0675-Buffer-OOB-setBlock-calls.patch rename to patches/server/0673-Buffer-OOB-setBlock-calls.patch diff --git a/patches/server/0676-Add-TameableDeathMessageEvent.patch b/patches/server/0674-Add-TameableDeathMessageEvent.patch similarity index 100% rename from patches/server/0676-Add-TameableDeathMessageEvent.patch rename to patches/server/0674-Add-TameableDeathMessageEvent.patch diff --git a/patches/server/0677-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0675-Fix-new-block-data-for-EntityChangeBlockEvent.patch similarity index 100% rename from patches/server/0677-Fix-new-block-data-for-EntityChangeBlockEvent.patch rename to patches/server/0675-Fix-new-block-data-for-EntityChangeBlockEvent.patch diff --git a/patches/server/0678-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0676-fix-player-loottables-running-when-mob-loot-gamerule.patch similarity index 93% rename from patches/server/0678-fix-player-loottables-running-when-mob-loot-gamerule.patch rename to patches/server/0676-fix-player-loottables-running-when-mob-loot-gamerule.patch index 96f920f7d1..7cf6d23322 100644 --- a/patches/server/0678-fix-player-loottables-running-when-mob-loot-gamerule.patch +++ b/patches/server/0676-fix-player-loottables-running-when-mob-loot-gamerule.patch @@ -5,7 +5,7 @@ Subject: [PATCH] fix player loottables running when mob loot gamerule is false diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 3b5ff5eaed200d07cadf069d5657c9aeab8db90b..cf674caab9e67a27f90ead557634949710c19ca3 100644 +index 20592a302333f1927ca088e8002cd76a8b10ca17..705727a13c12a26d669cebe9ec2fb9d100b59e1d 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1218,12 +1218,14 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0679-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0677-Ensure-entity-passenger-world-matches-ridden-entity.patch similarity index 100% rename from patches/server/0679-Ensure-entity-passenger-world-matches-ridden-entity.patch rename to patches/server/0677-Ensure-entity-passenger-world-matches-ridden-entity.patch diff --git a/patches/server/0680-Cache-resource-keys-and-optimize-reference-Holder-ta.patch b/patches/server/0678-Cache-resource-keys-and-optimize-reference-Holder-ta.patch similarity index 100% rename from patches/server/0680-Cache-resource-keys-and-optimize-reference-Holder-ta.patch rename to patches/server/0678-Cache-resource-keys-and-optimize-reference-Holder-ta.patch diff --git a/patches/server/0681-Allow-changing-the-EnderDragon-podium.patch b/patches/server/0679-Allow-changing-the-EnderDragon-podium.patch similarity index 100% rename from patches/server/0681-Allow-changing-the-EnderDragon-podium.patch rename to patches/server/0679-Allow-changing-the-EnderDragon-podium.patch diff --git a/patches/server/0682-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0680-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch similarity index 100% rename from patches/server/0682-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch rename to patches/server/0680-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch diff --git a/patches/server/0683-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0681-Prevent-tile-entity-copies-loading-chunks.patch similarity index 100% rename from patches/server/0683-Prevent-tile-entity-copies-loading-chunks.patch rename to patches/server/0681-Prevent-tile-entity-copies-loading-chunks.patch diff --git a/patches/server/0684-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0682-Use-username-instead-of-display-name-in-PlayerList-g.patch similarity index 100% rename from patches/server/0684-Use-username-instead-of-display-name-in-PlayerList-g.patch rename to patches/server/0682-Use-username-instead-of-display-name-in-PlayerList-g.patch diff --git a/patches/server/0685-Expand-PlayerItemDamageEvent.patch b/patches/server/0683-Expand-PlayerItemDamageEvent.patch similarity index 100% rename from patches/server/0685-Expand-PlayerItemDamageEvent.patch rename to patches/server/0683-Expand-PlayerItemDamageEvent.patch diff --git a/patches/server/0686-WorldCreator-keepSpawnLoaded.patch b/patches/server/0684-WorldCreator-keepSpawnLoaded.patch similarity index 100% rename from patches/server/0686-WorldCreator-keepSpawnLoaded.patch rename to patches/server/0684-WorldCreator-keepSpawnLoaded.patch diff --git a/patches/server/0687-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/server/0685-Fix-CME-in-CraftPersistentDataTypeRegistry.patch similarity index 100% rename from patches/server/0687-Fix-CME-in-CraftPersistentDataTypeRegistry.patch rename to patches/server/0685-Fix-CME-in-CraftPersistentDataTypeRegistry.patch diff --git a/patches/server/0688-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0686-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch similarity index 100% rename from patches/server/0688-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch rename to patches/server/0686-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch diff --git a/patches/server/0689-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0687-Add-EntityDyeEvent-and-CollarColorable-interface.patch similarity index 100% rename from patches/server/0689-Add-EntityDyeEvent-and-CollarColorable-interface.patch rename to patches/server/0687-Add-EntityDyeEvent-and-CollarColorable-interface.patch diff --git a/patches/server/0690-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0688-Fire-CauldronLevelChange-on-initial-fill.patch similarity index 100% rename from patches/server/0690-Fire-CauldronLevelChange-on-initial-fill.patch rename to patches/server/0688-Fire-CauldronLevelChange-on-initial-fill.patch diff --git a/patches/server/0691-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0689-fix-powder-snow-cauldrons-not-turning-to-water.patch similarity index 100% rename from patches/server/0691-fix-powder-snow-cauldrons-not-turning-to-water.patch rename to patches/server/0689-fix-powder-snow-cauldrons-not-turning-to-water.patch diff --git a/patches/server/0692-Add-PlayerStopUsingItemEvent.patch b/patches/server/0690-Add-PlayerStopUsingItemEvent.patch similarity index 100% rename from patches/server/0692-Add-PlayerStopUsingItemEvent.patch rename to patches/server/0690-Add-PlayerStopUsingItemEvent.patch diff --git a/patches/server/0693-Don-t-tick-markers.patch b/patches/server/0691-Don-t-tick-markers.patch similarity index 100% rename from patches/server/0693-Don-t-tick-markers.patch rename to patches/server/0691-Don-t-tick-markers.patch diff --git a/patches/server/0694-Expand-FallingBlock-API.patch b/patches/server/0692-Expand-FallingBlock-API.patch similarity index 100% rename from patches/server/0694-Expand-FallingBlock-API.patch rename to patches/server/0692-Expand-FallingBlock-API.patch diff --git a/patches/server/0695-Add-support-for-Proxy-Protocol.patch b/patches/server/0693-Add-support-for-Proxy-Protocol.patch similarity index 100% rename from patches/server/0695-Add-support-for-Proxy-Protocol.patch rename to patches/server/0693-Add-support-for-Proxy-Protocol.patch diff --git a/patches/server/0696-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0694-Fix-OfflinePlayer-getBedSpawnLocation.patch similarity index 100% rename from patches/server/0696-Fix-OfflinePlayer-getBedSpawnLocation.patch rename to patches/server/0694-Fix-OfflinePlayer-getBedSpawnLocation.patch diff --git a/patches/server/0697-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0695-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch similarity index 100% rename from patches/server/0697-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch rename to patches/server/0695-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch diff --git a/patches/server/0698-Sanitize-sent-BlockEntity-NBT.patch b/patches/server/0696-Sanitize-sent-BlockEntity-NBT.patch similarity index 100% rename from patches/server/0698-Sanitize-sent-BlockEntity-NBT.patch rename to patches/server/0696-Sanitize-sent-BlockEntity-NBT.patch diff --git a/patches/server/0699-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0697-Disable-component-selector-resolving-in-books-by-def.patch similarity index 100% rename from patches/server/0699-Disable-component-selector-resolving-in-books-by-def.patch rename to patches/server/0697-Disable-component-selector-resolving-in-books-by-def.patch diff --git a/patches/server/0700-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0698-Prevent-entity-loading-causing-async-lookups.patch similarity index 100% rename from patches/server/0700-Prevent-entity-loading-causing-async-lookups.patch rename to patches/server/0698-Prevent-entity-loading-causing-async-lookups.patch diff --git a/patches/server/0701-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0699-Throw-exception-on-world-create-while-being-ticked.patch similarity index 100% rename from patches/server/0701-Throw-exception-on-world-create-while-being-ticked.patch rename to patches/server/0699-Throw-exception-on-world-create-while-being-ticked.patch diff --git a/patches/server/0702-Dont-resent-entity-on-art-update.patch b/patches/server/0700-Dont-resent-entity-on-art-update.patch similarity index 100% rename from patches/server/0702-Dont-resent-entity-on-art-update.patch rename to patches/server/0700-Dont-resent-entity-on-art-update.patch diff --git a/patches/server/0703-Add-WardenAngerChangeEvent.patch b/patches/server/0701-Add-WardenAngerChangeEvent.patch similarity index 100% rename from patches/server/0703-Add-WardenAngerChangeEvent.patch rename to patches/server/0701-Add-WardenAngerChangeEvent.patch diff --git a/patches/server/0704-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0702-Add-option-for-strict-advancement-dimension-checks.patch similarity index 96% rename from patches/server/0704-Add-option-for-strict-advancement-dimension-checks.patch rename to patches/server/0702-Add-option-for-strict-advancement-dimension-checks.patch index 3b8d2aa02f..c58840bc49 100644 --- a/patches/server/0704-Add-option-for-strict-advancement-dimension-checks.patch +++ b/patches/server/0702-Add-option-for-strict-advancement-dimension-checks.patch @@ -24,7 +24,7 @@ index 01b8f7024fbc965bc6a7f97f79ba3dec964ef769..801823d003a8e28a13fe90db4604cd09 } else { BlockPos blockPos = BlockPos.containing(x, y, z); diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index cf674caab9e67a27f90ead557634949710c19ca3..c98e07e1a507d5ffd3b16fa4bf3cdcc3b704e67d 100644 +index 705727a13c12a26d669cebe9ec2fb9d100b59e1d..0f7a07a22ee1db3fd96c06ce7248d9d5392bd14f 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1655,6 +1655,12 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0705-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0703-Add-missing-important-BlockStateListPopulator-method.patch similarity index 100% rename from patches/server/0705-Add-missing-important-BlockStateListPopulator-method.patch rename to patches/server/0703-Add-missing-important-BlockStateListPopulator-method.patch diff --git a/patches/server/0706-Nameable-Banner-API.patch b/patches/server/0704-Nameable-Banner-API.patch similarity index 100% rename from patches/server/0706-Nameable-Banner-API.patch rename to patches/server/0704-Nameable-Banner-API.patch diff --git a/patches/server/0707-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0705-Don-t-broadcast-messages-to-command-blocks.patch similarity index 100% rename from patches/server/0707-Don-t-broadcast-messages-to-command-blocks.patch rename to patches/server/0705-Don-t-broadcast-messages-to-command-blocks.patch diff --git a/patches/server/0708-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0706-Prevent-empty-items-from-being-added-to-world.patch similarity index 100% rename from patches/server/0708-Prevent-empty-items-from-being-added-to-world.patch rename to patches/server/0706-Prevent-empty-items-from-being-added-to-world.patch diff --git a/patches/server/0709-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0707-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch similarity index 100% rename from patches/server/0709-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch rename to patches/server/0707-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch diff --git a/patches/server/0710-Add-Player-getFishHook.patch b/patches/server/0708-Add-Player-getFishHook.patch similarity index 92% rename from patches/server/0710-Add-Player-getFishHook.patch rename to patches/server/0708-Add-Player-getFishHook.patch index b2f8e7f0eb..15a4d9dca1 100644 --- a/patches/server/0710-Add-Player-getFishHook.patch +++ b/patches/server/0708-Add-Player-getFishHook.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add Player#getFishHook diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index 1e49eae80730aa9d2e49cd92759d899deb49fb90..df9d02eb1ffc3cc669e835e2c08d951283871db3 100644 +index d5c4184e0d93eabc699661829ff4bf9b46d27142..aa3a47149fec342096817c7b9ce45ea196fd33d0 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -160,6 +160,15 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { diff --git a/patches/server/0711-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0709-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch similarity index 100% rename from patches/server/0711-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch rename to patches/server/0709-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch diff --git a/patches/server/0712-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0710-Add-various-missing-EntityDropItemEvent-calls.patch similarity index 100% rename from patches/server/0712-Add-various-missing-EntityDropItemEvent-calls.patch rename to patches/server/0710-Add-various-missing-EntityDropItemEvent-calls.patch diff --git a/patches/server/0713-Fix-Bee-flower-NPE.patch b/patches/server/0711-Fix-Bee-flower-NPE.patch similarity index 100% rename from patches/server/0713-Fix-Bee-flower-NPE.patch rename to patches/server/0711-Fix-Bee-flower-NPE.patch diff --git a/patches/server/0714-More-Teleport-API.patch b/patches/server/0712-More-Teleport-API.patch similarity index 99% rename from patches/server/0714-More-Teleport-API.patch rename to patches/server/0712-More-Teleport-API.patch index d588e8eee3..0496d12460 100644 --- a/patches/server/0714-More-Teleport-API.patch +++ b/patches/server/0712-More-Teleport-API.patch @@ -113,7 +113,7 @@ index 10fb64df10820974d11f142c102a11a5bd0f317c..8d2f6bb43fb69a4a1e2085960eb24f43 private final org.bukkit.entity.Entity.Spigot spigot = new org.bukkit.entity.Entity.Spigot() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index e9e895b885e6e45df45246f3988d6e62a1b3d960..6c6128922491efe4f47eb27039eb078f2f411315 100644 +index 13f17ea2164972df50359af9af14262d0821c2a6..659e9e1062dd7d5cd6d1756f3d61c2478179d479 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1293,13 +1293,94 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0715-Add-EntityPortalReadyEvent.patch b/patches/server/0713-Add-EntityPortalReadyEvent.patch similarity index 100% rename from patches/server/0715-Add-EntityPortalReadyEvent.patch rename to patches/server/0713-Add-EntityPortalReadyEvent.patch diff --git a/patches/server/0716-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0714-Don-t-use-level-random-in-entity-constructors.patch similarity index 100% rename from patches/server/0716-Don-t-use-level-random-in-entity-constructors.patch rename to patches/server/0714-Don-t-use-level-random-in-entity-constructors.patch diff --git a/patches/server/0717-Send-block-entities-after-destroy-prediction.patch b/patches/server/0715-Send-block-entities-after-destroy-prediction.patch similarity index 100% rename from patches/server/0717-Send-block-entities-after-destroy-prediction.patch rename to patches/server/0715-Send-block-entities-after-destroy-prediction.patch diff --git a/patches/server/0718-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0716-Warn-on-plugins-accessing-faraway-chunks.patch similarity index 100% rename from patches/server/0718-Warn-on-plugins-accessing-faraway-chunks.patch rename to patches/server/0716-Warn-on-plugins-accessing-faraway-chunks.patch diff --git a/patches/server/0719-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0717-Custom-Chat-Completion-Suggestions-API.patch similarity index 94% rename from patches/server/0719-Custom-Chat-Completion-Suggestions-API.patch rename to patches/server/0717-Custom-Chat-Completion-Suggestions-API.patch index f8af416810..60f779c74e 100644 --- a/patches/server/0719-Custom-Chat-Completion-Suggestions-API.patch +++ b/patches/server/0717-Custom-Chat-Completion-Suggestions-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Custom Chat Completion Suggestions API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 6c6128922491efe4f47eb27039eb078f2f411315..b8a0be15e8987719b8cfb4ab842544197cfa2d67 100644 +index 659e9e1062dd7d5cd6d1756f3d61c2478179d479..947c4fd897ee61799d5532aca67b7118a806e842 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -698,6 +698,24 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0720-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0718-Add-and-fix-missing-BlockFadeEvents.patch similarity index 100% rename from patches/server/0720-Add-and-fix-missing-BlockFadeEvents.patch rename to patches/server/0718-Add-and-fix-missing-BlockFadeEvents.patch diff --git a/patches/server/0721-Collision-API.patch b/patches/server/0719-Collision-API.patch similarity index 100% rename from patches/server/0721-Collision-API.patch rename to patches/server/0719-Collision-API.patch diff --git a/patches/server/0722-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0720-Fix-suggest-command-message-for-brigadier-syntax-exc.patch similarity index 100% rename from patches/server/0722-Fix-suggest-command-message-for-brigadier-syntax-exc.patch rename to patches/server/0720-Fix-suggest-command-message-for-brigadier-syntax-exc.patch diff --git a/patches/server/0723-Block-Ticking-API.patch b/patches/server/0721-Block-Ticking-API.patch similarity index 100% rename from patches/server/0723-Block-Ticking-API.patch rename to patches/server/0721-Block-Ticking-API.patch diff --git a/patches/server/0724-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0722-Add-Velocity-IP-Forwarding-Support.patch similarity index 100% rename from patches/server/0724-Add-Velocity-IP-Forwarding-Support.patch rename to patches/server/0722-Add-Velocity-IP-Forwarding-Support.patch diff --git a/patches/server/0725-Add-NamespacedKey-biome-methods.patch b/patches/server/0723-Add-NamespacedKey-biome-methods.patch similarity index 100% rename from patches/server/0725-Add-NamespacedKey-biome-methods.patch rename to patches/server/0723-Add-NamespacedKey-biome-methods.patch diff --git a/patches/server/0726-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0724-Fix-plugin-loggers-on-server-shutdown.patch similarity index 100% rename from patches/server/0726-Fix-plugin-loggers-on-server-shutdown.patch rename to patches/server/0724-Fix-plugin-loggers-on-server-shutdown.patch diff --git a/patches/server/0727-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0725-Stop-large-look-changes-from-crashing-the-server.patch similarity index 100% rename from patches/server/0727-Stop-large-look-changes-from-crashing-the-server.patch rename to patches/server/0725-Stop-large-look-changes-from-crashing-the-server.patch diff --git a/patches/server/0728-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0726-Fire-EntityChangeBlockEvent-in-more-places.patch similarity index 100% rename from patches/server/0728-Fire-EntityChangeBlockEvent-in-more-places.patch rename to patches/server/0726-Fire-EntityChangeBlockEvent-in-more-places.patch diff --git a/patches/server/0729-Missing-eating-regain-reason.patch b/patches/server/0727-Missing-eating-regain-reason.patch similarity index 100% rename from patches/server/0729-Missing-eating-regain-reason.patch rename to patches/server/0727-Missing-eating-regain-reason.patch diff --git a/patches/server/0730-Missing-effect-cause.patch b/patches/server/0728-Missing-effect-cause.patch similarity index 100% rename from patches/server/0730-Missing-effect-cause.patch rename to patches/server/0728-Missing-effect-cause.patch diff --git a/patches/server/0731-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0729-Added-byte-array-serialization-deserialization-for-P.patch similarity index 100% rename from patches/server/0731-Added-byte-array-serialization-deserialization-for-P.patch rename to patches/server/0729-Added-byte-array-serialization-deserialization-for-P.patch diff --git a/patches/server/0732-Add-source-block-to-BlockPhysicsEvent.patch b/patches/server/0730-Add-source-block-to-BlockPhysicsEvent.patch similarity index 100% rename from patches/server/0732-Add-source-block-to-BlockPhysicsEvent.patch rename to patches/server/0730-Add-source-block-to-BlockPhysicsEvent.patch diff --git a/patches/server/0733-Configurable-chat-thread-limit.patch b/patches/server/0731-Configurable-chat-thread-limit.patch similarity index 100% rename from patches/server/0733-Configurable-chat-thread-limit.patch rename to patches/server/0731-Configurable-chat-thread-limit.patch diff --git a/patches/server/0734-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0732-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch similarity index 100% rename from patches/server/0734-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch rename to patches/server/0732-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch diff --git a/patches/server/0735-fix-Jigsaw-block-kicking-user.patch b/patches/server/0733-fix-Jigsaw-block-kicking-user.patch similarity index 100% rename from patches/server/0735-fix-Jigsaw-block-kicking-user.patch rename to patches/server/0733-fix-Jigsaw-block-kicking-user.patch diff --git a/patches/server/0736-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0734-use-BlockFormEvent-for-mud-converting-into-clay.patch similarity index 100% rename from patches/server/0736-use-BlockFormEvent-for-mud-converting-into-clay.patch rename to patches/server/0734-use-BlockFormEvent-for-mud-converting-into-clay.patch diff --git a/patches/server/0737-Add-getDrops-to-BlockState.patch b/patches/server/0735-Add-getDrops-to-BlockState.patch similarity index 100% rename from patches/server/0737-Add-getDrops-to-BlockState.patch rename to patches/server/0735-Add-getDrops-to-BlockState.patch diff --git a/patches/server/0738-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0736-Fix-a-bunch-of-vanilla-bugs.patch similarity index 100% rename from patches/server/0738-Fix-a-bunch-of-vanilla-bugs.patch rename to patches/server/0736-Fix-a-bunch-of-vanilla-bugs.patch diff --git a/patches/server/0739-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0737-Remove-unnecessary-onTrackingStart-during-navigation.patch similarity index 100% rename from patches/server/0739-Remove-unnecessary-onTrackingStart-during-navigation.patch rename to patches/server/0737-Remove-unnecessary-onTrackingStart-during-navigation.patch diff --git a/patches/server/0740-Fix-custom-piglin-loved-items.patch b/patches/server/0738-Fix-custom-piglin-loved-items.patch similarity index 100% rename from patches/server/0740-Fix-custom-piglin-loved-items.patch rename to patches/server/0738-Fix-custom-piglin-loved-items.patch diff --git a/patches/server/0741-EntityPickupItemEvent-fixes.patch b/patches/server/0739-EntityPickupItemEvent-fixes.patch similarity index 100% rename from patches/server/0741-EntityPickupItemEvent-fixes.patch rename to patches/server/0739-EntityPickupItemEvent-fixes.patch diff --git a/patches/server/0742-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0740-Correctly-handle-interactions-with-items-on-cooldown.patch similarity index 100% rename from patches/server/0742-Correctly-handle-interactions-with-items-on-cooldown.patch rename to patches/server/0740-Correctly-handle-interactions-with-items-on-cooldown.patch diff --git a/patches/server/0743-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0741-Add-PlayerInventorySlotChangeEvent.patch similarity index 97% rename from patches/server/0743-Add-PlayerInventorySlotChangeEvent.patch rename to patches/server/0741-Add-PlayerInventorySlotChangeEvent.patch index ba048c97a2..873fac7831 100644 --- a/patches/server/0743-Add-PlayerInventorySlotChangeEvent.patch +++ b/patches/server/0741-Add-PlayerInventorySlotChangeEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerInventorySlotChangeEvent diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index c98e07e1a507d5ffd3b16fa4bf3cdcc3b704e67d..0929f399f0525d8cc886dc32392aa2d3096431b5 100644 +index 0f7a07a22ee1db3fd96c06ce7248d9d5392bd14f..046f7f73a6b1673d0736c49b5d0fb09b6eb6d91d 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -381,6 +381,25 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0744-Elder-Guardian-appearance-API.patch b/patches/server/0742-Elder-Guardian-appearance-API.patch similarity index 90% rename from patches/server/0744-Elder-Guardian-appearance-API.patch rename to patches/server/0742-Elder-Guardian-appearance-API.patch index 4d3622601d..3d635e7223 100644 --- a/patches/server/0744-Elder-Guardian-appearance-API.patch +++ b/patches/server/0742-Elder-Guardian-appearance-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Elder Guardian appearance API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index b8a0be15e8987719b8cfb4ab842544197cfa2d67..762dfbf88773b85893b3d4fa3a71ce577f3ecbd6 100644 +index 947c4fd897ee61799d5532aca67b7118a806e842..c94e24b1d0752ed5031f5710068c2e1dd6a172c5 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -3310,6 +3310,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0745-Add-entity-knockback-API.patch b/patches/server/0743-Add-entity-knockback-API.patch similarity index 100% rename from patches/server/0745-Add-entity-knockback-API.patch rename to patches/server/0743-Add-entity-knockback-API.patch diff --git a/patches/server/0746-Detect-headless-JREs.patch b/patches/server/0744-Detect-headless-JREs.patch similarity index 100% rename from patches/server/0746-Detect-headless-JREs.patch rename to patches/server/0744-Detect-headless-JREs.patch diff --git a/patches/server/0747-fix-entity-vehicle-collision-event-not-called.patch b/patches/server/0745-fix-entity-vehicle-collision-event-not-called.patch similarity index 100% rename from patches/server/0747-fix-entity-vehicle-collision-event-not-called.patch rename to patches/server/0745-fix-entity-vehicle-collision-event-not-called.patch diff --git a/patches/server/0748-Add-EntityToggleSitEvent.patch b/patches/server/0746-Add-EntityToggleSitEvent.patch similarity index 100% rename from patches/server/0748-Add-EntityToggleSitEvent.patch rename to patches/server/0746-Add-EntityToggleSitEvent.patch diff --git a/patches/server/0749-Add-fire-tick-delay-option.patch b/patches/server/0747-Add-fire-tick-delay-option.patch similarity index 100% rename from patches/server/0749-Add-fire-tick-delay-option.patch rename to patches/server/0747-Add-fire-tick-delay-option.patch diff --git a/patches/server/0750-Add-Moving-Piston-API.patch b/patches/server/0748-Add-Moving-Piston-API.patch similarity index 100% rename from patches/server/0750-Add-Moving-Piston-API.patch rename to patches/server/0748-Add-Moving-Piston-API.patch diff --git a/patches/server/0751-Ignore-impossible-spawn-tick.patch b/patches/server/0749-Ignore-impossible-spawn-tick.patch similarity index 100% rename from patches/server/0751-Ignore-impossible-spawn-tick.patch rename to patches/server/0749-Ignore-impossible-spawn-tick.patch diff --git a/patches/server/0752-Fix-EntityArgument-and-EntitySelectorParser-permissi.patch b/patches/server/0750-Fix-EntityArgument-and-EntitySelectorParser-permissi.patch similarity index 100% rename from patches/server/0752-Fix-EntityArgument-and-EntitySelectorParser-permissi.patch rename to patches/server/0750-Fix-EntityArgument-and-EntitySelectorParser-permissi.patch diff --git a/patches/server/0753-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0751-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch similarity index 100% rename from patches/server/0753-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch rename to patches/server/0751-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch diff --git a/patches/server/0754-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0752-Add-PrePlayerAttackEntityEvent.patch similarity index 100% rename from patches/server/0754-Add-PrePlayerAttackEntityEvent.patch rename to patches/server/0752-Add-PrePlayerAttackEntityEvent.patch diff --git a/patches/server/0755-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0753-ensure-reset-EnderDragon-boss-event-name.patch similarity index 100% rename from patches/server/0755-ensure-reset-EnderDragon-boss-event-name.patch rename to patches/server/0753-ensure-reset-EnderDragon-boss-event-name.patch diff --git a/patches/server/0756-Add-Player-Warden-Warning-API.patch b/patches/server/0754-Add-Player-Warden-Warning-API.patch similarity index 95% rename from patches/server/0756-Add-Player-Warden-Warning-API.patch rename to patches/server/0754-Add-Player-Warden-Warning-API.patch index a8a6cb8100..8755c60c90 100644 --- a/patches/server/0756-Add-Player-Warden-Warning-API.patch +++ b/patches/server/0754-Add-Player-Warden-Warning-API.patch @@ -10,7 +10,7 @@ public net.minecraft.world.entity.monster.warden.WardenSpawnTracker cooldownTick public net.minecraft.world.entity.monster.warden.WardenSpawnTracker increaseWarningLevel()V diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 762dfbf88773b85893b3d4fa3a71ce577f3ecbd6..82767306f63025fa537163cbbac24bd4d66e3416 100644 +index c94e24b1d0752ed5031f5710068c2e1dd6a172c5..76d85db873d223aa3f8b310e83eff880d451ff8f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -3315,6 +3315,41 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0757-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0755-More-vanilla-friendly-methods-to-update-trades.patch similarity index 100% rename from patches/server/0757-More-vanilla-friendly-methods-to-update-trades.patch rename to patches/server/0755-More-vanilla-friendly-methods-to-update-trades.patch diff --git a/patches/server/0758-Add-paper-dumplisteners-command.patch b/patches/server/0756-Add-paper-dumplisteners-command.patch similarity index 100% rename from patches/server/0758-Add-paper-dumplisteners-command.patch rename to patches/server/0756-Add-paper-dumplisteners-command.patch diff --git a/patches/server/0759-check-global-player-list-where-appropriate.patch b/patches/server/0757-check-global-player-list-where-appropriate.patch similarity index 100% rename from patches/server/0759-check-global-player-list-where-appropriate.patch rename to patches/server/0757-check-global-player-list-where-appropriate.patch diff --git a/patches/server/0760-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0758-Fix-async-entity-add-due-to-fungus-trees.patch similarity index 100% rename from patches/server/0760-Fix-async-entity-add-due-to-fungus-trees.patch rename to patches/server/0758-Fix-async-entity-add-due-to-fungus-trees.patch diff --git a/patches/server/0761-ItemStack-damage-API.patch b/patches/server/0759-ItemStack-damage-API.patch similarity index 100% rename from patches/server/0761-ItemStack-damage-API.patch rename to patches/server/0759-ItemStack-damage-API.patch diff --git a/patches/server/0762-Friction-API.patch b/patches/server/0760-Friction-API.patch similarity index 100% rename from patches/server/0762-Friction-API.patch rename to patches/server/0760-Friction-API.patch diff --git a/patches/server/0763-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0761-Ability-to-control-player-s-insomnia-and-phantoms.patch similarity index 100% rename from patches/server/0763-Ability-to-control-player-s-insomnia-and-phantoms.patch rename to patches/server/0761-Ability-to-control-player-s-insomnia-and-phantoms.patch diff --git a/patches/server/0764-Fix-premature-player-kicks-on-shutdown.patch b/patches/server/0762-Fix-premature-player-kicks-on-shutdown.patch similarity index 100% rename from patches/server/0764-Fix-premature-player-kicks-on-shutdown.patch rename to patches/server/0762-Fix-premature-player-kicks-on-shutdown.patch diff --git a/patches/server/0765-Sync-offhand-slot-in-menus.patch b/patches/server/0763-Sync-offhand-slot-in-menus.patch similarity index 97% rename from patches/server/0765-Sync-offhand-slot-in-menus.patch rename to patches/server/0763-Sync-offhand-slot-in-menus.patch index 7a9fe3be6f..8200d057c4 100644 --- a/patches/server/0765-Sync-offhand-slot-in-menus.patch +++ b/patches/server/0763-Sync-offhand-slot-in-menus.patch @@ -8,7 +8,7 @@ offhand slot isn't sent. This is not correct because you *can* put stuff into th by pressing the offhand swap item diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 0929f399f0525d8cc886dc32392aa2d3096431b5..772a759a474a114ccb2f7f83b678708714788e60 100644 +index 046f7f73a6b1673d0736c49b5d0fb09b6eb6d91d..986daea0c055d6015441b22c610e5e29b7ebd2ff 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -350,6 +350,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0766-Player-Entity-Tracking-Events.patch b/patches/server/0764-Player-Entity-Tracking-Events.patch similarity index 100% rename from patches/server/0766-Player-Entity-Tracking-Events.patch rename to patches/server/0764-Player-Entity-Tracking-Events.patch diff --git a/patches/server/0767-Limit-pet-look-distance.patch b/patches/server/0765-Limit-pet-look-distance.patch similarity index 100% rename from patches/server/0767-Limit-pet-look-distance.patch rename to patches/server/0765-Limit-pet-look-distance.patch diff --git a/patches/server/0768-fix-Instruments.patch b/patches/server/0766-fix-Instruments.patch similarity index 97% rename from patches/server/0768-fix-Instruments.patch rename to patches/server/0766-fix-Instruments.patch index 76c48459cd..4269d924c3 100644 --- a/patches/server/0768-fix-Instruments.patch +++ b/patches/server/0766-fix-Instruments.patch @@ -6,7 +6,7 @@ Subject: [PATCH] fix Instruments properly handle Player#playNote diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 82767306f63025fa537163cbbac24bd4d66e3416..02e3c1aef805dd83a54a9fab2843dc2d7d47cdb5 100644 +index 76d85db873d223aa3f8b310e83eff880d451ff8f..9e7c7e016211622e35acda872477acb1ea62ca9f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -775,7 +775,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0769-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0767-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch similarity index 100% rename from patches/server/0769-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch rename to patches/server/0767-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch diff --git a/patches/server/0770-Add-BlockLockCheckEvent.patch b/patches/server/0768-Add-BlockLockCheckEvent.patch similarity index 100% rename from patches/server/0770-Add-BlockLockCheckEvent.patch rename to patches/server/0768-Add-BlockLockCheckEvent.patch diff --git a/patches/server/0771-Add-Sneaking-API-for-Entities.patch b/patches/server/0769-Add-Sneaking-API-for-Entities.patch similarity index 100% rename from patches/server/0771-Add-Sneaking-API-for-Entities.patch rename to patches/server/0769-Add-Sneaking-API-for-Entities.patch diff --git a/patches/server/0772-Improve-logging-and-errors.patch b/patches/server/0770-Improve-logging-and-errors.patch similarity index 100% rename from patches/server/0772-Improve-logging-and-errors.patch rename to patches/server/0770-Improve-logging-and-errors.patch diff --git a/patches/server/0773-Improve-PortalEvents.patch b/patches/server/0771-Improve-PortalEvents.patch similarity index 98% rename from patches/server/0773-Improve-PortalEvents.patch rename to patches/server/0771-Improve-PortalEvents.patch index fc97d0c046..1f961cddb9 100644 --- a/patches/server/0773-Improve-PortalEvents.patch +++ b/patches/server/0771-Improve-PortalEvents.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Improve PortalEvents diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 772a759a474a114ccb2f7f83b678708714788e60..6a8a1c22e1bf53df7cf4b14daf9ff1de7017ef8b 100644 +index 986daea0c055d6015441b22c610e5e29b7ebd2ff..df2c899988429cb68b0abbb829d378e6a2ed022b 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1561,7 +1561,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0774-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0772-Add-config-option-for-spider-worldborder-climbing.patch similarity index 100% rename from patches/server/0774-Add-config-option-for-spider-worldborder-climbing.patch rename to patches/server/0772-Add-config-option-for-spider-worldborder-climbing.patch diff --git a/patches/server/0775-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0773-Add-missing-SpigotConfig-logCommands-check.patch similarity index 100% rename from patches/server/0775-Add-missing-SpigotConfig-logCommands-check.patch rename to patches/server/0773-Add-missing-SpigotConfig-logCommands-check.patch diff --git a/patches/server/0776-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0774-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch similarity index 100% rename from patches/server/0776-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch rename to patches/server/0774-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch diff --git a/patches/server/0777-Flying-Fall-Damage.patch b/patches/server/0775-Flying-Fall-Damage.patch similarity index 96% rename from patches/server/0777-Flying-Fall-Damage.patch rename to patches/server/0775-Flying-Fall-Damage.patch index 55e6d96677..6e83415e6d 100644 --- a/patches/server/0777-Flying-Fall-Damage.patch +++ b/patches/server/0775-Flying-Fall-Damage.patch @@ -26,7 +26,7 @@ index 30e0a5fe3f9bd85d2b702c2c877c5682ed35d461..aca888c2f02b09ac6739bdc81b194c45 } else { if (fallDistance >= 2.0F) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 02e3c1aef805dd83a54a9fab2843dc2d7d47cdb5..9e46b2c9b3390c70ab10f279a4b41160b2f17b6d 100644 +index 9e7c7e016211622e35acda872477acb1ea62ca9f..2bebbc926acce49d2ea1e7a170abb5b9a587868d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2593,6 +2593,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0778-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0776-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch similarity index 100% rename from patches/server/0778-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch rename to patches/server/0776-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch diff --git a/patches/server/0779-config-for-disabling-entity-tag-tags.patch b/patches/server/0777-config-for-disabling-entity-tag-tags.patch similarity index 100% rename from patches/server/0779-config-for-disabling-entity-tag-tags.patch rename to patches/server/0777-config-for-disabling-entity-tag-tags.patch diff --git a/patches/server/0780-Use-single-player-info-update-packet-on-join.patch b/patches/server/0778-Use-single-player-info-update-packet-on-join.patch similarity index 100% rename from patches/server/0780-Use-single-player-info-update-packet-on-join.patch rename to patches/server/0778-Use-single-player-info-update-packet-on-join.patch diff --git a/patches/server/0781-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0779-Correctly-shrink-items-during-EntityResurrectEvent.patch similarity index 100% rename from patches/server/0781-Correctly-shrink-items-during-EntityResurrectEvent.patch rename to patches/server/0779-Correctly-shrink-items-during-EntityResurrectEvent.patch diff --git a/patches/server/0782-Win-Screen-API.patch b/patches/server/0780-Win-Screen-API.patch similarity index 93% rename from patches/server/0782-Win-Screen-API.patch rename to patches/server/0780-Win-Screen-API.patch index 2f98e51fbf..42b019a13f 100644 --- a/patches/server/0782-Win-Screen-API.patch +++ b/patches/server/0780-Win-Screen-API.patch @@ -7,7 +7,7 @@ Subject: [PATCH] Win Screen API public net.minecraft.server.level.ServerPlayer seenCredits diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 9e46b2c9b3390c70ab10f279a4b41160b2f17b6d..37f8b1adfeba6eebcbb21cd9a143ac8f6dacdcfb 100644 +index 2bebbc926acce49d2ea1e7a170abb5b9a587868d..cc8423a7feeb33f95a429c293e628fb1499ebb73 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1312,6 +1312,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0783-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0781-Remove-CraftItemStack-setAmount-null-assignment.patch similarity index 100% rename from patches/server/0783-Remove-CraftItemStack-setAmount-null-assignment.patch rename to patches/server/0781-Remove-CraftItemStack-setAmount-null-assignment.patch diff --git a/patches/server/0784-Fix-force-opening-enchantment-tables.patch b/patches/server/0782-Fix-force-opening-enchantment-tables.patch similarity index 94% rename from patches/server/0784-Fix-force-opening-enchantment-tables.patch rename to patches/server/0782-Fix-force-opening-enchantment-tables.patch index 6ddc05bd3f..deac4001bb 100644 --- a/patches/server/0784-Fix-force-opening-enchantment-tables.patch +++ b/patches/server/0782-Fix-force-opening-enchantment-tables.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix force-opening enchantment tables diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index df9d02eb1ffc3cc669e835e2c08d951283871db3..04fe27a84eb240f8e9bb0ed5b21fd60cfed619ad 100644 +index aa3a47149fec342096817c7b9ce45ea196fd33d0..9509fa35ccf6f1f6fe24250bad8095b6ccdad6b0 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -411,7 +411,18 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { diff --git a/patches/server/0785-Add-Entity-Body-Yaw-API.patch b/patches/server/0783-Add-Entity-Body-Yaw-API.patch similarity index 100% rename from patches/server/0785-Add-Entity-Body-Yaw-API.patch rename to patches/server/0783-Add-Entity-Body-Yaw-API.patch diff --git a/patches/server/0786-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0784-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch similarity index 100% rename from patches/server/0786-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch rename to patches/server/0784-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch diff --git a/patches/server/0787-Add-EntityFertilizeEggEvent.patch b/patches/server/0785-Add-EntityFertilizeEggEvent.patch similarity index 100% rename from patches/server/0787-Add-EntityFertilizeEggEvent.patch rename to patches/server/0785-Add-EntityFertilizeEggEvent.patch diff --git a/patches/server/0788-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0786-Fix-HumanEntity-drop-not-updating-the-client-inv.patch similarity index 94% rename from patches/server/0788-Fix-HumanEntity-drop-not-updating-the-client-inv.patch rename to patches/server/0786-Fix-HumanEntity-drop-not-updating-the-client-inv.patch index 21d4d0ad65..5807cdf697 100644 --- a/patches/server/0788-Fix-HumanEntity-drop-not-updating-the-client-inv.patch +++ b/patches/server/0786-Fix-HumanEntity-drop-not-updating-the-client-inv.patch @@ -7,7 +7,7 @@ Subject: [PATCH] Fix HumanEntity#drop not updating the client inv public net.minecraft.server.level.ServerPlayer containerSynchronizer diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index 04fe27a84eb240f8e9bb0ed5b21fd60cfed619ad..7dddf4dd090fcd9e86b147d7e4ddeaa99800713e 100644 +index 9509fa35ccf6f1f6fe24250bad8095b6ccdad6b0..db99af60c8145cc62f368b06bbc283f24d4dbfb2 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -782,8 +782,15 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { diff --git a/patches/server/0789-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0787-Add-CompostItemEvent-and-EntityCompostItemEvent.patch similarity index 100% rename from patches/server/0789-Add-CompostItemEvent-and-EntityCompostItemEvent.patch rename to patches/server/0787-Add-CompostItemEvent-and-EntityCompostItemEvent.patch diff --git a/patches/server/0790-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0788-Correctly-handle-ArmorStand-invisibility.patch similarity index 100% rename from patches/server/0790-Correctly-handle-ArmorStand-invisibility.patch rename to patches/server/0788-Correctly-handle-ArmorStand-invisibility.patch diff --git a/patches/server/0791-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0789-Fix-advancement-triggers-for-entity-damage.patch similarity index 100% rename from patches/server/0791-Fix-advancement-triggers-for-entity-damage.patch rename to patches/server/0789-Fix-advancement-triggers-for-entity-damage.patch diff --git a/patches/server/0792-Fix-text-display-error-on-spawn.patch b/patches/server/0790-Fix-text-display-error-on-spawn.patch similarity index 100% rename from patches/server/0792-Fix-text-display-error-on-spawn.patch rename to patches/server/0790-Fix-text-display-error-on-spawn.patch diff --git a/patches/server/0793-Fix-inventories-returning-null-Locations.patch b/patches/server/0791-Fix-inventories-returning-null-Locations.patch similarity index 100% rename from patches/server/0793-Fix-inventories-returning-null-Locations.patch rename to patches/server/0791-Fix-inventories-returning-null-Locations.patch diff --git a/patches/server/0794-Add-Shearable-API.patch b/patches/server/0792-Add-Shearable-API.patch similarity index 100% rename from patches/server/0794-Add-Shearable-API.patch rename to patches/server/0792-Add-Shearable-API.patch diff --git a/patches/server/0795-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0793-Fix-SpawnEggMeta-get-setSpawnedType.patch similarity index 100% rename from patches/server/0795-Fix-SpawnEggMeta-get-setSpawnedType.patch rename to patches/server/0793-Fix-SpawnEggMeta-get-setSpawnedType.patch diff --git a/patches/server/0796-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0794-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch similarity index 100% rename from patches/server/0796-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch rename to patches/server/0794-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch diff --git a/patches/server/0797-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0795-Treat-sequence-violations-like-they-should-be.patch similarity index 100% rename from patches/server/0797-Treat-sequence-violations-like-they-should-be.patch rename to patches/server/0795-Treat-sequence-violations-like-they-should-be.patch diff --git a/patches/server/0798-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0796-Prevent-causing-expired-keys-from-impacting-new-join.patch similarity index 100% rename from patches/server/0798-Prevent-causing-expired-keys-from-impacting-new-join.patch rename to patches/server/0796-Prevent-causing-expired-keys-from-impacting-new-join.patch diff --git a/patches/server/0799-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0797-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch similarity index 100% rename from patches/server/0799-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch rename to patches/server/0797-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch diff --git a/patches/server/0800-Use-array-for-gamerule-storage.patch b/patches/server/0798-Use-array-for-gamerule-storage.patch similarity index 100% rename from patches/server/0800-Use-array-for-gamerule-storage.patch rename to patches/server/0798-Use-array-for-gamerule-storage.patch diff --git a/patches/server/0801-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0799-Fix-a-couple-of-upstream-bed-issues.patch similarity index 100% rename from patches/server/0801-Fix-a-couple-of-upstream-bed-issues.patch rename to patches/server/0799-Fix-a-couple-of-upstream-bed-issues.patch diff --git a/patches/server/0802-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0800-Fix-demo-flag-not-enabling-demo-mode.patch similarity index 100% rename from patches/server/0802-Fix-demo-flag-not-enabling-demo-mode.patch rename to patches/server/0800-Fix-demo-flag-not-enabling-demo-mode.patch diff --git a/patches/server/0803-Add-Mob-Experience-reward-API.patch b/patches/server/0801-Add-Mob-Experience-reward-API.patch similarity index 100% rename from patches/server/0803-Add-Mob-Experience-reward-API.patch rename to patches/server/0801-Add-Mob-Experience-reward-API.patch diff --git a/patches/server/0804-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0802-Break-redstone-on-top-of-trap-doors-early.patch similarity index 100% rename from patches/server/0804-Break-redstone-on-top-of-trap-doors-early.patch rename to patches/server/0802-Break-redstone-on-top-of-trap-doors-early.patch diff --git a/patches/server/0805-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0803-Avoid-Lazy-Initialization-for-Enum-Fields.patch similarity index 100% rename from patches/server/0805-Avoid-Lazy-Initialization-for-Enum-Fields.patch rename to patches/server/0803-Avoid-Lazy-Initialization-for-Enum-Fields.patch diff --git a/patches/server/0806-More-accurate-isInOpenWater-impl.patch b/patches/server/0804-More-accurate-isInOpenWater-impl.patch similarity index 100% rename from patches/server/0806-More-accurate-isInOpenWater-impl.patch rename to patches/server/0804-More-accurate-isInOpenWater-impl.patch diff --git a/patches/server/0807-Expand-PlayerItemMendEvent.patch b/patches/server/0805-Expand-PlayerItemMendEvent.patch similarity index 98% rename from patches/server/0807-Expand-PlayerItemMendEvent.patch rename to patches/server/0805-Expand-PlayerItemMendEvent.patch index f2aa9edbd1..aba88cb11c 100644 --- a/patches/server/0807-Expand-PlayerItemMendEvent.patch +++ b/patches/server/0805-Expand-PlayerItemMendEvent.patch @@ -30,7 +30,7 @@ index 3a7af27bb1ce0cbe56bd3760cd400083daf98d4c..bf0838f574fa3fb9654e087d602b8d38 if (l > 0) { // this.value = l; // CraftBukkit - update exp value of orb for PlayerItemMendEvent calls // Paper - the value field should not be mutated here because it doesn't take "count" into account diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 37f8b1adfeba6eebcbb21cd9a143ac8f6dacdcfb..981b5074e832038537f8281e25bbd868c580c091 100644 +index cc8423a7feeb33f95a429c293e628fb1499ebb73..086492649e07de374aed486181a7c3ddb96cd7e1 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1865,11 +1865,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0808-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0806-Refresh-ProjectileSource-for-projectiles.patch similarity index 100% rename from patches/server/0808-Refresh-ProjectileSource-for-projectiles.patch rename to patches/server/0806-Refresh-ProjectileSource-for-projectiles.patch diff --git a/patches/server/0809-Add-transient-modifier-API.patch b/patches/server/0807-Add-transient-modifier-API.patch similarity index 100% rename from patches/server/0809-Add-transient-modifier-API.patch rename to patches/server/0807-Add-transient-modifier-API.patch diff --git a/patches/server/0810-Fix-block-place-logic.patch b/patches/server/0808-Fix-block-place-logic.patch similarity index 100% rename from patches/server/0810-Fix-block-place-logic.patch rename to patches/server/0808-Fix-block-place-logic.patch diff --git a/patches/server/0811-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0809-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch similarity index 100% rename from patches/server/0811-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch rename to patches/server/0809-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch diff --git a/patches/server/0812-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0810-Call-BlockGrowEvent-for-missing-blocks.patch similarity index 100% rename from patches/server/0812-Call-BlockGrowEvent-for-missing-blocks.patch rename to patches/server/0810-Call-BlockGrowEvent-for-missing-blocks.patch diff --git a/patches/server/0813-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0811-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch similarity index 100% rename from patches/server/0813-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch rename to patches/server/0811-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch diff --git a/patches/server/0814-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0812-fix-MapLike-spam-for-missing-key-selector.patch similarity index 100% rename from patches/server/0814-fix-MapLike-spam-for-missing-key-selector.patch rename to patches/server/0812-fix-MapLike-spam-for-missing-key-selector.patch diff --git a/patches/server/0815-Fix-sniffer-removeExploredLocation.patch b/patches/server/0813-Fix-sniffer-removeExploredLocation.patch similarity index 100% rename from patches/server/0815-Fix-sniffer-removeExploredLocation.patch rename to patches/server/0813-Fix-sniffer-removeExploredLocation.patch diff --git a/patches/server/0816-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0814-Add-method-to-remove-all-active-potion-effects.patch similarity index 100% rename from patches/server/0816-Add-method-to-remove-all-active-potion-effects.patch rename to patches/server/0814-Add-method-to-remove-all-active-potion-effects.patch diff --git a/patches/server/0817-Add-event-for-player-editing-sign.patch b/patches/server/0815-Add-event-for-player-editing-sign.patch similarity index 100% rename from patches/server/0817-Add-event-for-player-editing-sign.patch rename to patches/server/0815-Add-event-for-player-editing-sign.patch diff --git a/patches/server/0818-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0816-Only-tick-item-frames-if-players-can-see-it.patch similarity index 100% rename from patches/server/0818-Only-tick-item-frames-if-players-can-see-it.patch rename to patches/server/0816-Only-tick-item-frames-if-players-can-see-it.patch diff --git a/patches/server/0819-Fix-cmd-permission-levels-for-command-blocks.patch b/patches/server/0817-Fix-cmd-permission-levels-for-command-blocks.patch similarity index 100% rename from patches/server/0819-Fix-cmd-permission-levels-for-command-blocks.patch rename to patches/server/0817-Fix-cmd-permission-levels-for-command-blocks.patch diff --git a/patches/server/0820-Add-option-to-disable-block-updates.patch b/patches/server/0818-Add-option-to-disable-block-updates.patch similarity index 100% rename from patches/server/0820-Add-option-to-disable-block-updates.patch rename to patches/server/0818-Add-option-to-disable-block-updates.patch diff --git a/patches/server/0821-Call-missing-BlockDispenseEvent.patch b/patches/server/0819-Call-missing-BlockDispenseEvent.patch similarity index 100% rename from patches/server/0821-Call-missing-BlockDispenseEvent.patch rename to patches/server/0819-Call-missing-BlockDispenseEvent.patch diff --git a/patches/server/0822-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0820-Don-t-load-chunks-for-supporting-block-checks.patch similarity index 100% rename from patches/server/0822-Don-t-load-chunks-for-supporting-block-checks.patch rename to patches/server/0820-Don-t-load-chunks-for-supporting-block-checks.patch diff --git a/patches/server/0823-Optimize-player-lookups-for-beacons.patch b/patches/server/0821-Optimize-player-lookups-for-beacons.patch similarity index 100% rename from patches/server/0823-Optimize-player-lookups-for-beacons.patch rename to patches/server/0821-Optimize-player-lookups-for-beacons.patch diff --git a/patches/server/0824-More-Sign-Block-API.patch b/patches/server/0822-More-Sign-Block-API.patch similarity index 100% rename from patches/server/0824-More-Sign-Block-API.patch rename to patches/server/0822-More-Sign-Block-API.patch diff --git a/patches/server/0825-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0823-fix-item-meta-for-tadpole-buckets.patch similarity index 100% rename from patches/server/0825-fix-item-meta-for-tadpole-buckets.patch rename to patches/server/0823-fix-item-meta-for-tadpole-buckets.patch diff --git a/patches/server/0826-Fix-BanList-API.patch b/patches/server/0824-Fix-BanList-API.patch similarity index 99% rename from patches/server/0826-Fix-BanList-API.patch rename to patches/server/0824-Fix-BanList-API.patch index e1b5f101e4..6773a8fbe0 100644 --- a/patches/server/0826-Fix-BanList-API.patch +++ b/patches/server/0824-Fix-BanList-API.patch @@ -208,7 +208,7 @@ index 172202accf4448a933fcf1ff820316c7910dd7f7..50ee7656580d386db473c054f5c5ec57 return null; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 981b5074e832038537f8281e25bbd868c580c091..cf9f7143924239c8add0e7231d922e41d9ff84d7 100644 +index 086492649e07de374aed486181a7c3ddb96cd7e1..e00a0eef7166793849f1caca285a51b922d422fa 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1759,23 +1759,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0827-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0825-Determine-lava-and-water-fluid-explosion-resistance-.patch similarity index 100% rename from patches/server/0827-Determine-lava-and-water-fluid-explosion-resistance-.patch rename to patches/server/0825-Determine-lava-and-water-fluid-explosion-resistance-.patch diff --git a/patches/server/0828-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0826-Fix-possible-NPE-on-painting-creation.patch similarity index 100% rename from patches/server/0828-Fix-possible-NPE-on-painting-creation.patch rename to patches/server/0826-Fix-possible-NPE-on-painting-creation.patch diff --git a/patches/server/0829-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0827-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch similarity index 100% rename from patches/server/0829-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch rename to patches/server/0827-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch diff --git a/patches/server/0830-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0828-ExperienceOrb-should-call-EntitySpawnEvent.patch similarity index 100% rename from patches/server/0830-ExperienceOrb-should-call-EntitySpawnEvent.patch rename to patches/server/0828-ExperienceOrb-should-call-EntitySpawnEvent.patch diff --git a/patches/server/0831-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0829-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch similarity index 100% rename from patches/server/0831-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch rename to patches/server/0829-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch diff --git a/patches/server/0832-Add-whitelist-events.patch b/patches/server/0830-Add-whitelist-events.patch similarity index 100% rename from patches/server/0832-Add-whitelist-events.patch rename to patches/server/0830-Add-whitelist-events.patch diff --git a/patches/server/0833-Implement-PlayerFailMoveEvent.patch b/patches/server/0831-Implement-PlayerFailMoveEvent.patch similarity index 100% rename from patches/server/0833-Implement-PlayerFailMoveEvent.patch rename to patches/server/0831-Implement-PlayerFailMoveEvent.patch diff --git a/patches/server/0834-Folia-scheduler-and-owned-region-API.patch b/patches/server/0832-Folia-scheduler-and-owned-region-API.patch similarity index 100% rename from patches/server/0834-Folia-scheduler-and-owned-region-API.patch rename to patches/server/0832-Folia-scheduler-and-owned-region-API.patch diff --git a/patches/server/0835-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0833-Only-erase-allay-memory-on-non-item-targets.patch similarity index 100% rename from patches/server/0835-Only-erase-allay-memory-on-non-item-targets.patch rename to patches/server/0833-Only-erase-allay-memory-on-non-item-targets.patch diff --git a/patches/server/0836-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0834-Fix-rotation-when-spawning-display-entities.patch similarity index 100% rename from patches/server/0836-Fix-rotation-when-spawning-display-entities.patch rename to patches/server/0834-Fix-rotation-when-spawning-display-entities.patch diff --git a/patches/server/0837-Only-capture-actual-tree-growth.patch b/patches/server/0835-Only-capture-actual-tree-growth.patch similarity index 100% rename from patches/server/0837-Only-capture-actual-tree-growth.patch rename to patches/server/0835-Only-capture-actual-tree-growth.patch diff --git a/patches/server/0838-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0836-Use-correct-source-for-mushroom-block-spread-event.patch similarity index 100% rename from patches/server/0838-Use-correct-source-for-mushroom-block-spread-event.patch rename to patches/server/0836-Use-correct-source-for-mushroom-block-spread-event.patch diff --git a/patches/server/0839-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0837-Respect-randomizeData-on-more-entities-when-spawning.patch similarity index 100% rename from patches/server/0839-Respect-randomizeData-on-more-entities-when-spawning.patch rename to patches/server/0837-Respect-randomizeData-on-more-entities-when-spawning.patch diff --git a/patches/server/0840-Use-correct-seed-on-api-world-load.patch b/patches/server/0838-Use-correct-seed-on-api-world-load.patch similarity index 100% rename from patches/server/0840-Use-correct-seed-on-api-world-load.patch rename to patches/server/0838-Use-correct-seed-on-api-world-load.patch diff --git a/patches/server/0841-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0839-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch similarity index 100% rename from patches/server/0841-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch rename to patches/server/0839-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch diff --git a/patches/server/0842-Cache-map-ids-on-item-frames.patch b/patches/server/0840-Cache-map-ids-on-item-frames.patch similarity index 100% rename from patches/server/0842-Cache-map-ids-on-item-frames.patch rename to patches/server/0840-Cache-map-ids-on-item-frames.patch diff --git a/patches/server/0843-API-for-updating-recipes-on-clients.patch b/patches/server/0841-API-for-updating-recipes-on-clients.patch similarity index 100% rename from patches/server/0843-API-for-updating-recipes-on-clients.patch rename to patches/server/0841-API-for-updating-recipes-on-clients.patch diff --git a/patches/server/0844-Fix-custom-statistic-criteria-creation.patch b/patches/server/0842-Fix-custom-statistic-criteria-creation.patch similarity index 100% rename from patches/server/0844-Fix-custom-statistic-criteria-creation.patch rename to patches/server/0842-Fix-custom-statistic-criteria-creation.patch diff --git a/patches/server/0845-Bandaid-fix-for-Effect.patch b/patches/server/0843-Bandaid-fix-for-Effect.patch similarity index 98% rename from patches/server/0845-Bandaid-fix-for-Effect.patch rename to patches/server/0843-Bandaid-fix-for-Effect.patch index 088947acc2..c6a0aab0ab 100644 --- a/patches/server/0845-Bandaid-fix-for-Effect.patch +++ b/patches/server/0843-Bandaid-fix-for-Effect.patch @@ -81,7 +81,7 @@ index 431bd698e28b7731bf781e29de6c6a3fd936c71c..bca9e4908c7949a6f0b24fed2aa7332d // Special case: the axis is optional for ELECTRIC_SPARK Preconditions.checkArgument(effect.getData() == null || effect == Effect.ELECTRIC_SPARK, "Wrong kind of data for the %s effect", effect); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index cf9f7143924239c8add0e7231d922e41d9ff84d7..df986f2359b5bce137d7c37ed34e49ac912229e2 100644 +index e00a0eef7166793849f1caca285a51b922d422fa..e98d9d0c7a04d168cf8de42d575e07d55065bd09 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -924,7 +924,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0846-SculkCatalyst-bloom-API.patch b/patches/server/0844-SculkCatalyst-bloom-API.patch similarity index 100% rename from patches/server/0846-SculkCatalyst-bloom-API.patch rename to patches/server/0844-SculkCatalyst-bloom-API.patch diff --git a/patches/server/0847-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0845-API-for-an-entity-s-scoreboard-name.patch similarity index 100% rename from patches/server/0847-API-for-an-entity-s-scoreboard-name.patch rename to patches/server/0845-API-for-an-entity-s-scoreboard-name.patch diff --git a/patches/server/0848-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0846-Deprecate-and-replace-methods-with-old-StructureType.patch similarity index 100% rename from patches/server/0848-Deprecate-and-replace-methods-with-old-StructureType.patch rename to patches/server/0846-Deprecate-and-replace-methods-with-old-StructureType.patch diff --git a/patches/server/0849-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0847-Don-t-tab-complete-namespaced-commands-if-send-names.patch similarity index 100% rename from patches/server/0849-Don-t-tab-complete-namespaced-commands-if-send-names.patch rename to patches/server/0847-Don-t-tab-complete-namespaced-commands-if-send-names.patch diff --git a/patches/server/0850-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0848-Properly-handle-BlockBreakEvent-isDropItems.patch similarity index 100% rename from patches/server/0850-Properly-handle-BlockBreakEvent-isDropItems.patch rename to patches/server/0848-Properly-handle-BlockBreakEvent-isDropItems.patch diff --git a/patches/server/0851-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0849-Fire-entity-death-event-for-ender-dragon.patch similarity index 100% rename from patches/server/0851-Fire-entity-death-event-for-ender-dragon.patch rename to patches/server/0849-Fire-entity-death-event-for-ender-dragon.patch diff --git a/patches/server/0852-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0850-Configurable-entity-tracking-range-by-Y-coordinate.patch similarity index 100% rename from patches/server/0852-Configurable-entity-tracking-range-by-Y-coordinate.patch rename to patches/server/0850-Configurable-entity-tracking-range-by-Y-coordinate.patch diff --git a/patches/server/0853-Add-Listing-API-for-Player.patch b/patches/server/0851-Add-Listing-API-for-Player.patch similarity index 99% rename from patches/server/0853-Add-Listing-API-for-Player.patch rename to patches/server/0851-Add-Listing-API-for-Player.patch index 78c2c8af8c..2fb2685db5 100644 --- a/patches/server/0853-Add-Listing-API-for-Player.patch +++ b/patches/server/0851-Add-Listing-API-for-Player.patch @@ -122,7 +122,7 @@ index efc12d629b71ba1da664d9ecfd4575bee9b45dc3..9067100a82a8c405cec0a19e53b3b245 // Paper end - Use single player info update packet on join player.sentListPacket = true; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index df986f2359b5bce137d7c37ed34e49ac912229e2..21a700a44972336ee619389eab1d83545883f092 100644 +index e98d9d0c7a04d168cf8de42d575e07d55065bd09..3e9a4fb43589b4e0cf3a08f7b2a1a0e38b14c001 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -206,6 +206,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0854-Configurable-Region-Compression-Format.patch b/patches/server/0852-Configurable-Region-Compression-Format.patch similarity index 96% rename from patches/server/0854-Configurable-Region-Compression-Format.patch rename to patches/server/0852-Configurable-Region-Compression-Format.patch index 64a52a4ea2..ce17b1e202 100644 --- a/patches/server/0854-Configurable-Region-Compression-Format.patch +++ b/patches/server/0852-Configurable-Region-Compression-Format.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable Region Compression Format diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java -index f1237f6fd6414900ffbad0caee31aa83310eeef4..e858436bcf1b234d4bc6e6a117f5224d5c2d9f90 100644 +index b24e8255ab18eb5b2e4968aa62aa3d72ef33f0eb..0028f4fd331b6f94be2a2b4d90e56dcdd881178d 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java @@ -50,7 +50,7 @@ public class RegionFile implements AutoCloseable { diff --git a/patches/server/0855-Add-BlockFace-to-BlockDamageEvent.patch b/patches/server/0853-Add-BlockFace-to-BlockDamageEvent.patch similarity index 100% rename from patches/server/0855-Add-BlockFace-to-BlockDamageEvent.patch rename to patches/server/0853-Add-BlockFace-to-BlockDamageEvent.patch diff --git a/patches/server/0856-Fix-NPE-on-Boat-getStatus.patch b/patches/server/0854-Fix-NPE-on-Boat-getStatus.patch similarity index 100% rename from patches/server/0856-Fix-NPE-on-Boat-getStatus.patch rename to patches/server/0854-Fix-NPE-on-Boat-getStatus.patch diff --git a/patches/server/0857-Expand-Pose-API.patch b/patches/server/0855-Expand-Pose-API.patch similarity index 100% rename from patches/server/0857-Expand-Pose-API.patch rename to patches/server/0855-Expand-Pose-API.patch diff --git a/patches/server/0858-More-DragonBattle-API.patch b/patches/server/0856-More-DragonBattle-API.patch similarity index 100% rename from patches/server/0858-More-DragonBattle-API.patch rename to patches/server/0856-More-DragonBattle-API.patch diff --git a/patches/server/0859-Add-PlayerPickItemEvent.patch b/patches/server/0857-Add-PlayerPickItemEvent.patch similarity index 100% rename from patches/server/0859-Add-PlayerPickItemEvent.patch rename to patches/server/0857-Add-PlayerPickItemEvent.patch diff --git a/patches/server/0860-Allow-trident-custom-damage.patch b/patches/server/0858-Allow-trident-custom-damage.patch similarity index 100% rename from patches/server/0860-Allow-trident-custom-damage.patch rename to patches/server/0858-Allow-trident-custom-damage.patch diff --git a/patches/server/0861-Expose-hand-in-BlockCanBuildEvent.patch b/patches/server/0859-Expose-hand-in-BlockCanBuildEvent.patch similarity index 100% rename from patches/server/0861-Expose-hand-in-BlockCanBuildEvent.patch rename to patches/server/0859-Expose-hand-in-BlockCanBuildEvent.patch diff --git a/patches/server/0862-Optimize-nearest-structure-border-iteration.patch b/patches/server/0860-Optimize-nearest-structure-border-iteration.patch similarity index 100% rename from patches/server/0862-Optimize-nearest-structure-border-iteration.patch rename to patches/server/0860-Optimize-nearest-structure-border-iteration.patch diff --git a/patches/server/0863-Implement-OfflinePlayer-isConnected.patch b/patches/server/0861-Implement-OfflinePlayer-isConnected.patch similarity index 94% rename from patches/server/0863-Implement-OfflinePlayer-isConnected.patch rename to patches/server/0861-Implement-OfflinePlayer-isConnected.patch index 4e901ad769..b3d522bfbc 100644 --- a/patches/server/0863-Implement-OfflinePlayer-isConnected.patch +++ b/patches/server/0861-Implement-OfflinePlayer-isConnected.patch @@ -23,7 +23,7 @@ index 2c2c4db31a746b4eb853dc04c6b3e5631bbfa034..4f4e3ee18d586f61706504218cddc06a public String getName() { Player player = this.getPlayer(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 76ee6dcf028720f22ca6d0ba5975a8f1555cca37..d8f0f8f0afd0a3705cf20b2670a6dd137cd70c15 100644 +index 3e9a4fb43589b4e0cf3a08f7b2a1a0e38b14c001..3ff1eeb47b2d547483f3340eca4adad7a2d55c78 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -261,6 +261,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0864-Fix-slot-desync.patch b/patches/server/0862-Fix-slot-desync.patch similarity index 99% rename from patches/server/0864-Fix-slot-desync.patch rename to patches/server/0862-Fix-slot-desync.patch index e43a5e95b8..7570c7226a 100644 --- a/patches/server/0864-Fix-slot-desync.patch +++ b/patches/server/0862-Fix-slot-desync.patch @@ -10,7 +10,7 @@ Co-authored-by: Minecrell Co-authored-by: Newwind diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 6a8a1c22e1bf53df7cf4b14daf9ff1de7017ef8b..678c31bcb98acb376e08de220f9fc9322c4f85fc 100644 +index df2c899988429cb68b0abbb829d378e6a2ed022b..0c5e67db809a9d741cb27d97d42dd9e71fda44eb 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -460,6 +460,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0865-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/0863-Add-titleOverride-to-InventoryOpenEvent.patch similarity index 97% rename from patches/server/0865-Add-titleOverride-to-InventoryOpenEvent.patch rename to patches/server/0863-Add-titleOverride-to-InventoryOpenEvent.patch index 483c549c82..80612faf72 100644 --- a/patches/server/0865-Add-titleOverride-to-InventoryOpenEvent.patch +++ b/patches/server/0863-Add-titleOverride-to-InventoryOpenEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add titleOverride to InventoryOpenEvent diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 678c31bcb98acb376e08de220f9fc9322c4f85fc..e038664858c7af59f52a6328c73ecb27f8a16644 100644 +index 0c5e67db809a9d741cb27d97d42dd9e71fda44eb..7bf2e642507b1b68ddeaddf8b435728e3a434ff5 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1924,12 +1924,17 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { @@ -37,7 +37,7 @@ index 678c31bcb98acb376e08de220f9fc9322c4f85fc..e038664858c7af59f52a6328c73ecb27 this.initMenu(container); return OptionalInt.of(this.containerCounter); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index 7dddf4dd090fcd9e86b147d7e4ddeaa99800713e..4312290ad970f71e1dc25b707ab312c597a481a9 100644 +index db99af60c8145cc62f368b06bbc283f24d4dbfb2..e345cdbfab44a0f5da80d738798dbb4424b7ab5c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -366,12 +366,16 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { diff --git a/patches/server/0866-Configure-sniffer-egg-hatch-time.patch b/patches/server/0864-Configure-sniffer-egg-hatch-time.patch similarity index 100% rename from patches/server/0866-Configure-sniffer-egg-hatch-time.patch rename to patches/server/0864-Configure-sniffer-egg-hatch-time.patch diff --git a/patches/server/0867-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/0865-Do-crystal-portal-proximity-check-before-entity-look.patch similarity index 100% rename from patches/server/0867-Do-crystal-portal-proximity-check-before-entity-look.patch rename to patches/server/0865-Do-crystal-portal-proximity-check-before-entity-look.patch diff --git a/patches/server/0868-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/0866-Skip-POI-finding-if-stuck-in-vehicle.patch similarity index 100% rename from patches/server/0868-Skip-POI-finding-if-stuck-in-vehicle.patch rename to patches/server/0866-Skip-POI-finding-if-stuck-in-vehicle.patch diff --git a/patches/server/0869-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/0867-Add-slot-sanity-checks-in-container-clicks.patch similarity index 100% rename from patches/server/0869-Add-slot-sanity-checks-in-container-clicks.patch rename to patches/server/0867-Add-slot-sanity-checks-in-container-clicks.patch diff --git a/patches/server/0870-Call-BlockRedstoneEvents-properly.patch b/patches/server/0868-Call-BlockRedstoneEvents-properly.patch similarity index 100% rename from patches/server/0870-Call-BlockRedstoneEvents-properly.patch rename to patches/server/0868-Call-BlockRedstoneEvents-properly.patch diff --git a/patches/server/0871-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/0869-Allow-proper-checking-of-empty-item-stacks.patch similarity index 100% rename from patches/server/0871-Allow-proper-checking-of-empty-item-stacks.patch rename to patches/server/0869-Allow-proper-checking-of-empty-item-stacks.patch diff --git a/patches/server/0872-Fix-silent-equipment-change-for-mobs.patch b/patches/server/0870-Fix-silent-equipment-change-for-mobs.patch similarity index 100% rename from patches/server/0872-Fix-silent-equipment-change-for-mobs.patch rename to patches/server/0870-Fix-silent-equipment-change-for-mobs.patch diff --git a/patches/server/0873-Fix-spigot-s-Forced-Stats.patch b/patches/server/0871-Fix-spigot-s-Forced-Stats.patch similarity index 100% rename from patches/server/0873-Fix-spigot-s-Forced-Stats.patch rename to patches/server/0871-Fix-spigot-s-Forced-Stats.patch diff --git a/patches/server/0874-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/0872-Add-missing-InventoryHolders-to-inventories.patch similarity index 100% rename from patches/server/0874-Add-missing-InventoryHolders-to-inventories.patch rename to patches/server/0872-Add-missing-InventoryHolders-to-inventories.patch diff --git a/patches/server/0875-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/0873-Do-not-read-tile-entities-in-chunks-that-are-positio.patch similarity index 100% rename from patches/server/0875-Do-not-read-tile-entities-in-chunks-that-are-positio.patch rename to patches/server/0873-Do-not-read-tile-entities-in-chunks-that-are-positio.patch diff --git a/patches/server/0876-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/0874-Add-missing-logs-for-log-ips-config-option.patch similarity index 100% rename from patches/server/0876-Add-missing-logs-for-log-ips-config-option.patch rename to patches/server/0874-Add-missing-logs-for-log-ips-config-option.patch diff --git a/patches/server/0877-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/0875-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch similarity index 100% rename from patches/server/0877-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch rename to patches/server/0875-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch diff --git a/patches/server/0878-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/0876-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch similarity index 100% rename from patches/server/0878-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch rename to patches/server/0876-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch diff --git a/patches/server/0879-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/0877-Fix-team-sidebar-objectives-not-being-cleared.patch similarity index 100% rename from patches/server/0879-Fix-team-sidebar-objectives-not-being-cleared.patch rename to patches/server/0877-Fix-team-sidebar-objectives-not-being-cleared.patch diff --git a/patches/server/0880-Fix-missing-map-initialize-event-call.patch b/patches/server/0878-Fix-missing-map-initialize-event-call.patch similarity index 100% rename from patches/server/0880-Fix-missing-map-initialize-event-call.patch rename to patches/server/0878-Fix-missing-map-initialize-event-call.patch diff --git a/patches/server/0881-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/0879-Update-entity-data-when-attaching-firework-to-entity.patch similarity index 100% rename from patches/server/0881-Update-entity-data-when-attaching-firework-to-entity.patch rename to patches/server/0879-Update-entity-data-when-attaching-firework-to-entity.patch diff --git a/patches/server/0882-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/0880-Fix-UnsafeValues-loadAdvancement.patch similarity index 100% rename from patches/server/0882-Fix-UnsafeValues-loadAdvancement.patch rename to patches/server/0880-Fix-UnsafeValues-loadAdvancement.patch diff --git a/patches/server/0883-Add-player-idle-duration-API.patch b/patches/server/0881-Add-player-idle-duration-API.patch similarity index 91% rename from patches/server/0883-Add-player-idle-duration-API.patch rename to patches/server/0881-Add-player-idle-duration-API.patch index ae9d939194..d86386b0b1 100644 --- a/patches/server/0883-Add-player-idle-duration-API.patch +++ b/patches/server/0881-Add-player-idle-duration-API.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add player idle duration API Implements API for getting and resetting a player's idle duration. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 24abbc26ef9bc8ddc468b7d241cf825405fcfae3..6f1533523424de0d362d1251f05490829460eb8b 100644 +index 3ff1eeb47b2d547483f3340eca4adad7a2d55c78..d11f2fbdf41bf5e6ccc51f467e3f8ebb3f9e4f0b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -3431,6 +3431,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0884-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/0882-Don-t-check-if-we-can-see-non-visible-entities.patch similarity index 100% rename from patches/server/0884-Don-t-check-if-we-can-see-non-visible-entities.patch rename to patches/server/0882-Don-t-check-if-we-can-see-non-visible-entities.patch diff --git a/patches/server/0885-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/0883-Fix-NPE-in-SculkBloomEvent-world-access.patch similarity index 100% rename from patches/server/0885-Fix-NPE-in-SculkBloomEvent-world-access.patch rename to patches/server/0883-Fix-NPE-in-SculkBloomEvent-world-access.patch diff --git a/patches/server/0886-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/0884-Allow-null-itemstack-for-Player-sendEquipmentChange.patch similarity index 90% rename from patches/server/0886-Allow-null-itemstack-for-Player-sendEquipmentChange.patch rename to patches/server/0884-Allow-null-itemstack-for-Player-sendEquipmentChange.patch index 885ede13a7..04ca940c95 100644 --- a/patches/server/0886-Allow-null-itemstack-for-Player-sendEquipmentChange.patch +++ b/patches/server/0884-Allow-null-itemstack-for-Player-sendEquipmentChange.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow null itemstack for Player#sendEquipmentChange diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 6f1533523424de0d362d1251f05490829460eb8b..cc4911163e0e22a7313ea4a591efc7dd40fb1b72 100644 +index d11f2fbdf41bf5e6ccc51f467e3f8ebb3f9e4f0b..1a2fa3ffaa36b486513ff5b16cf2ee27269cae18 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1134,7 +1134,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0887-Optimize-VarInts.patch b/patches/server/0885-Optimize-VarInts.patch similarity index 100% rename from patches/server/0887-Optimize-VarInts.patch rename to patches/server/0885-Optimize-VarInts.patch diff --git a/patches/server/0888-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/server/0886-Add-API-to-get-the-collision-shape-of-a-block-before.patch similarity index 100% rename from patches/server/0888-Add-API-to-get-the-collision-shape-of-a-block-before.patch rename to patches/server/0886-Add-API-to-get-the-collision-shape-of-a-block-before.patch diff --git a/patches/server/0889-Add-predicate-for-blocks-when-raytracing.patch b/patches/server/0887-Add-predicate-for-blocks-when-raytracing.patch similarity index 100% rename from patches/server/0889-Add-predicate-for-blocks-when-raytracing.patch rename to patches/server/0887-Add-predicate-for-blocks-when-raytracing.patch diff --git a/patches/server/0890-Broadcast-take-item-packets-with-collector-as-source.patch b/patches/server/0888-Broadcast-take-item-packets-with-collector-as-source.patch similarity index 100% rename from patches/server/0890-Broadcast-take-item-packets-with-collector-as-source.patch rename to patches/server/0888-Broadcast-take-item-packets-with-collector-as-source.patch diff --git a/patches/server/0891-Expand-LingeringPotion-API.patch b/patches/server/0889-Expand-LingeringPotion-API.patch similarity index 100% rename from patches/server/0891-Expand-LingeringPotion-API.patch rename to patches/server/0889-Expand-LingeringPotion-API.patch diff --git a/patches/server/0892-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/server/0890-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch similarity index 100% rename from patches/server/0892-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch rename to patches/server/0890-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch diff --git a/patches/server/0893-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/server/0891-Add-hand-to-fish-event-for-all-player-interactions.patch similarity index 100% rename from patches/server/0893-Add-hand-to-fish-event-for-all-player-interactions.patch rename to patches/server/0891-Add-hand-to-fish-event-for-all-player-interactions.patch diff --git a/patches/server/0894-Fix-several-issues-with-EntityBreedEvent.patch b/patches/server/0892-Fix-several-issues-with-EntityBreedEvent.patch similarity index 100% rename from patches/server/0894-Fix-several-issues-with-EntityBreedEvent.patch rename to patches/server/0892-Fix-several-issues-with-EntityBreedEvent.patch diff --git a/patches/server/0895-Add-UUID-attribute-modifier-API.patch b/patches/server/0893-Add-UUID-attribute-modifier-API.patch similarity index 100% rename from patches/server/0895-Add-UUID-attribute-modifier-API.patch rename to patches/server/0893-Add-UUID-attribute-modifier-API.patch diff --git a/patches/server/0896-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/server/0894-Fix-missing-event-call-for-entity-teleport-API.patch similarity index 100% rename from patches/server/0896-Fix-missing-event-call-for-entity-teleport-API.patch rename to patches/server/0894-Fix-missing-event-call-for-entity-teleport-API.patch diff --git a/patches/server/0897-Lazily-create-LootContext-for-criterions.patch b/patches/server/0895-Lazily-create-LootContext-for-criterions.patch similarity index 100% rename from patches/server/0897-Lazily-create-LootContext-for-criterions.patch rename to patches/server/0895-Lazily-create-LootContext-for-criterions.patch diff --git a/patches/server/0898-Don-t-fire-sync-events-during-worldgen.patch b/patches/server/0896-Don-t-fire-sync-events-during-worldgen.patch similarity index 100% rename from patches/server/0898-Don-t-fire-sync-events-during-worldgen.patch rename to patches/server/0896-Don-t-fire-sync-events-during-worldgen.patch diff --git a/patches/server/0899-Add-Structure-check-API.patch b/patches/server/0897-Add-Structure-check-API.patch similarity index 100% rename from patches/server/0899-Add-Structure-check-API.patch rename to patches/server/0897-Add-Structure-check-API.patch diff --git a/patches/server/0900-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/server/0898-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch similarity index 100% rename from patches/server/0900-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch rename to patches/server/0898-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch diff --git a/patches/server/0901-Restore-vanilla-entity-drops-behavior.patch b/patches/server/0899-Restore-vanilla-entity-drops-behavior.patch similarity index 99% rename from patches/server/0901-Restore-vanilla-entity-drops-behavior.patch rename to patches/server/0899-Restore-vanilla-entity-drops-behavior.patch index 9bc5b11cbd..d7aef7b13a 100644 --- a/patches/server/0901-Restore-vanilla-entity-drops-behavior.patch +++ b/patches/server/0899-Restore-vanilla-entity-drops-behavior.patch @@ -9,7 +9,7 @@ on dropping the item instead of generalizing it for all dropped items like CB does. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index e038664858c7af59f52a6328c73ecb27f8a16644..55a4424c47591d1bcaba306f6af877a4fb7144bf 100644 +index 7bf2e642507b1b68ddeaddf8b435728e3a434ff5..1bf9dcc77676376184ea45465a6e5ea5ddeb99f4 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1235,20 +1235,20 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0902-Dont-resend-blocks-on-interactions.patch b/patches/server/0900-Dont-resend-blocks-on-interactions.patch similarity index 100% rename from patches/server/0902-Dont-resend-blocks-on-interactions.patch rename to patches/server/0900-Dont-resend-blocks-on-interactions.patch diff --git a/patches/server/0903-add-more-scoreboard-API.patch b/patches/server/0901-add-more-scoreboard-API.patch similarity index 100% rename from patches/server/0903-add-more-scoreboard-API.patch rename to patches/server/0901-add-more-scoreboard-API.patch diff --git a/patches/server/0904-Improve-Registry.patch b/patches/server/0902-Improve-Registry.patch similarity index 100% rename from patches/server/0904-Improve-Registry.patch rename to patches/server/0902-Improve-Registry.patch diff --git a/patches/server/0905-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch b/patches/server/0903-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch similarity index 100% rename from patches/server/0905-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch rename to patches/server/0903-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch diff --git a/patches/server/0906-Add-experience-points-API.patch b/patches/server/0904-Add-experience-points-API.patch similarity index 97% rename from patches/server/0906-Add-experience-points-API.patch rename to patches/server/0904-Add-experience-points-API.patch index 6db4aca493..43c16d428f 100644 --- a/patches/server/0906-Add-experience-points-API.patch +++ b/patches/server/0904-Add-experience-points-API.patch @@ -18,7 +18,7 @@ index aca888c2f02b09ac6739bdc81b194c4527dd69f5..a19a795deaa7f46c92b97912e2ade006 // Paper start - send while respecting visibility private static void sendSoundEffect(Player fromEntity, double x, double y, double z, SoundEvent soundEffect, SoundSource soundCategory, float volume, float pitch) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index cc4911163e0e22a7313ea4a591efc7dd40fb1b72..f881a73c6213582ef6d2632759a5d3a46dbf19ef 100644 +index 1a2fa3ffaa36b486513ff5b16cf2ee27269cae18..46e800a3116a364cc8230b2f84084ade256959c7 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1933,6 +1933,49 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0907-Add-drops-to-shear-events.patch b/patches/server/0905-Add-drops-to-shear-events.patch similarity index 100% rename from patches/server/0907-Add-drops-to-shear-events.patch rename to patches/server/0905-Add-drops-to-shear-events.patch diff --git a/patches/server/0908-Add-PlayerShieldDisableEvent.patch b/patches/server/0906-Add-PlayerShieldDisableEvent.patch similarity index 100% rename from patches/server/0908-Add-PlayerShieldDisableEvent.patch rename to patches/server/0906-Add-PlayerShieldDisableEvent.patch diff --git a/patches/server/0909-Validate-ResourceLocation-in-NBT-reading.patch b/patches/server/0907-Validate-ResourceLocation-in-NBT-reading.patch similarity index 100% rename from patches/server/0909-Validate-ResourceLocation-in-NBT-reading.patch rename to patches/server/0907-Validate-ResourceLocation-in-NBT-reading.patch diff --git a/patches/server/0910-Properly-handle-experience-dropping-on-block-break.patch b/patches/server/0908-Properly-handle-experience-dropping-on-block-break.patch similarity index 100% rename from patches/server/0910-Properly-handle-experience-dropping-on-block-break.patch rename to patches/server/0908-Properly-handle-experience-dropping-on-block-break.patch diff --git a/patches/server/0911-Fixup-NamespacedKey-handling.patch b/patches/server/0909-Fixup-NamespacedKey-handling.patch similarity index 100% rename from patches/server/0911-Fixup-NamespacedKey-handling.patch rename to patches/server/0909-Fixup-NamespacedKey-handling.patch diff --git a/patches/server/0912-Expose-LootTable-of-DecoratedPot.patch b/patches/server/0910-Expose-LootTable-of-DecoratedPot.patch similarity index 100% rename from patches/server/0912-Expose-LootTable-of-DecoratedPot.patch rename to patches/server/0910-Expose-LootTable-of-DecoratedPot.patch diff --git a/patches/server/0913-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0911-Reduce-allocation-of-Vec3D-by-entity-tracker.patch similarity index 100% rename from patches/server/0913-Reduce-allocation-of-Vec3D-by-entity-tracker.patch rename to patches/server/0911-Reduce-allocation-of-Vec3D-by-entity-tracker.patch diff --git a/patches/server/0914-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0912-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch similarity index 100% rename from patches/server/0914-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch rename to patches/server/0912-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch diff --git a/patches/server/0915-Add-ShulkerDuplicateEvent.patch b/patches/server/0913-Add-ShulkerDuplicateEvent.patch similarity index 100% rename from patches/server/0915-Add-ShulkerDuplicateEvent.patch rename to patches/server/0913-Add-ShulkerDuplicateEvent.patch diff --git a/patches/server/0916-Add-api-for-spawn-egg-texture-colors.patch b/patches/server/0914-Add-api-for-spawn-egg-texture-colors.patch similarity index 100% rename from patches/server/0916-Add-api-for-spawn-egg-texture-colors.patch rename to patches/server/0914-Add-api-for-spawn-egg-texture-colors.patch diff --git a/patches/server/0917-Add-Lifecycle-Event-system.patch b/patches/server/0915-Add-Lifecycle-Event-system.patch similarity index 100% rename from patches/server/0917-Add-Lifecycle-Event-system.patch rename to patches/server/0915-Add-Lifecycle-Event-system.patch diff --git a/patches/server/0918-ItemStack-Tooltip-API.patch b/patches/server/0916-ItemStack-Tooltip-API.patch similarity index 100% rename from patches/server/0918-ItemStack-Tooltip-API.patch rename to patches/server/0916-ItemStack-Tooltip-API.patch diff --git a/patches/server/0919-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/server/0917-Add-getChunkSnapshot-includeLightData-parameter.patch similarity index 100% rename from patches/server/0919-Add-getChunkSnapshot-includeLightData-parameter.patch rename to patches/server/0917-Add-getChunkSnapshot-includeLightData-parameter.patch diff --git a/patches/server/0920-Add-FluidState-API.patch b/patches/server/0918-Add-FluidState-API.patch similarity index 100% rename from patches/server/0920-Add-FluidState-API.patch rename to patches/server/0918-Add-FluidState-API.patch diff --git a/patches/server/0921-add-number-format-api.patch b/patches/server/0919-add-number-format-api.patch similarity index 100% rename from patches/server/0921-add-number-format-api.patch rename to patches/server/0919-add-number-format-api.patch diff --git a/patches/server/0922-improve-BanList-types.patch b/patches/server/0920-improve-BanList-types.patch similarity index 100% rename from patches/server/0922-improve-BanList-types.patch rename to patches/server/0920-improve-BanList-types.patch diff --git a/patches/server/0923-Expanded-Hopper-API.patch b/patches/server/0921-Expanded-Hopper-API.patch similarity index 100% rename from patches/server/0923-Expanded-Hopper-API.patch rename to patches/server/0921-Expanded-Hopper-API.patch diff --git a/patches/server/0924-Add-BlockBreakProgressUpdateEvent.patch b/patches/server/0922-Add-BlockBreakProgressUpdateEvent.patch similarity index 100% rename from patches/server/0924-Add-BlockBreakProgressUpdateEvent.patch rename to patches/server/0922-Add-BlockBreakProgressUpdateEvent.patch diff --git a/patches/server/0925-Deprecate-ItemStack-setType.patch b/patches/server/0923-Deprecate-ItemStack-setType.patch similarity index 100% rename from patches/server/0925-Deprecate-ItemStack-setType.patch rename to patches/server/0923-Deprecate-ItemStack-setType.patch diff --git a/patches/server/0926-Add-CartographyItemEvent.patch b/patches/server/0924-Add-CartographyItemEvent.patch similarity index 100% rename from patches/server/0926-Add-CartographyItemEvent.patch rename to patches/server/0924-Add-CartographyItemEvent.patch diff --git a/patches/server/0927-More-Raid-API.patch b/patches/server/0925-More-Raid-API.patch similarity index 100% rename from patches/server/0927-More-Raid-API.patch rename to patches/server/0925-More-Raid-API.patch diff --git a/patches/server/0928-Add-onboarding-message-for-initial-server-start.patch b/patches/server/0926-Add-onboarding-message-for-initial-server-start.patch similarity index 98% rename from patches/server/0928-Add-onboarding-message-for-initial-server-start.patch rename to patches/server/0926-Add-onboarding-message-for-initial-server-start.patch index b9d8134356..a7f484e960 100644 --- a/patches/server/0928-Add-onboarding-message-for-initial-server-start.patch +++ b/patches/server/0926-Add-onboarding-message-for-initial-server-start.patch @@ -17,7 +17,7 @@ index 007e01d329a31acf7f4ed4c6dc4de7ad54ccad04..8cf720f08514e8e4f62f4ad196f1277b node = loader.load(); this.verifyGlobalConfigVersion(node); diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java -index e0cef37664b64f5db95943c5c118424436163e06..5e9c471ab20b0391e7e41351c65d96745fc8ce4a 100644 +index d8db428f06606c16466d39cceb2a5e02eb3d3b24..2d2ff826354670fef356e241d939080c9ed3fd4a 100644 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java @@ -25,6 +25,7 @@ public class GlobalConfiguration extends ConfigurationPart { diff --git a/patches/server/0929-Configurable-max-block-fluid-ticks.patch b/patches/server/0927-Configurable-max-block-fluid-ticks.patch similarity index 100% rename from patches/server/0929-Configurable-max-block-fluid-ticks.patch rename to patches/server/0927-Configurable-max-block-fluid-ticks.patch diff --git a/patches/server/0930-Fix-bees-aging-inside-hives.patch b/patches/server/0928-Fix-bees-aging-inside-hives.patch similarity index 100% rename from patches/server/0930-Fix-bees-aging-inside-hives.patch rename to patches/server/0928-Fix-bees-aging-inside-hives.patch diff --git a/patches/server/0931-Disable-memory-reserve-allocating.patch b/patches/server/0929-Disable-memory-reserve-allocating.patch similarity index 100% rename from patches/server/0931-Disable-memory-reserve-allocating.patch rename to patches/server/0929-Disable-memory-reserve-allocating.patch diff --git a/patches/server/0932-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch b/patches/server/0930-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch similarity index 100% rename from patches/server/0932-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch rename to patches/server/0930-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch diff --git a/patches/server/0933-Fix-DamageSource-API.patch b/patches/server/0931-Fix-DamageSource-API.patch similarity index 100% rename from patches/server/0933-Fix-DamageSource-API.patch rename to patches/server/0931-Fix-DamageSource-API.patch diff --git a/patches/server/0934-Fix-creation-of-invalid-block-entity-during-world-ge.patch b/patches/server/0932-Fix-creation-of-invalid-block-entity-during-world-ge.patch similarity index 100% rename from patches/server/0934-Fix-creation-of-invalid-block-entity-during-world-ge.patch rename to patches/server/0932-Fix-creation-of-invalid-block-entity-during-world-ge.patch diff --git a/patches/server/0935-Fix-possible-StackOverflowError-and-NPE-for-some-dis.patch b/patches/server/0933-Fix-possible-StackOverflowError-and-NPE-for-some-dis.patch similarity index 100% rename from patches/server/0935-Fix-possible-StackOverflowError-and-NPE-for-some-dis.patch rename to patches/server/0933-Fix-possible-StackOverflowError-and-NPE-for-some-dis.patch diff --git a/patches/server/0936-Improve-tag-parser-handling.patch b/patches/server/0934-Improve-tag-parser-handling.patch similarity index 100% rename from patches/server/0936-Improve-tag-parser-handling.patch rename to patches/server/0934-Improve-tag-parser-handling.patch diff --git a/patches/server/0937-Item-Mutation-Fixes.patch b/patches/server/0935-Item-Mutation-Fixes.patch similarity index 100% rename from patches/server/0937-Item-Mutation-Fixes.patch rename to patches/server/0935-Item-Mutation-Fixes.patch diff --git a/patches/server/0938-Per-world-ticks-per-spawn-settings.patch b/patches/server/0936-Per-world-ticks-per-spawn-settings.patch similarity index 100% rename from patches/server/0938-Per-world-ticks-per-spawn-settings.patch rename to patches/server/0936-Per-world-ticks-per-spawn-settings.patch diff --git a/patches/server/0939-Properly-track-the-changed-item-from-dispense-events.patch b/patches/server/0937-Properly-track-the-changed-item-from-dispense-events.patch similarity index 100% rename from patches/server/0939-Properly-track-the-changed-item-from-dispense-events.patch rename to patches/server/0937-Properly-track-the-changed-item-from-dispense-events.patch diff --git a/patches/server/0940-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0938-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch similarity index 100% rename from patches/server/0940-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch rename to patches/server/0938-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch diff --git a/patches/server/0941-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0939-Add-config-for-mobs-immune-to-default-effects.patch similarity index 100% rename from patches/server/0941-Add-config-for-mobs-immune-to-default-effects.patch rename to patches/server/0939-Add-config-for-mobs-immune-to-default-effects.patch diff --git a/patches/server/0942-Deep-clone-nbt-tags-in-PDC.patch b/patches/server/0940-Deep-clone-nbt-tags-in-PDC.patch similarity index 100% rename from patches/server/0942-Deep-clone-nbt-tags-in-PDC.patch rename to patches/server/0940-Deep-clone-nbt-tags-in-PDC.patch diff --git a/patches/server/0943-Support-old-UUID-format-for-NBT.patch b/patches/server/0941-Support-old-UUID-format-for-NBT.patch similarity index 100% rename from patches/server/0943-Support-old-UUID-format-for-NBT.patch rename to patches/server/0941-Support-old-UUID-format-for-NBT.patch diff --git a/patches/server/0944-Fix-shield-disable-inconsistency.patch b/patches/server/0942-Fix-shield-disable-inconsistency.patch similarity index 100% rename from patches/server/0944-Fix-shield-disable-inconsistency.patch rename to patches/server/0942-Fix-shield-disable-inconsistency.patch diff --git a/patches/server/0945-Handle-Large-Packets-disconnecting-client.patch b/patches/server/0943-Handle-Large-Packets-disconnecting-client.patch similarity index 100% rename from patches/server/0945-Handle-Large-Packets-disconnecting-client.patch rename to patches/server/0943-Handle-Large-Packets-disconnecting-client.patch diff --git a/patches/server/0946-Fix-ItemFlags.patch b/patches/server/0944-Fix-ItemFlags.patch similarity index 100% rename from patches/server/0946-Fix-ItemFlags.patch rename to patches/server/0944-Fix-ItemFlags.patch diff --git a/patches/server/0947-Fix-damage-modifier-inconsistencies.patch b/patches/server/0945-Fix-damage-modifier-inconsistencies.patch similarity index 100% rename from patches/server/0947-Fix-damage-modifier-inconsistencies.patch rename to patches/server/0945-Fix-damage-modifier-inconsistencies.patch diff --git a/patches/server/0948-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch b/patches/server/0946-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch similarity index 100% rename from patches/server/0948-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch rename to patches/server/0946-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch diff --git a/patches/server/0949-improve-checking-handled-tags-in-itemmeta.patch b/patches/server/0947-improve-checking-handled-tags-in-itemmeta.patch similarity index 100% rename from patches/server/0949-improve-checking-handled-tags-in-itemmeta.patch rename to patches/server/0947-improve-checking-handled-tags-in-itemmeta.patch diff --git a/patches/server/0950-Expose-hasColor-to-leather-armor.patch b/patches/server/0948-Expose-hasColor-to-leather-armor.patch similarity index 100% rename from patches/server/0950-Expose-hasColor-to-leather-armor.patch rename to patches/server/0948-Expose-hasColor-to-leather-armor.patch diff --git a/patches/server/0951-Added-API-to-get-player-ha-proxy-address.patch b/patches/server/0949-Added-API-to-get-player-ha-proxy-address.patch similarity index 97% rename from patches/server/0951-Added-API-to-get-player-ha-proxy-address.patch rename to patches/server/0949-Added-API-to-get-player-ha-proxy-address.patch index b1e5e78bb0..42ff377a0c 100644 --- a/patches/server/0951-Added-API-to-get-player-ha-proxy-address.patch +++ b/patches/server/0949-Added-API-to-get-player-ha-proxy-address.patch @@ -35,7 +35,7 @@ index c62df32af11636ad408b584fcc590590ce4fb0d0..baed0bb80d44973f9323bbe536551182 } else { super.channelRead(ctx, msg); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index a1c7e7b95718562d86ee8e6da1bb6e6b5d82ce7a..700751a1469dd99339e6502e96cd98e72feee803 100644 +index 46e800a3116a364cc8230b2f84084ade256959c7..bdc5ad40f83590066f8702b2b60868bd56d58596 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -270,7 +270,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0952-General-ItemMeta-fixes.patch b/patches/server/0950-General-ItemMeta-fixes.patch similarity index 100% rename from patches/server/0952-General-ItemMeta-fixes.patch rename to patches/server/0950-General-ItemMeta-fixes.patch diff --git a/patches/server/0953-More-Chest-Block-API.patch b/patches/server/0951-More-Chest-Block-API.patch similarity index 100% rename from patches/server/0953-More-Chest-Block-API.patch rename to patches/server/0951-More-Chest-Block-API.patch diff --git a/patches/server/0954-Print-data-component-type-on-encoding-error.patch b/patches/server/0952-Print-data-component-type-on-encoding-error.patch similarity index 100% rename from patches/server/0954-Print-data-component-type-on-encoding-error.patch rename to patches/server/0952-Print-data-component-type-on-encoding-error.patch diff --git a/patches/server/0955-Brigadier-based-command-API.patch b/patches/server/0953-Brigadier-based-command-API.patch similarity index 100% rename from patches/server/0955-Brigadier-based-command-API.patch rename to patches/server/0953-Brigadier-based-command-API.patch diff --git a/patches/server/0956-Fix-issues-with-Recipe-API.patch b/patches/server/0954-Fix-issues-with-Recipe-API.patch similarity index 100% rename from patches/server/0956-Fix-issues-with-Recipe-API.patch rename to patches/server/0954-Fix-issues-with-Recipe-API.patch diff --git a/patches/server/0957-Fix-equipment-slot-and-group-API.patch b/patches/server/0955-Fix-equipment-slot-and-group-API.patch similarity index 100% rename from patches/server/0957-Fix-equipment-slot-and-group-API.patch rename to patches/server/0955-Fix-equipment-slot-and-group-API.patch diff --git a/patches/server/0958-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch b/patches/server/0956-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch similarity index 100% rename from patches/server/0958-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch rename to patches/server/0956-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch diff --git a/patches/server/0959-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0957-Prevent-sending-oversized-item-data-in-equipment-and.patch similarity index 100% rename from patches/server/0959-Prevent-sending-oversized-item-data-in-equipment-and.patch rename to patches/server/0957-Prevent-sending-oversized-item-data-in-equipment-and.patch diff --git a/patches/server/0960-Prevent-NPE-if-hooked-entity-was-cleared.patch b/patches/server/0958-Prevent-NPE-if-hooked-entity-was-cleared.patch similarity index 100% rename from patches/server/0960-Prevent-NPE-if-hooked-entity-was-cleared.patch rename to patches/server/0958-Prevent-NPE-if-hooked-entity-was-cleared.patch diff --git a/patches/server/0961-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch b/patches/server/0959-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch similarity index 100% rename from patches/server/0961-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch rename to patches/server/0959-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch diff --git a/patches/server/0962-Add-missing-fishing-event-state.patch b/patches/server/0960-Add-missing-fishing-event-state.patch similarity index 100% rename from patches/server/0962-Add-missing-fishing-event-state.patch rename to patches/server/0960-Add-missing-fishing-event-state.patch diff --git a/patches/server/0963-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch b/patches/server/0961-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch similarity index 100% rename from patches/server/0963-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch rename to patches/server/0961-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch diff --git a/patches/server/0964-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch b/patches/server/0962-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch similarity index 100% rename from patches/server/0964-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch rename to patches/server/0962-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch diff --git a/patches/server/0965-Adopt-MaterialRerouting.patch b/patches/server/0963-Adopt-MaterialRerouting.patch similarity index 100% rename from patches/server/0965-Adopt-MaterialRerouting.patch rename to patches/server/0963-Adopt-MaterialRerouting.patch diff --git a/patches/server/0966-Suspicious-Effect-Entry-API.patch b/patches/server/0964-Suspicious-Effect-Entry-API.patch similarity index 100% rename from patches/server/0966-Suspicious-Effect-Entry-API.patch rename to patches/server/0964-Suspicious-Effect-Entry-API.patch diff --git a/patches/server/0967-check-if-itemstack-is-stackable-first.patch b/patches/server/0965-check-if-itemstack-is-stackable-first.patch similarity index 100% rename from patches/server/0967-check-if-itemstack-is-stackable-first.patch rename to patches/server/0965-check-if-itemstack-is-stackable-first.patch diff --git a/patches/server/0968-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0966-Fix-removing-recipes-from-RecipeIterator.patch similarity index 100% rename from patches/server/0968-Fix-removing-recipes-from-RecipeIterator.patch rename to patches/server/0966-Fix-removing-recipes-from-RecipeIterator.patch diff --git a/patches/server/0969-Configurable-damage-tick-when-blocking-with-shield.patch b/patches/server/0967-Configurable-damage-tick-when-blocking-with-shield.patch similarity index 100% rename from patches/server/0969-Configurable-damage-tick-when-blocking-with-shield.patch rename to patches/server/0967-Configurable-damage-tick-when-blocking-with-shield.patch diff --git a/patches/server/0970-Properly-remove-the-experimental-smithing-inventory-.patch b/patches/server/0968-Properly-remove-the-experimental-smithing-inventory-.patch similarity index 100% rename from patches/server/0970-Properly-remove-the-experimental-smithing-inventory-.patch rename to patches/server/0968-Properly-remove-the-experimental-smithing-inventory-.patch diff --git a/patches/server/0971-disable-forced-empty-world-ticks.patch b/patches/server/0969-disable-forced-empty-world-ticks.patch similarity index 100% rename from patches/server/0971-disable-forced-empty-world-ticks.patch rename to patches/server/0969-disable-forced-empty-world-ticks.patch diff --git a/patches/server/0972-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/server/0970-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch similarity index 100% rename from patches/server/0972-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch rename to patches/server/0970-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch diff --git a/patches/server/0973-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/0971-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch similarity index 98% rename from patches/server/0973-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch rename to patches/server/0971-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch index 98c6089bbc..9bfa4733be 100644 --- a/patches/server/0973-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch +++ b/patches/server/0971-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch @@ -27,7 +27,7 @@ index b6b80285a54efd6012c4eedbdc5b2af702f27981..be35f9ab6d8877aad755a6ac0344a901 } } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 55a4424c47591d1bcaba306f6af877a4fb7144bf..a13f88ed2ce39848b1fe1673265cf6c62adbfb66 100644 +index 1bf9dcc77676376184ea45465a6e5ea5ddeb99f4..e1102d8fb73c6b545c205cd5ad4b4a0ae1a32529 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -2808,6 +2808,14 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0974-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0972-Optimize-Network-Manager-and-add-advanced-packet-sup.patch similarity index 100% rename from patches/server/0974-Optimize-Network-Manager-and-add-advanced-packet-sup.patch rename to patches/server/0972-Optimize-Network-Manager-and-add-advanced-packet-sup.patch diff --git a/patches/server/0975-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0973-Allow-Saving-of-Oversized-Chunks.patch similarity index 91% rename from patches/server/0975-Allow-Saving-of-Oversized-Chunks.patch rename to patches/server/0973-Allow-Saving-of-Oversized-Chunks.patch index 59ac229e5b..99f43d8eff 100644 --- a/patches/server/0975-Allow-Saving-of-Oversized-Chunks.patch +++ b/patches/server/0973-Allow-Saving-of-Oversized-Chunks.patch @@ -3,8 +3,6 @@ From: Aikar Date: Fri, 15 Feb 2019 01:08:19 -0500 Subject: [PATCH] Allow Saving of Oversized Chunks -Note 1.17 update: With 1.17, Entities are no longer stored in chunk slices, so this needs updating!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - The Minecraft World Region File format has a hard cap of 1MB per chunk. This is due to the fact that the header of the file format only allocates a single byte for sector count, meaning a maximum of 256 sectors, at 4k per sector. @@ -35,7 +33,7 @@ to a jar with this fix, the data will be restored. Feature patch diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java -index e858436bcf1b234d4bc6e6a117f5224d5c2d9f90..e761b63eebc1e76b2bb1cb887d83d0b63ad6ec90 100644 +index 0028f4fd331b6f94be2a2b4d90e56dcdd881178d..863960ead8deaa0553be1c98e4fa09f07fcb8ef0 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java @@ -18,10 +18,13 @@ import java.nio.file.LinkOption; @@ -60,10 +58,10 @@ index e858436bcf1b234d4bc6e6a117f5224d5c2d9f90..e761b63eebc1e76b2bb1cb887d83d0b6 this.version = compressionFormat; if (!Files.isDirectory(directory, new LinkOption[0])) { throw new IllegalArgumentException("Expected directory, got " + String.valueOf(directory.toAbsolutePath())); -@@ -443,6 +447,74 @@ public class RegionFile implements AutoCloseable { +@@ -442,6 +446,74 @@ public class RegionFile implements AutoCloseable { + } - public static final int MAX_CHUNK_SIZE = 500 * 1024 * 1024; // Paper - don't write garbage data to disk if writing serialization fails + // Paper start + private final byte[] oversized = new byte[1024]; + private int oversizedCount; @@ -136,7 +134,7 @@ index e858436bcf1b234d4bc6e6a117f5224d5c2d9f90..e761b63eebc1e76b2bb1cb887d83d0b6 private final ChunkPos pos; diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java -index 4c1212c6ef48594e766fa9e35a6e15916602d587..2a0f7ab0b616fe07baac437372e3933186064dd5 100644 +index 54803d561d98b0d3fd8aa2060a7a184a00dd9da6..e6abe35d6c43b7f76cf3da129ec9552e7b82453e 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java @@ -55,6 +55,43 @@ public final class RegionFileStorage implements AutoCloseable { @@ -196,11 +194,11 @@ index 4c1212c6ef48594e766fa9e35a6e15916602d587..2a0f7ab0b616fe07baac437372e39331 CompoundTag nbttagcompound; label43: { -@@ -147,6 +190,7 @@ public final class RegionFileStorage implements AutoCloseable { +@@ -142,6 +185,7 @@ public final class RegionFileStorage implements AutoCloseable { try { NbtIo.write(nbt, (DataOutput) dataoutputstream); + regionfile.setOversized(pos.x, pos.z, false); // Paper - We don't do this anymore, mojang stores differently, but clear old meta flag if it exists to get rid of our own meta file once last oversized is gone - // Paper start - don't write garbage data to disk if writing serialization fails - dataoutputstream.close(); // Only write if successful - } catch (final RegionFileSizeException e) { + } catch (Throwable throwable) { + if (dataoutputstream != null) { + try { diff --git a/patches/server/0976-Flat-bedrock-generator-settings.patch b/patches/server/0974-Flat-bedrock-generator-settings.patch similarity index 100% rename from patches/server/0976-Flat-bedrock-generator-settings.patch rename to patches/server/0974-Flat-bedrock-generator-settings.patch diff --git a/patches/server/0977-Entity-Activation-Range-2.0.patch b/patches/server/0975-Entity-Activation-Range-2.0.patch similarity index 99% rename from patches/server/0977-Entity-Activation-Range-2.0.patch rename to patches/server/0975-Entity-Activation-Range-2.0.patch index d11a88d699..61a792a001 100644 --- a/patches/server/0977-Entity-Activation-Range-2.0.patch +++ b/patches/server/0975-Entity-Activation-Range-2.0.patch @@ -351,7 +351,7 @@ index 46afba838cf12eeb1bbccaa260131a76f090364b..e1c9a961064887070b29207efd7af478 } } diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index 84ff1210e944ea9d1ec88874d218458773e341c9..bd7c37123c70d2afdef252f39548725d4ef318ed 100644 +index 34297951d33242237af578d5ffc2e314c1e594f1..1d438ef44cbe4d1eedfba36d8fe5d2ad53464921 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -1,14 +1,22 @@ diff --git a/patches/server/0978-Anti-Xray.patch b/patches/server/0976-Anti-Xray.patch similarity index 100% rename from patches/server/0978-Anti-Xray.patch rename to patches/server/0976-Anti-Xray.patch diff --git a/patches/server/0979-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0977-Use-Velocity-compression-and-cipher-natives.patch similarity index 100% rename from patches/server/0979-Use-Velocity-compression-and-cipher-natives.patch rename to patches/server/0977-Use-Velocity-compression-and-cipher-natives.patch diff --git a/patches/server/0980-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0978-Optimize-Collision-to-not-load-chunks.patch similarity index 100% rename from patches/server/0980-Optimize-Collision-to-not-load-chunks.patch rename to patches/server/0978-Optimize-Collision-to-not-load-chunks.patch diff --git a/patches/server/0981-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0979-Optimize-GoalSelector-Goal.Flag-Set-operations.patch similarity index 100% rename from patches/server/0981-Optimize-GoalSelector-Goal.Flag-Set-operations.patch rename to patches/server/0979-Optimize-GoalSelector-Goal.Flag-Set-operations.patch diff --git a/patches/server/0982-Optimize-Hoppers.patch b/patches/server/0980-Optimize-Hoppers.patch similarity index 100% rename from patches/server/0982-Optimize-Hoppers.patch rename to patches/server/0980-Optimize-Hoppers.patch diff --git a/patches/server/0983-Optimize-Voxel-Shape-Merging.patch b/patches/server/0981-Optimize-Voxel-Shape-Merging.patch similarity index 100% rename from patches/server/0983-Optimize-Voxel-Shape-Merging.patch rename to patches/server/0981-Optimize-Voxel-Shape-Merging.patch diff --git a/patches/server/0984-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0982-Optimize-Bit-Operations-by-inlining.patch similarity index 100% rename from patches/server/0984-Optimize-Bit-Operations-by-inlining.patch rename to patches/server/0982-Optimize-Bit-Operations-by-inlining.patch diff --git a/patches/server/0985-Remove-streams-from-hot-code.patch b/patches/server/0983-Remove-streams-from-hot-code.patch similarity index 100% rename from patches/server/0985-Remove-streams-from-hot-code.patch rename to patches/server/0983-Remove-streams-from-hot-code.patch diff --git a/patches/server/0986-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0984-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch similarity index 100% rename from patches/server/0986-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch rename to patches/server/0984-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch diff --git a/patches/server/0987-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0985-Fix-entity-type-tags-suggestions-in-selectors.patch similarity index 100% rename from patches/server/0987-Fix-entity-type-tags-suggestions-in-selectors.patch rename to patches/server/0985-Fix-entity-type-tags-suggestions-in-selectors.patch diff --git a/patches/server/0988-Handle-Oversized-block-entities-in-chunks.patch b/patches/server/0986-Handle-Oversized-block-entities-in-chunks.patch similarity index 100% rename from patches/server/0988-Handle-Oversized-block-entities-in-chunks.patch rename to patches/server/0986-Handle-Oversized-block-entities-in-chunks.patch diff --git a/patches/server/0989-Check-distance-in-entity-interactions.patch b/patches/server/0987-Check-distance-in-entity-interactions.patch similarity index 100% rename from patches/server/0989-Check-distance-in-entity-interactions.patch rename to patches/server/0987-Check-distance-in-entity-interactions.patch diff --git a/patches/server/0990-Configurable-Sand-Duping.patch b/patches/server/0988-Configurable-Sand-Duping.patch similarity index 100% rename from patches/server/0990-Configurable-Sand-Duping.patch rename to patches/server/0988-Configurable-Sand-Duping.patch diff --git a/patches/server/0991-Properly-resend-entities.patch b/patches/server/0989-Properly-resend-entities.patch similarity index 100% rename from patches/server/0991-Properly-resend-entities.patch rename to patches/server/0989-Properly-resend-entities.patch diff --git a/patches/server/0992-Registry-Modification-API.patch b/patches/server/0990-Registry-Modification-API.patch similarity index 100% rename from patches/server/0992-Registry-Modification-API.patch rename to patches/server/0990-Registry-Modification-API.patch diff --git a/patches/server/0993-Add-registry-entry-and-builders.patch b/patches/server/0991-Add-registry-entry-and-builders.patch similarity index 100% rename from patches/server/0993-Add-registry-entry-and-builders.patch rename to patches/server/0991-Add-registry-entry-and-builders.patch diff --git a/patches/server/0994-Proxy-ItemStack-to-CraftItemStack.patch b/patches/server/0992-Proxy-ItemStack-to-CraftItemStack.patch similarity index 100% rename from patches/server/0994-Proxy-ItemStack-to-CraftItemStack.patch rename to patches/server/0992-Proxy-ItemStack-to-CraftItemStack.patch diff --git a/patches/server/0995-Make-a-PDC-view-accessible-directly-from-ItemStack.patch b/patches/server/0993-Make-a-PDC-view-accessible-directly-from-ItemStack.patch similarity index 100% rename from patches/server/0995-Make-a-PDC-view-accessible-directly-from-ItemStack.patch rename to patches/server/0993-Make-a-PDC-view-accessible-directly-from-ItemStack.patch diff --git a/patches/server/0996-Prioritize-Minecraft-commands-in-function-parsing-an.patch b/patches/server/0994-Prioritize-Minecraft-commands-in-function-parsing-an.patch similarity index 100% rename from patches/server/0996-Prioritize-Minecraft-commands-in-function-parsing-an.patch rename to patches/server/0994-Prioritize-Minecraft-commands-in-function-parsing-an.patch diff --git a/patches/server/0997-optimize-dirt-and-snow-spreading.patch b/patches/server/0995-optimize-dirt-and-snow-spreading.patch similarity index 100% rename from patches/server/0997-optimize-dirt-and-snow-spreading.patch rename to patches/server/0995-optimize-dirt-and-snow-spreading.patch diff --git a/patches/server/0998-Fix-NPE-for-Jukebox-setRecord.patch b/patches/server/0996-Fix-NPE-for-Jukebox-setRecord.patch similarity index 100% rename from patches/server/0998-Fix-NPE-for-Jukebox-setRecord.patch rename to patches/server/0996-Fix-NPE-for-Jukebox-setRecord.patch diff --git a/patches/server/0999-fix-horse-inventories.patch b/patches/server/0997-fix-horse-inventories.patch similarity index 100% rename from patches/server/0999-fix-horse-inventories.patch rename to patches/server/0997-fix-horse-inventories.patch diff --git a/patches/server/1000-Only-call-EntityDamageEvents-before-actuallyHurt.patch b/patches/server/0998-Only-call-EntityDamageEvents-before-actuallyHurt.patch similarity index 100% rename from patches/server/1000-Only-call-EntityDamageEvents-before-actuallyHurt.patch rename to patches/server/0998-Only-call-EntityDamageEvents-before-actuallyHurt.patch diff --git a/patches/server/1001-Add-ItemType-getItemRarity.patch b/patches/server/0999-Add-ItemType-getItemRarity.patch similarity index 100% rename from patches/server/1001-Add-ItemType-getItemRarity.patch rename to patches/server/0999-Add-ItemType-getItemRarity.patch diff --git a/patches/server/1002-Add-plugin-info-at-startup.patch b/patches/server/1000-Add-plugin-info-at-startup.patch similarity index 100% rename from patches/server/1002-Add-plugin-info-at-startup.patch rename to patches/server/1000-Add-plugin-info-at-startup.patch diff --git a/patches/server/1003-Make-interaction-leniency-distance-configurable.patch b/patches/server/1001-Make-interaction-leniency-distance-configurable.patch similarity index 100% rename from patches/server/1003-Make-interaction-leniency-distance-configurable.patch rename to patches/server/1001-Make-interaction-leniency-distance-configurable.patch diff --git a/patches/server/1004-Fix-PickupStatus-getting-reset.patch b/patches/server/1002-Fix-PickupStatus-getting-reset.patch similarity index 100% rename from patches/server/1004-Fix-PickupStatus-getting-reset.patch rename to patches/server/1002-Fix-PickupStatus-getting-reset.patch diff --git a/patches/server/1005-Check-for-block-type-in-SculkSensorBlock-canActivate.patch b/patches/server/1003-Check-for-block-type-in-SculkSensorBlock-canActivate.patch similarity index 100% rename from patches/server/1005-Check-for-block-type-in-SculkSensorBlock-canActivate.patch rename to patches/server/1003-Check-for-block-type-in-SculkSensorBlock-canActivate.patch diff --git a/patches/server/1006-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/patches/server/1004-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch similarity index 100% rename from patches/server/1006-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch rename to patches/server/1004-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch diff --git a/patches/server/1007-Configuration-for-horizontal-only-item-merging.patch b/patches/server/1005-Configuration-for-horizontal-only-item-merging.patch similarity index 100% rename from patches/server/1007-Configuration-for-horizontal-only-item-merging.patch rename to patches/server/1005-Configuration-for-horizontal-only-item-merging.patch diff --git a/patches/server/1008-Add-skipping-world-symlink-scan.patch b/patches/server/1006-Add-skipping-world-symlink-scan.patch similarity index 100% rename from patches/server/1008-Add-skipping-world-symlink-scan.patch rename to patches/server/1006-Add-skipping-world-symlink-scan.patch diff --git a/patches/server/1009-Add-even-more-Enchantment-API.patch b/patches/server/1007-Add-even-more-Enchantment-API.patch similarity index 100% rename from patches/server/1009-Add-even-more-Enchantment-API.patch rename to patches/server/1007-Add-even-more-Enchantment-API.patch diff --git a/patches/server/1010-Leashable-API.patch b/patches/server/1008-Leashable-API.patch similarity index 100% rename from patches/server/1010-Leashable-API.patch rename to patches/server/1008-Leashable-API.patch diff --git a/patches/server/1011-Fix-CraftBukkit-drag-system.patch b/patches/server/1009-Fix-CraftBukkit-drag-system.patch similarity index 100% rename from patches/server/1011-Fix-CraftBukkit-drag-system.patch rename to patches/server/1009-Fix-CraftBukkit-drag-system.patch diff --git a/patches/server/1012-Fix-SculkBloomEvent-firing-for-block-entity-loading.patch b/patches/server/1010-Fix-SculkBloomEvent-firing-for-block-entity-loading.patch similarity index 100% rename from patches/server/1012-Fix-SculkBloomEvent-firing-for-block-entity-loading.patch rename to patches/server/1010-Fix-SculkBloomEvent-firing-for-block-entity-loading.patch diff --git a/patches/server/1013-Remove-set-damage-lootable-item-function-from-compas.patch b/patches/server/1011-Remove-set-damage-lootable-item-function-from-compas.patch similarity index 100% rename from patches/server/1013-Remove-set-damage-lootable-item-function-from-compas.patch rename to patches/server/1011-Remove-set-damage-lootable-item-function-from-compas.patch diff --git a/patches/server/1014-Add-enchantment-seed-update-API.patch b/patches/server/1012-Add-enchantment-seed-update-API.patch similarity index 100% rename from patches/server/1014-Add-enchantment-seed-update-API.patch rename to patches/server/1012-Add-enchantment-seed-update-API.patch diff --git a/patches/server/1015-Fix-synchronise-sending-chat-to-client-with-updating.patch b/patches/server/1013-Fix-synchronise-sending-chat-to-client-with-updating.patch similarity index 100% rename from patches/server/1015-Fix-synchronise-sending-chat-to-client-with-updating.patch rename to patches/server/1013-Fix-synchronise-sending-chat-to-client-with-updating.patch diff --git a/patches/server/1016-Fix-InventoryOpenEvent-cancellation.patch b/patches/server/1014-Fix-InventoryOpenEvent-cancellation.patch similarity index 99% rename from patches/server/1016-Fix-InventoryOpenEvent-cancellation.patch rename to patches/server/1014-Fix-InventoryOpenEvent-cancellation.patch index eb14b552dc..5abbfba60b 100644 --- a/patches/server/1016-Fix-InventoryOpenEvent-cancellation.patch +++ b/patches/server/1014-Fix-InventoryOpenEvent-cancellation.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix InventoryOpenEvent cancellation diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index a13f88ed2ce39848b1fe1673265cf6c62adbfb66..08a82b7a3456f58b3d0fdbb8e8dbce6972ad1672 100644 +index e1102d8fb73c6b545c205cd5ad4b4a0ae1a32529..f6e130aba66935f808dcfd7ef987131092ddfe4e 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1942,6 +1942,10 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/1017-Fire-BlockExpEvent-on-grindstone-use.patch b/patches/server/1015-Fire-BlockExpEvent-on-grindstone-use.patch similarity index 100% rename from patches/server/1017-Fire-BlockExpEvent-on-grindstone-use.patch rename to patches/server/1015-Fire-BlockExpEvent-on-grindstone-use.patch diff --git a/patches/server/1018-Check-dead-flag-in-isAlive.patch b/patches/server/1016-Check-dead-flag-in-isAlive.patch similarity index 100% rename from patches/server/1018-Check-dead-flag-in-isAlive.patch rename to patches/server/1016-Check-dead-flag-in-isAlive.patch diff --git a/patches/server/1019-Add-FeatureFlag-API.patch b/patches/server/1017-Add-FeatureFlag-API.patch similarity index 100% rename from patches/server/1019-Add-FeatureFlag-API.patch rename to patches/server/1017-Add-FeatureFlag-API.patch diff --git a/patches/server/1020-Tag-Lifecycle-Events.patch b/patches/server/1018-Tag-Lifecycle-Events.patch similarity index 100% rename from patches/server/1020-Tag-Lifecycle-Events.patch rename to patches/server/1018-Tag-Lifecycle-Events.patch diff --git a/patches/server/1021-Item-serialization-as-json.patch b/patches/server/1019-Item-serialization-as-json.patch similarity index 100% rename from patches/server/1021-Item-serialization-as-json.patch rename to patches/server/1019-Item-serialization-as-json.patch diff --git a/patches/server/1022-Validate-slot-in-PlayerInventory-setSlot.patch b/patches/server/1020-Validate-slot-in-PlayerInventory-setSlot.patch similarity index 100% rename from patches/server/1022-Validate-slot-in-PlayerInventory-setSlot.patch rename to patches/server/1020-Validate-slot-in-PlayerInventory-setSlot.patch diff --git a/patches/server/1023-Remove-wall-time-unused-skip-tick-protection.patch b/patches/server/1021-Remove-wall-time-unused-skip-tick-protection.patch similarity index 100% rename from patches/server/1023-Remove-wall-time-unused-skip-tick-protection.patch rename to patches/server/1021-Remove-wall-time-unused-skip-tick-protection.patch diff --git a/patches/server/1024-Disable-pretty-printing-for-advancement-saving.patch b/patches/server/1022-Disable-pretty-printing-for-advancement-saving.patch similarity index 100% rename from patches/server/1024-Disable-pretty-printing-for-advancement-saving.patch rename to patches/server/1022-Disable-pretty-printing-for-advancement-saving.patch diff --git a/patches/server/1025-Fix-PlayerCommandPreprocessEvent-on-signed-commands.patch b/patches/server/1023-Fix-PlayerCommandPreprocessEvent-on-signed-commands.patch similarity index 100% rename from patches/server/1025-Fix-PlayerCommandPreprocessEvent-on-signed-commands.patch rename to patches/server/1023-Fix-PlayerCommandPreprocessEvent-on-signed-commands.patch diff --git a/patches/server/1026-Add-enchantWithLevels-with-enchantment-registry-set.patch b/patches/server/1024-Add-enchantWithLevels-with-enchantment-registry-set.patch similarity index 100% rename from patches/server/1026-Add-enchantWithLevels-with-enchantment-registry-set.patch rename to patches/server/1024-Add-enchantWithLevels-with-enchantment-registry-set.patch diff --git a/patches/server/1027-Improve-entity-effect-API.patch b/patches/server/1025-Improve-entity-effect-API.patch similarity index 98% rename from patches/server/1027-Improve-entity-effect-API.patch rename to patches/server/1025-Improve-entity-effect-API.patch index d1af1cbccf..7acc892caa 100644 --- a/patches/server/1027-Improve-entity-effect-API.patch +++ b/patches/server/1025-Improve-entity-effect-API.patch @@ -25,7 +25,7 @@ index d1d9916db7bd4886d30355e6a0ecb69cd21c2364..ddabaed899c755925ad8618b78c33dac + // Paper end - broadcast hurt animation } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 4b65a7967cdcc94e04fa375a6bad2c012b3b4d4b..4459d9f205222764affae053930c15f5107d4e69 100644 +index bdc5ad40f83590066f8702b2b60868bd56d58596..5989a9af8840e1bdb5c7a25a44473e2ab597e1e5 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1284,6 +1284,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/1028-Add-recipeBrewTime.patch b/patches/server/1026-Add-recipeBrewTime.patch similarity index 100% rename from patches/server/1028-Add-recipeBrewTime.patch rename to patches/server/1026-Add-recipeBrewTime.patch diff --git a/patches/server/1029-Call-bucket-events-for-cauldrons.patch b/patches/server/1027-Call-bucket-events-for-cauldrons.patch similarity index 100% rename from patches/server/1029-Call-bucket-events-for-cauldrons.patch rename to patches/server/1027-Call-bucket-events-for-cauldrons.patch diff --git a/patches/server/1030-Add-PlayerInsertLecternBookEvent.patch b/patches/server/1028-Add-PlayerInsertLecternBookEvent.patch similarity index 100% rename from patches/server/1030-Add-PlayerInsertLecternBookEvent.patch rename to patches/server/1028-Add-PlayerInsertLecternBookEvent.patch diff --git a/patches/server/1031-Void-damage-configuration-API.patch b/patches/server/1029-Void-damage-configuration-API.patch similarity index 100% rename from patches/server/1031-Void-damage-configuration-API.patch rename to patches/server/1029-Void-damage-configuration-API.patch diff --git a/patches/server/1032-Add-Offline-PDC-API.patch b/patches/server/1030-Add-Offline-PDC-API.patch similarity index 100% rename from patches/server/1032-Add-Offline-PDC-API.patch rename to patches/server/1030-Add-Offline-PDC-API.patch diff --git a/patches/server/1033-Add-AnvilView-bypassEnchantmentLevelRestriction.patch b/patches/server/1031-Add-AnvilView-bypassEnchantmentLevelRestriction.patch similarity index 100% rename from patches/server/1033-Add-AnvilView-bypassEnchantmentLevelRestriction.patch rename to patches/server/1031-Add-AnvilView-bypassEnchantmentLevelRestriction.patch diff --git a/patches/server/1034-Add-proper-async-player-disconnections.patch b/patches/server/1032-Add-proper-async-player-disconnections.patch similarity index 100% rename from patches/server/1034-Add-proper-async-player-disconnections.patch rename to patches/server/1032-Add-proper-async-player-disconnections.patch diff --git a/patches/server/1035-DataComponent-API.patch b/patches/server/1033-DataComponent-API.patch similarity index 100% rename from patches/server/1035-DataComponent-API.patch rename to patches/server/1033-DataComponent-API.patch diff --git a/patches/server/1036-Always-send-Banner-patterns-to-the-client.patch b/patches/server/1034-Always-send-Banner-patterns-to-the-client.patch similarity index 100% rename from patches/server/1036-Always-send-Banner-patterns-to-the-client.patch rename to patches/server/1034-Always-send-Banner-patterns-to-the-client.patch diff --git a/patches/server/1037-Rewrite-dataconverter-system.patch b/patches/server/1035-Rewrite-dataconverter-system.patch similarity index 100% rename from patches/server/1037-Rewrite-dataconverter-system.patch rename to patches/server/1035-Rewrite-dataconverter-system.patch diff --git a/patches/server/1038-Moonrise-optimisation-patches.patch b/patches/server/1036-Moonrise-optimisation-patches.patch similarity index 99% rename from patches/server/1038-Moonrise-optimisation-patches.patch rename to patches/server/1036-Moonrise-optimisation-patches.patch index 993b277e65..ae38b2a8aa 100644 --- a/patches/server/1038-Moonrise-optimisation-patches.patch +++ b/patches/server/1036-Moonrise-optimisation-patches.patch @@ -825,10 +825,10 @@ index 0000000000000000000000000000000000000000..a814512fcfb85312474ae2c2c2144384 +} diff --git a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/io/MoonriseRegionFileIO.java b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/io/MoonriseRegionFileIO.java new file mode 100644 -index 0000000000000000000000000000000000000000..99f6f3e58b11b8967e6f1c3391c190d9a860ab7f +index 0000000000000000000000000000000000000000..1acea58838f057ab87efd103cbecb6f5aeaef393 --- /dev/null +++ b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/io/MoonriseRegionFileIO.java -@@ -0,0 +1,1707 @@ +@@ -0,0 +1,1700 @@ +package ca.spottedleaf.moonrise.patches.chunk_system.io; + +import ca.spottedleaf.concurrentutil.collection.MultiThreadedQueue; @@ -2045,15 +2045,8 @@ index 0000000000000000000000000000000000000000..99f6f3e58b11b8967e6f1c3391c190d9 + try { + writeData = this.regionDataController.startWrite(this.chunkX, this.chunkZ, write); + } catch (final Throwable thr) { -+ // TODO implement this? -+ /*if (thr instanceof RegionFileStorage.RegionFileSizeException) { -+ final int maxSize = RegionFile.MAX_CHUNK_SIZE / (1024 * 1024); -+ LOGGER.error("Chunk at (" + this.chunkX + "," + this.chunkZ + ") in '" + WorldUtil.getWorldName(this.world) + "' exceeds max size of " + maxSize + "MiB, it has been deleted from disk."); -+ } else */ -+ { -+ failedWrite = thr instanceof IOException; -+ LOGGER.error("Failed to write chunk data for task: " + this.toString(), thr); -+ } ++ failedWrite = thr instanceof IOException; ++ LOGGER.error("Failed to write chunk data for task: " + this.toString(), thr); + } + + if (writeData == null) { @@ -32858,7 +32851,7 @@ index cb823d342e41b5861adfc847a313c265fb702a4c..2b1ea97199d5976e5ff4bd049c1e6c8b private final Long2ObjectLinkedOpenHashMap> regionCacheForBlender = new Long2ObjectLinkedOpenHashMap<>(); private static final int REGION_CACHE_SIZE = 1024; diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java -index e761b63eebc1e76b2bb1cb887d83d0b63ad6ec90..e9e1ab1a5be996bc648a53dc4d4123a6b966c437 100644 +index 863960ead8deaa0553be1c98e4fa09f07fcb8ef0..057875cbbdc92ba49b429f9a129514760edb32a2 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java @@ -28,7 +28,7 @@ import net.minecraft.nbt.NbtIo; // Paper @@ -32909,7 +32902,7 @@ index e761b63eebc1e76b2bb1cb887d83d0b63ad6ec90..e9e1ab1a5be996bc648a53dc4d4123a6 Path path = this.getExternalChunkPath(pos); if (!Files.isRegularFile(path, new LinkOption[0])) { -@@ -515,10 +540,29 @@ public class RegionFile implements AutoCloseable { +@@ -514,10 +539,29 @@ public class RegionFile implements AutoCloseable { } // Paper end @@ -32940,7 +32933,7 @@ index e761b63eebc1e76b2bb1cb887d83d0b63ad6ec90..e9e1ab1a5be996bc648a53dc4d4123a6 public ChunkBuffer(final ChunkPos chunkcoordintpair) { super(8096); super.write(0); -@@ -552,7 +596,7 @@ public class RegionFile implements AutoCloseable { +@@ -534,7 +578,7 @@ public class RegionFile implements AutoCloseable { JvmProfiler.INSTANCE.onRegionFileWrite(RegionFile.this.info, this.pos, RegionFile.this.version, i); bytebuffer.putInt(0, i); @@ -32950,7 +32943,7 @@ index e761b63eebc1e76b2bb1cb887d83d0b63ad6ec90..e9e1ab1a5be996bc648a53dc4d4123a6 } diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java -index 2a0f7ab0b616fe07baac437372e3933186064dd5..2d5c1b91b814316bf9f2f22bcd30adacc8970b01 100644 +index e6abe35d6c43b7f76cf3da129ec9552e7b82453e..fdf8e18d24442178b52397acb482ffa3306a32e3 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java @@ -17,7 +17,7 @@ import net.minecraft.nbt.StreamTagVisitor; @@ -33204,7 +33197,7 @@ index 2a0f7ab0b616fe07baac437372e3933186064dd5..2d5c1b91b814316bf9f2f22bcd30adac - protected void write(ChunkPos pos, @Nullable CompoundTag nbt) throws IOException { - RegionFile regionfile = this.getRegionFile(pos, false); // CraftBukkit -+ public void write(ChunkPos pos, @Nullable CompoundTag nbt) throws IOException { // Paper - public ++ public void write(ChunkPos pos, @Nullable CompoundTag nbt) throws IOException { // Paper - rewrite chunk system - public + RegionFile regionfile = this.getRegionFile(pos, nbt == null); // CraftBukkit // Paper - rewrite chunk system + // Paper start - rewrite chunk system + if (regionfile == null) { @@ -33212,10 +33205,10 @@ index 2a0f7ab0b616fe07baac437372e3933186064dd5..2d5c1b91b814316bf9f2f22bcd30adac + return; + } + // Paper end - rewrite chunk system - // Paper start - Chunk save reattempt - int attempts = 0; - Exception lastException = null; -@@ -226,30 +418,37 @@ public final class RegionFileStorage implements AutoCloseable { + + if (nbt == null) { + regionfile.clear(pos); +@@ -206,30 +398,37 @@ public final class RegionFileStorage implements AutoCloseable { } public void close() throws IOException { diff --git a/patches/server/0629-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/1037-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch similarity index 50% rename from patches/server/0629-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch rename to patches/server/1037-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch index 80c053acc6..c155a5cca2 100644 --- a/patches/server/0629-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch +++ b/patches/server/1037-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch @@ -8,18 +8,18 @@ This ensures at least a valid version of the chunk exists on disk, even if outdated diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java -index 12b7d50f49a2184aaf220a4a50a137b217c57124..f1237f6fd6414900ffbad0caee31aa83310eeef4 100644 +index 057875cbbdc92ba49b429f9a129514760edb32a2..ff092c6d0cd436f14a9a4ff5c8ddbb5538d1a8c5 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java -@@ -442,6 +442,7 @@ public class RegionFile implements AutoCloseable { +@@ -539,6 +539,7 @@ public class RegionFile implements AutoCloseable, ca.spottedleaf.moonrise.patche } - + // Paper end + public static final int MAX_CHUNK_SIZE = 500 * 1024 * 1024; // Paper - don't write garbage data to disk if writing serialization fails - private class ChunkBuffer extends ByteArrayOutputStream { + private class ChunkBuffer extends ByteArrayOutputStream implements ca.spottedleaf.moonrise.patches.chunk_system.storage.ChunkSystemChunkBuffer { // Paper - rewrite chunk system private final ChunkPos pos; -@@ -455,6 +456,23 @@ public class RegionFile implements AutoCloseable { +@@ -571,6 +572,23 @@ public class RegionFile implements AutoCloseable, ca.spottedleaf.moonrise.patche super.write(RegionFile.this.version.getId()); this.pos = chunkcoordintpair; } @@ -44,19 +44,54 @@ index 12b7d50f49a2184aaf220a4a50a137b217c57124..f1237f6fd6414900ffbad0caee31aa83 public void close() throws IOException { ByteBuffer bytebuffer = ByteBuffer.wrap(this.buf, 0, this.count); diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java -index 491035aaefff4ee96435ec5d3f9417e28eae0796..4c1212c6ef48594e766fa9e35a6e15916602d587 100644 +index fdf8e18d24442178b52397acb482ffa3306a32e3..8d66d6b7aeb9feb54ebd83f5c73b45d42b9a7034 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java -@@ -147,10 +147,17 @@ public final class RegionFileStorage implements AutoCloseable { +@@ -19,6 +19,8 @@ import net.minecraft.world.level.ChunkPos; + public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise.patches.chunk_system.io.ChunkSystemRegionFileStorage { // Paper - rewrite chunk system + ++ private static final org.slf4j.Logger LOGGER = com.mojang.logging.LogUtils.getLogger(); // Paper ++ + public static final String ANVIL_EXTENSION = ".mca"; + private static final int MAX_CACHE_SIZE = 256; + public final Long2ObjectLinkedOpenHashMap regionCache = new Long2ObjectLinkedOpenHashMap(); +@@ -123,11 +125,24 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise + // (and, the regionfile parameter is unused for writing until the write call) + final ca.spottedleaf.moonrise.patches.chunk_system.io.MoonriseRegionFileIO.RegionDataController.WriteData writeData = ((ca.spottedleaf.moonrise.patches.chunk_system.storage.ChunkSystemRegionFile)regionFile).moonrise$startWrite(compound, pos); + ++ try { // Paper - implement RegionFileSizeException + try { + NbtIo.write(compound, writeData.output()); + } finally { + writeData.output().close(); + } ++ // Paper start - implement RegionFileSizeException ++ } catch (final RegionFileSizeException ex) { ++ // note: it's OK if close() is called, as close() here will not issue a write to the RegionFile ++ // see startWrite ++ final int maxSize = RegionFile.MAX_CHUNK_SIZE / (1024 * 1024); ++ LOGGER.error("Chunk at (" + chunkX + "," + chunkZ + ") in regionfile '" + regionFile.getPath().toString() + "' exceeds max size of " + maxSize + "MiB, it has been deleted from disk."); ++ return new ca.spottedleaf.moonrise.patches.chunk_system.io.MoonriseRegionFileIO.RegionDataController.WriteData( ++ compound, ca.spottedleaf.moonrise.patches.chunk_system.io.MoonriseRegionFileIO.RegionDataController.WriteData.WriteResult.DELETE, ++ null, null ++ ); ++ } ++ // Paper end - implement RegionFileSizeException + + return writeData; + } +@@ -378,10 +393,18 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise try { NbtIo.write(nbt, (DataOutput) dataoutputstream); + regionfile.setOversized(pos.x, pos.z, false); // Paper - We don't do this anymore, mojang stores differently, but clear old meta flag if it exists to get rid of our own meta file once last oversized is gone + // Paper start - don't write garbage data to disk if writing serialization fails + dataoutputstream.close(); // Only write if successful -+ } catch (final RegionFileSizeException e) { -+ attempts = 5; // Don't retry ++ } catch (final RegionFileSizeException ex) { + regionfile.clear(pos); -+ throw e; ++ final int maxSize = RegionFile.MAX_CHUNK_SIZE / (1024 * 1024); ++ LOGGER.error("Chunk at (" + pos.x + "," + pos.z + ") in regionfile '" + regionfile.getPath().toString() + "' exceeds max size of " + maxSize + "MiB, it has been deleted from disk."); ++ return; + // Paper end - don't write garbage data to disk if writing serialization fails } catch (Throwable throwable) { if (dataoutputstream != null) { @@ -66,7 +101,7 @@ index 491035aaefff4ee96435ec5d3f9417e28eae0796..4c1212c6ef48594e766fa9e35a6e1591 } catch (Throwable throwable1) { throwable.addSuppressed(throwable1); } -@@ -158,10 +165,7 @@ public final class RegionFileStorage implements AutoCloseable { +@@ -389,10 +412,7 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise throw throwable; } @@ -76,9 +111,9 @@ index 491035aaefff4ee96435ec5d3f9417e28eae0796..4c1212c6ef48594e766fa9e35a6e1591 - } + // Paper - don't write garbage data to disk if writing serialization fails; move into try block to only write if successfully serialized } - // Paper start - Chunk save reattempt - return; -@@ -208,4 +212,13 @@ public final class RegionFileStorage implements AutoCloseable { + + } +@@ -435,4 +455,13 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise public RegionStorageInfo info() { return this.info; } diff --git a/patches/server/1039-API-for-checking-sent-chunks.patch b/patches/server/1038-API-for-checking-sent-chunks.patch similarity index 95% rename from patches/server/1039-API-for-checking-sent-chunks.patch rename to patches/server/1038-API-for-checking-sent-chunks.patch index 94b9491284..b8a7aea07d 100644 --- a/patches/server/1039-API-for-checking-sent-chunks.patch +++ b/patches/server/1038-API-for-checking-sent-chunks.patch @@ -5,7 +5,7 @@ Subject: [PATCH] API for checking sent chunks diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 73de1c68e92bf6b17cbb5cd49447bc98ae0fb650..a6dd30f0267a4c8bdc58d8745782a8862aabeba6 100644 +index e1f20b5b9ebc5d9870136aa2c77d887094bd4b6e..7aa3ba20f63be469ec82637e79f864262e41f3c6 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -3500,6 +3500,35 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/1040-Fix-CraftWorld-isChunkGenerated.patch b/patches/server/1039-Fix-CraftWorld-isChunkGenerated.patch similarity index 100% rename from patches/server/1040-Fix-CraftWorld-isChunkGenerated.patch rename to patches/server/1039-Fix-CraftWorld-isChunkGenerated.patch diff --git a/patches/server/1041-Add-startup-flag-to-disable-gamerule-limits.patch b/patches/server/1040-Add-startup-flag-to-disable-gamerule-limits.patch similarity index 100% rename from patches/server/1041-Add-startup-flag-to-disable-gamerule-limits.patch rename to patches/server/1040-Add-startup-flag-to-disable-gamerule-limits.patch diff --git a/patches/server/1042-Improved-Watchdog-Support.patch b/patches/server/1041-Improved-Watchdog-Support.patch similarity index 99% rename from patches/server/1042-Improved-Watchdog-Support.patch rename to patches/server/1041-Improved-Watchdog-Support.patch index 85b1434e1b..d6ad1f105d 100644 --- a/patches/server/1042-Improved-Watchdog-Support.patch +++ b/patches/server/1041-Improved-Watchdog-Support.patch @@ -329,7 +329,7 @@ index d6e942aca1bcc769c390504a4119d6619872c4d4..9b706276dc5b5f55b966c5472c6c4e86 } } diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 86cd6e1b8f68dd0564ee2a7c60f02d7af287af67..022de445bbbb869c38be4972c98dcf1c665539ec 100644 +index 061d3e77fe8d9322eb660ac1995e025aba51ae1a..3f69dfe877a6c3a362a28c29f556b7b9b2ad19b0 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -1488,6 +1488,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl diff --git a/patches/server/1043-Detail-more-information-in-watchdog-dumps.patch b/patches/server/1042-Detail-more-information-in-watchdog-dumps.patch similarity index 100% rename from patches/server/1043-Detail-more-information-in-watchdog-dumps.patch rename to patches/server/1042-Detail-more-information-in-watchdog-dumps.patch diff --git a/patches/server/1044-Entity-load-save-limit-per-chunk.patch b/patches/server/1043-Entity-load-save-limit-per-chunk.patch similarity index 100% rename from patches/server/1044-Entity-load-save-limit-per-chunk.patch rename to patches/server/1043-Entity-load-save-limit-per-chunk.patch diff --git a/patches/server/1045-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/1044-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch similarity index 99% rename from patches/server/1045-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch rename to patches/server/1044-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch index d0af0f3027..189786ebed 100644 --- a/patches/server/1045-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch +++ b/patches/server/1044-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch @@ -44,7 +44,7 @@ index a23dc2f8f4475de1ee35bf18a7a8a53233ccac12..226af44fd469053451a0403a95ffb446 this.used.set(start, start + size); } diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java -index e9e1ab1a5be996bc648a53dc4d4123a6b966c437..6a465d9b12c92b5385c394fef7456630be97c04d 100644 +index ba1b6760430babcea9338f4243abbaeb27883df7..b256e0d0cfed34f736f6f1f1128c8cbc6ef1f55b 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java @@ -51,6 +51,354 @@ public class RegionFile implements AutoCloseable, ca.spottedleaf.moonrise.patche @@ -631,10 +631,10 @@ index e9e1ab1a5be996bc648a53dc4d4123a6b966c437..6a465d9b12c92b5385c394fef7456630 return bytebuffer; } diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java -index 2d5c1b91b814316bf9f2f22bcd30adacc8970b01..78922c3e9a69db1774dd846047b79e9523d7cf41 100644 +index 8d66d6b7aeb9feb54ebd83f5c73b45d42b9a7034..e40665cead218502b44dd49051a53326ed94f061 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java -@@ -196,11 +196,42 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise +@@ -211,11 +211,42 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise } } // Paper end - rewrite chunk system @@ -677,7 +677,7 @@ index 2d5c1b91b814316bf9f2f22bcd30adacc8970b01..78922c3e9a69db1774dd846047b79e95 } // Paper start - rewrite chunk system -@@ -300,6 +331,19 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise +@@ -315,6 +346,19 @@ public class RegionFileStorage implements AutoCloseable, ca.spottedleaf.moonrise try { if (datainputstream != null) { nbttagcompound = NbtIo.read((DataInput) datainputstream); diff --git a/patches/server/1046-Bundle-spark.patch b/patches/server/1045-Bundle-spark.patch similarity index 100% rename from patches/server/1046-Bundle-spark.patch rename to patches/server/1045-Bundle-spark.patch diff --git a/patches/server/1047-Improve-performance-of-mass-crafts.patch b/patches/server/1046-Improve-performance-of-mass-crafts.patch similarity index 100% rename from patches/server/1047-Improve-performance-of-mass-crafts.patch rename to patches/server/1046-Improve-performance-of-mass-crafts.patch diff --git a/patches/server/1048-Incremental-chunk-and-player-saving.patch b/patches/server/1047-Incremental-chunk-and-player-saving.patch similarity index 97% rename from patches/server/1048-Incremental-chunk-and-player-saving.patch rename to patches/server/1047-Incremental-chunk-and-player-saving.patch index d545517720..08c5b68dc1 100644 --- a/patches/server/1048-Incremental-chunk-and-player-saving.patch +++ b/patches/server/1047-Incremental-chunk-and-player-saving.patch @@ -51,7 +51,7 @@ index 38b5eef0b5ff38f9a8dfa59822d7b41336108f49..b33b68649e67de08719b30e98650c84f ProfilerFiller gameprofilerfiller = Profiler.get(); diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index ff79925649ac1ceb6121c4b74fdb65f5f138f689..5f244cafe6c3cfb4a3bd08f9ae0f1a5aeec9b359 100644 +index d81be1069ef6ce51789df38ce21f125b6d524945..dc523c3017939d4a206f28617e5aacd83e5d2334 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1353,6 +1353,30 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe @@ -86,7 +86,7 @@ index ff79925649ac1ceb6121c4b74fdb65f5f138f689..5f244cafe6c3cfb4a3bd08f9ae0f1a5a // Paper start - add close param this.save(progressListener, flush, savingDisabled, false); diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index dda53c52fab7c02f39451335fe0bfe36852ac994..167ab6346edb8f29c29a7327f031c0f5df71acf1 100644 +index 2b6c5b2387b67f25d8877849ccbfaaa77eab51d3..05981a075898794b899f1327bff1e7ca8ef8fc13 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -221,6 +221,7 @@ import org.bukkit.inventory.MainHand; diff --git a/patches/server/1049-Optimise-general-POI-access.patch b/patches/server/1048-Optimise-general-POI-access.patch similarity index 100% rename from patches/server/1049-Optimise-general-POI-access.patch rename to patches/server/1048-Optimise-general-POI-access.patch diff --git a/patches/server/1050-Fix-entity-tracker-desync-when-new-players-are-added.patch b/patches/server/1049-Fix-entity-tracker-desync-when-new-players-are-added.patch similarity index 100% rename from patches/server/1050-Fix-entity-tracker-desync-when-new-players-are-added.patch rename to patches/server/1049-Fix-entity-tracker-desync-when-new-players-are-added.patch diff --git a/patches/server/1051-Lag-compensation-ticks.patch b/patches/server/1050-Lag-compensation-ticks.patch similarity index 98% rename from patches/server/1051-Lag-compensation-ticks.patch rename to patches/server/1050-Lag-compensation-ticks.patch index 9e44007563..3497e375ef 100644 --- a/patches/server/1051-Lag-compensation-ticks.patch +++ b/patches/server/1050-Lag-compensation-ticks.patch @@ -30,7 +30,7 @@ index b33b68649e67de08719b30e98650c84f4c3c18d6..e636a96ea6220fda671a31d3d9cdea46 gameprofilerfiller.push(() -> { String s = String.valueOf(worldserver); diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 5f244cafe6c3cfb4a3bd08f9ae0f1a5aeec9b359..91c99cf68bf07eb81dcb63690365559df41b912e 100644 +index dc523c3017939d4a206f28617e5aacd83e5d2334..5979e8d25eaddf990ded79bcf6485cc0612faa63 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -582,6 +582,17 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe diff --git a/patches/server/1052-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/1051-Optimise-collision-checking-in-player-move-packet-ha.patch similarity index 100% rename from patches/server/1052-Optimise-collision-checking-in-player-move-packet-ha.patch rename to patches/server/1051-Optimise-collision-checking-in-player-move-packet-ha.patch diff --git a/patches/server/1053-Optional-per-player-mob-spawns.patch b/patches/server/1052-Optional-per-player-mob-spawns.patch similarity index 98% rename from patches/server/1053-Optional-per-player-mob-spawns.patch rename to patches/server/1052-Optional-per-player-mob-spawns.patch index 45f24f3663..79231e71e6 100644 --- a/patches/server/1053-Optional-per-player-mob-spawns.patch +++ b/patches/server/1052-Optional-per-player-mob-spawns.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Optional per player mob spawns Feature patch diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index f1999729cd1c00071c5e1835ee49ea5fcafa7b05..4896c3ba81ead769972fa9efdbe563d4006e4401 100644 +index 674fbb35d372a67c21453a8c63c3628c563ccef7..d708edb01328642b9374c59bd73ff39824005f2e 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -229,8 +229,26 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider @@ -38,7 +38,7 @@ index f1999729cd1c00071c5e1835ee49ea5fcafa7b05..4896c3ba81ead769972fa9efdbe563d4 // Paper end diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index 10a9406e96ab0ab2404c0e0a9bef08e86a6a12a2..078a14ee8956a56b129be92a26d19c1c536c9589 100644 +index b3ce572547535001959d9bcc6cb567da552c6539..8e96905fa93b02623f16feb4369a45b175031ebf 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java @@ -492,7 +492,7 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon @@ -72,7 +72,7 @@ index 10a9406e96ab0ab2404c0e0a9bef08e86a6a12a2..078a14ee8956a56b129be92a26d19c1c this.lastSpawnState = spawnercreature_d; profiler.popPush("spawnAndTick"); diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 167ab6346edb8f29c29a7327f031c0f5df71acf1..f28babf8c778ef570d35e1aaa88467160cf3f1b1 100644 +index 05981a075898794b899f1327bff1e7ca8ef8fc13..2b40896483ffbba2c84dbaaae3194342ed5d2170 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -303,6 +303,10 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple diff --git a/patches/server/1054-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/1053-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch similarity index 95% rename from patches/server/1054-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch rename to patches/server/1053-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch index 9980b9f1cb..0e96e6bf9c 100644 --- a/patches/server/1054-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch +++ b/patches/server/1053-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Improve cancelling PreCreatureSpawnEvent with per player mob diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 4896c3ba81ead769972fa9efdbe563d4006e4401..5b3a886c624b36557cbfaccdc3fb05a46a4ba36a 100644 +index d708edb01328642b9374c59bd73ff39824005f2e..52a6a4badace15a983f0acb431036bd704d9cebd 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -246,8 +246,25 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider @@ -37,7 +37,7 @@ index 4896c3ba81ead769972fa9efdbe563d4006e4401..5b3a886c624b36557cbfaccdc3fb05a4 } // Paper end diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index 078a14ee8956a56b129be92a26d19c1c536c9589..61a73a234d9bdd22958ae261b7d0359179f7a57b 100644 +index 8e96905fa93b02623f16feb4369a45b175031ebf..d021cd5b6136f0125076513977f430c6d4dd4f9f 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java @@ -555,7 +555,17 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon @@ -60,7 +60,7 @@ index 078a14ee8956a56b129be92a26d19c1c536c9589..61a73a234d9bdd22958ae261b7d03591 spawnercreature_d = NaturalSpawner.createState(naturalSpawnChunkCount, this.level.getAllEntities(), this::getFullChunk, null, true); } else { diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index f28babf8c778ef570d35e1aaa88467160cf3f1b1..b525369fb6f3bb80c1553ae41b1e3bddeda29936 100644 +index 2b40896483ffbba2c84dbaaae3194342ed5d2170..a755a2742f18ed55adc1fc735d995c9874b1e62e 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -307,6 +307,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple diff --git a/patches/server/1055-Avoid-issues-with-certain-tasks-not-processing-durin.patch b/patches/server/1054-Avoid-issues-with-certain-tasks-not-processing-durin.patch similarity index 100% rename from patches/server/1055-Avoid-issues-with-certain-tasks-not-processing-durin.patch rename to patches/server/1054-Avoid-issues-with-certain-tasks-not-processing-durin.patch diff --git a/patches/server/1056-Allow-using-old-ender-pearl-behavior.patch b/patches/server/1055-Allow-using-old-ender-pearl-behavior.patch similarity index 97% rename from patches/server/1056-Allow-using-old-ender-pearl-behavior.patch rename to patches/server/1055-Allow-using-old-ender-pearl-behavior.patch index 939dd90893..cd17c1aa1f 100644 --- a/patches/server/1056-Allow-using-old-ender-pearl-behavior.patch +++ b/patches/server/1055-Allow-using-old-ender-pearl-behavior.patch @@ -9,7 +9,7 @@ When enabled, ender pearls will not load chunks and will save to the world inste public net.minecraft.world.entity.projectile.Projectile cachedOwner diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index b525369fb6f3bb80c1553ae41b1e3bddeda29936..2e8ecf3bbb9f9ceba6f896738fa1ab8e2bd0fed6 100644 +index a755a2742f18ed55adc1fc735d995c9874b1e62e..5a8f396d47577f087abb415c972fd4f51e50faba 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -836,6 +836,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple diff --git a/patches/server/1057-Block-Enderpearl-Travel-Exploit.patch b/patches/server/1056-Block-Enderpearl-Travel-Exploit.patch similarity index 96% rename from patches/server/1057-Block-Enderpearl-Travel-Exploit.patch rename to patches/server/1056-Block-Enderpearl-Travel-Exploit.patch index 303bfdae1b..1ce0fb851b 100644 --- a/patches/server/1057-Block-Enderpearl-Travel-Exploit.patch +++ b/patches/server/1056-Block-Enderpearl-Travel-Exploit.patch @@ -19,7 +19,7 @@ fully prevent enderpearl travel exploits. public net.minecraft.world.entity.projectile.Projectile ownerUUID diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 91c99cf68bf07eb81dcb63690365559df41b912e..6bf37e37e179e7f962ca6a256b8476b99855aac5 100644 +index 5979e8d25eaddf990ded79bcf6485cc0612faa63..0a46bf03f9a55c7453f042cba6f448d4d0bcd1e6 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -2664,6 +2664,12 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe diff --git a/patches/server/1058-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/1057-Fix-inconsistencies-in-dispense-events-regarding-sta.patch similarity index 100% rename from patches/server/1058-Fix-inconsistencies-in-dispense-events-regarding-sta.patch rename to patches/server/1057-Fix-inconsistencies-in-dispense-events-regarding-sta.patch diff --git a/patches/server/1059-Correct-update-cursor.patch b/patches/server/1058-Correct-update-cursor.patch similarity index 100% rename from patches/server/1059-Correct-update-cursor.patch rename to patches/server/1058-Correct-update-cursor.patch diff --git a/patches/server/1060-Call-CraftPlayer-onEntityRemove-for-all-online-playe.patch b/patches/server/1059-Call-CraftPlayer-onEntityRemove-for-all-online-playe.patch similarity index 91% rename from patches/server/1060-Call-CraftPlayer-onEntityRemove-for-all-online-playe.patch rename to patches/server/1059-Call-CraftPlayer-onEntityRemove-for-all-online-playe.patch index 4af4caf52d..cb02caeb92 100644 --- a/patches/server/1060-Call-CraftPlayer-onEntityRemove-for-all-online-playe.patch +++ b/patches/server/1059-Call-CraftPlayer-onEntityRemove-for-all-online-playe.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Call CraftPlayer#onEntityRemove for all online players diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 6bf37e37e179e7f962ca6a256b8476b99855aac5..9638bb0393257a917bdaa95d33561b37ab1878bc 100644 +index 0a46bf03f9a55c7453f042cba6f448d4d0bcd1e6..3d09c0c9ca3541c2b3b6feeb426eeffbdaeef69c 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -2786,7 +2786,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe diff --git a/patches/server/1061-Improve-exact-choice-recipe-ingredients.patch b/patches/server/1060-Improve-exact-choice-recipe-ingredients.patch similarity index 100% rename from patches/server/1061-Improve-exact-choice-recipe-ingredients.patch rename to patches/server/1060-Improve-exact-choice-recipe-ingredients.patch diff --git a/patches/server/1062-Eigencraft-redstone-implementation.patch b/patches/server/1061-Eigencraft-redstone-implementation.patch similarity index 100% rename from patches/server/1062-Eigencraft-redstone-implementation.patch rename to patches/server/1061-Eigencraft-redstone-implementation.patch diff --git a/patches/server/1063-Improve-performance-of-RecipeMap-removeRecipe.patch b/patches/server/1062-Improve-performance-of-RecipeMap-removeRecipe.patch similarity index 100% rename from patches/server/1063-Improve-performance-of-RecipeMap-removeRecipe.patch rename to patches/server/1062-Improve-performance-of-RecipeMap-removeRecipe.patch diff --git a/patches/server/1064-Reduce-work-done-in-CraftMapCanvas.drawImage-by-limi.patch b/patches/server/1063-Reduce-work-done-in-CraftMapCanvas.drawImage-by-limi.patch similarity index 100% rename from patches/server/1064-Reduce-work-done-in-CraftMapCanvas.drawImage-by-limi.patch rename to patches/server/1063-Reduce-work-done-in-CraftMapCanvas.drawImage-by-limi.patch diff --git a/patches/server/1065-Add-Alternate-Current-redstone-implementation.patch b/patches/server/1064-Add-Alternate-Current-redstone-implementation.patch similarity index 99% rename from patches/server/1065-Add-Alternate-Current-redstone-implementation.patch rename to patches/server/1064-Add-Alternate-Current-redstone-implementation.patch index 631fddfa22..246643d457 100644 --- a/patches/server/1065-Add-Alternate-Current-redstone-implementation.patch +++ b/patches/server/1064-Add-Alternate-Current-redstone-implementation.patch @@ -2328,7 +2328,7 @@ index 0000000000000000000000000000000000000000..298076a0db4e6ee6e4775ac43bf749d9 + } +} diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 9638bb0393257a917bdaa95d33561b37ab1878bc..957cae6ddeba9efe3b55588567ae51e8b86b6a42 100644 +index 3d09c0c9ca3541c2b3b6feeb426eeffbdaeef69c..b4027f5cf90935a1fe3ab2c28b0bcbb55a7b541b 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -230,6 +230,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe @@ -2354,7 +2354,7 @@ index 9638bb0393257a917bdaa95d33561b37ab1878bc..957cae6ddeba9efe3b55588567ae51e8 EntityCallbacks() {} diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 022de445bbbb869c38be4972c98dcf1c665539ec..2cc264f577fdd81d02783e0d6146bea9728789c7 100644 +index 3f69dfe877a6c3a362a28c29f556b7b9b2ad19b0..0de2b79481352b52438dde284262019b29949ad8 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -2015,6 +2015,17 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl diff --git a/patches/server/1066-Fix-incorrect-invulnerability-damage-reduction.patch b/patches/server/1065-Fix-incorrect-invulnerability-damage-reduction.patch similarity index 100% rename from patches/server/1066-Fix-incorrect-invulnerability-damage-reduction.patch rename to patches/server/1065-Fix-incorrect-invulnerability-damage-reduction.patch diff --git a/patches/server/1067-Fix-NPE-when-EntityResurrectEvent-is-uncancelled.patch b/patches/server/1066-Fix-NPE-when-EntityResurrectEvent-is-uncancelled.patch similarity index 100% rename from patches/server/1067-Fix-NPE-when-EntityResurrectEvent-is-uncancelled.patch rename to patches/server/1066-Fix-NPE-when-EntityResurrectEvent-is-uncancelled.patch diff --git a/patches/server/1068-API-to-check-if-the-server-is-sleeping.patch b/patches/server/1067-API-to-check-if-the-server-is-sleeping.patch similarity index 100% rename from patches/server/1068-API-to-check-if-the-server-is-sleeping.patch rename to patches/server/1067-API-to-check-if-the-server-is-sleeping.patch diff --git a/patches/server/1069-API-to-allow-disallow-tick-sleeping.patch b/patches/server/1068-API-to-allow-disallow-tick-sleeping.patch similarity index 100% rename from patches/server/1069-API-to-allow-disallow-tick-sleeping.patch rename to patches/server/1068-API-to-allow-disallow-tick-sleeping.patch diff --git a/patches/server/1070-Configurable-Entity-Despawn-Time.patch b/patches/server/1069-Configurable-Entity-Despawn-Time.patch similarity index 100% rename from patches/server/1070-Configurable-Entity-Despawn-Time.patch rename to patches/server/1069-Configurable-Entity-Despawn-Time.patch diff --git a/patches/server/1071-Expanded-Art-API.patch b/patches/server/1070-Expanded-Art-API.patch similarity index 100% rename from patches/server/1071-Expanded-Art-API.patch rename to patches/server/1070-Expanded-Art-API.patch diff --git a/patches/server/1072-Call-ProjectileHitEvent-for-entity-hits.patch b/patches/server/1071-Call-ProjectileHitEvent-for-entity-hits.patch similarity index 100% rename from patches/server/1072-Call-ProjectileHitEvent-for-entity-hits.patch rename to patches/server/1071-Call-ProjectileHitEvent-for-entity-hits.patch