diff --git a/patches/server/0004-Paper-config-files.patch b/patches/server/0004-Paper-config-files.patch index fa4ca2088da9..a63701ad3efa 100644 --- a/patches/server/0004-Paper-config-files.patch +++ b/patches/server/0004-Paper-config-files.patch @@ -7,7 +7,7 @@ Loads each yml file for early init too so it can be used for early options diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java new file mode 100644 -index 0000000000000000000000000000000000000000..bee2fa2bfbb61209381f24ed6508d3d1c73a344a +index 0000000000000000000000000000000000000000..a7182a4c64980aa19b8493ac9c2bb762603e615b --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java @@ -0,0 +1,285 @@ @@ -220,7 +220,7 @@ index 0000000000000000000000000000000000000000..bee2fa2bfbb61209381f24ed6508d3d1 + ServerChunkCache chunkProviderServer = world.getChunkSource(); + + world.getAllEntities().forEach(e -> { -+ ResourceLocation key = new ResourceLocation(""); // TODO: update in next patch ++ ResourceLocation key = EntityType.getKey(e.getType()); + + MutablePair> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap())); + ChunkPos chunk = e.chunkPosition(); diff --git a/patches/server/0011-Add-MinecraftKey-Information-to-Objects.patch b/patches/server/0011-Add-MinecraftKey-Information-to-Objects.patch deleted file mode 100644 index a62b06ca65a3..000000000000 --- a/patches/server/0011-Add-MinecraftKey-Information-to-Objects.patch +++ /dev/null @@ -1,124 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Aikar -Date: Wed, 4 Jul 2018 01:40:13 -0400 -Subject: [PATCH] Add MinecraftKey Information to Objects - -Stores the reference to the objects respective MinecraftKey - -diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java -index bee2fa2bfbb61209381f24ed6508d3d1c73a344a..1fa190e098079522e0fe3593fa261c1b7ad4e24b 100644 ---- a/src/main/java/com/destroystokyo/paper/PaperCommand.java -+++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java -@@ -207,7 +207,7 @@ public class PaperCommand extends Command { - ServerChunkCache chunkProviderServer = world.getChunkSource(); - - world.getAllEntities().forEach(e -> { -- ResourceLocation key = new ResourceLocation(""); // TODO: update in next patch -+ ResourceLocation key = e.getMinecraftKey(); - - MutablePair> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap())); - ChunkPos chunk = e.chunkPosition(); -diff --git a/src/main/java/io/papermc/paper/util/KeyedObject.java b/src/main/java/io/papermc/paper/util/KeyedObject.java -new file mode 100644 -index 0000000000000000000000000000000000000000..9f0c7fd903f085e70db1785fb8bcdb5456e6ca51 ---- /dev/null -+++ b/src/main/java/io/papermc/paper/util/KeyedObject.java -@@ -0,0 +1,11 @@ -+package io.papermc.paper.util; -+ -+import net.minecraft.resources.ResourceLocation; -+ -+public interface KeyedObject { -+ ResourceLocation getMinecraftKey(); -+ default String getMinecraftKeyString() { -+ ResourceLocation key = getMinecraftKey(); -+ return key != null ? key.toString() : null; -+ } -+} -diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index e778f4da8b3e33b6fc9bbe21a7cbc1f185130e69..e191f080e781473481712e27763ab80c04fe60ab 100644 ---- a/src/main/java/net/minecraft/world/entity/Entity.java -+++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -148,7 +148,7 @@ import org.bukkit.event.player.PlayerTeleportEvent; - import org.bukkit.plugin.PluginManager; - // CraftBukkit end - --public abstract class Entity implements Nameable, EntityAccess, CommandSource { -+public abstract class Entity implements Nameable, EntityAccess, CommandSource, io.papermc.paper.util.KeyedObject { // Paper - - // CraftBukkit start - private static final int CURRENT_LEVEL = 2; -@@ -1968,12 +1968,32 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { - return true; - } - -+ // Paper start -+ private ResourceLocation entityKey; -+ private String entityKeyString; -+ -+ @Override -+ public ResourceLocation getMinecraftKey() { -+ if (entityKey == null) { -+ this.entityKey = EntityType.getKey(this.getType()); -+ this.entityKeyString = this.entityKey != null ? this.entityKey.toString() : null; -+ } -+ return entityKey; -+ } -+ -+ @Override -+ public String getMinecraftKeyString() { -+ getMinecraftKey(); // Try to load if it doesn't exists. see: https://github.com/PaperMC/Paper/issues/1280 -+ return entityKeyString; -+ } -+ - @Nullable - public final String getEncodeId() { - EntityType entitytypes = this.getType(); - ResourceLocation minecraftkey = EntityType.getKey(entitytypes); - -- return entitytypes.canSerialize() && minecraftkey != null ? minecraftkey.toString() : null; -+ return entitytypes != null && entitytypes.canSerialize() ? getMinecraftKeyString() : null; -+ // Paper end - } - - protected abstract void readAdditionalSaveData(CompoundTag nbt); -diff --git a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java -index dec38e58e30c84887e9d29436c0f76c70c0a627d..53a8e9a63b2ea5f698acbd80b2eca9e3e3cfedb8 100644 ---- a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java -+++ b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java -@@ -23,7 +23,7 @@ import org.bukkit.inventory.InventoryHolder; - - import org.spigotmc.CustomTimingsHandler; // Spigot - --public abstract class BlockEntity { -+public abstract class BlockEntity implements io.papermc.paper.util.KeyedObject { // Paper - - public CustomTimingsHandler tickTimer = org.bukkit.craftbukkit.SpigotTimings.getTileEntityTimings(this); // Spigot - // CraftBukkit start - data containers -@@ -48,6 +48,26 @@ public abstract class BlockEntity { - return new BlockPos(nbt.getInt("x"), nbt.getInt("y"), nbt.getInt("z")); - } - -+ // Paper start -+ private String tileEntityKeyString = null; -+ private ResourceLocation tileEntityKey = null; -+ -+ @Override -+ public ResourceLocation getMinecraftKey() { -+ if (tileEntityKey == null) { -+ tileEntityKey = BlockEntityType.getKey(this.type); -+ tileEntityKeyString = tileEntityKey != null ? tileEntityKey.toString() : null; -+ } -+ return tileEntityKey; -+ } -+ -+ @Override -+ public String getMinecraftKeyString() { -+ getMinecraftKey(); // Try to load if it doesn't exists. -+ return tileEntityKeyString; -+ } -+ // Paper end -+ - @Nullable - public Level getLevel() { - return this.level; diff --git a/patches/server/0012-Timings-v2.patch b/patches/server/0011-Timings-v2.patch similarity index 99% rename from patches/server/0012-Timings-v2.patch rename to patches/server/0011-Timings-v2.patch index 6cc67ec1d107..a9998f7ab5c0 100644 --- a/patches/server/0012-Timings-v2.patch +++ b/patches/server/0011-Timings-v2.patch @@ -1405,7 +1405,7 @@ index be9a29f01d59584a1492d925248f0947610ce9d0..bfec1beb0af39e2af6be7c6423bf1eaa public UserWhiteList getWhiteList() { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index e191f080e781473481712e27763ab80c04fe60ab..04692fe4e7f2107ffc8c48cebdf88e18e58f4ce9 100644 +index e778f4da8b3e33b6fc9bbe21a7cbc1f185130e69..55ff800e5882841d5512901c883e308c9426e5de 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -128,7 +128,6 @@ import org.bukkit.craftbukkit.event.CraftPortalEvent; @@ -1416,7 +1416,7 @@ index e191f080e781473481712e27763ab80c04fe60ab..04692fe4e7f2107ffc8c48cebdf88e18 import org.bukkit.event.entity.EntityCombustByEntityEvent; import org.bukkit.event.hanging.HangingBreakByEntityEvent; import org.bukkit.event.vehicle.VehicleBlockCollisionEvent; -@@ -295,7 +294,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -295,7 +294,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { public boolean lastDamageCancelled; // SPIGOT-5339, SPIGOT-6252, SPIGOT-6777: Keep track if the event was canceled public boolean persistentInvisibility = false; public BlockPos lastLavaContact; @@ -1424,7 +1424,7 @@ index e191f080e781473481712e27763ab80c04fe60ab..04692fe4e7f2107ffc8c48cebdf88e18 // Spigot start public final org.spigotmc.ActivationRange.ActivationType activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this); public final boolean defaultActivationState; -@@ -744,7 +742,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -744,7 +742,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } public void move(MoverType movementType, Vec3 movement) { @@ -1432,7 +1432,7 @@ index e191f080e781473481712e27763ab80c04fe60ab..04692fe4e7f2107ffc8c48cebdf88e18 if (this.noPhysics) { this.setPos(this.getX() + movement.x, this.getY() + movement.y, this.getZ() + movement.z); } else { -@@ -906,7 +903,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -906,7 +903,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { this.level.getProfiler().pop(); } } @@ -1642,7 +1642,7 @@ index e72f44910f7390da9e2d78c5bb8f14d5abf9562b..54125cf5957f8165551e077c47d02b7d private String descriptionId; @Nullable diff --git a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java -index 53a8e9a63b2ea5f698acbd80b2eca9e3e3cfedb8..a35e3f54cbec83e8c691b6f61d4e1ac1ece6156d 100644 +index dec38e58e30c84887e9d29436c0f76c70c0a627d..be08224c8107aab3e9a3645a20977dd14bfff782 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java @@ -22,10 +22,12 @@ import org.bukkit.inventory.InventoryHolder; @@ -1652,7 +1652,7 @@ index 53a8e9a63b2ea5f698acbd80b2eca9e3e3cfedb8..a35e3f54cbec83e8c691b6f61d4e1ac1 +import co.aikar.timings.MinecraftTimings; // Paper +import co.aikar.timings.Timing; // Paper - public abstract class BlockEntity implements io.papermc.paper.util.KeyedObject { // Paper + public abstract class BlockEntity { - public CustomTimingsHandler tickTimer = org.bukkit.craftbukkit.SpigotTimings.getTileEntityTimings(this); // Spigot + public Timing tickTimer = MinecraftTimings.getTileEntityTimings(this); // Paper diff --git a/patches/server/0013-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/server/0012-Add-command-line-option-to-load-extra-plugin-jars-no.patch similarity index 95% rename from patches/server/0013-Add-command-line-option-to-load-extra-plugin-jars-no.patch rename to patches/server/0012-Add-command-line-option-to-load-extra-plugin-jars-no.patch index c62c0ccac2ec..e4c83f02f8c3 100644 --- a/patches/server/0013-Add-command-line-option-to-load-extra-plugin-jars-no.patch +++ b/patches/server/0012-Add-command-line-option-to-load-extra-plugin-jars-no.patch @@ -7,7 +7,7 @@ Subject: [PATCH] Add command line option to load extra plugin jars not in the ex: java -jar paperclip.jar nogui -add-plugin=/path/to/plugin.jar -add-plugin=/path/to/another/plugin_jar.jar diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 0f1784e2cdde46f2213e540f1959a9c42d5db0c0..ba53a17a8730344882502995245171190b2de5ee 100644 +index fe5454f9e2507824c78cab3e31428608bf229ce1..d2c5221f7d0ed3cb04f160a9e77d9aba6ec206a4 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -398,10 +398,15 @@ public final class CraftServer implements Server { @@ -66,7 +66,7 @@ index 0f1784e2cdde46f2213e540f1959a9c42d5db0c0..ba53a17a873034488250299524517119 if (type == PluginLoadOrder.STARTUP) { this.helpMap.clear(); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 1039517ead86512a34e07b44b131981c1dea7b00..7e5fc58f43836edab3696b9644264434c5a95a2f 100644 +index aff3116c77277dcb4d3825d33f40a0b17258a0ba..ae4dc96da9e50ce8645e1b5da13e29085e916e98 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -142,6 +142,12 @@ public class Main { diff --git a/patches/server/0014-Configurable-cactus-bamboo-and-reed-growth-heights.patch b/patches/server/0013-Configurable-cactus-bamboo-and-reed-growth-heights.patch similarity index 100% rename from patches/server/0014-Configurable-cactus-bamboo-and-reed-growth-heights.patch rename to patches/server/0013-Configurable-cactus-bamboo-and-reed-growth-heights.patch diff --git a/patches/server/0015-Configurable-baby-zombie-movement-speed.patch b/patches/server/0014-Configurable-baby-zombie-movement-speed.patch similarity index 100% rename from patches/server/0015-Configurable-baby-zombie-movement-speed.patch rename to patches/server/0014-Configurable-baby-zombie-movement-speed.patch diff --git a/patches/server/0016-Configurable-fishing-time-ranges.patch b/patches/server/0015-Configurable-fishing-time-ranges.patch similarity index 96% rename from patches/server/0016-Configurable-fishing-time-ranges.patch rename to patches/server/0015-Configurable-fishing-time-ranges.patch index 9b62e01dba33..4b09a21b14ae 100644 --- a/patches/server/0016-Configurable-fishing-time-ranges.patch +++ b/patches/server/0015-Configurable-fishing-time-ranges.patch @@ -22,7 +22,7 @@ index ec3fb557fa31b153de20c4990066182a774dd489..5896b4e4646d722db5622a424fa26f42 + } } diff --git a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java -index 67fe1a436ca7b0069fabc3a1bfd0206babf07b8a..24192a91d9f5c890a316ec150d4aec84073cb61a 100644 +index 1fe9c591fdb1b8c3d457964a6877a91b56470016..34ee9c22ed5bca2406588a4b6a045bbc51c64920 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java +++ b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java @@ -85,6 +85,10 @@ public class FishingHook extends Projectile { diff --git a/patches/server/0017-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch b/patches/server/0016-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch similarity index 96% rename from patches/server/0017-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch rename to patches/server/0016-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch index fa851d5d09c7..df382a396dc1 100644 --- a/patches/server/0017-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch +++ b/patches/server/0016-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch @@ -19,10 +19,10 @@ index 5896b4e4646d722db5622a424fa26f42d3f8d9ff..0a6e98ca5534430540044a32c280e568 + } } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 04692fe4e7f2107ffc8c48cebdf88e18e58f4ce9..8a4f4582a6bd69016a36d611f9c4ac2262f7f3ec 100644 +index 55ff800e5882841d5512901c883e308c9426e5de..89a0fe6695f70c726b5a39b8990ed7e7ce451a92 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -1278,6 +1278,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -1278,6 +1278,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { return this.isInWater() || this.isInRain(); } diff --git a/patches/server/0018-Add-configurable-despawn-distances-for-living-entiti.patch b/patches/server/0017-Add-configurable-despawn-distances-for-living-entiti.patch similarity index 100% rename from patches/server/0018-Add-configurable-despawn-distances-for-living-entiti.patch rename to patches/server/0017-Add-configurable-despawn-distances-for-living-entiti.patch diff --git a/patches/server/0019-Allow-for-toggling-of-spawn-chunks.patch b/patches/server/0018-Allow-for-toggling-of-spawn-chunks.patch similarity index 100% rename from patches/server/0019-Allow-for-toggling-of-spawn-chunks.patch rename to patches/server/0018-Allow-for-toggling-of-spawn-chunks.patch diff --git a/patches/server/0020-Drop-falling-block-and-tnt-entities-at-the-specified.patch b/patches/server/0019-Drop-falling-block-and-tnt-entities-at-the-specified.patch similarity index 100% rename from patches/server/0020-Drop-falling-block-and-tnt-entities-at-the-specified.patch rename to patches/server/0019-Drop-falling-block-and-tnt-entities-at-the-specified.patch diff --git a/patches/server/0021-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/patches/server/0020-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch similarity index 98% rename from patches/server/0021-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch rename to patches/server/0020-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch index 144fd8d6595a..bdc9370bf8cf 100644 --- a/patches/server/0021-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch +++ b/patches/server/0020-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch @@ -45,7 +45,7 @@ index d2c5221f7d0ed3cb04f160a9e77d9aba6ec206a4..bb304601b3795349dd45d94c53f082a3 private final String bukkitVersion = Versioning.getBukkitVersion(); private final Logger logger = Logger.getLogger("Minecraft"); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 52b13926ac40d61162b9da818fe6dc2c32cbae06..cd96196c8744596b95fd2a87bbbb9765f27c8be4 100644 +index ae4dc96da9e50ce8645e1b5da13e29085e916e98..a0ac6ba17a46bac4c5363a32e078ab89b260bac8 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -216,12 +216,25 @@ public class Main { diff --git a/patches/server/0022-Implement-Paper-VersionChecker.patch b/patches/server/0021-Implement-Paper-VersionChecker.patch similarity index 100% rename from patches/server/0022-Implement-Paper-VersionChecker.patch rename to patches/server/0021-Implement-Paper-VersionChecker.patch diff --git a/patches/server/0023-Add-version-history-to-version-command.patch b/patches/server/0022-Add-version-history-to-version-command.patch similarity index 100% rename from patches/server/0023-Add-version-history-to-version-command.patch rename to patches/server/0022-Add-version-history-to-version-command.patch diff --git a/patches/server/0024-Player-affects-spawning-API.patch b/patches/server/0023-Player-affects-spawning-API.patch similarity index 98% rename from patches/server/0024-Player-affects-spawning-API.patch rename to patches/server/0023-Player-affects-spawning-API.patch index d9ccce3ce5c1..6c3ce7bc7320 100644 --- a/patches/server/0024-Player-affects-spawning-API.patch +++ b/patches/server/0023-Player-affects-spawning-API.patch @@ -47,7 +47,7 @@ index 6eaedfabf70b604705ad9a772a2e602c8590b500..97c2c1647fa12650e5963c7c1c746fec return false; } diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 612de4e8c26fd41d300ac09eb59d1ceac248778e..71610fa70cdaf3c5a54250a5814809013a6d228e 100644 +index 1d4d3d6fc8affde249fb7cda8a3a488b6689130a..067513b240db88b818bd26d74c31fb5f8ee80f5d 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -175,6 +175,9 @@ public abstract class Player extends LivingEntity { diff --git a/patches/server/0025-Further-improve-server-tick-loop.patch b/patches/server/0024-Further-improve-server-tick-loop.patch similarity index 100% rename from patches/server/0025-Further-improve-server-tick-loop.patch rename to patches/server/0024-Further-improve-server-tick-loop.patch diff --git a/patches/server/0026-Only-refresh-abilities-if-needed.patch b/patches/server/0025-Only-refresh-abilities-if-needed.patch similarity index 100% rename from patches/server/0026-Only-refresh-abilities-if-needed.patch rename to patches/server/0025-Only-refresh-abilities-if-needed.patch diff --git a/patches/server/0027-Entity-Origin-API.patch b/patches/server/0026-Entity-Origin-API.patch similarity index 97% rename from patches/server/0027-Entity-Origin-API.patch rename to patches/server/0026-Entity-Origin-API.patch index 8e66eaa1c1b2..7af1395f3000 100644 --- a/patches/server/0027-Entity-Origin-API.patch +++ b/patches/server/0026-Entity-Origin-API.patch @@ -25,10 +25,10 @@ index 0750cf27c1b2cac723d68d0e6c2204cbb5795571..0eb0229125fd027025b6b44dfceddf62 public void onTrackingEnd(Entity entity) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 8a4f4582a6bd69016a36d611f9c4ac2262f7f3ec..a4cd7088113b60fd10e79359e5749fd15dacebe8 100644 +index 89a0fe6695f70c726b5a39b8990ed7e7ce451a92..ac540cacc1858697b54950e86e84efbff54e07a1 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -300,7 +300,27 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -300,7 +300,27 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { public long activatedTick = Integer.MIN_VALUE; public void inactiveTick() { } // Spigot end @@ -56,7 +56,7 @@ index 8a4f4582a6bd69016a36d611f9c4ac2262f7f3ec..a4cd7088113b60fd10e79359e5749fd1 public float getBukkitYaw() { return this.yRot; } -@@ -1822,6 +1842,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -1822,6 +1842,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { this.bukkitEntity.storeBukkitValues(nbt); } // CraftBukkit end @@ -72,7 +72,7 @@ index 8a4f4582a6bd69016a36d611f9c4ac2262f7f3ec..a4cd7088113b60fd10e79359e5749fd1 return nbt; } catch (Throwable throwable) { CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT"); -@@ -1952,6 +1981,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -1952,6 +1981,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } // CraftBukkit end diff --git a/patches/server/0028-Prevent-tile-entity-and-entity-crashes.patch b/patches/server/0027-Prevent-tile-entity-and-entity-crashes.patch similarity index 95% rename from patches/server/0028-Prevent-tile-entity-and-entity-crashes.patch rename to patches/server/0027-Prevent-tile-entity-and-entity-crashes.patch index 53317d541f4e..ee6101afaf48 100644 --- a/patches/server/0028-Prevent-tile-entity-and-entity-crashes.patch +++ b/patches/server/0027-Prevent-tile-entity-and-entity-crashes.patch @@ -26,10 +26,10 @@ index 1cb128fb60636016db826ab3120d586346d88cec..8653fa072825c024e0fb620bdada4adc } diff --git a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java -index a35e3f54cbec83e8c691b6f61d4e1ac1ece6156d..5c2ac7a1de96d9b4830955c2ff108c0881b5949b 100644 +index be08224c8107aab3e9a3645a20977dd14bfff782..c518704386f14cd033307dd976455c35760d7236 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java -@@ -233,7 +233,12 @@ public abstract class BlockEntity implements io.papermc.paper.util.KeyedObject { +@@ -213,7 +213,12 @@ public abstract class BlockEntity { return minecraftkey + " // " + this.getClass().getCanonicalName(); }); if (this.level != null) { diff --git a/patches/server/0029-Configurable-top-of-nether-void-damage.patch b/patches/server/0028-Configurable-top-of-nether-void-damage.patch similarity index 94% rename from patches/server/0029-Configurable-top-of-nether-void-damage.patch rename to patches/server/0028-Configurable-top-of-nether-void-damage.patch index 75fbf7ca7c2d..4eecf0de5abd 100644 --- a/patches/server/0029-Configurable-top-of-nether-void-damage.patch +++ b/patches/server/0028-Configurable-top-of-nether-void-damage.patch @@ -29,10 +29,10 @@ index 6dec1bb96d695f28aae6517e4d78249169d2351a..1b090f2e38a8857ef74403e1f3db8c2b + } } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index a4cd7088113b60fd10e79359e5749fd15dacebe8..d5307003e50251f3c52a7d395aaea07891c83bf8 100644 +index ac540cacc1858697b54950e86e84efbff54e07a1..e9b8d4add28a8ba11eae057740c0cf057e414da2 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -648,7 +648,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -648,7 +648,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } public void checkOutOfWorld() { diff --git a/patches/server/0030-Check-online-mode-before-converting-and-renaming-pla.patch b/patches/server/0029-Check-online-mode-before-converting-and-renaming-pla.patch similarity index 100% rename from patches/server/0030-Check-online-mode-before-converting-and-renaming-pla.patch rename to patches/server/0029-Check-online-mode-before-converting-and-renaming-pla.patch diff --git a/patches/server/0031-Always-tick-falling-blocks.patch b/patches/server/0030-Always-tick-falling-blocks.patch similarity index 100% rename from patches/server/0031-Always-tick-falling-blocks.patch rename to patches/server/0030-Always-tick-falling-blocks.patch diff --git a/patches/server/0032-Configurable-end-credits.patch b/patches/server/0031-Configurable-end-credits.patch similarity index 100% rename from patches/server/0032-Configurable-end-credits.patch rename to patches/server/0031-Configurable-end-credits.patch diff --git a/patches/server/0033-Fix-lag-from-explosions-processing-dead-entities.patch b/patches/server/0032-Fix-lag-from-explosions-processing-dead-entities.patch similarity index 100% rename from patches/server/0033-Fix-lag-from-explosions-processing-dead-entities.patch rename to patches/server/0032-Fix-lag-from-explosions-processing-dead-entities.patch diff --git a/patches/server/0034-Optimize-explosions.patch b/patches/server/0033-Optimize-explosions.patch similarity index 100% rename from patches/server/0034-Optimize-explosions.patch rename to patches/server/0033-Optimize-explosions.patch diff --git a/patches/server/0035-Disable-explosion-knockback.patch b/patches/server/0034-Disable-explosion-knockback.patch similarity index 100% rename from patches/server/0035-Disable-explosion-knockback.patch rename to patches/server/0034-Disable-explosion-knockback.patch diff --git a/patches/server/0036-Disable-thunder.patch b/patches/server/0035-Disable-thunder.patch similarity index 95% rename from patches/server/0036-Disable-thunder.patch rename to patches/server/0035-Disable-thunder.patch index 59050743e61e..9026d6d2e1ba 100644 --- a/patches/server/0036-Disable-thunder.patch +++ b/patches/server/0035-Disable-thunder.patch @@ -19,7 +19,7 @@ index 5cae4a5caf9aba8c0e99f1cb6badc5e8374862c8..1a9b4b08ea906adbfa25c3963a463487 + } } diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 54416a9327ecb02627537306678122ae77da1239..b8942266379e5e513b1a814906db3b7f96c4284f 100644 +index 0eb0229125fd027025b6b44dfceddf626fc05399..9383ba7a6bc91fa73a235e3d94de8a5332ba2924 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -561,7 +561,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0037-Disable-ice-and-snow.patch b/patches/server/0036-Disable-ice-and-snow.patch similarity index 94% rename from patches/server/0037-Disable-ice-and-snow.patch rename to patches/server/0036-Disable-ice-and-snow.patch index 5a6d654b2441..0755be7364e2 100644 --- a/patches/server/0037-Disable-ice-and-snow.patch +++ b/patches/server/0036-Disable-ice-and-snow.patch @@ -19,7 +19,7 @@ index 1a9b4b08ea906adbfa25c3963a4634871d7ca2f6..ceb1602afb90fc0a23d6cc8d22fc85fa + } } diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index b8942266379e5e513b1a814906db3b7f96c4284f..5c6ba29dfd786098528d7e118c3059c9d75a9c42 100644 +index 9383ba7a6bc91fa73a235e3d94de8a5332ba2924..e330fc198705ff2a4d8503f8710e6424afc9fbbf 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -585,7 +585,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0038-Configurable-mob-spawner-tick-rate.patch b/patches/server/0037-Configurable-mob-spawner-tick-rate.patch similarity index 100% rename from patches/server/0038-Configurable-mob-spawner-tick-rate.patch rename to patches/server/0037-Configurable-mob-spawner-tick-rate.patch diff --git a/patches/server/0039-Implement-PlayerLocaleChangeEvent.patch b/patches/server/0038-Implement-PlayerLocaleChangeEvent.patch similarity index 100% rename from patches/server/0039-Implement-PlayerLocaleChangeEvent.patch rename to patches/server/0038-Implement-PlayerLocaleChangeEvent.patch diff --git a/patches/server/0040-Per-Player-View-Distance-API-placeholders.patch b/patches/server/0039-Per-Player-View-Distance-API-placeholders.patch similarity index 98% rename from patches/server/0040-Per-Player-View-Distance-API-placeholders.patch rename to patches/server/0039-Per-Player-View-Distance-API-placeholders.patch index 1025e74e8ff0..1091db72e334 100644 --- a/patches/server/0040-Per-Player-View-Distance-API-placeholders.patch +++ b/patches/server/0039-Per-Player-View-Distance-API-placeholders.patch @@ -18,7 +18,7 @@ index bb2a788d3687977a0607b83150ad1bf1eb8803f2..42e69a8e3e93e2da9f4ee576900795b8 + public final int getViewDistance() { return this.getLevel().getChunkSource().chunkMap.viewDistance - 1; } // Paper - placeholder } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 5963fa56e7dcd61336a14fa1035c6c14143989ad..4c2aad1db5a4f82e5fa5c187cb58e8c675b4d697 100644 +index 305d5cb3581764b4d89c1f2220acb5786eb8faef..1b16d5d4823086d41f00bf0ccba4e21265f51886 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1832,6 +1832,37 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0041-Add-BeaconEffectEvent.patch b/patches/server/0040-Add-BeaconEffectEvent.patch similarity index 100% rename from patches/server/0041-Add-BeaconEffectEvent.patch rename to patches/server/0040-Add-BeaconEffectEvent.patch diff --git a/patches/server/0042-Configurable-container-update-tick-rate.patch b/patches/server/0041-Configurable-container-update-tick-rate.patch similarity index 100% rename from patches/server/0042-Configurable-container-update-tick-rate.patch rename to patches/server/0041-Configurable-container-update-tick-rate.patch diff --git a/patches/server/0043-Use-UserCache-for-player-heads.patch b/patches/server/0042-Use-UserCache-for-player-heads.patch similarity index 100% rename from patches/server/0043-Use-UserCache-for-player-heads.patch rename to patches/server/0042-Use-UserCache-for-player-heads.patch diff --git a/patches/server/0044-Disable-spigot-tick-limiters.patch b/patches/server/0043-Disable-spigot-tick-limiters.patch similarity index 100% rename from patches/server/0044-Disable-spigot-tick-limiters.patch rename to patches/server/0043-Disable-spigot-tick-limiters.patch diff --git a/patches/server/0045-Add-PlayerInitialSpawnEvent.patch b/patches/server/0044-Add-PlayerInitialSpawnEvent.patch similarity index 100% rename from patches/server/0045-Add-PlayerInitialSpawnEvent.patch rename to patches/server/0044-Add-PlayerInitialSpawnEvent.patch diff --git a/patches/server/0046-Configurable-Disabling-Cat-Chest-Detection.patch b/patches/server/0045-Configurable-Disabling-Cat-Chest-Detection.patch similarity index 100% rename from patches/server/0046-Configurable-Disabling-Cat-Chest-Detection.patch rename to patches/server/0045-Configurable-Disabling-Cat-Chest-Detection.patch diff --git a/patches/server/0047-Ensure-commands-are-not-ran-async.patch b/patches/server/0046-Ensure-commands-are-not-ran-async.patch similarity index 100% rename from patches/server/0047-Ensure-commands-are-not-ran-async.patch rename to patches/server/0046-Ensure-commands-are-not-ran-async.patch diff --git a/patches/server/0048-All-chunks-are-slime-spawn-chunks-toggle.patch b/patches/server/0047-All-chunks-are-slime-spawn-chunks-toggle.patch similarity index 100% rename from patches/server/0048-All-chunks-are-slime-spawn-chunks-toggle.patch rename to patches/server/0047-All-chunks-are-slime-spawn-chunks-toggle.patch diff --git a/patches/server/0049-Expose-server-CommandMap.patch b/patches/server/0048-Expose-server-CommandMap.patch similarity index 100% rename from patches/server/0049-Expose-server-CommandMap.patch rename to patches/server/0048-Expose-server-CommandMap.patch diff --git a/patches/server/0050-Be-a-bit-more-informative-in-maxHealth-exception.patch b/patches/server/0049-Be-a-bit-more-informative-in-maxHealth-exception.patch similarity index 100% rename from patches/server/0050-Be-a-bit-more-informative-in-maxHealth-exception.patch rename to patches/server/0049-Be-a-bit-more-informative-in-maxHealth-exception.patch diff --git a/patches/server/0051-Ensure-inv-drag-is-in-bounds.patch b/patches/server/0050-Ensure-inv-drag-is-in-bounds.patch similarity index 100% rename from patches/server/0051-Ensure-inv-drag-is-in-bounds.patch rename to patches/server/0050-Ensure-inv-drag-is-in-bounds.patch diff --git a/patches/server/0052-Player-Tab-List-and-Title-APIs.patch b/patches/server/0051-Player-Tab-List-and-Title-APIs.patch similarity index 100% rename from patches/server/0052-Player-Tab-List-and-Title-APIs.patch rename to patches/server/0051-Player-Tab-List-and-Title-APIs.patch diff --git a/patches/server/0053-Add-configurable-portal-search-radius.patch b/patches/server/0052-Add-configurable-portal-search-radius.patch similarity index 94% rename from patches/server/0053-Add-configurable-portal-search-radius.patch rename to patches/server/0052-Add-configurable-portal-search-radius.patch index 4c53f428dfbb..53fe945c501c 100644 --- a/patches/server/0053-Add-configurable-portal-search-radius.patch +++ b/patches/server/0052-Add-configurable-portal-search-radius.patch @@ -23,10 +23,10 @@ index 1e3c39f0eeeb07f8d49e3651b18a152db9ccba7b..c248b66486044150c64eaddbef85fa66 + } } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index d5307003e50251f3c52a7d395aaea07891c83bf8..413de81d30fe4ee6cf7aba88805e0e536f498565 100644 +index e9b8d4add28a8ba11eae057740c0cf057e414da2..d10ae40d5999e3ea24df55465248004a1b98a287 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -2937,7 +2937,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -2917,7 +2917,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { double d0 = DimensionType.getTeleportationScale(this.level.dimensionType(), destination.dimensionType()); BlockPos blockposition = worldborder.clampToBounds(this.getX() * d0, this.getY(), this.getZ() * d0); // CraftBukkit start diff --git a/patches/server/0054-Add-velocity-warnings.patch b/patches/server/0053-Add-velocity-warnings.patch similarity index 100% rename from patches/server/0054-Add-velocity-warnings.patch rename to patches/server/0053-Add-velocity-warnings.patch diff --git a/patches/server/0055-Configurable-inter-world-teleportation-safety.patch b/patches/server/0054-Configurable-inter-world-teleportation-safety.patch similarity index 100% rename from patches/server/0055-Configurable-inter-world-teleportation-safety.patch rename to patches/server/0054-Configurable-inter-world-teleportation-safety.patch diff --git a/patches/server/0056-Add-exception-reporting-event.patch b/patches/server/0055-Add-exception-reporting-event.patch similarity index 100% rename from patches/server/0056-Add-exception-reporting-event.patch rename to patches/server/0055-Add-exception-reporting-event.patch diff --git a/patches/server/0057-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch b/patches/server/0056-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch similarity index 100% rename from patches/server/0057-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch rename to patches/server/0056-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch diff --git a/patches/server/0058-Disable-Scoreboards-for-non-players-by-default.patch b/patches/server/0057-Disable-Scoreboards-for-non-players-by-default.patch similarity index 93% rename from patches/server/0058-Disable-Scoreboards-for-non-players-by-default.patch rename to patches/server/0057-Disable-Scoreboards-for-non-players-by-default.patch index 06d44656614a..3b46f159edaf 100644 --- a/patches/server/0058-Disable-Scoreboards-for-non-players-by-default.patch +++ b/patches/server/0057-Disable-Scoreboards-for-non-players-by-default.patch @@ -25,10 +25,10 @@ index ada624b5f58381122e59568c2087cf38fd2baf3e..5b55fce59db9ac3ab6030ebe8374c514 + } } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 413de81d30fe4ee6cf7aba88805e0e536f498565..78fd9e84e24b163b4918ba0580abca18806f4988 100644 +index d10ae40d5999e3ea24df55465248004a1b98a287..68a1756e5a259fd1165d51835890127e0416dfd6 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -2577,6 +2577,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -2557,6 +2557,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @Nullable public Team getTeam() { diff --git a/patches/server/0059-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/server/0058-Add-methods-for-working-with-arrows-stuck-in-living-.patch similarity index 100% rename from patches/server/0059-Add-methods-for-working-with-arrows-stuck-in-living-.patch rename to patches/server/0058-Add-methods-for-working-with-arrows-stuck-in-living-.patch diff --git a/patches/server/0060-Chunk-Save-Reattempt.patch b/patches/server/0059-Chunk-Save-Reattempt.patch similarity index 100% rename from patches/server/0060-Chunk-Save-Reattempt.patch rename to patches/server/0059-Chunk-Save-Reattempt.patch diff --git a/patches/server/0061-Complete-resource-pack-API.patch b/patches/server/0060-Complete-resource-pack-API.patch similarity index 100% rename from patches/server/0061-Complete-resource-pack-API.patch rename to patches/server/0060-Complete-resource-pack-API.patch diff --git a/patches/server/0062-Default-loading-permissions.yml-before-plugins.patch b/patches/server/0061-Default-loading-permissions.yml-before-plugins.patch similarity index 100% rename from patches/server/0062-Default-loading-permissions.yml-before-plugins.patch rename to patches/server/0061-Default-loading-permissions.yml-before-plugins.patch diff --git a/patches/server/0063-Allow-Reloading-of-Custom-Permissions.patch b/patches/server/0062-Allow-Reloading-of-Custom-Permissions.patch similarity index 100% rename from patches/server/0063-Allow-Reloading-of-Custom-Permissions.patch rename to patches/server/0062-Allow-Reloading-of-Custom-Permissions.patch diff --git a/patches/server/0064-Remove-Metadata-on-reload.patch b/patches/server/0063-Remove-Metadata-on-reload.patch similarity index 100% rename from patches/server/0064-Remove-Metadata-on-reload.patch rename to patches/server/0063-Remove-Metadata-on-reload.patch diff --git a/patches/server/0065-Handle-Item-Meta-Inconsistencies.patch b/patches/server/0064-Handle-Item-Meta-Inconsistencies.patch similarity index 99% rename from patches/server/0065-Handle-Item-Meta-Inconsistencies.patch rename to patches/server/0064-Handle-Item-Meta-Inconsistencies.patch index 91d8e83c36d9..d0cba7fd66d1 100644 --- a/patches/server/0065-Handle-Item-Meta-Inconsistencies.patch +++ b/patches/server/0064-Handle-Item-Meta-Inconsistencies.patch @@ -203,7 +203,7 @@ index e88df908377450964ae5b6ff97ee97bd2f09c05f..ba70ac49222c517a38e20e86cee1fd38 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 39d2cd4acbce96cd7b9bd76bddf85b9b8729855a..51d37a8963a2f8f5381bf802e28e5dfcdcc27eaa 100644 +index 911a732065a908545ac6a7c10262980a59bd157e..3f34d3989df1fedf625dc2bd767794067d8a0c06 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/0066-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/patches/server/0065-Configurable-Non-Player-Arrow-Despawn-Rate.patch similarity index 100% rename from patches/server/0066-Configurable-Non-Player-Arrow-Despawn-Rate.patch rename to patches/server/0065-Configurable-Non-Player-Arrow-Despawn-Rate.patch diff --git a/patches/server/0067-Add-World-Util-Methods.patch b/patches/server/0066-Add-World-Util-Methods.patch similarity index 96% rename from patches/server/0067-Add-World-Util-Methods.patch rename to patches/server/0066-Add-World-Util-Methods.patch index 01e0d5c51dd2..e777866fe19f 100644 --- a/patches/server/0067-Add-World-Util-Methods.patch +++ b/patches/server/0066-Add-World-Util-Methods.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add World Util Methods Methods that can be used for other patches to help improve logic. diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 5c6ba29dfd786098528d7e118c3059c9d75a9c42..0507e0fdbc2aae621a8078a939ad10b5dab33f64 100644 +index e330fc198705ff2a4d8503f8710e6424afc9fbbf..780afec80f90473beb4ea585f514ea7727344b9f 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -209,7 +209,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0068-Custom-replacement-for-eaten-items.patch b/patches/server/0067-Custom-replacement-for-eaten-items.patch similarity index 100% rename from patches/server/0068-Custom-replacement-for-eaten-items.patch rename to patches/server/0067-Custom-replacement-for-eaten-items.patch diff --git a/patches/server/0069-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/patches/server/0068-handle-NaN-health-absorb-values-and-repair-bad-data.patch similarity index 100% rename from patches/server/0069-handle-NaN-health-absorb-values-and-repair-bad-data.patch rename to patches/server/0068-handle-NaN-health-absorb-values-and-repair-bad-data.patch diff --git a/patches/server/0070-Use-a-Shared-Random-for-Entities.patch b/patches/server/0069-Use-a-Shared-Random-for-Entities.patch similarity index 93% rename from patches/server/0070-Use-a-Shared-Random-for-Entities.patch rename to patches/server/0069-Use-a-Shared-Random-for-Entities.patch index 3d805466e84a..81647eb019ca 100644 --- a/patches/server/0070-Use-a-Shared-Random-for-Entities.patch +++ b/patches/server/0069-Use-a-Shared-Random-for-Entities.patch @@ -6,10 +6,10 @@ 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 78fd9e84e24b163b4918ba0580abca18806f4988..8e746391d6e3393a19e0f0cb3b28b6722df55510 100644 +index 68a1756e5a259fd1165d51835890127e0416dfd6..d400b612557cfc976e9644a740be94757e0d20bb 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -155,6 +155,21 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -155,6 +155,21 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { return tag.contains("Bukkit.updateLevel") && tag.getInt("Bukkit.updateLevel") >= level; } @@ -31,7 +31,7 @@ index 78fd9e84e24b163b4918ba0580abca18806f4988..8e746391d6e3393a19e0f0cb3b28b672 private CraftEntity bukkitEntity; public CraftEntity getBukkitEntity() { -@@ -342,7 +357,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -342,7 +357,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { this.bb = Entity.INITIAL_AABB; this.stuckSpeedMultiplier = Vec3.ZERO; this.nextStep = 1.0F; diff --git a/patches/server/0071-Configurable-spawn-chances-for-skeleton-horses.patch b/patches/server/0070-Configurable-spawn-chances-for-skeleton-horses.patch similarity index 96% rename from patches/server/0071-Configurable-spawn-chances-for-skeleton-horses.patch rename to patches/server/0070-Configurable-spawn-chances-for-skeleton-horses.patch index 6fd7e8e73464..453b58dc0eb0 100644 --- a/patches/server/0071-Configurable-spawn-chances-for-skeleton-horses.patch +++ b/patches/server/0070-Configurable-spawn-chances-for-skeleton-horses.patch @@ -22,7 +22,7 @@ index 71c672eafdce3547eaeb8e31fddcb142ad213094..aa8cd5965632626e4cbd4952acf9b349 + } } diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 0507e0fdbc2aae621a8078a939ad10b5dab33f64..04816aea9c3a9e999851694fc8485ead586520f8 100644 +index 780afec80f90473beb4ea585f514ea7727344b9f..f70b70eb0505aa1efb115e0e5a45a068244fc755 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -565,7 +565,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0072-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/server/0071-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch similarity index 100% rename from patches/server/0072-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch rename to patches/server/0071-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch diff --git a/patches/server/0073-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/patches/server/0072-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch similarity index 98% rename from patches/server/0073-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch rename to patches/server/0072-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch index 6cbf5d62c4ad..5c42084c66f5 100644 --- a/patches/server/0073-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch +++ b/patches/server/0072-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch @@ -18,7 +18,7 @@ index 400a59336300b189a1b86621b53817940f9a599e..16dbd40ab7394450fd97ced74954ae15 this.profiler.push(() -> { return worldserver + " " + worldserver.dimension().location(); diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 04816aea9c3a9e999851694fc8485ead586520f8..06c182e04e1e046d8e5623d5422a2732cbfec78b 100644 +index f70b70eb0505aa1efb115e0e5a45a068244fc755..93c967efbcdbc44f3729d7a70e90847212daa647 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -208,6 +208,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0074-Entity-AddTo-RemoveFrom-World-Events.patch b/patches/server/0073-Entity-AddTo-RemoveFrom-World-Events.patch similarity index 100% rename from patches/server/0074-Entity-AddTo-RemoveFrom-World-Events.patch rename to patches/server/0073-Entity-AddTo-RemoveFrom-World-Events.patch diff --git a/patches/server/0075-Configurable-Chunk-Inhabited-Time.patch b/patches/server/0074-Configurable-Chunk-Inhabited-Time.patch similarity index 100% rename from patches/server/0075-Configurable-Chunk-Inhabited-Time.patch rename to patches/server/0074-Configurable-Chunk-Inhabited-Time.patch diff --git a/patches/server/0076-EntityPathfindEvent.patch b/patches/server/0075-EntityPathfindEvent.patch similarity index 100% rename from patches/server/0076-EntityPathfindEvent.patch rename to patches/server/0075-EntityPathfindEvent.patch diff --git a/patches/server/0077-Sanitise-RegionFileCache-and-make-configurable.patch b/patches/server/0076-Sanitise-RegionFileCache-and-make-configurable.patch similarity index 100% rename from patches/server/0077-Sanitise-RegionFileCache-and-make-configurable.patch rename to patches/server/0076-Sanitise-RegionFileCache-and-make-configurable.patch diff --git a/patches/server/0078-Do-not-load-chunks-for-Pathfinding.patch b/patches/server/0077-Do-not-load-chunks-for-Pathfinding.patch similarity index 100% rename from patches/server/0078-Do-not-load-chunks-for-Pathfinding.patch rename to patches/server/0077-Do-not-load-chunks-for-Pathfinding.patch diff --git a/patches/server/0079-Add-PlayerUseUnknownEntityEvent.patch b/patches/server/0078-Add-PlayerUseUnknownEntityEvent.patch similarity index 100% rename from patches/server/0079-Add-PlayerUseUnknownEntityEvent.patch rename to patches/server/0078-Add-PlayerUseUnknownEntityEvent.patch diff --git a/patches/server/0080-Configurable-Grass-Spread-Tick-Rate.patch b/patches/server/0079-Configurable-Grass-Spread-Tick-Rate.patch similarity index 100% rename from patches/server/0080-Configurable-Grass-Spread-Tick-Rate.patch rename to patches/server/0079-Configurable-Grass-Spread-Tick-Rate.patch diff --git a/patches/server/0081-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/patches/server/0080-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch similarity index 100% rename from patches/server/0081-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch rename to patches/server/0080-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch diff --git a/patches/server/0082-Optimize-DataBits.patch b/patches/server/0081-Optimize-DataBits.patch similarity index 100% rename from patches/server/0082-Optimize-DataBits.patch rename to patches/server/0081-Optimize-DataBits.patch diff --git a/patches/server/0083-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/patches/server/0082-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch similarity index 100% rename from patches/server/0083-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch rename to patches/server/0082-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch diff --git a/patches/server/0084-Configurable-Player-Collision.patch b/patches/server/0083-Configurable-Player-Collision.patch similarity index 100% rename from patches/server/0084-Configurable-Player-Collision.patch rename to patches/server/0083-Configurable-Player-Collision.patch diff --git a/patches/server/0085-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/patches/server/0084-Add-handshake-event-to-allow-plugins-to-handle-clien.patch similarity index 100% rename from patches/server/0085-Add-handshake-event-to-allow-plugins-to-handle-clien.patch rename to patches/server/0084-Add-handshake-event-to-allow-plugins-to-handle-clien.patch diff --git a/patches/server/0086-Configurable-RCON-IP-address.patch b/patches/server/0085-Configurable-RCON-IP-address.patch similarity index 100% rename from patches/server/0086-Configurable-RCON-IP-address.patch rename to patches/server/0085-Configurable-RCON-IP-address.patch diff --git a/patches/server/0087-EntityRegainHealthEvent-isFastRegen-API.patch b/patches/server/0086-EntityRegainHealthEvent-isFastRegen-API.patch similarity index 100% rename from patches/server/0087-EntityRegainHealthEvent-isFastRegen-API.patch rename to patches/server/0086-EntityRegainHealthEvent-isFastRegen-API.patch diff --git a/patches/server/0088-Add-ability-to-configure-frosted_ice-properties.patch b/patches/server/0087-Add-ability-to-configure-frosted_ice-properties.patch similarity index 100% rename from patches/server/0088-Add-ability-to-configure-frosted_ice-properties.patch rename to patches/server/0087-Add-ability-to-configure-frosted_ice-properties.patch diff --git a/patches/server/0089-remove-null-possibility-for-getServer-singleton.patch b/patches/server/0088-remove-null-possibility-for-getServer-singleton.patch similarity index 100% rename from patches/server/0089-remove-null-possibility-for-getServer-singleton.patch rename to patches/server/0088-remove-null-possibility-for-getServer-singleton.patch diff --git a/patches/server/0090-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/0089-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch similarity index 100% rename from patches/server/0090-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch rename to patches/server/0089-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch diff --git a/patches/server/0091-LootTable-API-Replenishable-Lootables-Feature.patch b/patches/server/0090-LootTable-API-Replenishable-Lootables-Feature.patch similarity index 99% rename from patches/server/0091-LootTable-API-Replenishable-Lootables-Feature.patch rename to patches/server/0090-LootTable-API-Replenishable-Lootables-Feature.patch index 897d43d9c20b..5f0cd44b2b11 100644 --- a/patches/server/0091-LootTable-API-Replenishable-Lootables-Feature.patch +++ b/patches/server/0090-LootTable-API-Replenishable-Lootables-Feature.patch @@ -515,10 +515,10 @@ index 0000000000000000000000000000000000000000..3377b86c337d0234bbb9b0349e4034a7 + } +} diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 8e746391d6e3393a19e0f0cb3b28b6722df55510..6436ab09944ba1bec7f9ae011078898ac4d55f9e 100644 +index d400b612557cfc976e9644a740be94757e0d20bb..5a6aa26ee937a456ede56a9b18cf3bf58aba892d 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -170,6 +170,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -170,6 +170,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { }; // Paper end diff --git a/patches/server/0092-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/patches/server/0091-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch similarity index 100% rename from patches/server/0092-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch rename to patches/server/0091-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch diff --git a/patches/server/0093-System-property-for-disabling-watchdoge.patch b/patches/server/0092-System-property-for-disabling-watchdoge.patch similarity index 100% rename from patches/server/0093-System-property-for-disabling-watchdoge.patch rename to patches/server/0092-System-property-for-disabling-watchdoge.patch diff --git a/patches/server/0094-Async-GameProfileCache-saving.patch b/patches/server/0093-Async-GameProfileCache-saving.patch similarity index 100% rename from patches/server/0094-Async-GameProfileCache-saving.patch rename to patches/server/0093-Async-GameProfileCache-saving.patch diff --git a/patches/server/0095-Optional-TNT-doesn-t-move-in-water.patch b/patches/server/0094-Optional-TNT-doesn-t-move-in-water.patch similarity index 100% rename from patches/server/0095-Optional-TNT-doesn-t-move-in-water.patch rename to patches/server/0094-Optional-TNT-doesn-t-move-in-water.patch diff --git a/patches/server/0096-Faster-redstone-torch-rapid-clock-removal.patch b/patches/server/0095-Faster-redstone-torch-rapid-clock-removal.patch similarity index 100% rename from patches/server/0096-Faster-redstone-torch-rapid-clock-removal.patch rename to patches/server/0095-Faster-redstone-torch-rapid-clock-removal.patch diff --git a/patches/server/0097-Add-server-name-parameter.patch b/patches/server/0096-Add-server-name-parameter.patch similarity index 90% rename from patches/server/0097-Add-server-name-parameter.patch rename to patches/server/0096-Add-server-name-parameter.patch index b7f8d4773407..4c801e60c347 100644 --- a/patches/server/0097-Add-server-name-parameter.patch +++ b/patches/server/0096-Add-server-name-parameter.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add server-name parameter diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 1ea304aaf85ada7737f62248f7b8cd44c800505e..ff36d930a5fade32942a11f378d1c187f8f9f01a 100644 +index a0ac6ba17a46bac4c5363a32e078ab89b260bac8..b3d62affc6558d2c3082a75793ebd8b521eb1df6 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -149,6 +149,14 @@ public class Main { diff --git a/patches/server/0098-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch b/patches/server/0097-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch similarity index 100% rename from patches/server/0098-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch rename to patches/server/0097-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch diff --git a/patches/server/0099-Fix-Old-Sign-Conversion.patch b/patches/server/0098-Fix-Old-Sign-Conversion.patch similarity index 94% rename from patches/server/0099-Fix-Old-Sign-Conversion.patch rename to patches/server/0098-Fix-Old-Sign-Conversion.patch index eb04571684c5..a26c037a5a6a 100644 --- a/patches/server/0099-Fix-Old-Sign-Conversion.patch +++ b/patches/server/0098-Fix-Old-Sign-Conversion.patch @@ -9,10 +9,10 @@ Subject: [PATCH] Fix Old Sign Conversion This causes Igloos and such to render broken signs. We fix this by ignoring sign conversion for Defined Structures diff --git a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java -index 5c2ac7a1de96d9b4830955c2ff108c0881b5949b..32a2fbf4a11a84d5a55e02d3ba21e6f4430379c0 100644 +index c518704386f14cd033307dd976455c35760d7236..148e79ae4e24fe16dbbb17550c3f258d4362c266 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java -@@ -32,6 +32,7 @@ public abstract class BlockEntity implements io.papermc.paper.util.KeyedObject { +@@ -32,6 +32,7 @@ public abstract class BlockEntity { private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry(); public CraftPersistentDataContainer persistentDataContainer; // CraftBukkit end diff --git a/patches/server/0100-Avoid-blocking-on-Network-Manager-creation.patch b/patches/server/0099-Avoid-blocking-on-Network-Manager-creation.patch similarity index 100% rename from patches/server/0100-Avoid-blocking-on-Network-Manager-creation.patch rename to patches/server/0099-Avoid-blocking-on-Network-Manager-creation.patch diff --git a/patches/server/0101-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/patches/server/0100-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch similarity index 92% rename from patches/server/0101-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch rename to patches/server/0100-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch index fc115189d5bd..cd84d9aaf9cf 100644 --- a/patches/server/0101-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch +++ b/patches/server/0100-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't lookup game profiles that have no UUID and no name diff --git a/src/main/java/net/minecraft/server/players/GameProfileCache.java b/src/main/java/net/minecraft/server/players/GameProfileCache.java -index 981845707f47a674a912bf84509397a42b973e74..920a1ded577aa1c265137dd72a6f3d13a431d5c8 100644 +index fdf2557ed19c6ba9c64eddd2876b2434925dcf36..d8acbce8c2f0cc9a93fff044b25629021bf90f75 100644 --- a/src/main/java/net/minecraft/server/players/GameProfileCache.java +++ b/src/main/java/net/minecraft/server/players/GameProfileCache.java @@ -101,7 +101,7 @@ public class GameProfileCache { diff --git a/patches/server/0102-Add-setting-for-proxy-online-mode-status.patch b/patches/server/0101-Add-setting-for-proxy-online-mode-status.patch similarity index 100% rename from patches/server/0102-Add-setting-for-proxy-online-mode-status.patch rename to patches/server/0101-Add-setting-for-proxy-online-mode-status.patch diff --git a/patches/server/0103-Optimise-BlockState-s-hashCode-equals.patch b/patches/server/0102-Optimise-BlockState-s-hashCode-equals.patch similarity index 100% rename from patches/server/0103-Optimise-BlockState-s-hashCode-equals.patch rename to patches/server/0102-Optimise-BlockState-s-hashCode-equals.patch diff --git a/patches/server/0104-Configurable-packet-in-spam-threshold.patch b/patches/server/0103-Configurable-packet-in-spam-threshold.patch similarity index 100% rename from patches/server/0104-Configurable-packet-in-spam-threshold.patch rename to patches/server/0103-Configurable-packet-in-spam-threshold.patch diff --git a/patches/server/0105-Configurable-flying-kick-messages.patch b/patches/server/0104-Configurable-flying-kick-messages.patch similarity index 96% rename from patches/server/0105-Configurable-flying-kick-messages.patch rename to patches/server/0104-Configurable-flying-kick-messages.patch index f39db8c39e5b..c2c87428ccd9 100644 --- a/patches/server/0105-Configurable-flying-kick-messages.patch +++ b/patches/server/0104-Configurable-flying-kick-messages.patch @@ -21,7 +21,7 @@ index 081761cd2177bd3cea5a489a85e7088c46d12725..6f36c7a233ec0335d713523e87a28ba9 + } } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 350a8194ef52242be6a70a16d2692e17216178fb..47d8ae1eb7edea51a81ddfaef3cd1c4b06ad12a3 100644 +index 66fa0c05da7b5ca6a9a89b45bd796b50afe55a39..2259f6d9be2390aaa8ffc43b3c2e37b0036b43ac 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -300,7 +300,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0106-Add-EntityZapEvent.patch b/patches/server/0105-Add-EntityZapEvent.patch similarity index 100% rename from patches/server/0106-Add-EntityZapEvent.patch rename to patches/server/0105-Add-EntityZapEvent.patch diff --git a/patches/server/0107-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch b/patches/server/0106-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch similarity index 100% rename from patches/server/0107-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch rename to patches/server/0106-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch diff --git a/patches/server/0108-Cache-user-authenticator-threads.patch b/patches/server/0107-Cache-user-authenticator-threads.patch similarity index 100% rename from patches/server/0108-Cache-user-authenticator-threads.patch rename to patches/server/0107-Cache-user-authenticator-threads.patch diff --git a/patches/server/0109-Allow-Reloading-of-Command-Aliases.patch b/patches/server/0108-Allow-Reloading-of-Command-Aliases.patch similarity index 100% rename from patches/server/0109-Allow-Reloading-of-Command-Aliases.patch rename to patches/server/0108-Allow-Reloading-of-Command-Aliases.patch diff --git a/patches/server/0110-Add-source-to-PlayerExpChangeEvent.patch b/patches/server/0109-Add-source-to-PlayerExpChangeEvent.patch similarity index 100% rename from patches/server/0110-Add-source-to-PlayerExpChangeEvent.patch rename to patches/server/0109-Add-source-to-PlayerExpChangeEvent.patch diff --git a/patches/server/0111-Add-ProjectileCollideEvent.patch b/patches/server/0110-Add-ProjectileCollideEvent.patch similarity index 100% rename from patches/server/0111-Add-ProjectileCollideEvent.patch rename to patches/server/0110-Add-ProjectileCollideEvent.patch diff --git a/patches/server/0112-Prevent-Pathfinding-out-of-World-Border.patch b/patches/server/0111-Prevent-Pathfinding-out-of-World-Border.patch similarity index 100% rename from patches/server/0112-Prevent-Pathfinding-out-of-World-Border.patch rename to patches/server/0111-Prevent-Pathfinding-out-of-World-Border.patch diff --git a/patches/server/0113-Optimize-World.isLoaded-BlockPosition-Z.patch b/patches/server/0112-Optimize-World.isLoaded-BlockPosition-Z.patch similarity index 100% rename from patches/server/0113-Optimize-World.isLoaded-BlockPosition-Z.patch rename to patches/server/0112-Optimize-World.isLoaded-BlockPosition-Z.patch diff --git a/patches/server/0114-Bound-Treasure-Maps-to-World-Border.patch b/patches/server/0113-Bound-Treasure-Maps-to-World-Border.patch similarity index 100% rename from patches/server/0114-Bound-Treasure-Maps-to-World-Border.patch rename to patches/server/0113-Bound-Treasure-Maps-to-World-Border.patch diff --git a/patches/server/0115-Configurable-Cartographer-Treasure-Maps.patch b/patches/server/0114-Configurable-Cartographer-Treasure-Maps.patch similarity index 100% rename from patches/server/0115-Configurable-Cartographer-Treasure-Maps.patch rename to patches/server/0114-Configurable-Cartographer-Treasure-Maps.patch diff --git a/patches/server/0116-Optimize-ItemStack.isEmpty.patch b/patches/server/0115-Optimize-ItemStack.isEmpty.patch similarity index 100% rename from patches/server/0116-Optimize-ItemStack.isEmpty.patch rename to patches/server/0115-Optimize-ItemStack.isEmpty.patch diff --git a/patches/server/0117-Add-API-methods-to-control-if-armour-stands-can-move.patch b/patches/server/0116-Add-API-methods-to-control-if-armour-stands-can-move.patch similarity index 100% rename from patches/server/0117-Add-API-methods-to-control-if-armour-stands-can-move.patch rename to patches/server/0116-Add-API-methods-to-control-if-armour-stands-can-move.patch diff --git a/patches/server/0118-String-based-Action-Bar-API.patch b/patches/server/0117-String-based-Action-Bar-API.patch similarity index 100% rename from patches/server/0118-String-based-Action-Bar-API.patch rename to patches/server/0117-String-based-Action-Bar-API.patch diff --git a/patches/server/0119-Properly-fix-item-duplication-bug.patch b/patches/server/0118-Properly-fix-item-duplication-bug.patch similarity index 100% rename from patches/server/0119-Properly-fix-item-duplication-bug.patch rename to patches/server/0118-Properly-fix-item-duplication-bug.patch diff --git a/patches/server/0120-Firework-API-s.patch b/patches/server/0119-Firework-API-s.patch similarity index 100% rename from patches/server/0120-Firework-API-s.patch rename to patches/server/0119-Firework-API-s.patch diff --git a/patches/server/0121-PlayerTeleportEndGatewayEvent.patch b/patches/server/0120-PlayerTeleportEndGatewayEvent.patch similarity index 100% rename from patches/server/0121-PlayerTeleportEndGatewayEvent.patch rename to patches/server/0120-PlayerTeleportEndGatewayEvent.patch diff --git a/patches/server/0122-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/server/0121-Provide-E-TE-Chunk-count-stat-methods.patch similarity index 97% rename from patches/server/0122-Provide-E-TE-Chunk-count-stat-methods.patch rename to patches/server/0121-Provide-E-TE-Chunk-count-stat-methods.patch index 676ea3eba38d..d59da0cee814 100644 --- a/patches/server/0122-Provide-E-TE-Chunk-count-stat-methods.patch +++ b/patches/server/0121-Provide-E-TE-Chunk-count-stat-methods.patch @@ -20,7 +20,7 @@ index 567cc347af00eed98fdf8832ef6c9468332b94e4..d22b7edc9ddea765c11e82346afd3942 private boolean tickingBlockEntities; public final Thread thread; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 4c2aad1db5a4f82e5fa5c187cb58e8c675b4d697..7d65bed4a6571594b5d47e4debd01813a272814e 100644 +index 1b16d5d4823086d41f00bf0ccba4e21265f51886..fbb159f1300f4bcd0f85ec348f16de3e80af686f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -144,6 +144,57 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0123-Enforce-Sync-Player-Saves.patch b/patches/server/0122-Enforce-Sync-Player-Saves.patch similarity index 100% rename from patches/server/0123-Enforce-Sync-Player-Saves.patch rename to patches/server/0122-Enforce-Sync-Player-Saves.patch diff --git a/patches/server/0124-Don-t-allow-entities-to-ride-themselves-572.patch b/patches/server/0123-Don-t-allow-entities-to-ride-themselves-572.patch similarity index 80% rename from patches/server/0124-Don-t-allow-entities-to-ride-themselves-572.patch rename to patches/server/0123-Don-t-allow-entities-to-ride-themselves-572.patch index fc09d5c62795..bd3b9c3908e1 100644 --- a/patches/server/0124-Don-t-allow-entities-to-ride-themselves-572.patch +++ b/patches/server/0123-Don-t-allow-entities-to-ride-themselves-572.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Don't allow entities to ride themselves - #572 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 6436ab09944ba1bec7f9ae011078898ac4d55f9e..d6501d075b090abb8166dfda10c80d63b67d8e42 100644 +index 5a6aa26ee937a456ede56a9b18cf3bf58aba892d..081a95e3bb448a44565f6e75ebbc18bbc5fe1b18 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -2260,6 +2260,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -2240,6 +2240,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } protected boolean addPassenger(Entity entity) { // CraftBukkit 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 d4b310eadfbb..c43b8dc60040 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 @@ -230,7 +230,7 @@ index b9a0fc52460ce0c50deea25112dee20c977e99c5..d7cb3d8b37f225ee4796246aa907da10 } diff --git a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java -index 24192a91d9f5c890a316ec150d4aec84073cb61a..8162ead7ca524f80b8b4a846273266a837db5924 100644 +index 34ee9c22ed5bca2406588a4b6a045bbc51c64920..ce43f33ffd8726d3fb592348ac1b10f37645eb0e 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java +++ b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java @@ -513,7 +513,7 @@ public class FishingHook extends Projectile { diff --git a/patches/server/0126-Cap-Entity-Collisions.patch b/patches/server/0125-Cap-Entity-Collisions.patch similarity index 95% rename from patches/server/0126-Cap-Entity-Collisions.patch rename to patches/server/0125-Cap-Entity-Collisions.patch index ca4502f8c77f..5e456a904c5f 100644 --- a/patches/server/0126-Cap-Entity-Collisions.patch +++ b/patches/server/0125-Cap-Entity-Collisions.patch @@ -27,10 +27,10 @@ index 5183c756289db3600d04d473c20d08768af91ea9..72501b05d1d5d9304e4ac31bbf694f5c + } } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index d6501d075b090abb8166dfda10c80d63b67d8e42..357f10f8daa93e0222ced3e9b9c5930ad0a5658c 100644 +index 081a95e3bb448a44565f6e75ebbc18bbc5fe1b18..005c44bbabf706d7f35476219153ed91e32665d2 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -317,6 +317,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -317,6 +317,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { public void inactiveTick() { } // Spigot end // Paper start 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-Do-not-let-armorstands-drown.patch b/patches/server/0127-Do-not-let-armorstands-drown.patch similarity index 100% rename from patches/server/0128-Do-not-let-armorstands-drown.patch rename to patches/server/0127-Do-not-let-armorstands-drown.patch diff --git a/patches/server/0129-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/patches/server/0128-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch similarity index 100% rename from patches/server/0129-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch rename to patches/server/0128-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch diff --git a/patches/server/0130-Properly-handle-async-calls-to-restart-the-server.patch b/patches/server/0129-Properly-handle-async-calls-to-restart-the-server.patch similarity index 100% rename from patches/server/0130-Properly-handle-async-calls-to-restart-the-server.patch rename to patches/server/0129-Properly-handle-async-calls-to-restart-the-server.patch diff --git a/patches/server/0131-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/patches/server/0130-Add-option-to-make-parrots-stay-on-shoulders-despite.patch similarity index 100% rename from patches/server/0131-Add-option-to-make-parrots-stay-on-shoulders-despite.patch rename to patches/server/0130-Add-option-to-make-parrots-stay-on-shoulders-despite.patch diff --git a/patches/server/0132-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/server/0131-Add-configuration-option-to-prevent-player-names-fro.patch similarity index 100% rename from patches/server/0132-Add-configuration-option-to-prevent-player-names-fro.patch rename to patches/server/0131-Add-configuration-option-to-prevent-player-names-fro.patch diff --git a/patches/server/0133-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/server/0132-Use-TerminalConsoleAppender-for-console-improvements.patch similarity index 99% rename from patches/server/0133-Use-TerminalConsoleAppender-for-console-improvements.patch rename to patches/server/0132-Use-TerminalConsoleAppender-for-console-improvements.patch index a04e5151aadc..5be5b1a6782f 100644 --- a/patches/server/0133-Use-TerminalConsoleAppender-for-console-improvements.patch +++ b/patches/server/0132-Use-TerminalConsoleAppender-for-console-improvements.patch @@ -262,7 +262,7 @@ index 57999f25a820cc9b395f6c3037e0fcce9bc4a80c..044609ec67ea3fc6240437807a329e13 @Override public PluginCommand getPluginCommand(String name) { diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index ff36d930a5fade32942a11f378d1c187f8f9f01a..1e49bff6e1ccd7cf8405785c73f56caada94e399 100644 +index b3d62affc6558d2c3082a75793ebd8b521eb1df6..75789a104025469fbee0d934396f65e5e47e0e41 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -12,7 +12,7 @@ import java.util.logging.Level; diff --git a/patches/server/0134-provide-a-configurable-option-to-disable-creeper-lin.patch b/patches/server/0133-provide-a-configurable-option-to-disable-creeper-lin.patch similarity index 100% rename from patches/server/0134-provide-a-configurable-option-to-disable-creeper-lin.patch rename to patches/server/0133-provide-a-configurable-option-to-disable-creeper-lin.patch diff --git a/patches/server/0135-Item-canEntityPickup.patch b/patches/server/0134-Item-canEntityPickup.patch similarity index 100% rename from patches/server/0135-Item-canEntityPickup.patch rename to patches/server/0134-Item-canEntityPickup.patch diff --git a/patches/server/0136-PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/server/0135-PlayerPickupItemEvent-setFlyAtPlayer.patch similarity index 100% rename from patches/server/0136-PlayerPickupItemEvent-setFlyAtPlayer.patch rename to patches/server/0135-PlayerPickupItemEvent-setFlyAtPlayer.patch diff --git a/patches/server/0137-PlayerAttemptPickupItemEvent.patch b/patches/server/0136-PlayerAttemptPickupItemEvent.patch similarity index 100% rename from patches/server/0137-PlayerAttemptPickupItemEvent.patch rename to patches/server/0136-PlayerAttemptPickupItemEvent.patch diff --git a/patches/server/0138-Add-UnknownCommandEvent.patch b/patches/server/0137-Add-UnknownCommandEvent.patch similarity index 100% rename from patches/server/0138-Add-UnknownCommandEvent.patch rename to patches/server/0137-Add-UnknownCommandEvent.patch diff --git a/patches/server/0139-Basic-PlayerProfile-API.patch b/patches/server/0138-Basic-PlayerProfile-API.patch similarity index 100% rename from patches/server/0139-Basic-PlayerProfile-API.patch rename to patches/server/0138-Basic-PlayerProfile-API.patch diff --git a/patches/server/0140-Shoulder-Entities-Release-API.patch b/patches/server/0139-Shoulder-Entities-Release-API.patch similarity index 100% rename from patches/server/0140-Shoulder-Entities-Release-API.patch rename to patches/server/0139-Shoulder-Entities-Release-API.patch diff --git a/patches/server/0141-Profile-Lookup-Events.patch b/patches/server/0140-Profile-Lookup-Events.patch similarity index 100% rename from patches/server/0141-Profile-Lookup-Events.patch rename to patches/server/0140-Profile-Lookup-Events.patch diff --git a/patches/server/0142-Block-player-logins-during-server-shutdown.patch b/patches/server/0141-Block-player-logins-during-server-shutdown.patch similarity index 100% rename from patches/server/0142-Block-player-logins-during-server-shutdown.patch rename to patches/server/0141-Block-player-logins-during-server-shutdown.patch diff --git a/patches/server/0143-Entity-fromMobSpawner.patch b/patches/server/0142-Entity-fromMobSpawner.patch similarity index 93% rename from patches/server/0143-Entity-fromMobSpawner.patch rename to patches/server/0142-Entity-fromMobSpawner.patch index 012ca3be7c8c..026dea506c1f 100644 --- a/patches/server/0143-Entity-fromMobSpawner.patch +++ b/patches/server/0142-Entity-fromMobSpawner.patch @@ -5,10 +5,10 @@ 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 357f10f8daa93e0222ced3e9b9c5930ad0a5658c..d9e2cf70c4fcbf2d02a8bba00be28528df76b645 100644 +index 005c44bbabf706d7f35476219153ed91e32665d2..ed2187ea8e0b30c7bcb473a50dd33781ef4ac8ae 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -318,6 +318,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -318,6 +318,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { // Spigot end // Paper start protected int numCollisions = 0; // Paper @@ -16,7 +16,7 @@ index 357f10f8daa93e0222ced3e9b9c5930ad0a5658c..d9e2cf70c4fcbf2d02a8bba00be28528 @javax.annotation.Nullable private org.bukkit.util.Vector origin; @javax.annotation.Nullable -@@ -1871,6 +1872,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -1871,6 +1872,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } nbt.put("Paper.Origin", this.newDoubleList(origin.getX(), origin.getY(), origin.getZ())); } @@ -27,7 +27,7 @@ index 357f10f8daa93e0222ced3e9b9c5930ad0a5658c..d9e2cf70c4fcbf2d02a8bba00be28528 // Paper end return nbt; } catch (Throwable throwable) { -@@ -2014,6 +2019,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -2014,6 +2019,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { this.originWorld = originWorld; origin = new org.bukkit.util.Vector(originTag.getDouble(0), originTag.getDouble(1), originTag.getDouble(2)); } diff --git a/patches/server/0144-Improve-the-Saddle-API-for-Horses.patch b/patches/server/0143-Improve-the-Saddle-API-for-Horses.patch similarity index 100% rename from patches/server/0144-Improve-the-Saddle-API-for-Horses.patch rename to patches/server/0143-Improve-the-Saddle-API-for-Horses.patch diff --git a/patches/server/0145-Implement-ensureServerConversions-API.patch b/patches/server/0144-Implement-ensureServerConversions-API.patch similarity index 100% rename from patches/server/0145-Implement-ensureServerConversions-API.patch rename to patches/server/0144-Implement-ensureServerConversions-API.patch diff --git a/patches/server/0146-Implement-getI18NDisplayName.patch b/patches/server/0145-Implement-getI18NDisplayName.patch similarity index 100% rename from patches/server/0146-Implement-getI18NDisplayName.patch rename to patches/server/0145-Implement-getI18NDisplayName.patch diff --git a/patches/server/0147-ProfileWhitelistVerifyEvent.patch b/patches/server/0146-ProfileWhitelistVerifyEvent.patch similarity index 100% rename from patches/server/0147-ProfileWhitelistVerifyEvent.patch rename to patches/server/0146-ProfileWhitelistVerifyEvent.patch diff --git a/patches/server/0148-Fix-this-stupid-bullshit.patch b/patches/server/0147-Fix-this-stupid-bullshit.patch similarity index 96% rename from patches/server/0148-Fix-this-stupid-bullshit.patch rename to patches/server/0147-Fix-this-stupid-bullshit.patch index e76bb5784fed..880976788ecd 100644 --- a/patches/server/0148-Fix-this-stupid-bullshit.patch +++ b/patches/server/0147-Fix-this-stupid-bullshit.patch @@ -31,7 +31,7 @@ index 9f23951f6b4c17c2a968fdcb3e8f9f65c296f34a..248b7ca7dbd75d4eab52fb937cace2b2 Bootstrap.isBootstrapped = true; if (Registry.REGISTRY.keySet().isEmpty()) { diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index a168fd9daeca1bc5f390558eebaa3ee1a264f3ca..2695f047a2e3c7acb67487c2b547cfbd6d50c29c 100644 +index 75789a104025469fbee0d934396f65e5e47e0e41..ee9f7f42a0eeb3c6f9930e227eeda26ba362e7f4 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -234,10 +234,12 @@ public class Main { diff --git a/patches/server/0149-LivingEntity-setKiller.patch b/patches/server/0148-LivingEntity-setKiller.patch similarity index 100% rename from patches/server/0149-LivingEntity-setKiller.patch rename to patches/server/0148-LivingEntity-setKiller.patch diff --git a/patches/server/0150-Ocelot-despawns-should-honor-nametags-and-leash.patch b/patches/server/0149-Ocelot-despawns-should-honor-nametags-and-leash.patch similarity index 100% rename from patches/server/0150-Ocelot-despawns-should-honor-nametags-and-leash.patch rename to patches/server/0149-Ocelot-despawns-should-honor-nametags-and-leash.patch diff --git a/patches/server/0151-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/patches/server/0150-Reset-spawner-timer-when-spawner-event-is-cancelled.patch similarity index 100% rename from patches/server/0151-Reset-spawner-timer-when-spawner-event-is-cancelled.patch rename to patches/server/0150-Reset-spawner-timer-when-spawner-event-is-cancelled.patch diff --git a/patches/server/0152-Allow-specifying-a-custom-authentication-servers-dow.patch b/patches/server/0151-Allow-specifying-a-custom-authentication-servers-dow.patch similarity index 100% rename from patches/server/0152-Allow-specifying-a-custom-authentication-servers-dow.patch rename to patches/server/0151-Allow-specifying-a-custom-authentication-servers-dow.patch diff --git a/patches/server/0153-Handle-plugin-prefixes-using-Log4J-configuration.patch b/patches/server/0152-Handle-plugin-prefixes-using-Log4J-configuration.patch similarity index 100% rename from patches/server/0153-Handle-plugin-prefixes-using-Log4J-configuration.patch rename to patches/server/0152-Handle-plugin-prefixes-using-Log4J-configuration.patch diff --git a/patches/server/0154-Improve-Log4J-Configuration-Plugin-Loggers.patch b/patches/server/0153-Improve-Log4J-Configuration-Plugin-Loggers.patch similarity index 100% rename from patches/server/0154-Improve-Log4J-Configuration-Plugin-Loggers.patch rename to patches/server/0153-Improve-Log4J-Configuration-Plugin-Loggers.patch diff --git a/patches/server/0155-Add-PlayerJumpEvent.patch b/patches/server/0154-Add-PlayerJumpEvent.patch similarity index 100% rename from patches/server/0155-Add-PlayerJumpEvent.patch rename to patches/server/0154-Add-PlayerJumpEvent.patch diff --git a/patches/server/0156-handle-PacketPlayInKeepAlive-async.patch b/patches/server/0155-handle-PacketPlayInKeepAlive-async.patch similarity index 100% rename from patches/server/0156-handle-PacketPlayInKeepAlive-async.patch rename to patches/server/0155-handle-PacketPlayInKeepAlive-async.patch diff --git a/patches/server/0157-Expose-client-protocol-version-and-virtual-host.patch b/patches/server/0156-Expose-client-protocol-version-and-virtual-host.patch similarity index 100% rename from patches/server/0157-Expose-client-protocol-version-and-virtual-host.patch rename to patches/server/0156-Expose-client-protocol-version-and-virtual-host.patch diff --git a/patches/server/0158-revert-serverside-behavior-of-keepalives.patch b/patches/server/0157-revert-serverside-behavior-of-keepalives.patch similarity index 98% rename from patches/server/0158-revert-serverside-behavior-of-keepalives.patch rename to patches/server/0157-revert-serverside-behavior-of-keepalives.patch index fa656de035a1..e4d961cfcaed 100644 --- a/patches/server/0158-revert-serverside-behavior-of-keepalives.patch +++ b/patches/server/0157-revert-serverside-behavior-of-keepalives.patch @@ -17,7 +17,7 @@ from networking or during connections flood of chunk packets on slower clients, at the cost of dead connections being kept open for longer. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index f75027fc9f6457fbf46c97a381729ff043a1b413..44e4cd2a3039be132ca5f03759801456b3290f72 100644 +index 4ab220e1a0f4d6fe2686657e6e282b9cc5c03c15..205b8643df701fd4ee7f31e257ad7867afa10f73 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -221,9 +221,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0159-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/patches/server/0158-Send-attack-SoundEffects-only-to-players-who-can-see.patch similarity index 100% rename from patches/server/0159-Send-attack-SoundEffects-only-to-players-who-can-see.patch rename to patches/server/0158-Send-attack-SoundEffects-only-to-players-who-can-see.patch diff --git a/patches/server/0160-Add-PlayerArmorChangeEvent.patch b/patches/server/0159-Add-PlayerArmorChangeEvent.patch similarity index 100% rename from patches/server/0160-Add-PlayerArmorChangeEvent.patch rename to patches/server/0159-Add-PlayerArmorChangeEvent.patch diff --git a/patches/server/0161-Prevent-logins-from-being-processed-when-the-player-.patch b/patches/server/0160-Prevent-logins-from-being-processed-when-the-player-.patch similarity index 100% rename from patches/server/0161-Prevent-logins-from-being-processed-when-the-player-.patch rename to patches/server/0160-Prevent-logins-from-being-processed-when-the-player-.patch diff --git a/patches/server/0162-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/patches/server/0161-Fix-MC-117075-TE-Unload-Lag-Spike.patch similarity index 100% rename from patches/server/0162-Fix-MC-117075-TE-Unload-Lag-Spike.patch rename to patches/server/0161-Fix-MC-117075-TE-Unload-Lag-Spike.patch diff --git a/patches/server/0163-use-CB-BlockState-implementations-for-captured-block.patch b/patches/server/0162-use-CB-BlockState-implementations-for-captured-block.patch similarity index 100% rename from patches/server/0163-use-CB-BlockState-implementations-for-captured-block.patch rename to patches/server/0162-use-CB-BlockState-implementations-for-captured-block.patch diff --git a/patches/server/0164-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/server/0163-API-to-get-a-BlockState-without-a-snapshot.patch similarity index 95% rename from patches/server/0164-API-to-get-a-BlockState-without-a-snapshot.patch rename to patches/server/0163-API-to-get-a-BlockState-without-a-snapshot.patch index 4603963ad182..f3b9b0813c13 100644 --- a/patches/server/0164-API-to-get-a-BlockState-without-a-snapshot.patch +++ b/patches/server/0163-API-to-get-a-BlockState-without-a-snapshot.patch @@ -13,10 +13,10 @@ also Avoid NPE during CraftBlockEntityState load if could not get TE If Tile Entity was null, correct Sign to return empty lines instead of null diff --git a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java -index 32a2fbf4a11a84d5a55e02d3ba21e6f4430379c0..a69bbc11b9e003aed1630a6f5cdbca521deb6ff5 100644 +index 148e79ae4e24fe16dbbb17550c3f258d4362c266..06beb18e5e1950aeb6cb427876fcc4c5ea95adb2 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java -@@ -45,6 +45,7 @@ public abstract class BlockEntity implements io.papermc.paper.util.KeyedObject { +@@ -45,6 +45,7 @@ public abstract class BlockEntity { this.type = type; this.worldPosition = pos.immutable(); this.blockState = state; @@ -24,7 +24,7 @@ index 32a2fbf4a11a84d5a55e02d3ba21e6f4430379c0..a69bbc11b9e003aed1630a6f5cdbca52 } public static BlockPos getPosFromTag(CompoundTag nbt) { -@@ -86,7 +87,7 @@ public abstract class BlockEntity implements io.papermc.paper.util.KeyedObject { +@@ -66,7 +67,7 @@ public abstract class BlockEntity { // CraftBukkit start - read container public void load(CompoundTag nbt) { @@ -33,7 +33,7 @@ index 32a2fbf4a11a84d5a55e02d3ba21e6f4430379c0..a69bbc11b9e003aed1630a6f5cdbca52 net.minecraft.nbt.Tag persistentDataTag = nbt.get("PublicBukkitValues"); if (persistentDataTag instanceof CompoundTag) { -@@ -260,8 +261,15 @@ public abstract class BlockEntity implements io.papermc.paper.util.KeyedObject { +@@ -240,8 +241,15 @@ public abstract class BlockEntity { // CraftBukkit start - add method public InventoryHolder getOwner() { diff --git a/patches/server/0165-AsyncTabCompleteEvent.patch b/patches/server/0164-AsyncTabCompleteEvent.patch similarity index 98% rename from patches/server/0165-AsyncTabCompleteEvent.patch rename to patches/server/0164-AsyncTabCompleteEvent.patch index 0269750a0342..5fd131a8369f 100644 --- a/patches/server/0165-AsyncTabCompleteEvent.patch +++ b/patches/server/0164-AsyncTabCompleteEvent.patch @@ -72,7 +72,7 @@ index 205b8643df701fd4ee7f31e257ad7867afa10f73..586692eff023d9e6bb9c6ecaa051bd0c @Override diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 24f361820f195e948f617cd134352e098b298b5d..d9dce9ada23473af6920bedd6d28739cf62e4744 100644 +index 3ebb9ee5938d9cd14f352cba4cb8c74e6aa9c60f..88740b58dbdde998aec9ac14364ca2d45dfd41c3 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2072,7 +2072,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0166-PlayerPickupExperienceEvent.patch b/patches/server/0165-PlayerPickupExperienceEvent.patch similarity index 100% rename from patches/server/0166-PlayerPickupExperienceEvent.patch rename to patches/server/0165-PlayerPickupExperienceEvent.patch diff --git a/patches/server/0167-Ability-to-apply-mending-to-XP-API.patch b/patches/server/0166-Ability-to-apply-mending-to-XP-API.patch similarity index 100% rename from patches/server/0167-Ability-to-apply-mending-to-XP-API.patch rename to patches/server/0166-Ability-to-apply-mending-to-XP-API.patch diff --git a/patches/server/0168-PlayerNaturallySpawnCreaturesEvent.patch b/patches/server/0167-PlayerNaturallySpawnCreaturesEvent.patch similarity index 100% rename from patches/server/0168-PlayerNaturallySpawnCreaturesEvent.patch rename to patches/server/0167-PlayerNaturallySpawnCreaturesEvent.patch diff --git a/patches/server/0169-PreCreatureSpawnEvent.patch b/patches/server/0168-PreCreatureSpawnEvent.patch similarity index 100% rename from patches/server/0169-PreCreatureSpawnEvent.patch rename to patches/server/0168-PreCreatureSpawnEvent.patch diff --git a/patches/server/0170-Add-setPlayerProfile-API-for-Skulls.patch b/patches/server/0169-Add-setPlayerProfile-API-for-Skulls.patch similarity index 100% rename from patches/server/0170-Add-setPlayerProfile-API-for-Skulls.patch rename to patches/server/0169-Add-setPlayerProfile-API-for-Skulls.patch diff --git a/patches/server/0171-Fill-Profile-Property-Events.patch b/patches/server/0170-Fill-Profile-Property-Events.patch similarity index 100% rename from patches/server/0171-Fill-Profile-Property-Events.patch rename to patches/server/0170-Fill-Profile-Property-Events.patch diff --git a/patches/server/0172-PlayerAdvancementCriterionGrantEvent.patch b/patches/server/0171-PlayerAdvancementCriterionGrantEvent.patch similarity index 100% rename from patches/server/0172-PlayerAdvancementCriterionGrantEvent.patch rename to patches/server/0171-PlayerAdvancementCriterionGrantEvent.patch diff --git a/patches/server/0173-Add-ArmorStand-Item-Meta.patch b/patches/server/0172-Add-ArmorStand-Item-Meta.patch similarity index 100% rename from patches/server/0173-Add-ArmorStand-Item-Meta.patch rename to patches/server/0172-Add-ArmorStand-Item-Meta.patch diff --git a/patches/server/0174-Extend-Player-Interact-cancellation.patch b/patches/server/0173-Extend-Player-Interact-cancellation.patch similarity index 100% rename from patches/server/0174-Extend-Player-Interact-cancellation.patch rename to patches/server/0173-Extend-Player-Interact-cancellation.patch diff --git a/patches/server/0175-Tameable-getOwnerUniqueId-API.patch b/patches/server/0174-Tameable-getOwnerUniqueId-API.patch similarity index 100% rename from patches/server/0175-Tameable-getOwnerUniqueId-API.patch rename to patches/server/0174-Tameable-getOwnerUniqueId-API.patch diff --git a/patches/server/0176-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/patches/server/0175-Toggleable-player-crits-helps-mitigate-hacked-client.patch similarity index 100% rename from patches/server/0176-Toggleable-player-crits-helps-mitigate-hacked-client.patch rename to patches/server/0175-Toggleable-player-crits-helps-mitigate-hacked-client.patch diff --git a/patches/server/0177-Disable-Explicit-Network-Manager-Flushing.patch b/patches/server/0176-Disable-Explicit-Network-Manager-Flushing.patch similarity index 100% rename from patches/server/0177-Disable-Explicit-Network-Manager-Flushing.patch rename to patches/server/0176-Disable-Explicit-Network-Manager-Flushing.patch diff --git a/patches/server/0178-Implement-extended-PaperServerListPingEvent.patch b/patches/server/0177-Implement-extended-PaperServerListPingEvent.patch similarity index 100% rename from patches/server/0178-Implement-extended-PaperServerListPingEvent.patch rename to patches/server/0177-Implement-extended-PaperServerListPingEvent.patch diff --git a/patches/server/0179-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/patches/server/0178-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch similarity index 100% rename from patches/server/0179-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch rename to patches/server/0178-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch diff --git a/patches/server/0180-Player.setPlayerProfile-API.patch b/patches/server/0179-Player.setPlayerProfile-API.patch similarity index 100% rename from patches/server/0180-Player.setPlayerProfile-API.patch rename to patches/server/0179-Player.setPlayerProfile-API.patch diff --git a/patches/server/0181-getPlayerUniqueId-API.patch b/patches/server/0180-getPlayerUniqueId-API.patch similarity index 94% rename from patches/server/0181-getPlayerUniqueId-API.patch rename to patches/server/0180-getPlayerUniqueId-API.patch index 251356f545aa..e15ff6040189 100644 --- a/patches/server/0181-getPlayerUniqueId-API.patch +++ b/patches/server/0180-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 d9dce9ada23473af6920bedd6d28739cf62e4744..eb5a7b302b027ab19d42326683f93671a40c64d6 100644 +index 88740b58dbdde998aec9ac14364ca2d45dfd41c3..8a7fcbfe18db14e5d0f7c9089c58dea18d12f133 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1699,6 +1699,25 @@ public final class CraftServer implements Server { diff --git a/patches/server/0182-Improved-Async-Task-Scheduler.patch b/patches/server/0181-Improved-Async-Task-Scheduler.patch similarity index 100% rename from patches/server/0182-Improved-Async-Task-Scheduler.patch rename to patches/server/0181-Improved-Async-Task-Scheduler.patch diff --git a/patches/server/0183-Upstream-config-migrations.patch b/patches/server/0182-Upstream-config-migrations.patch similarity index 100% rename from patches/server/0183-Upstream-config-migrations.patch rename to patches/server/0182-Upstream-config-migrations.patch diff --git a/patches/server/0184-Make-legacy-ping-handler-more-reliable.patch b/patches/server/0183-Make-legacy-ping-handler-more-reliable.patch similarity index 100% rename from patches/server/0184-Make-legacy-ping-handler-more-reliable.patch rename to patches/server/0183-Make-legacy-ping-handler-more-reliable.patch diff --git a/patches/server/0185-Call-PaperServerListPingEvent-for-legacy-pings.patch b/patches/server/0184-Call-PaperServerListPingEvent-for-legacy-pings.patch similarity index 100% rename from patches/server/0185-Call-PaperServerListPingEvent-for-legacy-pings.patch rename to patches/server/0184-Call-PaperServerListPingEvent-for-legacy-pings.patch diff --git a/patches/server/0186-Flag-to-disable-the-channel-limit.patch b/patches/server/0185-Flag-to-disable-the-channel-limit.patch similarity index 100% rename from patches/server/0186-Flag-to-disable-the-channel-limit.patch rename to patches/server/0185-Flag-to-disable-the-channel-limit.patch diff --git a/patches/server/0187-Add-openSign-method-to-HumanEntity.patch b/patches/server/0186-Add-openSign-method-to-HumanEntity.patch similarity index 100% rename from patches/server/0187-Add-openSign-method-to-HumanEntity.patch rename to patches/server/0186-Add-openSign-method-to-HumanEntity.patch diff --git a/patches/server/0188-Configurable-sprint-interruption-on-attack.patch b/patches/server/0187-Configurable-sprint-interruption-on-attack.patch similarity index 100% rename from patches/server/0188-Configurable-sprint-interruption-on-attack.patch rename to patches/server/0187-Configurable-sprint-interruption-on-attack.patch diff --git a/patches/server/0189-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/server/0188-Fix-exploit-that-allowed-colored-signs-to-be-created.patch similarity index 100% rename from patches/server/0189-Fix-exploit-that-allowed-colored-signs-to-be-created.patch rename to patches/server/0188-Fix-exploit-that-allowed-colored-signs-to-be-created.patch diff --git a/patches/server/0190-EndermanEscapeEvent.patch b/patches/server/0189-EndermanEscapeEvent.patch similarity index 100% rename from patches/server/0190-EndermanEscapeEvent.patch rename to patches/server/0189-EndermanEscapeEvent.patch diff --git a/patches/server/0191-Enderman.teleportRandomly.patch b/patches/server/0190-Enderman.teleportRandomly.patch similarity index 100% rename from patches/server/0191-Enderman.teleportRandomly.patch rename to patches/server/0190-Enderman.teleportRandomly.patch diff --git a/patches/server/0192-Block-Enderpearl-Travel-Exploit.patch b/patches/server/0191-Block-Enderpearl-Travel-Exploit.patch similarity index 100% rename from patches/server/0192-Block-Enderpearl-Travel-Exploit.patch rename to patches/server/0191-Block-Enderpearl-Travel-Exploit.patch diff --git a/patches/server/0193-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/server/0192-Expand-World.spawnParticle-API-and-add-Builder.patch similarity index 97% rename from patches/server/0193-Expand-World.spawnParticle-API-and-add-Builder.patch rename to patches/server/0192-Expand-World.spawnParticle-API-and-add-Builder.patch index 54e79a491b40..7c9e375beccb 100644 --- a/patches/server/0193-Expand-World.spawnParticle-API-and-add-Builder.patch +++ b/patches/server/0192-Expand-World.spawnParticle-API-and-add-Builder.patch @@ -34,7 +34,7 @@ index 9769977c9db77aa52b99b793ca4f5d0c7b54528f..d8b0f6ae1604a158ef1be02701c8c605 if (this.sendParticles(entityplayer, force, d0, d1, d2, packetplayoutworldparticles)) { // CraftBukkit diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 7d65bed4a6571594b5d47e4debd01813a272814e..bd1157ee7e721876824f66cc72dc90c3e49871ce 100644 +index fbb159f1300f4bcd0f85ec348f16de3e80af686f..6be238a6df674cd46e417459e610afd3f4d672d2 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1812,11 +1812,17 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0194-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/patches/server/0193-Prevent-Frosted-Ice-from-loading-holding-chunks.patch similarity index 100% rename from patches/server/0194-Prevent-Frosted-Ice-from-loading-holding-chunks.patch rename to patches/server/0193-Prevent-Frosted-Ice-from-loading-holding-chunks.patch diff --git a/patches/server/0195-EndermanAttackPlayerEvent.patch b/patches/server/0194-EndermanAttackPlayerEvent.patch similarity index 100% rename from patches/server/0195-EndermanAttackPlayerEvent.patch rename to patches/server/0194-EndermanAttackPlayerEvent.patch diff --git a/patches/server/0196-WitchConsumePotionEvent.patch b/patches/server/0195-WitchConsumePotionEvent.patch similarity index 100% rename from patches/server/0196-WitchConsumePotionEvent.patch rename to patches/server/0195-WitchConsumePotionEvent.patch diff --git a/patches/server/0197-WitchThrowPotionEvent.patch b/patches/server/0196-WitchThrowPotionEvent.patch similarity index 100% rename from patches/server/0197-WitchThrowPotionEvent.patch rename to patches/server/0196-WitchThrowPotionEvent.patch diff --git a/patches/server/0198-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/patches/server/0197-Allow-spawning-Item-entities-with-World.spawnEntity.patch similarity index 100% rename from patches/server/0198-Allow-spawning-Item-entities-with-World.spawnEntity.patch rename to patches/server/0197-Allow-spawning-Item-entities-with-World.spawnEntity.patch diff --git a/patches/server/0199-WitchReadyPotionEvent.patch b/patches/server/0198-WitchReadyPotionEvent.patch similarity index 100% rename from patches/server/0199-WitchReadyPotionEvent.patch rename to patches/server/0198-WitchReadyPotionEvent.patch diff --git a/patches/server/0200-ItemStack-getMaxItemUseDuration.patch b/patches/server/0199-ItemStack-getMaxItemUseDuration.patch similarity index 100% rename from patches/server/0200-ItemStack-getMaxItemUseDuration.patch rename to patches/server/0199-ItemStack-getMaxItemUseDuration.patch diff --git a/patches/server/0201-Implement-EntityTeleportEndGatewayEvent.patch b/patches/server/0200-Implement-EntityTeleportEndGatewayEvent.patch similarity index 100% rename from patches/server/0201-Implement-EntityTeleportEndGatewayEvent.patch rename to patches/server/0200-Implement-EntityTeleportEndGatewayEvent.patch diff --git a/patches/server/0202-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/patches/server/0201-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch similarity index 100% rename from patches/server/0202-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch rename to patches/server/0201-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch diff --git a/patches/server/0203-Fix-CraftEntity-hashCode.patch b/patches/server/0202-Fix-CraftEntity-hashCode.patch similarity index 100% rename from patches/server/0203-Fix-CraftEntity-hashCode.patch rename to patches/server/0202-Fix-CraftEntity-hashCode.patch diff --git a/patches/server/0204-Configurable-Alternative-LootPool-Luck-Formula.patch b/patches/server/0203-Configurable-Alternative-LootPool-Luck-Formula.patch similarity index 100% rename from patches/server/0204-Configurable-Alternative-LootPool-Luck-Formula.patch rename to patches/server/0203-Configurable-Alternative-LootPool-Luck-Formula.patch diff --git a/patches/server/0205-Print-Error-details-when-failing-to-save-player-data.patch b/patches/server/0204-Print-Error-details-when-failing-to-save-player-data.patch similarity index 100% rename from patches/server/0205-Print-Error-details-when-failing-to-save-player-data.patch rename to patches/server/0204-Print-Error-details-when-failing-to-save-player-data.patch diff --git a/patches/server/0206-Make-shield-blocking-delay-configurable.patch b/patches/server/0205-Make-shield-blocking-delay-configurable.patch similarity index 100% rename from patches/server/0206-Make-shield-blocking-delay-configurable.patch rename to patches/server/0205-Make-shield-blocking-delay-configurable.patch diff --git a/patches/server/0207-Improve-EntityShootBowEvent.patch b/patches/server/0206-Improve-EntityShootBowEvent.patch similarity index 100% rename from patches/server/0207-Improve-EntityShootBowEvent.patch rename to patches/server/0206-Improve-EntityShootBowEvent.patch diff --git a/patches/server/0208-PlayerReadyArrowEvent.patch b/patches/server/0207-PlayerReadyArrowEvent.patch similarity index 100% rename from patches/server/0208-PlayerReadyArrowEvent.patch rename to patches/server/0207-PlayerReadyArrowEvent.patch diff --git a/patches/server/0209-Implement-EntityKnockbackByEntityEvent.patch b/patches/server/0208-Implement-EntityKnockbackByEntityEvent.patch similarity index 100% rename from patches/server/0209-Implement-EntityKnockbackByEntityEvent.patch rename to patches/server/0208-Implement-EntityKnockbackByEntityEvent.patch diff --git a/patches/server/0210-Expand-Explosions-API.patch b/patches/server/0209-Expand-Explosions-API.patch similarity index 93% rename from patches/server/0210-Expand-Explosions-API.patch rename to patches/server/0209-Expand-Explosions-API.patch index ad6eb3d96011..bfdcb921eede 100644 --- a/patches/server/0210-Expand-Explosions-API.patch +++ b/patches/server/0209-Expand-Explosions-API.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Expand Explosions API Add Entity as a Source capability, and add more API choices, and on Location. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index bd1157ee7e721876824f66cc72dc90c3e49871ce..7c11de1cf5c1df6b1658147fe25eb67802c3899f 100644 +index 6be238a6df674cd46e417459e610afd3f4d672d2..ea8dac5b80a0e8f677d0f50f144ab927aab3ccf4 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -700,6 +700,12 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0211-LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/server/0210-LivingEntity-Hand-Raised-Item-Use-API.patch similarity index 100% rename from patches/server/0211-LivingEntity-Hand-Raised-Item-Use-API.patch rename to patches/server/0210-LivingEntity-Hand-Raised-Item-Use-API.patch diff --git a/patches/server/0212-RangedEntity-API.patch b/patches/server/0211-RangedEntity-API.patch similarity index 100% rename from patches/server/0212-RangedEntity-API.patch rename to patches/server/0211-RangedEntity-API.patch diff --git a/patches/server/0213-Add-config-to-disable-ender-dragon-legacy-check.patch b/patches/server/0212-Add-config-to-disable-ender-dragon-legacy-check.patch similarity index 100% rename from patches/server/0213-Add-config-to-disable-ender-dragon-legacy-check.patch rename to patches/server/0212-Add-config-to-disable-ender-dragon-legacy-check.patch diff --git a/patches/server/0214-Implement-World.getEntity-UUID-API.patch b/patches/server/0213-Implement-World.getEntity-UUID-API.patch similarity index 91% rename from patches/server/0214-Implement-World.getEntity-UUID-API.patch rename to patches/server/0213-Implement-World.getEntity-UUID-API.patch index 23976b68fb6b..dcccc8a89ac7 100644 --- a/patches/server/0214-Implement-World.getEntity-UUID-API.patch +++ b/patches/server/0213-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 7c11de1cf5c1df6b1658147fe25eb67802c3899f..a50f95940f1992ef6512a79d17b10cf51013f7f0 100644 +index ea8dac5b80a0e8f677d0f50f144ab927aab3ccf4..323d78917e23124e150ff427d26624ecbb7f0e4f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1034,6 +1034,15 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0215-InventoryCloseEvent-Reason-API.patch b/patches/server/0214-InventoryCloseEvent-Reason-API.patch similarity index 100% rename from patches/server/0215-InventoryCloseEvent-Reason-API.patch rename to patches/server/0214-InventoryCloseEvent-Reason-API.patch diff --git a/patches/server/0216-Vex-get-setSummoner-API.patch b/patches/server/0215-Vex-get-setSummoner-API.patch similarity index 100% rename from patches/server/0216-Vex-get-setSummoner-API.patch rename to patches/server/0215-Vex-get-setSummoner-API.patch diff --git a/patches/server/0217-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/server/0216-Refresh-player-inventory-when-cancelling-PlayerInter.patch similarity index 100% rename from patches/server/0217-Refresh-player-inventory-when-cancelling-PlayerInter.patch rename to patches/server/0216-Refresh-player-inventory-when-cancelling-PlayerInter.patch diff --git a/patches/server/0218-Avoid-item-merge-if-stack-size-above-max-stack-size.patch b/patches/server/0217-Avoid-item-merge-if-stack-size-above-max-stack-size.patch similarity index 100% rename from patches/server/0218-Avoid-item-merge-if-stack-size-above-max-stack-size.patch rename to patches/server/0217-Avoid-item-merge-if-stack-size-above-max-stack-size.patch diff --git a/patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/server/0218-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch similarity index 100% rename from patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch rename to patches/server/0218-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch diff --git a/patches/server/0220-add-more-information-to-Entity.toString.patch b/patches/server/0219-add-more-information-to-Entity.toString.patch similarity index 89% rename from patches/server/0220-add-more-information-to-Entity.toString.patch rename to patches/server/0219-add-more-information-to-Entity.toString.patch index fba5a0235000..7026f71e2c8c 100644 --- a/patches/server/0220-add-more-information-to-Entity.toString.patch +++ b/patches/server/0219-add-more-information-to-Entity.toString.patch @@ -6,10 +6,10 @@ 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 d9e2cf70c4fcbf2d02a8bba00be28528df76b645..919b66c88f21606348b20f02cc420d0ff1fa0f8b 100644 +index ed2187ea8e0b30c7bcb473a50dd33781ef4ac8ae..c8296a685d67413501128fb5a2d86febc7a50206 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -2844,7 +2844,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -2824,7 +2824,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { public String toString() { String s = this.level == null ? "~NULL~" : this.level.toString(); diff --git a/patches/server/0221-Add-CraftMagicNumbers.isSupportedApiVersion.patch b/patches/server/0220-Add-CraftMagicNumbers.isSupportedApiVersion.patch similarity index 100% rename from patches/server/0221-Add-CraftMagicNumbers.isSupportedApiVersion.patch rename to patches/server/0220-Add-CraftMagicNumbers.isSupportedApiVersion.patch diff --git a/patches/server/0222-EnderDragon-Events.patch b/patches/server/0221-EnderDragon-Events.patch similarity index 100% rename from patches/server/0222-EnderDragon-Events.patch rename to patches/server/0221-EnderDragon-Events.patch diff --git a/patches/server/0223-PlayerElytraBoostEvent.patch b/patches/server/0222-PlayerElytraBoostEvent.patch similarity index 100% rename from patches/server/0223-PlayerElytraBoostEvent.patch rename to patches/server/0222-PlayerElytraBoostEvent.patch diff --git a/patches/server/0224-PlayerLaunchProjectileEvent.patch b/patches/server/0223-PlayerLaunchProjectileEvent.patch similarity index 100% rename from patches/server/0224-PlayerLaunchProjectileEvent.patch rename to patches/server/0223-PlayerLaunchProjectileEvent.patch diff --git a/patches/server/0225-Improve-BlockPosition-inlining.patch b/patches/server/0224-Improve-BlockPosition-inlining.patch similarity index 100% rename from patches/server/0225-Improve-BlockPosition-inlining.patch rename to patches/server/0224-Improve-BlockPosition-inlining.patch diff --git a/patches/server/0226-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/server/0225-Option-to-prevent-armor-stands-from-doing-entity-loo.patch similarity index 100% rename from patches/server/0226-Option-to-prevent-armor-stands-from-doing-entity-loo.patch rename to patches/server/0225-Option-to-prevent-armor-stands-from-doing-entity-loo.patch diff --git a/patches/server/0227-Vanished-players-don-t-have-rights.patch b/patches/server/0226-Vanished-players-don-t-have-rights.patch similarity index 100% rename from patches/server/0227-Vanished-players-don-t-have-rights.patch rename to patches/server/0226-Vanished-players-don-t-have-rights.patch diff --git a/patches/server/0228-Allow-disabling-armour-stand-ticking.patch b/patches/server/0227-Allow-disabling-armour-stand-ticking.patch similarity index 100% rename from patches/server/0228-Allow-disabling-armour-stand-ticking.patch rename to patches/server/0227-Allow-disabling-armour-stand-ticking.patch diff --git a/patches/server/0229-SkeletonHorse-Additions.patch b/patches/server/0228-SkeletonHorse-Additions.patch similarity index 100% rename from patches/server/0229-SkeletonHorse-Additions.patch rename to patches/server/0228-SkeletonHorse-Additions.patch diff --git a/patches/server/0230-Don-t-call-getItemMeta-on-hasItemMeta.patch b/patches/server/0229-Don-t-call-getItemMeta-on-hasItemMeta.patch similarity index 100% rename from patches/server/0230-Don-t-call-getItemMeta-on-hasItemMeta.patch rename to patches/server/0229-Don-t-call-getItemMeta-on-hasItemMeta.patch diff --git a/patches/server/0231-Implement-Expanded-ArmorStand-API.patch b/patches/server/0230-Implement-Expanded-ArmorStand-API.patch similarity index 100% rename from patches/server/0231-Implement-Expanded-ArmorStand-API.patch rename to patches/server/0230-Implement-Expanded-ArmorStand-API.patch diff --git a/patches/server/0232-AnvilDamageEvent.patch b/patches/server/0231-AnvilDamageEvent.patch similarity index 100% rename from patches/server/0232-AnvilDamageEvent.patch rename to patches/server/0231-AnvilDamageEvent.patch diff --git a/patches/server/0233-Add-hand-to-bucket-events.patch b/patches/server/0232-Add-hand-to-bucket-events.patch similarity index 100% rename from patches/server/0233-Add-hand-to-bucket-events.patch rename to patches/server/0232-Add-hand-to-bucket-events.patch diff --git a/patches/server/0234-Add-TNTPrimeEvent.patch b/patches/server/0233-Add-TNTPrimeEvent.patch similarity index 100% rename from patches/server/0234-Add-TNTPrimeEvent.patch rename to patches/server/0233-Add-TNTPrimeEvent.patch diff --git a/patches/server/0235-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/server/0234-Break-up-and-make-tab-spam-limits-configurable.patch similarity index 100% rename from patches/server/0235-Break-up-and-make-tab-spam-limits-configurable.patch rename to patches/server/0234-Break-up-and-make-tab-spam-limits-configurable.patch diff --git a/patches/server/0236-MC-135506-Experience-should-save-as-Integers.patch b/patches/server/0235-MC-135506-Experience-should-save-as-Integers.patch similarity index 100% rename from patches/server/0236-MC-135506-Experience-should-save-as-Integers.patch rename to patches/server/0235-MC-135506-Experience-should-save-as-Integers.patch diff --git a/patches/server/0237-Fix-client-rendering-skulls-from-same-user.patch b/patches/server/0236-Fix-client-rendering-skulls-from-same-user.patch similarity index 100% rename from patches/server/0237-Fix-client-rendering-skulls-from-same-user.patch rename to patches/server/0236-Fix-client-rendering-skulls-from-same-user.patch diff --git a/patches/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/server/0237-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch similarity index 98% rename from patches/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch rename to patches/server/0237-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch index 58f70dd2ea47..df399c88db9e 100644 --- a/patches/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch +++ b/patches/server/0237-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch @@ -72,10 +72,10 @@ index 4d69b6b35f04c904ee9ca9c896baaa9892f8ef9c..5f58aa648a5f0c3e61f6d9d5853583ca return false; } else { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 919b66c88f21606348b20f02cc420d0ff1fa0f8b..ad2341ce26f976b4c45d91e8040bea5aef130f02 100644 +index c8296a685d67413501128fb5a2d86febc7a50206..30fb09933978264df4f476e7668998a5dd95eada 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -173,6 +173,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -173,6 +173,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { public com.destroystokyo.paper.loottable.PaperLootableInventoryData lootableData; // Paper private CraftEntity bukkitEntity; diff --git a/patches/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/server/0238-Add-Early-Warning-Feature-to-WatchDog.patch similarity index 99% rename from patches/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch rename to patches/server/0238-Add-Early-Warning-Feature-to-WatchDog.patch index cd76b5568725..8112c5a4c273 100644 --- a/patches/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch +++ b/patches/server/0238-Add-Early-Warning-Feature-to-WatchDog.patch @@ -48,7 +48,7 @@ index 4da9491425649b2b930b2304c4aa6692540ff4cb..d6e6bc73f9bbcae99126876a9abdd346 long start = System.nanoTime(), curTime, tickSection = start; // Paper - Further improve server tick loop lastTick = start - TICK_TIME; // Paper diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index eb5a7b302b027ab19d42326683f93671a40c64d6..57533be63ac4bb70be6e94598565211d4fce6da2 100644 +index 8a7fcbfe18db14e5d0f7c9089c58dea18d12f133..a804ec5036568f0bf932cd0c3d1a29958a456a74 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -904,6 +904,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0240-Use-ConcurrentHashMap-in-JsonList.patch b/patches/server/0239-Use-ConcurrentHashMap-in-JsonList.patch similarity index 100% rename from patches/server/0240-Use-ConcurrentHashMap-in-JsonList.patch rename to patches/server/0239-Use-ConcurrentHashMap-in-JsonList.patch diff --git a/patches/server/0241-Use-a-Queue-for-Queueing-Commands.patch b/patches/server/0240-Use-a-Queue-for-Queueing-Commands.patch similarity index 100% rename from patches/server/0241-Use-a-Queue-for-Queueing-Commands.patch rename to patches/server/0240-Use-a-Queue-for-Queueing-Commands.patch diff --git a/patches/server/0242-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/server/0241-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch similarity index 100% rename from patches/server/0242-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch rename to patches/server/0241-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch diff --git a/patches/server/0243-Optimize-BlockPosition-helper-methods.patch b/patches/server/0242-Optimize-BlockPosition-helper-methods.patch similarity index 100% rename from patches/server/0243-Optimize-BlockPosition-helper-methods.patch rename to patches/server/0242-Optimize-BlockPosition-helper-methods.patch diff --git a/patches/server/0244-Restore-vanilla-default-mob-spawn-range-and-water-an.patch b/patches/server/0243-Restore-vanilla-default-mob-spawn-range-and-water-an.patch similarity index 100% rename from patches/server/0244-Restore-vanilla-default-mob-spawn-range-and-water-an.patch rename to patches/server/0243-Restore-vanilla-default-mob-spawn-range-and-water-an.patch diff --git a/patches/server/0245-Slime-Pathfinder-Events.patch b/patches/server/0244-Slime-Pathfinder-Events.patch similarity index 100% rename from patches/server/0245-Slime-Pathfinder-Events.patch rename to patches/server/0244-Slime-Pathfinder-Events.patch diff --git a/patches/server/0246-Configurable-speed-for-water-flowing-over-lava.patch b/patches/server/0245-Configurable-speed-for-water-flowing-over-lava.patch similarity index 100% rename from patches/server/0246-Configurable-speed-for-water-flowing-over-lava.patch rename to patches/server/0245-Configurable-speed-for-water-flowing-over-lava.patch diff --git a/patches/server/0247-Optimize-CraftBlockData-Creation.patch b/patches/server/0246-Optimize-CraftBlockData-Creation.patch similarity index 100% rename from patches/server/0247-Optimize-CraftBlockData-Creation.patch rename to patches/server/0246-Optimize-CraftBlockData-Creation.patch diff --git a/patches/server/0248-Optimize-MappedRegistry.patch b/patches/server/0247-Optimize-MappedRegistry.patch similarity index 100% rename from patches/server/0248-Optimize-MappedRegistry.patch rename to patches/server/0247-Optimize-MappedRegistry.patch diff --git a/patches/server/0249-Add-PhantomPreSpawnEvent.patch b/patches/server/0248-Add-PhantomPreSpawnEvent.patch similarity index 100% rename from patches/server/0249-Add-PhantomPreSpawnEvent.patch rename to patches/server/0248-Add-PhantomPreSpawnEvent.patch diff --git a/patches/server/0250-Add-More-Creeper-API.patch b/patches/server/0249-Add-More-Creeper-API.patch similarity index 100% rename from patches/server/0250-Add-More-Creeper-API.patch rename to patches/server/0249-Add-More-Creeper-API.patch diff --git a/patches/server/0251-Inventory-removeItemAnySlot.patch b/patches/server/0250-Inventory-removeItemAnySlot.patch similarity index 100% rename from patches/server/0251-Inventory-removeItemAnySlot.patch rename to patches/server/0250-Inventory-removeItemAnySlot.patch diff --git a/patches/server/0252-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/patches/server/0251-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch similarity index 92% rename from patches/server/0252-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch rename to patches/server/0251-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch index 592f2eccb139..c4de836b2842 100644 --- a/patches/server/0252-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch +++ b/patches/server/0251-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 a50f95940f1992ef6512a79d17b10cf51013f7f0..16926ecc4a67951d58c1794a64a408dbd9943a30 100644 +index 323d78917e23124e150ff427d26624ecbb7f0e4f..11c9c33e560304c868991e9f6e4dc0040fbe06e9 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -381,7 +381,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0253-Asynchronous-chunk-IO-and-loading.patch b/patches/server/0252-Asynchronous-chunk-IO-and-loading.patch similarity index 100% rename from patches/server/0253-Asynchronous-chunk-IO-and-loading.patch rename to patches/server/0252-Asynchronous-chunk-IO-and-loading.patch diff --git a/patches/server/0254-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/server/0253-Add-ray-tracing-methods-to-LivingEntity.patch similarity index 100% rename from patches/server/0254-Add-ray-tracing-methods-to-LivingEntity.patch rename to patches/server/0253-Add-ray-tracing-methods-to-LivingEntity.patch diff --git a/patches/server/0255-Expose-attack-cooldown-methods-for-Player.patch b/patches/server/0254-Expose-attack-cooldown-methods-for-Player.patch similarity index 100% rename from patches/server/0255-Expose-attack-cooldown-methods-for-Player.patch rename to patches/server/0254-Expose-attack-cooldown-methods-for-Player.patch diff --git a/patches/server/0256-Improve-death-events.patch b/patches/server/0255-Improve-death-events.patch similarity index 100% rename from patches/server/0256-Improve-death-events.patch rename to patches/server/0255-Improve-death-events.patch diff --git a/patches/server/0257-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/server/0256-Allow-chests-to-be-placed-with-NBT-data.patch similarity index 100% rename from patches/server/0257-Allow-chests-to-be-placed-with-NBT-data.patch rename to patches/server/0256-Allow-chests-to-be-placed-with-NBT-data.patch diff --git a/patches/server/0258-Mob-Pathfinding-API.patch b/patches/server/0257-Mob-Pathfinding-API.patch similarity index 100% rename from patches/server/0258-Mob-Pathfinding-API.patch rename to patches/server/0257-Mob-Pathfinding-API.patch diff --git a/patches/server/0259-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/patches/server/0258-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch similarity index 100% rename from patches/server/0259-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch rename to patches/server/0258-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch diff --git a/patches/server/0260-Prevent-chunk-loading-from-Fluid-Flowing.patch b/patches/server/0259-Prevent-chunk-loading-from-Fluid-Flowing.patch similarity index 100% rename from patches/server/0260-Prevent-chunk-loading-from-Fluid-Flowing.patch rename to patches/server/0259-Prevent-chunk-loading-from-Fluid-Flowing.patch diff --git a/patches/server/0261-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/patches/server/0260-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch similarity index 100% rename from patches/server/0261-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch rename to patches/server/0260-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch diff --git a/patches/server/0262-Prevent-mob-spawning-from-loading-generating-chunks.patch b/patches/server/0261-Prevent-mob-spawning-from-loading-generating-chunks.patch similarity index 100% rename from patches/server/0262-Prevent-mob-spawning-from-loading-generating-chunks.patch rename to patches/server/0261-Prevent-mob-spawning-from-loading-generating-chunks.patch diff --git a/patches/server/0263-Implement-furnace-cook-speed-multiplier-API.patch b/patches/server/0262-Implement-furnace-cook-speed-multiplier-API.patch similarity index 100% rename from patches/server/0263-Implement-furnace-cook-speed-multiplier-API.patch rename to patches/server/0262-Implement-furnace-cook-speed-multiplier-API.patch diff --git a/patches/server/0264-Catch-JsonParseException-in-Entity-and-TE-names.patch b/patches/server/0263-Catch-JsonParseException-in-Entity-and-TE-names.patch similarity index 100% rename from patches/server/0264-Catch-JsonParseException-in-Entity-and-TE-names.patch rename to patches/server/0263-Catch-JsonParseException-in-Entity-and-TE-names.patch diff --git a/patches/server/0265-Honor-EntityAgeable.ageLock.patch b/patches/server/0264-Honor-EntityAgeable.ageLock.patch similarity index 100% rename from patches/server/0265-Honor-EntityAgeable.ageLock.patch rename to patches/server/0264-Honor-EntityAgeable.ageLock.patch diff --git a/patches/server/0266-Configurable-connection-throttle-kick-message.patch b/patches/server/0265-Configurable-connection-throttle-kick-message.patch similarity index 100% rename from patches/server/0266-Configurable-connection-throttle-kick-message.patch rename to patches/server/0265-Configurable-connection-throttle-kick-message.patch diff --git a/patches/server/0267-Hook-into-CB-plugin-rewrites.patch b/patches/server/0266-Hook-into-CB-plugin-rewrites.patch similarity index 100% rename from patches/server/0267-Hook-into-CB-plugin-rewrites.patch rename to patches/server/0266-Hook-into-CB-plugin-rewrites.patch diff --git a/patches/server/0268-PreSpawnerSpawnEvent.patch b/patches/server/0267-PreSpawnerSpawnEvent.patch similarity index 100% rename from patches/server/0268-PreSpawnerSpawnEvent.patch rename to patches/server/0267-PreSpawnerSpawnEvent.patch diff --git a/patches/server/0269-Add-LivingEntity-getTargetEntity.patch b/patches/server/0268-Add-LivingEntity-getTargetEntity.patch similarity index 100% rename from patches/server/0269-Add-LivingEntity-getTargetEntity.patch rename to patches/server/0268-Add-LivingEntity-getTargetEntity.patch diff --git a/patches/server/0270-Add-sun-related-API.patch b/patches/server/0269-Add-sun-related-API.patch similarity index 93% rename from patches/server/0270-Add-sun-related-API.patch rename to patches/server/0269-Add-sun-related-API.patch index dbba5a6c4f39..66f186517272 100644 --- a/patches/server/0270-Add-sun-related-API.patch +++ b/patches/server/0269-Add-sun-related-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add sun related API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 440a3cb699939b0b1224a4668f0e221f9c7f3159..5dcb92e37e5f419104bd416eb7b53128c1bfed9f 100644 +index 68d6f6b9edab370aaaf6a0113aaf7563770db229..b2388c3c2afa324ea21c5fb3265613f48f6ccfd1 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -676,6 +676,13 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0271-Turtle-API.patch b/patches/server/0270-Turtle-API.patch similarity index 100% rename from patches/server/0271-Turtle-API.patch rename to patches/server/0270-Turtle-API.patch diff --git a/patches/server/0272-Call-player-spectator-target-events-and-improve-impl.patch b/patches/server/0271-Call-player-spectator-target-events-and-improve-impl.patch similarity index 100% rename from patches/server/0272-Call-player-spectator-target-events-and-improve-impl.patch rename to patches/server/0271-Call-player-spectator-target-events-and-improve-impl.patch diff --git a/patches/server/0273-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/patches/server/0272-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch similarity index 100% rename from patches/server/0273-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch rename to patches/server/0272-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch diff --git a/patches/server/0274-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0273-Add-Velocity-IP-Forwarding-Support.patch similarity index 99% rename from patches/server/0274-Add-Velocity-IP-Forwarding-Support.patch rename to patches/server/0273-Add-Velocity-IP-Forwarding-Support.patch index bc475ba2ee3d..e7522b616f09 100644 --- a/patches/server/0274-Add-Velocity-IP-Forwarding-Support.patch +++ b/patches/server/0273-Add-Velocity-IP-Forwarding-Support.patch @@ -225,7 +225,7 @@ index 5ebc450432805d52457b9f8ff1e2b1981bdd78e6..4c06e62e967f28eb844d74237948834e } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 57533be63ac4bb70be6e94598565211d4fce6da2..39389c3389eb6b118b662cb77552d198b0b21c05 100644 +index a804ec5036568f0bf932cd0c3d1a29958a456a74..7e6e5b4f0c87037e6a365e53959c18063d5af48a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -759,7 +759,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0275-Add-more-Witch-API.patch b/patches/server/0274-Add-more-Witch-API.patch similarity index 100% rename from patches/server/0275-Add-more-Witch-API.patch rename to patches/server/0274-Add-more-Witch-API.patch diff --git a/patches/server/0276-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/server/0275-Check-Drowned-for-Villager-Aggression-Config.patch similarity index 100% rename from patches/server/0276-Check-Drowned-for-Villager-Aggression-Config.patch rename to patches/server/0275-Check-Drowned-for-Villager-Aggression-Config.patch diff --git a/patches/server/0277-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/server/0276-Add-option-to-prevent-players-from-moving-into-unloa.patch similarity index 100% rename from patches/server/0277-Add-option-to-prevent-players-from-moving-into-unloa.patch rename to patches/server/0276-Add-option-to-prevent-players-from-moving-into-unloa.patch diff --git a/patches/server/0278-Reset-players-airTicks-on-respawn.patch b/patches/server/0277-Reset-players-airTicks-on-respawn.patch similarity index 100% rename from patches/server/0278-Reset-players-airTicks-on-respawn.patch rename to patches/server/0277-Reset-players-airTicks-on-respawn.patch diff --git a/patches/server/0279-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/server/0278-Don-t-sleep-after-profile-lookups-if-not-needed.patch similarity index 100% rename from patches/server/0279-Don-t-sleep-after-profile-lookups-if-not-needed.patch rename to patches/server/0278-Don-t-sleep-after-profile-lookups-if-not-needed.patch diff --git a/patches/server/0280-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/server/0279-Improve-Server-Thread-Pool-and-Thread-Priorities.patch similarity index 100% rename from patches/server/0280-Improve-Server-Thread-Pool-and-Thread-Priorities.patch rename to patches/server/0279-Improve-Server-Thread-Pool-and-Thread-Priorities.patch diff --git a/patches/server/0281-Optimize-World-Time-Updates.patch b/patches/server/0280-Optimize-World-Time-Updates.patch similarity index 100% rename from patches/server/0281-Optimize-World-Time-Updates.patch rename to patches/server/0280-Optimize-World-Time-Updates.patch diff --git a/patches/server/0282-Restore-custom-InventoryHolder-support.patch b/patches/server/0281-Restore-custom-InventoryHolder-support.patch similarity index 100% rename from patches/server/0282-Restore-custom-InventoryHolder-support.patch rename to patches/server/0281-Restore-custom-InventoryHolder-support.patch diff --git a/patches/server/0283-Use-Vanilla-Minecart-Speeds.patch b/patches/server/0282-Use-Vanilla-Minecart-Speeds.patch similarity index 100% rename from patches/server/0283-Use-Vanilla-Minecart-Speeds.patch rename to patches/server/0282-Use-Vanilla-Minecart-Speeds.patch diff --git a/patches/server/0284-Fix-SpongeAbsortEvent-handling.patch b/patches/server/0283-Fix-SpongeAbsortEvent-handling.patch similarity index 100% rename from patches/server/0284-Fix-SpongeAbsortEvent-handling.patch rename to patches/server/0283-Fix-SpongeAbsortEvent-handling.patch diff --git a/patches/server/0285-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/server/0284-Don-t-allow-digging-into-unloaded-chunks.patch similarity index 100% rename from patches/server/0285-Don-t-allow-digging-into-unloaded-chunks.patch rename to patches/server/0284-Don-t-allow-digging-into-unloaded-chunks.patch diff --git a/patches/server/0286-Make-the-default-permission-message-configurable.patch b/patches/server/0285-Make-the-default-permission-message-configurable.patch similarity index 94% rename from patches/server/0286-Make-the-default-permission-message-configurable.patch rename to patches/server/0285-Make-the-default-permission-message-configurable.patch index f498d52fb46e..feaaf8cd010d 100644 --- a/patches/server/0286-Make-the-default-permission-message-configurable.patch +++ b/patches/server/0285-Make-the-default-permission-message-configurable.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Make the default permission message configurable diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java -index 1fa190e098079522e0fe3593fa261c1b7ad4e24b..1eb45df9dca5d0c31ac46709e706136a246cb8ea 100644 +index a7182a4c64980aa19b8493ac9c2bb762603e615b..006f2e900de3a665fa48cac877511277a900be62 100644 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java @@ -52,7 +52,7 @@ public class PaperCommand extends Command { @@ -42,7 +42,7 @@ index c1fbff8ccfdb95aebc330e2621c4fc9c71ebfb9e..36719c689a24c63e7d9a5b40f8c262c1 Object val = config.get("settings.save-player-data"); if (val instanceof Boolean) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 39389c3389eb6b118b662cb77552d198b0b21c05..ba0b22c45e0bdcda7087a262a82405a9efe8cc61 100644 +index 7e6e5b4f0c87037e6a365e53959c18063d5af48a..334e43e0628724996b2bda4ec775a5d637239c5e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2594,6 +2594,11 @@ public final class CraftServer implements Server { diff --git a/patches/server/0287-Prevent-rayTrace-from-loading-chunks.patch b/patches/server/0286-Prevent-rayTrace-from-loading-chunks.patch similarity index 100% rename from patches/server/0287-Prevent-rayTrace-from-loading-chunks.patch rename to patches/server/0286-Prevent-rayTrace-from-loading-chunks.patch diff --git a/patches/server/0288-Handle-Large-Packets-disconnecting-client.patch b/patches/server/0287-Handle-Large-Packets-disconnecting-client.patch similarity index 100% rename from patches/server/0288-Handle-Large-Packets-disconnecting-client.patch rename to patches/server/0287-Handle-Large-Packets-disconnecting-client.patch diff --git a/patches/server/0289-force-entity-dismount-during-teleportation.patch b/patches/server/0288-force-entity-dismount-during-teleportation.patch similarity index 92% rename from patches/server/0289-force-entity-dismount-during-teleportation.patch rename to patches/server/0288-force-entity-dismount-during-teleportation.patch index 5fceea067027..eb1b30999c05 100644 --- a/patches/server/0289-force-entity-dismount-during-teleportation.patch +++ b/patches/server/0288-force-entity-dismount-during-teleportation.patch @@ -41,10 +41,10 @@ index 31e6fefae574e6c3b233425ed39dff428e856cbd..295f597fb1ecf9210287d14837c286ae if (entity1 != entity && this.connection != null) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index ad2341ce26f976b4c45d91e8040bea5aef130f02..f1489819f53b096c81ef8d06d4e40e3661e6fe52 100644 +index 30fb09933978264df4f476e7668998a5dd95eada..9dcab83c9695c7f606b9bf3ba62d5f8fd807e239 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -2256,11 +2256,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -2236,11 +2236,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } public void removeVehicle() { @@ -62,7 +62,7 @@ index ad2341ce26f976b4c45d91e8040bea5aef130f02..f1489819f53b096c81ef8d06d4e40e36 } } -@@ -2323,7 +2328,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -2303,7 +2308,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { return true; // CraftBukkit } @@ -74,7 +74,7 @@ index ad2341ce26f976b4c45d91e8040bea5aef130f02..f1489819f53b096c81ef8d06d4e40e36 if (entity.getVehicle() == this) { throw new IllegalStateException("Use x.stopRiding(y), not y.removePassenger(x)"); } else { -@@ -2333,7 +2341,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -2313,7 +2321,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { if (this.getBukkitEntity() instanceof Vehicle && entity.getBukkitEntity() instanceof LivingEntity) { VehicleExitEvent event = new VehicleExitEvent( (Vehicle) this.getBukkitEntity(), @@ -83,7 +83,7 @@ index ad2341ce26f976b4c45d91e8040bea5aef130f02..f1489819f53b096c81ef8d06d4e40e36 ); // Suppress during worldgen if (this.valid) { -@@ -2347,7 +2355,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -2327,7 +2335,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } // CraftBukkit end // Spigot start diff --git a/patches/server/0290-Add-more-Zombie-API.patch b/patches/server/0289-Add-more-Zombie-API.patch similarity index 100% rename from patches/server/0290-Add-more-Zombie-API.patch rename to patches/server/0289-Add-more-Zombie-API.patch diff --git a/patches/server/0291-Book-Size-Limits.patch b/patches/server/0290-Book-Size-Limits.patch similarity index 100% rename from patches/server/0291-Book-Size-Limits.patch rename to patches/server/0290-Book-Size-Limits.patch diff --git a/patches/server/0292-Add-PlayerConnectionCloseEvent.patch b/patches/server/0291-Add-PlayerConnectionCloseEvent.patch similarity index 100% rename from patches/server/0292-Add-PlayerConnectionCloseEvent.patch rename to patches/server/0291-Add-PlayerConnectionCloseEvent.patch diff --git a/patches/server/0293-Prevent-Enderman-from-loading-chunks.patch b/patches/server/0292-Prevent-Enderman-from-loading-chunks.patch similarity index 100% rename from patches/server/0293-Prevent-Enderman-from-loading-chunks.patch rename to patches/server/0292-Prevent-Enderman-from-loading-chunks.patch diff --git a/patches/server/0294-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/server/0293-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch similarity index 98% rename from patches/server/0294-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch rename to patches/server/0293-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch index 0b2063eeb670..474924b34e30 100644 --- a/patches/server/0294-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch +++ b/patches/server/0293-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch @@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and documented as to their purpose. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 119a32c11aff63a764eadeca59d5f50fab89cb72..4e51975dbab2f4904246a2bcff12d923cd629909 100644 +index 295f597fb1ecf9210287d14837c286ae173655f1..7d9e65b073feb8ff473f23eaca88f20c0411d386 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -220,6 +220,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0295-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/server/0294-Workaround-for-vehicle-tracking-issue-on-disconnect.patch similarity index 100% rename from patches/server/0295-Workaround-for-vehicle-tracking-issue-on-disconnect.patch rename to patches/server/0294-Workaround-for-vehicle-tracking-issue-on-disconnect.patch diff --git a/patches/server/0296-Block-Entity-remove-from-being-called-on-Players.patch b/patches/server/0295-Block-Entity-remove-from-being-called-on-Players.patch similarity index 100% rename from patches/server/0296-Block-Entity-remove-from-being-called-on-Players.patch rename to patches/server/0295-Block-Entity-remove-from-being-called-on-Players.patch diff --git a/patches/server/0297-BlockDestroyEvent.patch b/patches/server/0296-BlockDestroyEvent.patch similarity index 100% rename from patches/server/0297-BlockDestroyEvent.patch rename to patches/server/0296-BlockDestroyEvent.patch diff --git a/patches/server/0298-Async-command-map-building.patch b/patches/server/0297-Async-command-map-building.patch similarity index 100% rename from patches/server/0298-Async-command-map-building.patch rename to patches/server/0297-Async-command-map-building.patch diff --git a/patches/server/0299-Implement-Brigadier-Mojang-API.patch b/patches/server/0298-Implement-Brigadier-Mojang-API.patch similarity index 100% rename from patches/server/0299-Implement-Brigadier-Mojang-API.patch rename to patches/server/0298-Implement-Brigadier-Mojang-API.patch diff --git a/patches/server/0300-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/patches/server/0299-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch similarity index 100% rename from patches/server/0300-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch rename to patches/server/0299-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch diff --git a/patches/server/0301-Limit-Client-Sign-length-more.patch b/patches/server/0300-Limit-Client-Sign-length-more.patch similarity index 100% rename from patches/server/0301-Limit-Client-Sign-length-more.patch rename to patches/server/0300-Limit-Client-Sign-length-more.patch diff --git a/patches/server/0302-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/patches/server/0301-Don-t-check-ConvertSigns-boolean-every-sign-save.patch similarity index 100% rename from patches/server/0302-Don-t-check-ConvertSigns-boolean-every-sign-save.patch rename to patches/server/0301-Don-t-check-ConvertSigns-boolean-every-sign-save.patch diff --git a/patches/server/0303-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0302-Optimize-Network-Manager-and-add-advanced-packet-sup.patch similarity index 100% rename from patches/server/0303-Optimize-Network-Manager-and-add-advanced-packet-sup.patch rename to patches/server/0302-Optimize-Network-Manager-and-add-advanced-packet-sup.patch diff --git a/patches/server/0304-Handle-Oversized-Tile-Entities-in-chunks.patch b/patches/server/0303-Handle-Oversized-Tile-Entities-in-chunks.patch similarity index 100% rename from patches/server/0304-Handle-Oversized-Tile-Entities-in-chunks.patch rename to patches/server/0303-Handle-Oversized-Tile-Entities-in-chunks.patch diff --git a/patches/server/0305-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/patches/server/0304-Set-Zombie-last-tick-at-start-of-drowning-process.patch similarity index 100% rename from patches/server/0305-Set-Zombie-last-tick-at-start-of-drowning-process.patch rename to patches/server/0304-Set-Zombie-last-tick-at-start-of-drowning-process.patch diff --git a/patches/server/0306-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/server/0305-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch similarity index 100% rename from patches/server/0306-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch rename to patches/server/0305-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch diff --git a/patches/server/0307-Use-proper-max-length-when-serialising-BungeeCord-te.patch b/patches/server/0306-Use-proper-max-length-when-serialising-BungeeCord-te.patch similarity index 100% rename from patches/server/0307-Use-proper-max-length-when-serialising-BungeeCord-te.patch rename to patches/server/0306-Use-proper-max-length-when-serialising-BungeeCord-te.patch diff --git a/patches/server/0308-Entity-getEntitySpawnReason.patch b/patches/server/0307-Entity-getEntitySpawnReason.patch similarity index 96% rename from patches/server/0308-Entity-getEntitySpawnReason.patch rename to patches/server/0307-Entity-getEntitySpawnReason.patch index 5f9713264498..ee2bce0c3cef 100644 --- a/patches/server/0308-Entity-getEntitySpawnReason.patch +++ b/patches/server/0307-Entity-getEntitySpawnReason.patch @@ -35,7 +35,7 @@ index b494d7fc864a2fa734c73c2c4d433e288bccfb26..840bfcea9347b50b422eb7a325a1be43 }); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index f1489819f53b096c81ef8d06d4e40e3661e6fe52..232ae73392ef1bf27f0ae2721b36069326174717 100644 +index 9dcab83c9695c7f606b9bf3ba62d5f8fd807e239..bf34137b09ed8ba9d7dc3f5e10c0ed73efebf3d7 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -70,6 +70,8 @@ import net.minecraft.world.InteractionHand; @@ -47,7 +47,7 @@ index f1489819f53b096c81ef8d06d4e40e3661e6fe52..232ae73392ef1bf27f0ae2721b360693 import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.vehicle.Boat; -@@ -168,6 +170,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -168,6 +170,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } } }; @@ -55,7 +55,7 @@ index f1489819f53b096c81ef8d06d4e40e3661e6fe52..232ae73392ef1bf27f0ae2721b360693 // Paper end public com.destroystokyo.paper.loottable.PaperLootableInventoryData lootableData; // Paper -@@ -1874,6 +1877,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -1874,6 +1877,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } nbt.put("Paper.Origin", this.newDoubleList(origin.getX(), origin.getY(), origin.getZ())); } @@ -65,7 +65,7 @@ index f1489819f53b096c81ef8d06d4e40e3661e6fe52..232ae73392ef1bf27f0ae2721b360693 // Save entity's from mob spawner status if (spawnedViaMobSpawner) { nbt.putBoolean("Paper.FromMobSpawner", true); -@@ -2023,6 +2029,26 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -2023,6 +2029,26 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } spawnedViaMobSpawner = nbt.getBoolean("Paper.FromMobSpawner"); // Restore entity's from mob spawner status diff --git a/patches/server/0309-Update-entity-Metadata-for-all-tracked-players.patch b/patches/server/0308-Update-entity-Metadata-for-all-tracked-players.patch similarity index 100% rename from patches/server/0309-Update-entity-Metadata-for-all-tracked-players.patch rename to patches/server/0308-Update-entity-Metadata-for-all-tracked-players.patch diff --git a/patches/server/0310-Fire-event-on-GS4-query.patch b/patches/server/0309-Fire-event-on-GS4-query.patch similarity index 100% rename from patches/server/0310-Fire-event-on-GS4-query.patch rename to patches/server/0309-Fire-event-on-GS4-query.patch diff --git a/patches/server/0311-Implement-PlayerPostRespawnEvent.patch b/patches/server/0310-Implement-PlayerPostRespawnEvent.patch similarity index 100% rename from patches/server/0311-Implement-PlayerPostRespawnEvent.patch rename to patches/server/0310-Implement-PlayerPostRespawnEvent.patch diff --git a/patches/server/0312-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/server/0311-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch similarity index 100% rename from patches/server/0312-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch rename to patches/server/0311-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch diff --git a/patches/server/0313-Server-Tick-Events.patch b/patches/server/0312-Server-Tick-Events.patch similarity index 100% rename from patches/server/0313-Server-Tick-Events.patch rename to patches/server/0312-Server-Tick-Events.patch diff --git a/patches/server/0314-PlayerDeathEvent-getItemsToKeep.patch b/patches/server/0313-PlayerDeathEvent-getItemsToKeep.patch similarity index 100% rename from patches/server/0314-PlayerDeathEvent-getItemsToKeep.patch rename to patches/server/0313-PlayerDeathEvent-getItemsToKeep.patch diff --git a/patches/server/0315-Optimize-Captured-TileEntity-Lookup.patch b/patches/server/0314-Optimize-Captured-TileEntity-Lookup.patch similarity index 100% rename from patches/server/0315-Optimize-Captured-TileEntity-Lookup.patch rename to patches/server/0314-Optimize-Captured-TileEntity-Lookup.patch diff --git a/patches/server/0316-Add-Heightmap-API.patch b/patches/server/0315-Add-Heightmap-API.patch similarity index 95% rename from patches/server/0316-Add-Heightmap-API.patch rename to patches/server/0315-Add-Heightmap-API.patch index 6ab1bbb77e00..ec7f5946c093 100644 --- a/patches/server/0316-Add-Heightmap-API.patch +++ b/patches/server/0315-Add-Heightmap-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add Heightmap API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 5dcb92e37e5f419104bd416eb7b53128c1bfed9f..bfdd37da36117274f2a15c7380d863c3235e696c 100644 +index b2388c3c2afa324ea21c5fb3265613f48f6ccfd1..80fe72b22afcb72fda1398197f1eec8e1c18a161 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -215,6 +215,29 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0317-Mob-Spawner-API-Enhancements.patch b/patches/server/0316-Mob-Spawner-API-Enhancements.patch similarity index 100% rename from patches/server/0317-Mob-Spawner-API-Enhancements.patch rename to patches/server/0316-Mob-Spawner-API-Enhancements.patch diff --git a/patches/server/0318-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/server/0317-Fix-CB-call-to-changed-postToMainThread-method.patch similarity index 100% rename from patches/server/0318-Fix-CB-call-to-changed-postToMainThread-method.patch rename to patches/server/0317-Fix-CB-call-to-changed-postToMainThread-method.patch diff --git a/patches/server/0319-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/server/0318-Fix-sounds-when-item-frames-are-modified-MC-123450.patch similarity index 100% rename from patches/server/0319-Fix-sounds-when-item-frames-are-modified-MC-123450.patch rename to patches/server/0318-Fix-sounds-when-item-frames-are-modified-MC-123450.patch diff --git a/patches/server/0320-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/patches/server/0319-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch similarity index 95% rename from patches/server/0320-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch rename to patches/server/0319-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch index 7c77472742ca..38abe074805a 100644 --- a/patches/server/0320-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch +++ b/patches/server/0319-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch @@ -29,7 +29,7 @@ index cdf6394401882cb0702be6ed962e9c0683d3f67a..5ce1fab4d1e68ad83bd46ae6269446b6 public boolean isDebugging() { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index ba0b22c45e0bdcda7087a262a82405a9efe8cc61..36b20b697850dff10910d7f4cd9543ba11e60568 100644 +index 334e43e0628724996b2bda4ec775a5d637239c5e..1efe81c2bec0920477d3062c0ea5829bd45ebc4d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2061,7 +2061,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0321-improve-CraftWorld-isChunkLoaded.patch b/patches/server/0320-improve-CraftWorld-isChunkLoaded.patch similarity index 94% rename from patches/server/0321-improve-CraftWorld-isChunkLoaded.patch rename to patches/server/0320-improve-CraftWorld-isChunkLoaded.patch index 9845a2731558..c4b6ec5536e5 100644 --- a/patches/server/0321-improve-CraftWorld-isChunkLoaded.patch +++ b/patches/server/0320-improve-CraftWorld-isChunkLoaded.patch @@ -9,7 +9,7 @@ waiting for the execution queue to get to our request; We can just query the chunk status and get a response now, vs having to wait diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index bfdd37da36117274f2a15c7380d863c3235e696c..be2790a12ec37267418b77569ceb7dec54d7c282 100644 +index 80fe72b22afcb72fda1398197f1eec8e1c18a161..62a3de8f5a7a8a6da0431918f016ebc1a1735f70 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -286,13 +286,13 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0322-Implement-CraftBlockSoundGroup.patch b/patches/server/0321-Implement-CraftBlockSoundGroup.patch similarity index 100% rename from patches/server/0322-Implement-CraftBlockSoundGroup.patch rename to patches/server/0321-Implement-CraftBlockSoundGroup.patch diff --git a/patches/server/0323-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/server/0322-Configurable-Keep-Spawn-Loaded-range-per-world.patch similarity index 99% rename from patches/server/0323-Configurable-Keep-Spawn-Loaded-range-per-world.patch rename to patches/server/0322-Configurable-Keep-Spawn-Loaded-range-per-world.patch index 020061b666c9..aac460cf7b93 100644 --- a/patches/server/0323-Configurable-Keep-Spawn-Loaded-range-per-world.patch +++ b/patches/server/0322-Configurable-Keep-Spawn-Loaded-range-per-world.patch @@ -217,7 +217,7 @@ index 1fdb4242784e55d5bb6102deb150a57a156aacd3..419e1c4db73631de3d65d8a0e7d5eb08 this.maxCount = i * i; } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index be2790a12ec37267418b77569ceb7dec54d7c282..b3bdfe375a42c5b4bb7b2a3c79678ca57419d179 100644 +index 62a3de8f5a7a8a6da0431918f016ebc1a1735f70..5aa50b1165d17626bdf2b0ccc654952767f9c539 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1349,15 +1349,21 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0324-ChunkMapDistance-CME.patch b/patches/server/0323-ChunkMapDistance-CME.patch similarity index 97% rename from patches/server/0324-ChunkMapDistance-CME.patch rename to patches/server/0323-ChunkMapDistance-CME.patch index 6043b5d3d0e5..e2928c7bd599 100644 --- a/patches/server/0324-ChunkMapDistance-CME.patch +++ b/patches/server/0323-ChunkMapDistance-CME.patch @@ -5,7 +5,7 @@ Subject: [PATCH] ChunkMapDistance CME diff --git a/src/main/java/net/minecraft/server/level/ChunkHolder.java b/src/main/java/net/minecraft/server/level/ChunkHolder.java -index d930162608e1b765ef222eb0fe61d010c6fa97f1..674a6492e2eb10cfd29989643eedcea08b2d5218 100644 +index 41fe4c01c2876dcb2372c4b412c8927359cf74d7..8356a0e816324ce67df14151bdc186e60d8a223c 100644 --- a/src/main/java/net/minecraft/server/level/ChunkHolder.java +++ b/src/main/java/net/minecraft/server/level/ChunkHolder.java @@ -73,6 +73,7 @@ public class ChunkHolder { diff --git a/patches/server/0325-Chunk-debug-command.patch b/patches/server/0324-Chunk-debug-command.patch similarity index 99% rename from patches/server/0325-Chunk-debug-command.patch rename to patches/server/0324-Chunk-debug-command.patch index 21f6eaae67d9..f4bd4f78b99e 100644 --- a/patches/server/0325-Chunk-debug-command.patch +++ b/patches/server/0324-Chunk-debug-command.patch @@ -32,7 +32,7 @@ https://bugs.mojang.com/browse/MC-141484?focusedCommentId=528273&page=com.atlass https://bugs.mojang.com/browse/MC-141484?focusedCommentId=528577&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-528577 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java -index 1eb45df9dca5d0c31ac46709e706136a246cb8ea..53e290aa5c90b241f8d817b4eede08da140197cd 100644 +index 006f2e900de3a665fa48cac877511277a900be62..2225f79b17862160701ae3670cda348cc2e45f0a 100644 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java @@ -6,13 +6,15 @@ import com.google.common.collect.ImmutableSet; diff --git a/patches/server/0326-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0325-Allow-Saving-of-Oversized-Chunks.patch similarity index 100% rename from patches/server/0326-Allow-Saving-of-Oversized-Chunks.patch rename to patches/server/0325-Allow-Saving-of-Oversized-Chunks.patch diff --git a/patches/server/0327-Expose-the-internal-current-tick.patch b/patches/server/0326-Expose-the-internal-current-tick.patch similarity index 100% rename from patches/server/0327-Expose-the-internal-current-tick.patch rename to patches/server/0326-Expose-the-internal-current-tick.patch diff --git a/patches/server/0328-Fix-World-isChunkGenerated-calls.patch b/patches/server/0327-Fix-World-isChunkGenerated-calls.patch similarity index 99% rename from patches/server/0328-Fix-World-isChunkGenerated-calls.patch rename to patches/server/0327-Fix-World-isChunkGenerated-calls.patch index b2948523d788..c64e0630ccbb 100644 --- a/patches/server/0328-Fix-World-isChunkGenerated-calls.patch +++ b/patches/server/0327-Fix-World-isChunkGenerated-calls.patch @@ -188,7 +188,7 @@ index a1bfcdd713c47d8613eb4af7625a64d51161690b..4bc33c31d497aa7d69226ab870fd7890 } catch (Throwable throwable) { if (dataoutputstream != null) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index b3bdfe375a42c5b4bb7b2a3c79678ca57419d179..2993fdcc7670d47466893d7ee4d0c3916859d37f 100644 +index 5aa50b1165d17626bdf2b0ccc654952767f9c539..98ce85ee3d717e921dcbf7e4c4b3a4c5db61b77b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -20,6 +20,7 @@ import java.util.Objects; diff --git a/patches/server/0329-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/server/0328-Show-blockstate-location-if-we-failed-to-read-it.patch similarity index 93% rename from patches/server/0329-Show-blockstate-location-if-we-failed-to-read-it.patch rename to patches/server/0328-Show-blockstate-location-if-we-failed-to-read-it.patch index 2ba2f1d4f7b6..f59317890905 100644 --- a/patches/server/0329-Show-blockstate-location-if-we-failed-to-read-it.patch +++ b/patches/server/0328-Show-blockstate-location-if-we-failed-to-read-it.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Show blockstate location if we failed to read it diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java -index c2c0b4bfab64394e55f2832e37e49bccb7e955ab..d46e3812ef058c119d327cf752e7deaa341736e3 100644 +index a76cce199acdcecfdd8b998ec08974c2ed0751cf..87c25170fbe8b0591d452612496ee1a627138de7 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java @@ -18,6 +18,7 @@ public class CraftBlockEntityState extends CraftBlockStat diff --git a/patches/server/0330-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/server/0329-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch similarity index 100% rename from patches/server/0330-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch rename to patches/server/0329-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch diff --git a/patches/server/0331-Configurable-projectile-relative-velocity.patch b/patches/server/0330-Configurable-projectile-relative-velocity.patch similarity index 100% rename from patches/server/0331-Configurable-projectile-relative-velocity.patch rename to patches/server/0330-Configurable-projectile-relative-velocity.patch diff --git a/patches/server/0332-offset-item-frame-ticking.patch b/patches/server/0331-offset-item-frame-ticking.patch similarity index 100% rename from patches/server/0332-offset-item-frame-ticking.patch rename to patches/server/0331-offset-item-frame-ticking.patch diff --git a/patches/server/0333-Fix-MC-158900.patch b/patches/server/0332-Fix-MC-158900.patch similarity index 100% rename from patches/server/0333-Fix-MC-158900.patch rename to patches/server/0332-Fix-MC-158900.patch diff --git a/patches/server/0334-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0333-Prevent-consuming-the-wrong-itemstack.patch similarity index 100% rename from patches/server/0334-Prevent-consuming-the-wrong-itemstack.patch rename to patches/server/0333-Prevent-consuming-the-wrong-itemstack.patch diff --git a/patches/server/0335-Dont-send-unnecessary-sign-update.patch b/patches/server/0334-Dont-send-unnecessary-sign-update.patch similarity index 100% rename from patches/server/0335-Dont-send-unnecessary-sign-update.patch rename to patches/server/0334-Dont-send-unnecessary-sign-update.patch diff --git a/patches/server/0336-Add-option-to-disable-pillager-patrols.patch b/patches/server/0335-Add-option-to-disable-pillager-patrols.patch similarity index 100% rename from patches/server/0336-Add-option-to-disable-pillager-patrols.patch rename to patches/server/0335-Add-option-to-disable-pillager-patrols.patch diff --git a/patches/server/0337-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch b/patches/server/0336-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch similarity index 100% rename from patches/server/0337-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch rename to patches/server/0336-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch diff --git a/patches/server/0338-Flat-bedrock-generator-settings.patch b/patches/server/0337-Flat-bedrock-generator-settings.patch similarity index 100% rename from patches/server/0338-Flat-bedrock-generator-settings.patch rename to patches/server/0337-Flat-bedrock-generator-settings.patch diff --git a/patches/server/0339-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0338-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch similarity index 100% rename from patches/server/0339-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch rename to patches/server/0338-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch diff --git a/patches/server/0340-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/server/0339-MC-145656-Fix-Follow-Range-Initial-Target.patch similarity index 100% rename from patches/server/0340-MC-145656-Fix-Follow-Range-Initial-Target.patch rename to patches/server/0339-MC-145656-Fix-Follow-Range-Initial-Target.patch diff --git a/patches/server/0341-Duplicate-UUID-Resolve-Option.patch b/patches/server/0340-Duplicate-UUID-Resolve-Option.patch similarity index 100% rename from patches/server/0341-Duplicate-UUID-Resolve-Option.patch rename to patches/server/0340-Duplicate-UUID-Resolve-Option.patch diff --git a/patches/server/0342-Optimize-Hoppers.patch b/patches/server/0341-Optimize-Hoppers.patch similarity index 98% rename from patches/server/0342-Optimize-Hoppers.patch rename to patches/server/0341-Optimize-Hoppers.patch index 5be48c443701..e4e4770a2ecf 100644 --- a/patches/server/0342-Optimize-Hoppers.patch +++ b/patches/server/0341-Optimize-Hoppers.patch @@ -67,18 +67,18 @@ index f1289d7251783c5203828c2b76785dd22c7e2992..b78769cf6a70fb7513ea8d3302cb2dd4 itemstack.setPopTime(this.getPopTime()); if (this.tag != null) { diff --git a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java -index a69bbc11b9e003aed1630a6f5cdbca521deb6ff5..e838abb6d258a1ab47e95572cf4c30c6ca6144b4 100644 +index 06beb18e5e1950aeb6cb427876fcc4c5ea95adb2..b0174aedb7358af1e80278e2f5f13e00c35ab3c6 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java -@@ -70,6 +70,7 @@ public abstract class BlockEntity implements io.papermc.paper.util.KeyedObject { - getMinecraftKey(); // Try to load if it doesn't exists. - return tileEntityKeyString; - } -+ static boolean IGNORE_TILE_UPDATES = false; - // Paper end +@@ -26,6 +26,7 @@ import co.aikar.timings.MinecraftTimings; // Paper + import co.aikar.timings.Timing; // Paper - @Nullable -@@ -182,6 +183,7 @@ public abstract class BlockEntity implements io.papermc.paper.util.KeyedObject { + public abstract class BlockEntity { ++ static boolean IGNORE_TILE_UPDATES = false; // Paper + + public Timing tickTimer = MinecraftTimings.getTileEntityTimings(this); // Paper + // CraftBukkit start - data containers +@@ -162,6 +163,7 @@ public abstract class BlockEntity { public void setChanged() { if (this.level != null) { diff --git a/patches/server/0343-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0342-PlayerDeathEvent-shouldDropExperience.patch similarity index 100% rename from patches/server/0343-PlayerDeathEvent-shouldDropExperience.patch rename to patches/server/0342-PlayerDeathEvent-shouldDropExperience.patch diff --git a/patches/server/0344-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0343-Prevent-bees-loading-chunks-checking-hive-position.patch similarity index 91% rename from patches/server/0344-Prevent-bees-loading-chunks-checking-hive-position.patch rename to patches/server/0343-Prevent-bees-loading-chunks-checking-hive-position.patch index 2c8a65022cd3..16e42ecce054 100644 --- a/patches/server/0344-Prevent-bees-loading-chunks-checking-hive-position.patch +++ b/patches/server/0343-Prevent-bees-loading-chunks-checking-hive-position.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent bees loading chunks checking hive position diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java -index c7ecdb37d18ea5c342b09ede6b347e414056d288..420df05634abc0e976be4f725ac9099112608b2b 100644 +index 2275601d784df397cb2a19328a3c2bcd7e0c1e96..6ea223224e984058f0c6d3443ce49a3a46688434 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java @@ -495,6 +495,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { diff --git a/patches/server/0345-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0344-Don-t-load-Chunks-from-Hoppers-and-other-things.patch similarity index 100% rename from patches/server/0345-Don-t-load-Chunks-from-Hoppers-and-other-things.patch rename to patches/server/0344-Don-t-load-Chunks-from-Hoppers-and-other-things.patch diff --git a/patches/server/0346-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/server/0345-Guard-against-serializing-mismatching-chunk-coordina.patch similarity index 100% rename from patches/server/0346-Guard-against-serializing-mismatching-chunk-coordina.patch rename to patches/server/0345-Guard-against-serializing-mismatching-chunk-coordina.patch diff --git a/patches/server/0347-Optimise-IEntityAccess-getPlayerByUUID.patch b/patches/server/0346-Optimise-IEntityAccess-getPlayerByUUID.patch similarity index 94% rename from patches/server/0347-Optimise-IEntityAccess-getPlayerByUUID.patch rename to patches/server/0346-Optimise-IEntityAccess-getPlayerByUUID.patch index 8ab8ea58fdb3..c68ba1a6b5a9 100644 --- a/patches/server/0347-Optimise-IEntityAccess-getPlayerByUUID.patch +++ b/patches/server/0346-Optimise-IEntityAccess-getPlayerByUUID.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Optimise IEntityAccess#getPlayerByUUID Use the world entity map instead of iterating over all players diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 704d5fd4038cd6913e0804b66da920cd661e93ee..2de2e890cbf74ba98ce0ae9d1ad1a8195eccf71f 100644 +index 3c89e7ec876cc11437e1e035d1f43ea32426eec7..7f2b61523ac2293fdc197cf3eaa341357cf6fc31 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -385,6 +385,14 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0348-Fix-items-not-falling-correctly.patch b/patches/server/0347-Fix-items-not-falling-correctly.patch similarity index 100% rename from patches/server/0348-Fix-items-not-falling-correctly.patch rename to patches/server/0347-Fix-items-not-falling-correctly.patch diff --git a/patches/server/0349-Lag-compensate-eating.patch b/patches/server/0348-Lag-compensate-eating.patch similarity index 100% rename from patches/server/0349-Lag-compensate-eating.patch rename to patches/server/0348-Lag-compensate-eating.patch diff --git a/patches/server/0350-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0349-Optimize-call-to-getFluid-for-explosions.patch similarity index 100% rename from patches/server/0350-Optimize-call-to-getFluid-for-explosions.patch rename to patches/server/0349-Optimize-call-to-getFluid-for-explosions.patch diff --git a/patches/server/0351-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/server/0350-Fix-last-firework-in-stack-not-having-effects-when-d.patch similarity index 100% rename from patches/server/0351-Fix-last-firework-in-stack-not-having-effects-when-d.patch rename to patches/server/0350-Fix-last-firework-in-stack-not-having-effects-when-d.patch diff --git a/patches/server/0352-Add-effect-to-block-break-naturally.patch b/patches/server/0351-Add-effect-to-block-break-naturally.patch similarity index 100% rename from patches/server/0352-Add-effect-to-block-break-naturally.patch rename to patches/server/0351-Add-effect-to-block-break-naturally.patch diff --git a/patches/server/0353-Entity-Activation-Range-2.0.patch b/patches/server/0352-Entity-Activation-Range-2.0.patch similarity index 99% rename from patches/server/0353-Entity-Activation-Range-2.0.patch rename to patches/server/0352-Entity-Activation-Range-2.0.patch index 1438a9e4e02f..b88ed3926f25 100644 --- a/patches/server/0353-Entity-Activation-Range-2.0.patch +++ b/patches/server/0352-Entity-Activation-Range-2.0.patch @@ -14,7 +14,7 @@ Adds flying monsters to control ghast and phantoms Adds villagers as separate config diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 2de2e890cbf74ba98ce0ae9d1ad1a8195eccf71f..2a040e2fc7684ed180efa81037a1c8cb34201518 100644 +index 7f2b61523ac2293fdc197cf3eaa341357cf6fc31..75d91cb0f432fb9a2b5b9a796ad2a60f4c891060 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -2,7 +2,6 @@ package net.minecraft.server.level; @@ -108,10 +108,10 @@ index 2de2e890cbf74ba98ce0ae9d1ad1a8195eccf71f..2a040e2fc7684ed180efa81037a1c8cb } else { passenger.stopRiding(); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 232ae73392ef1bf27f0ae2721b36069326174717..76525b5cee6a6d404ffa877875f08cb0c350510b 100644 +index bf34137b09ed8ba9d7dc3f5e10c0ed73efebf3d7..44fb916fafdc4eb9c4c7971b9c53f7f3bc00b431 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -322,6 +322,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -322,6 +322,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { public void inactiveTick() { } // Spigot end // Paper start @@ -120,7 +120,7 @@ index 232ae73392ef1bf27f0ae2721b36069326174717..76525b5cee6a6d404ffa877875f08cb0 protected int numCollisions = 0; // Paper public boolean spawnedViaMobSpawner; // Paper - Yes this name is similar to above, upstream took the better one @javax.annotation.Nullable -@@ -794,6 +796,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -794,6 +796,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } else { this.wasOnFire = this.isOnFire(); if (movementType == MoverType.PISTON) { @@ -129,7 +129,7 @@ index 232ae73392ef1bf27f0ae2721b36069326174717..76525b5cee6a6d404ffa877875f08cb0 movement = this.limitPistonMovement(movement); if (movement.equals(Vec3.ZERO)) { return; -@@ -806,6 +810,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -806,6 +810,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { this.stuckSpeedMultiplier = Vec3.ZERO; this.setDeltaMovement(Vec3.ZERO); } diff --git a/patches/server/0354-Increase-Light-Queue-Size.patch b/patches/server/0353-Increase-Light-Queue-Size.patch similarity index 100% rename from patches/server/0354-Increase-Light-Queue-Size.patch rename to patches/server/0353-Increase-Light-Queue-Size.patch diff --git a/patches/server/0355-Fix-Light-Command.patch b/patches/server/0354-Fix-Light-Command.patch similarity index 97% rename from patches/server/0355-Fix-Light-Command.patch rename to patches/server/0354-Fix-Light-Command.patch index 9829d9fb756f..24dc105565fb 100644 --- a/patches/server/0355-Fix-Light-Command.patch +++ b/patches/server/0354-Fix-Light-Command.patch @@ -7,7 +7,7 @@ This lets you run /paper fixlight (max 5) to automatically fix all light data in the chunks. diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java -index 005361c38b02713fb823d0be40954400d59f0c4d..3091c100eaf5a86ba270ef0d96de1852a2a0ac9e 100644 +index 2225f79b17862160701ae3670cda348cc2e45f0a..a85678da691debbd68cc07e799a6c397c22ae31d 100644 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java @@ -10,7 +10,8 @@ import net.minecraft.server.MinecraftServer; @@ -134,7 +134,7 @@ index 005361c38b02713fb823d0be40954400d59f0c4d..3091c100eaf5a86ba270ef0d96de1852 + } } diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index e3c9b1f33e146918dcdf4f3cd76fdf324acedda1..655a2f2fd64cc3ce1c972f3b05df8136f31a603a 100644 +index 5685ffe47fd68230cf30ca9f0e49e471b86eab00..071d821094ce1c13ad5755a1ba76d9a8f27bba97 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -137,6 +137,12 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0356-Anti-Xray.patch b/patches/server/0355-Anti-Xray.patch similarity index 99% rename from patches/server/0356-Anti-Xray.patch rename to patches/server/0355-Anti-Xray.patch index ad8b66e12493..97d0c4146e0b 100644 --- a/patches/server/0356-Anti-Xray.patch +++ b/patches/server/0355-Anti-Xray.patch @@ -1180,7 +1180,7 @@ index 071d821094ce1c13ad5755a1ba76d9a8f27bba97..0fad7ad13be138cbc7c4b09f457adbde List list = Lists.newArrayList(); List list1 = Lists.newArrayList(); diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 2a040e2fc7684ed180efa81037a1c8cb34201518..cadefabbbecdba5e6002c94c2df34dd0b7b76991 100644 +index 75d91cb0f432fb9a2b5b9a796ad2a60f4c891060..8c91e1de2bd9a42259be32322eb36d4979684edc 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -395,7 +395,7 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -1597,7 +1597,7 @@ index f3c67a815c570beb14136905cbf5aa4046ee8394..f8f44cb6e823a0150f3abdab133f8ae2 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 8bf2f50e314061a2493d0ce89b9d6104994fe6b6..a523e50d0542e8aeca961ed57346c3d7ecf01979 100644 +index 66132ce8beb96c6880a72514d8e43438d962c547..4793390fdeb5b1ba15135edb5576b1e4f3ebefbc 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2216,7 +2216,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0357-Implement-alternative-item-despawn-rate.patch b/patches/server/0356-Implement-alternative-item-despawn-rate.patch similarity index 100% rename from patches/server/0357-Implement-alternative-item-despawn-rate.patch rename to patches/server/0356-Implement-alternative-item-despawn-rate.patch diff --git a/patches/server/0358-Tracking-Range-Improvements.patch b/patches/server/0357-Tracking-Range-Improvements.patch similarity index 100% rename from patches/server/0358-Tracking-Range-Improvements.patch rename to patches/server/0357-Tracking-Range-Improvements.patch diff --git a/patches/server/0359-Fix-items-vanishing-through-end-portal.patch b/patches/server/0358-Fix-items-vanishing-through-end-portal.patch similarity index 87% rename from patches/server/0359-Fix-items-vanishing-through-end-portal.patch rename to patches/server/0358-Fix-items-vanishing-through-end-portal.patch index 0fd06fdeb9f7..09c072fba051 100644 --- a/patches/server/0359-Fix-items-vanishing-through-end-portal.patch +++ b/patches/server/0358-Fix-items-vanishing-through-end-portal.patch @@ -13,10 +13,10 @@ Quickly loading the exact world spawn chunk before searching the heightmap resolves the issue without having to load all spawn chunks. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 76525b5cee6a6d404ffa877875f08cb0c350510b..57d8fa214b842f6d03ed4c0709b7ec859914cc60 100644 +index 44fb916fafdc4eb9c4c7971b9c53f7f3bc00b431..361d8fc7cfbeb8b80b6e99ab61930596710c3bf5 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -3051,6 +3051,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -3031,6 +3031,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { if (flag1) { blockposition1 = ServerLevel.END_SPAWN_POINT; } else { diff --git a/patches/server/0360-implement-optional-per-player-mob-spawns.patch b/patches/server/0359-implement-optional-per-player-mob-spawns.patch similarity index 100% rename from patches/server/0360-implement-optional-per-player-mob-spawns.patch rename to patches/server/0359-implement-optional-per-player-mob-spawns.patch diff --git a/patches/server/0361-Avoid-hopper-searches-if-there-are-no-items.patch b/patches/server/0360-Avoid-hopper-searches-if-there-are-no-items.patch similarity index 100% rename from patches/server/0361-Avoid-hopper-searches-if-there-are-no-items.patch rename to patches/server/0360-Avoid-hopper-searches-if-there-are-no-items.patch diff --git a/patches/server/0362-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0361-Bees-get-gravity-in-void.-Fixes-MC-167279.patch similarity index 94% rename from patches/server/0362-Bees-get-gravity-in-void.-Fixes-MC-167279.patch rename to patches/server/0361-Bees-get-gravity-in-void.-Fixes-MC-167279.patch index 9e66f6e302be..03bd1852c1c1 100644 --- a/patches/server/0362-Bees-get-gravity-in-void.-Fixes-MC-167279.patch +++ b/patches/server/0361-Bees-get-gravity-in-void.-Fixes-MC-167279.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Bees get gravity in void. Fixes MC-167279 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java -index 420df05634abc0e976be4f725ac9099112608b2b..c08d0377820dd242b15d9b0b40d6ea622e07f26e 100644 +index 6ea223224e984058f0c6d3443ce49a3a46688434..8e857d4ff6497d68e462418d75b8378ff7adbc97 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java @@ -142,7 +142,22 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { diff --git a/patches/server/0363-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0362-Optimise-getChunkAt-calls-for-loaded-chunks.patch similarity index 100% rename from patches/server/0363-Optimise-getChunkAt-calls-for-loaded-chunks.patch rename to patches/server/0362-Optimise-getChunkAt-calls-for-loaded-chunks.patch diff --git a/patches/server/0364-Add-debug-for-sync-chunk-loads.patch b/patches/server/0363-Add-debug-for-sync-chunk-loads.patch similarity index 99% rename from patches/server/0364-Add-debug-for-sync-chunk-loads.patch rename to patches/server/0363-Add-debug-for-sync-chunk-loads.patch index c97f454650ef..c8070b663114 100644 --- a/patches/server/0364-Add-debug-for-sync-chunk-loads.patch +++ b/patches/server/0363-Add-debug-for-sync-chunk-loads.patch @@ -13,7 +13,7 @@ chunks, however it must be enabled by setting the startup flag /paper syncloadinfo clear diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java -index 0c0a8b93e67792aa641e1cb929a11f62cfa38e33..abd8edc1c3e9dfe0df1828761f87c33318c14143 100644 +index a85678da691debbd68cc07e799a6c397c22ae31d..03ba904f5ac018f7e99bfdb9a07295fd6ef9476c 100644 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java @@ -1,11 +1,17 @@ diff --git a/patches/server/0365-Remove-garbage-Java-version-check.patch b/patches/server/0364-Remove-garbage-Java-version-check.patch similarity index 100% rename from patches/server/0365-Remove-garbage-Java-version-check.patch rename to patches/server/0364-Remove-garbage-Java-version-check.patch diff --git a/patches/server/0366-Add-ThrownEggHatchEvent.patch b/patches/server/0365-Add-ThrownEggHatchEvent.patch similarity index 100% rename from patches/server/0366-Add-ThrownEggHatchEvent.patch rename to patches/server/0365-Add-ThrownEggHatchEvent.patch diff --git a/patches/server/0367-Entity-Jump-API.patch b/patches/server/0366-Entity-Jump-API.patch similarity index 100% rename from patches/server/0367-Entity-Jump-API.patch rename to patches/server/0366-Entity-Jump-API.patch diff --git a/patches/server/0368-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0367-Add-option-to-nerf-pigmen-from-nether-portals.patch similarity index 94% rename from patches/server/0368-Add-option-to-nerf-pigmen-from-nether-portals.patch rename to patches/server/0367-Add-option-to-nerf-pigmen-from-nether-portals.patch index 2b2765c7e6a1..43ab0fe04d31 100644 --- a/patches/server/0368-Add-option-to-nerf-pigmen-from-nether-portals.patch +++ b/patches/server/0367-Add-option-to-nerf-pigmen-from-nether-portals.patch @@ -21,10 +21,10 @@ index 575f277a5d38ade7d70c632712ea895cde3bfaae..bcc6dd9f175431e47b92f6ee85b6f86d private void lightQueueSize() { lightQueueSize = getInt("light-queue-size", lightQueueSize); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 57d8fa214b842f6d03ed4c0709b7ec859914cc60..2983a5dfc781f40f345a8ca88c83c6af44ea2c7c 100644 +index 361d8fc7cfbeb8b80b6e99ab61930596710c3bf5..814ff530067d5abe37782d06d9a05f85733f13d0 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -324,6 +324,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -324,6 +324,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { // Paper start public long activatedImmunityTick = Integer.MIN_VALUE; // Paper public boolean isTemporarilyActive = false; // Paper @@ -32,7 +32,7 @@ index 57d8fa214b842f6d03ed4c0709b7ec859914cc60..2983a5dfc781f40f345a8ca88c83c6af protected int numCollisions = 0; // Paper public boolean spawnedViaMobSpawner; // Paper - Yes this name is similar to above, upstream took the better one @javax.annotation.Nullable -@@ -1895,6 +1896,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -1895,6 +1896,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { if (spawnedViaMobSpawner) { nbt.putBoolean("Paper.FromMobSpawner", true); } @@ -42,7 +42,7 @@ index 57d8fa214b842f6d03ed4c0709b7ec859914cc60..2983a5dfc781f40f345a8ca88c83c6af // Paper end return nbt; } catch (Throwable throwable) { -@@ -2040,6 +2044,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -2040,6 +2044,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } spawnedViaMobSpawner = nbt.getBoolean("Paper.FromMobSpawner"); // Restore entity's from mob spawner status diff --git a/patches/server/0369-Make-the-GUI-graph-fancier.patch b/patches/server/0368-Make-the-GUI-graph-fancier.patch similarity index 100% rename from patches/server/0369-Make-the-GUI-graph-fancier.patch rename to patches/server/0368-Make-the-GUI-graph-fancier.patch diff --git a/patches/server/0370-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0369-add-hand-to-BlockMultiPlaceEvent.patch similarity index 100% rename from patches/server/0370-add-hand-to-BlockMultiPlaceEvent.patch rename to patches/server/0369-add-hand-to-BlockMultiPlaceEvent.patch diff --git a/patches/server/0371-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0370-Validate-tripwire-hook-placement-before-update.patch similarity index 100% rename from patches/server/0371-Validate-tripwire-hook-placement-before-update.patch rename to patches/server/0370-Validate-tripwire-hook-placement-before-update.patch diff --git a/patches/server/0372-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0371-Add-option-to-allow-iron-golems-to-spawn-in-air.patch similarity index 100% rename from patches/server/0372-Add-option-to-allow-iron-golems-to-spawn-in-air.patch rename to patches/server/0371-Add-option-to-allow-iron-golems-to-spawn-in-air.patch diff --git a/patches/server/0373-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0372-Configurable-chance-of-villager-zombie-infection.patch similarity index 100% rename from patches/server/0373-Configurable-chance-of-villager-zombie-infection.patch rename to patches/server/0372-Configurable-chance-of-villager-zombie-infection.patch diff --git a/patches/server/0374-Optimise-Chunk-getFluid.patch b/patches/server/0373-Optimise-Chunk-getFluid.patch similarity index 100% rename from patches/server/0374-Optimise-Chunk-getFluid.patch rename to patches/server/0373-Optimise-Chunk-getFluid.patch diff --git a/patches/server/0375-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0374-Set-spigots-verbose-world-setting-to-false-by-def.patch similarity index 100% rename from patches/server/0375-Set-spigots-verbose-world-setting-to-false-by-def.patch rename to patches/server/0374-Set-spigots-verbose-world-setting-to-false-by-def.patch diff --git a/patches/server/0376-Add-tick-times-API-and-mspt-command.patch b/patches/server/0375-Add-tick-times-API-and-mspt-command.patch similarity index 98% rename from patches/server/0376-Add-tick-times-API-and-mspt-command.patch rename to patches/server/0375-Add-tick-times-API-and-mspt-command.patch index 19bf56aa043a..69221d2124ca 100644 --- a/patches/server/0376-Add-tick-times-API-and-mspt-command.patch +++ b/patches/server/0375-Add-tick-times-API-and-mspt-command.patch @@ -146,7 +146,7 @@ index 287014feb99c67083a959f2c09213d49ad5f743d..2e08855085a547151140bcb05dce9bc4 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index a523e50d0542e8aeca961ed57346c3d7ecf01979..d4442ba4f0fc9e062fd321dccd0f49c3d10fd28b 100644 +index 4793390fdeb5b1ba15135edb5576b1e4f3ebefbc..827cc40bfba2c277a9329d63b8224e2aa6296fa4 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2455,6 +2455,16 @@ public final class CraftServer implements Server { diff --git a/patches/server/0377-Expose-MinecraftServer-isRunning.patch b/patches/server/0376-Expose-MinecraftServer-isRunning.patch similarity index 100% rename from patches/server/0377-Expose-MinecraftServer-isRunning.patch rename to patches/server/0376-Expose-MinecraftServer-isRunning.patch diff --git a/patches/server/0378-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0377-Add-Raw-Byte-ItemStack-Serialization.patch similarity index 100% rename from patches/server/0378-Add-Raw-Byte-ItemStack-Serialization.patch rename to patches/server/0377-Add-Raw-Byte-ItemStack-Serialization.patch diff --git a/patches/server/0379-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0378-Pillager-patrol-spawn-settings-and-per-player-option.patch similarity index 98% rename from patches/server/0379-Pillager-patrol-spawn-settings-and-per-player-option.patch rename to patches/server/0378-Pillager-patrol-spawn-settings-and-per-player-option.patch index dd92280d65a8..7fedd8c06a2f 100644 --- a/patches/server/0379-Pillager-patrol-spawn-settings-and-per-player-option.patch +++ b/patches/server/0378-Pillager-patrol-spawn-settings-and-per-player-option.patch @@ -33,7 +33,7 @@ index 3db1230c3abe8f4ba321146f8adbff7fadad9362..feadef47940a1eab3ea79236a40ffd3d public boolean generateFlatBedrock = false; diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 49f272d37fb59fd4c13466217389e626b6ca1e2d..f0c9610fe9e2475c13f897cb2d77978a0caa53a2 100644 +index 9815bb19b8210493d549bed5b2baa95331d71469..c16203295915df53f4b332af8235db215dab181d 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 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0380-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0379-Remote-Connections-shouldn-t-hold-up-shutdown.patch similarity index 100% rename from patches/server/0380-Remote-Connections-shouldn-t-hold-up-shutdown.patch rename to patches/server/0379-Remote-Connections-shouldn-t-hold-up-shutdown.patch diff --git a/patches/server/0381-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0380-Do-not-allow-bees-to-load-chunks-for-beehives.patch similarity index 95% rename from patches/server/0381-Do-not-allow-bees-to-load-chunks-for-beehives.patch rename to patches/server/0380-Do-not-allow-bees-to-load-chunks-for-beehives.patch index 881f96f85c85..471ca643c3d7 100644 --- a/patches/server/0381-Do-not-allow-bees-to-load-chunks-for-beehives.patch +++ b/patches/server/0380-Do-not-allow-bees-to-load-chunks-for-beehives.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Do not allow bees to load chunks for beehives diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java -index c08d0377820dd242b15d9b0b40d6ea622e07f26e..b07fa7fba33b76ae7054dc95b583a3c7a381c5ab 100644 +index 8e857d4ff6497d68e462418d75b8378ff7adbc97..c49e7ea3e2efc4459f5ed1d4ebd83c9d23420611 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java @@ -408,6 +408,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { diff --git a/patches/server/0382-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0381-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch similarity index 100% rename from patches/server/0382-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch rename to patches/server/0381-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch diff --git a/patches/server/0383-Don-t-tick-dead-players.patch b/patches/server/0382-Don-t-tick-dead-players.patch similarity index 100% rename from patches/server/0383-Don-t-tick-dead-players.patch rename to patches/server/0382-Don-t-tick-dead-players.patch diff --git a/patches/server/0384-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0383-Dead-Player-s-shouldn-t-be-able-to-move.patch similarity index 100% rename from patches/server/0384-Dead-Player-s-shouldn-t-be-able-to-move.patch rename to patches/server/0383-Dead-Player-s-shouldn-t-be-able-to-move.patch diff --git a/patches/server/0385-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0384-Optimize-Collision-to-not-load-chunks.patch similarity index 98% rename from patches/server/0385-Optimize-Collision-to-not-load-chunks.patch rename to patches/server/0384-Optimize-Collision-to-not-load-chunks.patch index 7d98711960f8..489030e65197 100644 --- a/patches/server/0385-Optimize-Collision-to-not-load-chunks.patch +++ b/patches/server/0384-Optimize-Collision-to-not-load-chunks.patch @@ -26,10 +26,10 @@ index 3c176d48e6b1a8e165b5860cd443b36c65397ce9..c909163f664875bded56656ad3c0ca6c entityplayer1.setPos(entityplayer1.getX(), entityplayer1.getY() + 1.0D, entityplayer1.getZ()); } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 2983a5dfc781f40f345a8ca88c83c6af44ea2c7c..03ead8423d022f91f849990b6167d86fec066361 100644 +index 814ff530067d5abe37782d06d9a05f85733f13d0..3df2ea950b5c5cc18e17d08af14b3caf4cac767e 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -174,6 +174,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -174,6 +174,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { // Paper end public com.destroystokyo.paper.loottable.PaperLootableInventoryData lootableData; // Paper diff --git a/patches/server/0386-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0385-Don-t-move-existing-players-to-world-spawn.patch similarity index 100% rename from patches/server/0386-Don-t-move-existing-players-to-world-spawn.patch rename to patches/server/0385-Don-t-move-existing-players-to-world-spawn.patch diff --git a/patches/server/0387-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0386-Optimize-GoalSelector-Goal.Flag-Set-operations.patch similarity index 100% rename from patches/server/0387-Optimize-GoalSelector-Goal.Flag-Set-operations.patch rename to patches/server/0386-Optimize-GoalSelector-Goal.Flag-Set-operations.patch diff --git a/patches/server/0388-Improved-Watchdog-Support.patch b/patches/server/0387-Improved-Watchdog-Support.patch similarity index 99% rename from patches/server/0388-Improved-Watchdog-Support.patch rename to patches/server/0387-Improved-Watchdog-Support.patch index a83ad8b011fe..3a10aa67b4c8 100644 --- a/patches/server/0388-Improved-Watchdog-Support.patch +++ b/patches/server/0387-Improved-Watchdog-Support.patch @@ -323,7 +323,7 @@ index 6129ea877c95445d358baf5036be8c4eee1f2770..9d667be3fe04b7d86986bd1ecaf4fce8 final String msg = String.format("BlockEntity threw exception at %s:%s,%s,%s", LevelChunk.this.getLevel().getWorld().getName(), this.getPos().getX(), this.getPos().getY(), this.getPos().getZ()); net.minecraft.server.MinecraftServer.LOGGER.error(msg, throwable); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 6535d59e4fd04cce072de4d939b84e423b5ce52d..e8bb0ee58df4d175d39469555fb62accfe4c6cf9 100644 +index f1c435ef799b3f7db63c0c73474b9b35b21bba24..8f5bd500a21715bc2da7c38f7f8123a2c0de0e96 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2061,7 +2061,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0389-Optimize-Pathfinding.patch b/patches/server/0388-Optimize-Pathfinding.patch similarity index 100% rename from patches/server/0389-Optimize-Pathfinding.patch rename to patches/server/0388-Optimize-Pathfinding.patch diff --git a/patches/server/0390-Reduce-Either-Optional-allocation.patch b/patches/server/0389-Reduce-Either-Optional-allocation.patch similarity index 100% rename from patches/server/0390-Reduce-Either-Optional-allocation.patch rename to patches/server/0389-Reduce-Either-Optional-allocation.patch diff --git a/patches/server/0391-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/server/0390-Reduce-memory-footprint-of-NBTTagCompound.patch similarity index 100% rename from patches/server/0391-Reduce-memory-footprint-of-NBTTagCompound.patch rename to patches/server/0390-Reduce-memory-footprint-of-NBTTagCompound.patch diff --git a/patches/server/0392-Prevent-opening-inventories-when-frozen.patch b/patches/server/0391-Prevent-opening-inventories-when-frozen.patch similarity index 100% rename from patches/server/0392-Prevent-opening-inventories-when-frozen.patch rename to patches/server/0391-Prevent-opening-inventories-when-frozen.patch diff --git a/patches/server/0393-Optimise-ArraySetSorted-removeIf.patch b/patches/server/0392-Optimise-ArraySetSorted-removeIf.patch similarity index 100% rename from patches/server/0393-Optimise-ArraySetSorted-removeIf.patch rename to patches/server/0392-Optimise-ArraySetSorted-removeIf.patch diff --git a/patches/server/0394-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0393-Don-t-run-entity-collision-code-if-not-needed.patch similarity index 100% rename from patches/server/0394-Don-t-run-entity-collision-code-if-not-needed.patch rename to patches/server/0393-Don-t-run-entity-collision-code-if-not-needed.patch diff --git a/patches/server/0395-Implement-Player-Client-Options-API.patch b/patches/server/0394-Implement-Player-Client-Options-API.patch similarity index 100% rename from patches/server/0395-Implement-Player-Client-Options-API.patch rename to patches/server/0394-Implement-Player-Client-Options-API.patch diff --git a/patches/server/0396-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0395-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch similarity index 100% rename from patches/server/0396-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch rename to patches/server/0395-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch diff --git a/patches/server/0397-Broadcast-join-message-to-console.patch b/patches/server/0396-Broadcast-join-message-to-console.patch similarity index 100% rename from patches/server/0397-Broadcast-join-message-to-console.patch rename to patches/server/0396-Broadcast-join-message-to-console.patch diff --git a/patches/server/0398-Fix-Chunk-Post-Processing-deadlock-risk.patch b/patches/server/0397-Fix-Chunk-Post-Processing-deadlock-risk.patch similarity index 100% rename from patches/server/0398-Fix-Chunk-Post-Processing-deadlock-risk.patch rename to patches/server/0397-Fix-Chunk-Post-Processing-deadlock-risk.patch diff --git a/patches/server/0399-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/server/0398-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch similarity index 100% rename from patches/server/0399-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch rename to patches/server/0398-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch diff --git a/patches/server/0400-Load-Chunks-for-Login-Asynchronously.patch b/patches/server/0399-Load-Chunks-for-Login-Asynchronously.patch similarity index 100% rename from patches/server/0400-Load-Chunks-for-Login-Asynchronously.patch rename to patches/server/0399-Load-Chunks-for-Login-Asynchronously.patch diff --git a/patches/server/0401-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0400-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch similarity index 91% rename from patches/server/0401-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch rename to patches/server/0400-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch index 50edad1be1ff..1478d80e4eff 100644 --- a/patches/server/0401-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch +++ b/patches/server/0400-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch @@ -7,10 +7,10 @@ The code following this has better support for null worlds to move them back to the world spawn. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 03ead8423d022f91f849990b6167d86fec066361..21cbab2bd5754158ae4aa1a95f8c80b685ec166b 100644 +index 3df2ea950b5c5cc18e17d08af14b3caf4cac767e..d9606a7f59e79910949350ea15ab321db7dac0e7 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -2017,9 +2017,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -2017,9 +2017,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { bworld = server.getWorld(worldName); } diff --git a/patches/server/0402-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0401-Add-PlayerAttackEntityCooldownResetEvent.patch similarity index 100% rename from patches/server/0402-Add-PlayerAttackEntityCooldownResetEvent.patch rename to patches/server/0401-Add-PlayerAttackEntityCooldownResetEvent.patch diff --git a/patches/server/0403-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0402-Don-t-fire-BlockFade-on-worldgen-threads.patch similarity index 100% rename from patches/server/0403-Don-t-fire-BlockFade-on-worldgen-threads.patch rename to patches/server/0402-Don-t-fire-BlockFade-on-worldgen-threads.patch diff --git a/patches/server/0404-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0403-Add-phantom-creative-and-insomniac-controls.patch similarity index 100% rename from patches/server/0404-Add-phantom-creative-and-insomniac-controls.patch rename to patches/server/0403-Add-phantom-creative-and-insomniac-controls.patch diff --git a/patches/server/0405-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/server/0404-Fix-numerous-item-duplication-issues-and-teleport-is.patch similarity index 94% rename from patches/server/0405-Fix-numerous-item-duplication-issues-and-teleport-is.patch rename to patches/server/0404-Fix-numerous-item-duplication-issues-and-teleport-is.patch index 49de0408d759..cf98c498f780 100644 --- a/patches/server/0405-Fix-numerous-item-duplication-issues-and-teleport-is.patch +++ b/patches/server/0404-Fix-numerous-item-duplication-issues-and-teleport-is.patch @@ -16,10 +16,10 @@ 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 21cbab2bd5754158ae4aa1a95f8c80b685ec166b..53c8583b8438571dd6fcec26c79a6594a4a6f786 100644 +index d9606a7f59e79910949350ea15ab321db7dac0e7..34aed5ecacf325b581252998d26324fa87dc4578 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -2167,11 +2167,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -2147,11 +2147,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } else { // CraftBukkit start - Capture drops for death event if (this instanceof net.minecraft.world.entity.LivingEntity && !((net.minecraft.world.entity.LivingEntity) this).forceDrops) { @@ -34,7 +34,7 @@ index 21cbab2bd5754158ae4aa1a95f8c80b685ec166b..53c8583b8438571dd6fcec26c79a6594 entityitem.setDefaultPickUpDelay(); // CraftBukkit start -@@ -2936,6 +2937,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -2916,6 +2917,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @Nullable public Entity teleportTo(ServerLevel worldserver, BlockPos location) { // CraftBukkit end @@ -47,7 +47,7 @@ index 21cbab2bd5754158ae4aa1a95f8c80b685ec166b..53c8583b8438571dd6fcec26c79a6594 if (this.level instanceof ServerLevel && !this.isRemoved()) { this.level.getProfiler().push("changeDimension"); // CraftBukkit start -@@ -2962,6 +2969,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -2942,6 +2949,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { // CraftBukkit end this.level.getProfiler().popPush("reloading"); @@ -59,7 +59,7 @@ index 21cbab2bd5754158ae4aa1a95f8c80b685ec166b..53c8583b8438571dd6fcec26c79a6594 Entity entity = this.getType().create(worldserver); if (entity != null) { -@@ -2975,10 +2987,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -2955,10 +2967,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { // CraftBukkit start - Forward the CraftEntity to the new entity this.getBukkitEntity().setHandle(entity); entity.bukkitEntity = this.getBukkitEntity(); @@ -70,7 +70,7 @@ index 21cbab2bd5754158ae4aa1a95f8c80b685ec166b..53c8583b8438571dd6fcec26c79a6594 // CraftBukkit end } -@@ -3100,7 +3108,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -3080,7 +3088,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } public boolean canChangeDimensions() { diff --git a/patches/server/0406-Villager-Restocks-API.patch b/patches/server/0405-Villager-Restocks-API.patch similarity index 100% rename from patches/server/0406-Villager-Restocks-API.patch rename to patches/server/0405-Villager-Restocks-API.patch diff --git a/patches/server/0407-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0406-Validate-PickItem-Packet-and-kick-for-invalid.patch similarity index 100% rename from patches/server/0407-Validate-PickItem-Packet-and-kick-for-invalid.patch rename to patches/server/0406-Validate-PickItem-Packet-and-kick-for-invalid.patch diff --git a/patches/server/0408-Expose-game-version.patch b/patches/server/0407-Expose-game-version.patch similarity index 89% rename from patches/server/0408-Expose-game-version.patch rename to patches/server/0407-Expose-game-version.patch index 56c6885807db..03ce2e3e199c 100644 --- a/patches/server/0408-Expose-game-version.patch +++ b/patches/server/0407-Expose-game-version.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Expose game version diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index e8bb0ee58df4d175d39469555fb62accfe4c6cf9..9afc3e6b3717caa26f7239c4032b699b2226ddd6 100644 +index 8f5bd500a21715bc2da7c38f7f8123a2c0de0e96..d04a63299d57ee7d3d4cd53db752562924a90df4 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -572,6 +572,13 @@ public final class CraftServer implements Server { diff --git a/patches/server/0409-Optimize-Voxel-Shape-Merging.patch b/patches/server/0408-Optimize-Voxel-Shape-Merging.patch similarity index 100% rename from patches/server/0409-Optimize-Voxel-Shape-Merging.patch rename to patches/server/0408-Optimize-Voxel-Shape-Merging.patch diff --git a/patches/server/0410-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0409-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch similarity index 93% rename from patches/server/0410-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch rename to patches/server/0409-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch index 9ca79e1b8036..735b8752791d 100644 --- a/patches/server/0410-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch +++ b/patches/server/0409-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 c579f586c9a2dcb6356b49f68591f61e0fa61b62..afcc80d1f79d1743b0940c69858eacec88fec889 100644 +index 7a5e7e8a680ead5128fbf5829bc47704715b94bd..fbe68bd4739d9a0e7d9bc4c3d5ba8ecfd2d13954 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -28,6 +28,7 @@ public class Main { diff --git a/patches/server/0411-misc-debugging-dumps.patch b/patches/server/0410-misc-debugging-dumps.patch similarity index 98% rename from patches/server/0411-misc-debugging-dumps.patch rename to patches/server/0410-misc-debugging-dumps.patch index 1c556f4401f2..9da79af1a962 100644 --- a/patches/server/0411-misc-debugging-dumps.patch +++ b/patches/server/0410-misc-debugging-dumps.patch @@ -74,7 +74,7 @@ index 0af65f1698e4ee9d94724f19b0abd61c437f18f2..d21f45d983bf3047811d2d73f4a38deb this.connection.send(new ClientboundDisconnectPacket(chatmessage)); this.connection.disconnect(chatmessage); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 9afc3e6b3717caa26f7239c4032b699b2226ddd6..c48d2e560cd19fd7ac58844ed7e3c98597f09562 100644 +index d04a63299d57ee7d3d4cd53db752562924a90df4..0784e79d0c99a29ea3a04a9b4e360dc385bdfa3a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -996,6 +996,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0412-Prevent-teleporting-dead-entities.patch b/patches/server/0411-Prevent-teleporting-dead-entities.patch similarity index 100% rename from patches/server/0412-Prevent-teleporting-dead-entities.patch rename to patches/server/0411-Prevent-teleporting-dead-entities.patch diff --git a/patches/server/0413-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0412-Deobfuscate-stacktraces-in-log-messages-crash-report.patch similarity index 100% rename from patches/server/0413-Deobfuscate-stacktraces-in-log-messages-crash-report.patch rename to patches/server/0412-Deobfuscate-stacktraces-in-log-messages-crash-report.patch diff --git a/patches/server/0414-Implement-Mob-Goal-API.patch b/patches/server/0413-Implement-Mob-Goal-API.patch similarity index 100% rename from patches/server/0414-Implement-Mob-Goal-API.patch rename to patches/server/0413-Implement-Mob-Goal-API.patch diff --git a/patches/server/0415-Add-villager-reputation-API.patch b/patches/server/0414-Add-villager-reputation-API.patch similarity index 100% rename from patches/server/0415-Add-villager-reputation-API.patch rename to patches/server/0414-Add-villager-reputation-API.patch diff --git a/patches/server/0416-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0415-Option-for-maximum-exp-value-when-merging-orbs.patch similarity index 100% rename from patches/server/0416-Option-for-maximum-exp-value-when-merging-orbs.patch rename to patches/server/0415-Option-for-maximum-exp-value-when-merging-orbs.patch diff --git a/patches/server/0417-ExperienceOrbMergeEvent.patch b/patches/server/0416-ExperienceOrbMergeEvent.patch similarity index 100% rename from patches/server/0417-ExperienceOrbMergeEvent.patch rename to patches/server/0416-ExperienceOrbMergeEvent.patch diff --git a/patches/server/0418-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0417-Fix-PotionEffect-ignores-icon-flag.patch similarity index 100% rename from patches/server/0418-Fix-PotionEffect-ignores-icon-flag.patch rename to patches/server/0417-Fix-PotionEffect-ignores-icon-flag.patch diff --git a/patches/server/0419-Optimize-brigadier-child-sorting-performance.patch b/patches/server/0418-Optimize-brigadier-child-sorting-performance.patch similarity index 100% rename from patches/server/0419-Optimize-brigadier-child-sorting-performance.patch rename to patches/server/0418-Optimize-brigadier-child-sorting-performance.patch diff --git a/patches/server/0420-Potential-bed-API.patch b/patches/server/0419-Potential-bed-API.patch similarity index 100% rename from patches/server/0420-Potential-bed-API.patch rename to patches/server/0419-Potential-bed-API.patch diff --git a/patches/server/0421-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0420-Wait-for-Async-Tasks-during-shutdown.patch similarity index 96% rename from patches/server/0421-Wait-for-Async-Tasks-during-shutdown.patch rename to patches/server/0420-Wait-for-Async-Tasks-during-shutdown.patch index 050ebb6ea6d1..a8fcd2014417 100644 --- a/patches/server/0421-Wait-for-Async-Tasks-during-shutdown.patch +++ b/patches/server/0420-Wait-for-Async-Tasks-during-shutdown.patch @@ -22,7 +22,7 @@ index 6d774f126e31e90d0845fc24b1ad7df5346c7cc9..ca228085e07254aa23937219c7ef2b33 // CraftBukkit end if (this.getConnection() != null) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 7f41a66e51c91fca6c6069f8072d215e6eaee7e3..aed3861a783155095b6aaf5d08af20b19f2573e1 100644 +index 6521ee7a5f84b72b90b022198d47854d27facc38..dd5c03a42ac3973334c9cad131fa1c895e45e948 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1005,6 +1005,35 @@ public final class CraftServer implements Server { diff --git a/patches/server/0422-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0421-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch similarity index 100% rename from patches/server/0422-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch rename to patches/server/0421-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch diff --git a/patches/server/0423-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0422-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch similarity index 100% rename from patches/server/0423-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch rename to patches/server/0422-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch diff --git a/patches/server/0424-Reduce-MutableInt-allocations-from-light-engine.patch b/patches/server/0423-Reduce-MutableInt-allocations-from-light-engine.patch similarity index 100% rename from patches/server/0424-Reduce-MutableInt-allocations-from-light-engine.patch rename to patches/server/0423-Reduce-MutableInt-allocations-from-light-engine.patch diff --git a/patches/server/0425-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0424-Reduce-allocation-of-Vec3D-by-entity-tracker.patch similarity index 100% rename from patches/server/0425-Reduce-allocation-of-Vec3D-by-entity-tracker.patch rename to patches/server/0424-Reduce-allocation-of-Vec3D-by-entity-tracker.patch diff --git a/patches/server/0426-Ensure-safe-gateway-teleport.patch b/patches/server/0425-Ensure-safe-gateway-teleport.patch similarity index 100% rename from patches/server/0426-Ensure-safe-gateway-teleport.patch rename to patches/server/0425-Ensure-safe-gateway-teleport.patch diff --git a/patches/server/0427-Add-option-for-console-having-all-permissions.patch b/patches/server/0426-Add-option-for-console-having-all-permissions.patch similarity index 100% rename from patches/server/0427-Add-option-for-console-having-all-permissions.patch rename to patches/server/0426-Add-option-for-console-having-all-permissions.patch diff --git a/patches/server/0428-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch b/patches/server/0427-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch similarity index 100% rename from patches/server/0428-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch rename to patches/server/0427-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch diff --git a/patches/server/0429-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/0428-Use-distance-map-to-optimise-entity-tracker.patch similarity index 99% rename from patches/server/0429-Use-distance-map-to-optimise-entity-tracker.patch rename to patches/server/0428-Use-distance-map-to-optimise-entity-tracker.patch index 89223bf280d6..9c6ed229cc75 100644 --- a/patches/server/0429-Use-distance-map-to-optimise-entity-tracker.patch +++ b/patches/server/0428-Use-distance-map-to-optimise-entity-tracker.patch @@ -280,7 +280,7 @@ index 63e264c862053874585b0f6aad2f89389c2dadcb..2c9cd3619b0759905637eff746a761eb return object instanceof ChunkMap.TrackedEntity ? ((ChunkMap.TrackedEntity) object).entity.getId() == this.entity.getId() : false; } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 53c8583b8438571dd6fcec26c79a6594a4a6f786..a99d0dfeece57204e94b349b385e315a83869bca 100644 +index 34aed5ecacf325b581252998d26324fa87dc4578..f81bf7d1b0c2f355b71ce2e5f68ec9fb7aad824a 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -54,6 +54,7 @@ import net.minecraft.network.syncher.EntityDataSerializers; @@ -291,7 +291,7 @@ index 53c8583b8438571dd6fcec26c79a6594a4a6f786..a99d0dfeece57204e94b349b385e315a import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; -@@ -362,6 +363,39 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -362,6 +363,39 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } // Paper end diff --git a/patches/server/0430-Optimize-ServerLevels-chunk-level-checking-methods.patch b/patches/server/0429-Optimize-ServerLevels-chunk-level-checking-methods.patch similarity index 100% rename from patches/server/0430-Optimize-ServerLevels-chunk-level-checking-methods.patch rename to patches/server/0429-Optimize-ServerLevels-chunk-level-checking-methods.patch diff --git a/patches/server/0431-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/patches/server/0430-Delay-Chunk-Unloads-based-on-Player-Movement.patch similarity index 100% rename from patches/server/0431-Delay-Chunk-Unloads-based-on-Player-Movement.patch rename to patches/server/0430-Delay-Chunk-Unloads-based-on-Player-Movement.patch diff --git a/patches/server/0432-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0431-Fix-villager-trading-demand-MC-163962.patch similarity index 100% rename from patches/server/0432-Fix-villager-trading-demand-MC-163962.patch rename to patches/server/0431-Fix-villager-trading-demand-MC-163962.patch diff --git a/patches/server/0433-Maps-shouldn-t-load-chunks.patch b/patches/server/0432-Maps-shouldn-t-load-chunks.patch similarity index 100% rename from patches/server/0433-Maps-shouldn-t-load-chunks.patch rename to patches/server/0432-Maps-shouldn-t-load-chunks.patch diff --git a/patches/server/0434-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0433-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch similarity index 100% rename from patches/server/0434-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch rename to patches/server/0433-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch diff --git a/patches/server/0435-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0434-Fix-missing-chunks-due-to-integer-overflow.patch similarity index 100% rename from patches/server/0435-Fix-missing-chunks-due-to-integer-overflow.patch rename to patches/server/0434-Fix-missing-chunks-due-to-integer-overflow.patch diff --git a/patches/server/0436-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0435-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch similarity index 100% rename from patches/server/0436-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch rename to patches/server/0435-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch diff --git a/patches/server/0437-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0436-Fix-piston-physics-inconsistency-MC-188840.patch similarity index 100% rename from patches/server/0437-Fix-piston-physics-inconsistency-MC-188840.patch rename to patches/server/0436-Fix-piston-physics-inconsistency-MC-188840.patch diff --git a/patches/server/0438-Fix-sand-duping.patch b/patches/server/0437-Fix-sand-duping.patch similarity index 100% rename from patches/server/0438-Fix-sand-duping.patch rename to patches/server/0437-Fix-sand-duping.patch diff --git a/patches/server/0439-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/server/0438-Prevent-position-desync-in-playerconnection-causing-.patch similarity index 100% rename from patches/server/0439-Prevent-position-desync-in-playerconnection-causing-.patch rename to patches/server/0438-Prevent-position-desync-in-playerconnection-causing-.patch diff --git a/patches/server/0440-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0439-Inventory-getHolder-method-without-block-snapshot.patch similarity index 100% rename from patches/server/0440-Inventory-getHolder-method-without-block-snapshot.patch rename to patches/server/0439-Inventory-getHolder-method-without-block-snapshot.patch diff --git a/patches/server/0441-Improve-Arrow-API.patch b/patches/server/0440-Improve-Arrow-API.patch similarity index 100% rename from patches/server/0441-Improve-Arrow-API.patch rename to patches/server/0440-Improve-Arrow-API.patch diff --git a/patches/server/0442-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0441-Add-and-implement-PlayerRecipeBookClickEvent.patch similarity index 100% rename from patches/server/0442-Add-and-implement-PlayerRecipeBookClickEvent.patch rename to patches/server/0441-Add-and-implement-PlayerRecipeBookClickEvent.patch diff --git a/patches/server/0443-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0442-Hide-sync-chunk-writes-behind-flag.patch similarity index 100% rename from patches/server/0443-Hide-sync-chunk-writes-behind-flag.patch rename to patches/server/0442-Hide-sync-chunk-writes-behind-flag.patch diff --git a/patches/server/0444-Add-permission-for-command-blocks.patch b/patches/server/0443-Add-permission-for-command-blocks.patch similarity index 100% rename from patches/server/0444-Add-permission-for-command-blocks.patch rename to patches/server/0443-Add-permission-for-command-blocks.patch diff --git a/patches/server/0445-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0444-Ensure-Entity-AABB-s-are-never-invalid.patch similarity index 83% rename from patches/server/0445-Ensure-Entity-AABB-s-are-never-invalid.patch rename to patches/server/0444-Ensure-Entity-AABB-s-are-never-invalid.patch index b2040a5e8109..9f39cd2fa04f 100644 --- a/patches/server/0445-Ensure-Entity-AABB-s-are-never-invalid.patch +++ b/patches/server/0444-Ensure-Entity-AABB-s-are-never-invalid.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Ensure Entity AABB's are never invalid diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index a99d0dfeece57204e94b349b385e315a83869bca..e2585356cb8e9d556901a87df4a0b33bf4a5dcf4 100644 +index f81bf7d1b0c2f355b71ce2e5f68ec9fb7aad824a..57ec20f963c440051b318bf29b59db965d9d744e 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -599,8 +599,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -599,8 +599,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } public void setPos(double x, double y, double z) { @@ -19,7 +19,7 @@ index a99d0dfeece57204e94b349b385e315a83869bca..e2585356cb8e9d556901a87df4a0b33b } protected AABB makeBoundingBox() { -@@ -3809,6 +3809,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -3789,6 +3789,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } public final void setPosRaw(double x, double y, double z) { @@ -31,7 +31,7 @@ index a99d0dfeece57204e94b349b385e315a83869bca..e2585356cb8e9d556901a87df4a0b33b if (this.position.x != x || this.position.y != y || this.position.z != z) { this.position = new Vec3(x, y, z); int i = Mth.floor(x); -@@ -3831,6 +3836,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -3811,6 +3816,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } } diff --git a/patches/server/0446-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0445-Fix-Per-World-Difficulty-Remembering-Difficulty.patch similarity index 98% rename from patches/server/0446-Fix-Per-World-Difficulty-Remembering-Difficulty.patch rename to patches/server/0445-Fix-Per-World-Difficulty-Remembering-Difficulty.patch index 35f8ec91fa43..ecab36dd4a11 100644 --- a/patches/server/0446-Fix-Per-World-Difficulty-Remembering-Difficulty.patch +++ b/patches/server/0445-Fix-Per-World-Difficulty-Remembering-Difficulty.patch @@ -102,7 +102,7 @@ index e2446434e0db09d303c4a831c8f60819ade18f9a..33c0db5e7dc0d824e10577fc73406134 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index aed3861a783155095b6aaf5d08af20b19f2573e1..991843e6395bdc88c135a7352bc44452390230cf 100644 +index dd5c03a42ac3973334c9cad131fa1c895e45e948..76a1805b9ff4d711cd88265e9bf152333167360e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -944,8 +944,8 @@ public final class CraftServer implements Server { diff --git a/patches/server/0447-Paper-dumpitem-command.patch b/patches/server/0446-Paper-dumpitem-command.patch similarity index 97% rename from patches/server/0447-Paper-dumpitem-command.patch rename to patches/server/0446-Paper-dumpitem-command.patch index be0e942b1b23..1c677ca32c13 100644 --- a/patches/server/0447-Paper-dumpitem-command.patch +++ b/patches/server/0446-Paper-dumpitem-command.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Paper dumpitem command Let's you quickly view the item in your hands NBT data diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java -index 51e469146f0712a509071c8438ff6b69f961f945..f436ab35798c9b6e6cb2eb60d2c02cbf9b742e69 100644 +index 03ba904f5ac018f7e99bfdb9a07295fd6ef9476c..5a30840a2c35d8b721e27e91b4e6816e9b7c1e5a 100644 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java @@ -20,6 +20,7 @@ import net.minecraft.server.level.ServerPlayer; diff --git a/patches/server/0448-Don-t-allow-null-UUID-s-for-chat.patch b/patches/server/0447-Don-t-allow-null-UUID-s-for-chat.patch similarity index 100% rename from patches/server/0448-Don-t-allow-null-UUID-s-for-chat.patch rename to patches/server/0447-Don-t-allow-null-UUID-s-for-chat.patch diff --git a/patches/server/0449-Improve-Legacy-Component-serialization-size.patch b/patches/server/0448-Improve-Legacy-Component-serialization-size.patch similarity index 100% rename from patches/server/0449-Improve-Legacy-Component-serialization-size.patch rename to patches/server/0448-Improve-Legacy-Component-serialization-size.patch diff --git a/patches/server/0450-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0449-Optimize-Bit-Operations-by-inlining.patch similarity index 100% rename from patches/server/0450-Optimize-Bit-Operations-by-inlining.patch rename to patches/server/0449-Optimize-Bit-Operations-by-inlining.patch diff --git a/patches/server/0451-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0450-Add-Plugin-Tickets-to-API-Chunk-Methods.patch similarity index 97% rename from patches/server/0451-Add-Plugin-Tickets-to-API-Chunk-Methods.patch rename to patches/server/0450-Add-Plugin-Tickets-to-API-Chunk-Methods.patch index 1a201b13a568..37de5fa93902 100644 --- a/patches/server/0451-Add-Plugin-Tickets-to-API-Chunk-Methods.patch +++ b/patches/server/0450-Add-Plugin-Tickets-to-API-Chunk-Methods.patch @@ -22,7 +22,7 @@ wants it to collect even faster, they can restore that setting back to 1 instead Not adding it to .getType() though to keep behavior consistent with vanilla for performance reasons. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 991843e6395bdc88c135a7352bc44452390230cf..139055e3e2641a204ac51ed847f08f300976f8fe 100644 +index 76a1805b9ff4d711cd88265e9bf152333167360e..145170acf479f9ee8f43ec7b8a39778de182cdfc 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -358,7 +358,7 @@ public final class CraftServer implements Server { @@ -44,7 +44,7 @@ index 991843e6395bdc88c135a7352bc44452390230cf..139055e3e2641a204ac51ed847f08f30 this.printSaveWarning = false; console.autosavePeriod = this.configuration.getInt("ticks-per.autosave"); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 2993fdcc7670d47466893d7ee4d0c3916859d37f..a5c335715a25dc154682e38a49ff308f30b41216 100644 +index 98ce85ee3d717e921dcbf7e4c4b3a4c5db61b77b..68f6ccacacad0e06f27d56b19b9f68b0691e747e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -275,8 +275,21 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0452-incremental-chunk-and-player-saving.patch b/patches/server/0451-incremental-chunk-and-player-saving.patch similarity index 100% rename from patches/server/0452-incremental-chunk-and-player-saving.patch rename to patches/server/0451-incremental-chunk-and-player-saving.patch diff --git a/patches/server/0453-Stop-copy-on-write-operations-for-updating-light-dat.patch b/patches/server/0452-Stop-copy-on-write-operations-for-updating-light-dat.patch similarity index 100% rename from patches/server/0453-Stop-copy-on-write-operations-for-updating-light-dat.patch rename to patches/server/0452-Stop-copy-on-write-operations-for-updating-light-dat.patch diff --git a/patches/server/0454-Support-old-UUID-format-for-NBT.patch b/patches/server/0453-Support-old-UUID-format-for-NBT.patch similarity index 100% rename from patches/server/0454-Support-old-UUID-format-for-NBT.patch rename to patches/server/0453-Support-old-UUID-format-for-NBT.patch diff --git a/patches/server/0455-Clean-up-duplicated-GameProfile-Properties.patch b/patches/server/0454-Clean-up-duplicated-GameProfile-Properties.patch similarity index 100% rename from patches/server/0455-Clean-up-duplicated-GameProfile-Properties.patch rename to patches/server/0454-Clean-up-duplicated-GameProfile-Properties.patch diff --git a/patches/server/0456-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0455-Convert-legacy-attributes-in-Item-Meta.patch similarity index 97% rename from patches/server/0456-Convert-legacy-attributes-in-Item-Meta.patch rename to patches/server/0455-Convert-legacy-attributes-in-Item-Meta.patch index d1830740b8b7..6f109d92c7c9 100644 --- a/patches/server/0456-Convert-legacy-attributes-in-Item-Meta.patch +++ b/patches/server/0455-Convert-legacy-attributes-in-Item-Meta.patch @@ -30,7 +30,7 @@ index 0520c45197629cbdc2777d9ae11eef572e793160..46c313d581b9af6aa0a48f97ae3cc800 public CraftAttributeMap(AttributeMap handle) { this.handle = handle; diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index 4b48f4e1b2d69a18be0e9d83d52bc4f58b1f5bd9..058a7ccd1680e68db55350a72510da4aaff8d60b 100644 +index 200d1cd53b5af8d7368b6c34b1cfb64463f3e782..ab809278b01f08342821bd4883601e814a74a066 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -480,7 +480,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { diff --git a/patches/server/0457-Remove-some-streams-from-structures.patch b/patches/server/0456-Remove-some-streams-from-structures.patch similarity index 100% rename from patches/server/0457-Remove-some-streams-from-structures.patch rename to patches/server/0456-Remove-some-streams-from-structures.patch diff --git a/patches/server/0458-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0457-Remove-streams-from-classes-related-villager-gossip.patch similarity index 100% rename from patches/server/0458-Remove-streams-from-classes-related-villager-gossip.patch rename to patches/server/0457-Remove-streams-from-classes-related-villager-gossip.patch diff --git a/patches/server/0459-Support-components-in-ItemMeta.patch b/patches/server/0458-Support-components-in-ItemMeta.patch similarity index 97% rename from patches/server/0459-Support-components-in-ItemMeta.patch rename to patches/server/0458-Support-components-in-ItemMeta.patch index f8e10e62b20a..7d7d7af4d6d2 100644 --- a/patches/server/0459-Support-components-in-ItemMeta.patch +++ b/patches/server/0458-Support-components-in-ItemMeta.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Support components in ItemMeta diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index 058a7ccd1680e68db55350a72510da4aaff8d60b..9486dc1c1ec5d997d53277ede2f85e9df153939e 100644 +index ab809278b01f08342821bd4883601e814a74a066..671ac759424eaf9b2573545c6fcbec1f3a0ef731 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -874,11 +874,23 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { diff --git a/patches/server/0460-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/patches/server/0459-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch similarity index 100% rename from patches/server/0460-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch rename to patches/server/0459-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch diff --git a/patches/server/0461-Add-entity-liquid-API.patch b/patches/server/0460-Add-entity-liquid-API.patch similarity index 93% rename from patches/server/0461-Add-entity-liquid-API.patch rename to patches/server/0460-Add-entity-liquid-API.patch index 4482f88f22bc..4a28ddb0654e 100644 --- a/patches/server/0461-Add-entity-liquid-API.patch +++ b/patches/server/0460-Add-entity-liquid-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add entity liquid API diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index e2585356cb8e9d556901a87df4a0b33bf4a5dcf4..eac485db587eba68ab0d05ac5bfd07fb20c0e766 100644 +index 57ec20f963c440051b318bf29b59db965d9d744e..3883c5d97f80a44cb371b69c3b07caa362416666 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -1372,7 +1372,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -1372,7 +1372,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { return this.isInWater() || this.isInRain(); } diff --git a/patches/server/0462-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0461-Update-itemstack-legacy-name-and-lore.patch similarity index 100% rename from patches/server/0462-Update-itemstack-legacy-name-and-lore.patch rename to patches/server/0461-Update-itemstack-legacy-name-and-lore.patch diff --git a/patches/server/0463-Spawn-player-in-correct-world-on-login.patch b/patches/server/0462-Spawn-player-in-correct-world-on-login.patch similarity index 100% rename from patches/server/0463-Spawn-player-in-correct-world-on-login.patch rename to patches/server/0462-Spawn-player-in-correct-world-on-login.patch diff --git a/patches/server/0464-Add-PrepareResultEvent.patch b/patches/server/0463-Add-PrepareResultEvent.patch similarity index 100% rename from patches/server/0464-Add-PrepareResultEvent.patch rename to patches/server/0463-Add-PrepareResultEvent.patch diff --git a/patches/server/0465-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0464-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch similarity index 100% rename from patches/server/0465-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch rename to patches/server/0464-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch diff --git a/patches/server/0466-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/patches/server/0465-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch similarity index 99% rename from patches/server/0466-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch rename to patches/server/0465-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch index 8601bd6cc598..aa7d212d9edd 100644 --- a/patches/server/0466-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch +++ b/patches/server/0465-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch @@ -1135,10 +1135,10 @@ index aa9d32a4c86aade43f91c78ae1179119d12e9a88..d5e5e0a80c1a3dd5823e9975062856b6 if (updatingChunk != null) { return updatingChunk.getEntityTickingChunkFuture(); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index eac485db587eba68ab0d05ac5bfd07fb20c0e766..2df33172415c8da39b9f299027cd86d2ce7c6890 100644 +index 3883c5d97f80a44cb371b69c3b07caa362416666..731cd8167eed50ac066734e97d3670df363a67d7 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -231,7 +231,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -231,7 +231,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { private BlockPos blockPosition; private ChunkPos chunkPosition; private Vec3 deltaMovement; diff --git a/patches/server/0467-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0466-Optimize-NetworkManager-Exception-Handling.patch similarity index 100% rename from patches/server/0467-Optimize-NetworkManager-Exception-Handling.patch rename to patches/server/0466-Optimize-NetworkManager-Exception-Handling.patch diff --git a/patches/server/0468-Optimize-the-advancement-data-player-iteration-to-be.patch b/patches/server/0467-Optimize-the-advancement-data-player-iteration-to-be.patch similarity index 100% rename from patches/server/0468-Optimize-the-advancement-data-player-iteration-to-be.patch rename to patches/server/0467-Optimize-the-advancement-data-player-iteration-to-be.patch diff --git a/patches/server/0469-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0468-Fix-arrows-never-despawning-MC-125757.patch similarity index 100% rename from patches/server/0469-Fix-arrows-never-despawning-MC-125757.patch rename to patches/server/0468-Fix-arrows-never-despawning-MC-125757.patch diff --git a/patches/server/0470-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0469-Thread-Safe-Vanilla-Command-permission-checking.patch similarity index 100% rename from patches/server/0470-Thread-Safe-Vanilla-Command-permission-checking.patch rename to patches/server/0469-Thread-Safe-Vanilla-Command-permission-checking.patch diff --git a/patches/server/0471-Move-range-check-for-block-placing-up.patch b/patches/server/0470-Move-range-check-for-block-placing-up.patch similarity index 100% rename from patches/server/0471-Move-range-check-for-block-placing-up.patch rename to patches/server/0470-Move-range-check-for-block-placing-up.patch diff --git a/patches/server/0472-Fix-SPIGOT-5989.patch b/patches/server/0471-Fix-SPIGOT-5989.patch similarity index 100% rename from patches/server/0472-Fix-SPIGOT-5989.patch rename to patches/server/0471-Fix-SPIGOT-5989.patch diff --git a/patches/server/0473-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0472-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch similarity index 100% rename from patches/server/0473-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch rename to patches/server/0472-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch diff --git a/patches/server/0474-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0473-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch similarity index 100% rename from patches/server/0474-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch rename to patches/server/0473-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch diff --git a/patches/server/0475-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0474-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch similarity index 100% rename from patches/server/0475-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch rename to patches/server/0474-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch diff --git a/patches/server/0476-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/patches/server/0475-Add-missing-strikeLighting-call-to-World-spigot-stri.patch similarity index 90% rename from patches/server/0476-Add-missing-strikeLighting-call-to-World-spigot-stri.patch rename to patches/server/0475-Add-missing-strikeLighting-call-to-World-spigot-stri.patch index f2627e779662..ff72c61e0217 100644 --- a/patches/server/0476-Add-missing-strikeLighting-call-to-World-spigot-stri.patch +++ b/patches/server/0475-Add-missing-strikeLighting-call-to-World-spigot-stri.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add missing strikeLighting call to diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 220db41f348437ae2d703ebae883e882804e6797..84607e4d2b22bc0c5df762fddb556eab7c06de23 100644 +index b61a53af941946a07f8bbd34f53191f3de23f927..4d0eb42a3f9ba213f70d856640beaa9aa42149db 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -2087,6 +2087,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0477-Fix-some-rails-connecting-improperly.patch b/patches/server/0476-Fix-some-rails-connecting-improperly.patch similarity index 100% rename from patches/server/0477-Fix-some-rails-connecting-improperly.patch rename to patches/server/0476-Fix-some-rails-connecting-improperly.patch diff --git a/patches/server/0478-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0477-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch similarity index 100% rename from patches/server/0478-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch rename to patches/server/0477-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch diff --git a/patches/server/0479-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0478-Do-not-let-the-server-load-chunks-from-newer-version.patch similarity index 100% rename from patches/server/0479-Do-not-let-the-server-load-chunks-from-newer-version.patch rename to patches/server/0478-Do-not-let-the-server-load-chunks-from-newer-version.patch diff --git a/patches/server/0480-Brand-support.patch b/patches/server/0479-Brand-support.patch similarity index 100% rename from patches/server/0480-Brand-support.patch rename to patches/server/0479-Brand-support.patch diff --git a/patches/server/0481-Add-setMaxPlayers-API.patch b/patches/server/0480-Add-setMaxPlayers-API.patch similarity index 94% rename from patches/server/0481-Add-setMaxPlayers-API.patch rename to patches/server/0480-Add-setMaxPlayers-API.patch index 5eaec89f6f4b..1c01607e8cff 100644 --- a/patches/server/0481-Add-setMaxPlayers-API.patch +++ b/patches/server/0480-Add-setMaxPlayers-API.patch @@ -18,7 +18,7 @@ index d5768986b1666691bbcefac158cea120eaf9cac5..e5dc73d7cfd2ec868b18c5d34010d79d private int simulationDistance; private boolean allowCheatsForAllPlayers; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 139055e3e2641a204ac51ed847f08f300976f8fe..df03883495d1c682726bd17de703bb3b59dded60 100644 +index 145170acf479f9ee8f43ec7b8a39778de182cdfc..f56626556f747e052a34d28af7cfaf0a0ebd4872 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -667,6 +667,13 @@ public final class CraftServer implements Server { diff --git a/patches/server/0482-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0481-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from patches/server/0482-Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/server/0481-Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/patches/server/0483-Don-t-require-FACING-data.patch b/patches/server/0482-Don-t-require-FACING-data.patch similarity index 100% rename from patches/server/0483-Don-t-require-FACING-data.patch rename to patches/server/0482-Don-t-require-FACING-data.patch diff --git a/patches/server/0484-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0483-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch similarity index 96% rename from patches/server/0484-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch rename to patches/server/0483-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch index 77a8845bd381..e7583167de46 100644 --- a/patches/server/0484-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch +++ b/patches/server/0483-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch @@ -17,7 +17,7 @@ index c77f464b772e72c23fe00e99bc0fee24d46fb16b..b42637a2e9594cc2a30f910ef08399c1 // if this keepSpawnInMemory is false a plugin has already removed our tickets, do not re-add this.removeTicketsForSpawn(this.paperConfig.keepLoadedRange, prevSpawn); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 84607e4d2b22bc0c5df762fddb556eab7c06de23..0d194f538e388560fbf946c581a5f5aea6550df7 100644 +index 4d0eb42a3f9ba213f70d856640beaa9aa42149db..de65baee5ae66c4ba5625701b1646e4129b5e054 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -256,11 +256,13 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0485-Add-moon-phase-API.patch b/patches/server/0484-Add-moon-phase-API.patch similarity index 89% rename from patches/server/0485-Add-moon-phase-API.patch rename to patches/server/0484-Add-moon-phase-API.patch index 35bfa2ea8c76..4edb6cc209fc 100644 --- a/patches/server/0485-Add-moon-phase-API.patch +++ b/patches/server/0484-Add-moon-phase-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add moon phase API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 0d194f538e388560fbf946c581a5f5aea6550df7..3f0a35ccb0763b34f735a76b230e30e7840684d1 100644 +index de65baee5ae66c4ba5625701b1646e4129b5e054..d27a921672a12ad5506c5af080e52cfb2500f7e7 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -194,6 +194,11 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0486-Improve-Chunk-Status-Transition-Speed.patch b/patches/server/0485-Improve-Chunk-Status-Transition-Speed.patch similarity index 97% rename from patches/server/0486-Improve-Chunk-Status-Transition-Speed.patch rename to patches/server/0485-Improve-Chunk-Status-Transition-Speed.patch index ce941b1f3f34..b9f918ff0530 100644 --- a/patches/server/0486-Improve-Chunk-Status-Transition-Speed.patch +++ b/patches/server/0485-Improve-Chunk-Status-Transition-Speed.patch @@ -36,7 +36,7 @@ scenario / path: Previously would have hopped to SERVER around 12+ times there extra. diff --git a/src/main/java/net/minecraft/server/level/ChunkHolder.java b/src/main/java/net/minecraft/server/level/ChunkHolder.java -index 6ba7e2713452c4c6f48a1a825ef27b500140aa16..cd4328bd606d778ebb45f36af8cf23d88edef881 100644 +index af0a36071b4cf1ec77839eb8aa8f33917148d5e1..dd073d97d21eaa15b004cfe3929b4bf20d16d266 100644 --- a/src/main/java/net/minecraft/server/level/ChunkHolder.java +++ b/src/main/java/net/minecraft/server/level/ChunkHolder.java @@ -95,6 +95,13 @@ public class ChunkHolder { diff --git a/patches/server/0487-Prevent-headless-pistons-from-being-created.patch b/patches/server/0486-Prevent-headless-pistons-from-being-created.patch similarity index 100% rename from patches/server/0487-Prevent-headless-pistons-from-being-created.patch rename to patches/server/0486-Prevent-headless-pistons-from-being-created.patch diff --git a/patches/server/0488-Add-BellRingEvent.patch b/patches/server/0487-Add-BellRingEvent.patch similarity index 100% rename from patches/server/0488-Add-BellRingEvent.patch rename to patches/server/0487-Add-BellRingEvent.patch diff --git a/patches/server/0489-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0488-Add-zombie-targets-turtle-egg-config.patch similarity index 100% rename from patches/server/0489-Add-zombie-targets-turtle-egg-config.patch rename to patches/server/0488-Add-zombie-targets-turtle-egg-config.patch diff --git a/patches/server/0490-Buffer-joins-to-world.patch b/patches/server/0489-Buffer-joins-to-world.patch similarity index 100% rename from patches/server/0490-Buffer-joins-to-world.patch rename to patches/server/0489-Buffer-joins-to-world.patch diff --git a/patches/server/0491-Optimize-redstone-algorithm.patch b/patches/server/0490-Optimize-redstone-algorithm.patch similarity index 100% rename from patches/server/0491-Optimize-redstone-algorithm.patch rename to patches/server/0490-Optimize-redstone-algorithm.patch diff --git a/patches/server/0492-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0491-Fix-hex-colors-not-working-in-some-kick-messages.patch similarity index 100% rename from patches/server/0492-Fix-hex-colors-not-working-in-some-kick-messages.patch rename to patches/server/0491-Fix-hex-colors-not-working-in-some-kick-messages.patch diff --git a/patches/server/0493-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0492-PortalCreateEvent-needs-to-know-its-entity.patch similarity index 100% rename from patches/server/0493-PortalCreateEvent-needs-to-know-its-entity.patch rename to patches/server/0492-PortalCreateEvent-needs-to-know-its-entity.patch diff --git a/patches/server/0494-Fix-CraftTeam-null-check.patch b/patches/server/0493-Fix-CraftTeam-null-check.patch similarity index 100% rename from patches/server/0494-Fix-CraftTeam-null-check.patch rename to patches/server/0493-Fix-CraftTeam-null-check.patch diff --git a/patches/server/0495-Add-more-Evoker-API.patch b/patches/server/0494-Add-more-Evoker-API.patch similarity index 100% rename from patches/server/0495-Add-more-Evoker-API.patch rename to patches/server/0494-Add-more-Evoker-API.patch diff --git a/patches/server/0496-Add-methods-to-get-translation-keys.patch b/patches/server/0495-Add-methods-to-get-translation-keys.patch similarity index 100% rename from patches/server/0496-Add-methods-to-get-translation-keys.patch rename to patches/server/0495-Add-methods-to-get-translation-keys.patch diff --git a/patches/server/0497-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0496-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from patches/server/0497-Create-HoverEvent-from-ItemStack-Entity.patch rename to patches/server/0496-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/patches/server/0498-Cache-block-data-strings.patch b/patches/server/0497-Cache-block-data-strings.patch similarity index 100% rename from patches/server/0498-Cache-block-data-strings.patch rename to patches/server/0497-Cache-block-data-strings.patch diff --git a/patches/server/0499-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0498-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch similarity index 96% rename from patches/server/0499-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch rename to patches/server/0498-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch index b61dd01c979c..412cfdb3ec75 100644 --- a/patches/server/0499-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch +++ b/patches/server/0498-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch @@ -31,10 +31,10 @@ index 82ef4b4f99216eee00c867565d55e133bf7d8bcb..9d073564faa0f8dbd46ea6f9590a8260 } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 2df33172415c8da39b9f299027cd86d2ce7c6890..bd285a7d84c934ec094099810eac1f03c09118e3 100644 +index 731cd8167eed50ac066734e97d3670df363a67d7..1412f0dc93a417b41e8f8c615c44a8eeb70dc133 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -154,6 +154,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -154,6 +154,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { // CraftBukkit start private static final int CURRENT_LEVEL = 2; @@ -42,7 +42,7 @@ index 2df33172415c8da39b9f299027cd86d2ce7c6890..bd285a7d84c934ec094099810eac1f03 static boolean isLevelAtLeast(CompoundTag tag, int level) { return tag.contains("Bukkit.updateLevel") && tag.getInt("Bukkit.updateLevel") >= level; } -@@ -1567,6 +1568,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -1567,6 +1568,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } public void moveTo(double x, double y, double z, float yaw, float pitch) { diff --git a/patches/server/0500-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0499-Add-additional-open-container-api-to-HumanEntity.patch similarity index 100% rename from patches/server/0500-Add-additional-open-container-api-to-HumanEntity.patch rename to patches/server/0499-Add-additional-open-container-api-to-HumanEntity.patch diff --git a/patches/server/0501-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0500-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch similarity index 100% rename from patches/server/0501-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch rename to patches/server/0500-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch diff --git a/patches/server/0502-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0501-Extend-block-drop-capture-to-capture-all-items-added.patch similarity index 100% rename from patches/server/0502-Extend-block-drop-capture-to-capture-all-items-added.patch rename to patches/server/0501-Extend-block-drop-capture-to-capture-all-items-added.patch diff --git a/patches/server/0503-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch b/patches/server/0502-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch similarity index 100% rename from patches/server/0503-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch rename to patches/server/0502-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch diff --git a/patches/server/0504-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0503-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch similarity index 88% rename from patches/server/0504-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch rename to patches/server/0503-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch index 0f59498bffbe..5116f3301898 100644 --- a/patches/server/0504-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch +++ b/patches/server/0503-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Expose the Entity Counter to allow plugins to use valid and diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index bd285a7d84c934ec094099810eac1f03c09118e3..35825b598778e6b8aef613263abab1a8d4ab4af3 100644 +index 1412f0dc93a417b41e8f8c615c44a8eeb70dc133..d470f7cbd953af86c57ee83d5f9b149abd270b05 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -4013,4 +4013,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -3993,4 +3993,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { void accept(Entity entity, double x, double y, double z); } diff --git a/patches/server/0505-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0504-Lazily-track-plugin-scoreboards-by-default.patch similarity index 100% rename from patches/server/0505-Lazily-track-plugin-scoreboards-by-default.patch rename to patches/server/0504-Lazily-track-plugin-scoreboards-by-default.patch diff --git a/patches/server/0506-Entity-isTicking.patch b/patches/server/0505-Entity-isTicking.patch similarity index 89% rename from patches/server/0506-Entity-isTicking.patch rename to patches/server/0505-Entity-isTicking.patch index 2b9164a12041..08e7181d91dc 100644 --- a/patches/server/0506-Entity-isTicking.patch +++ b/patches/server/0505-Entity-isTicking.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Entity#isTicking diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 35825b598778e6b8aef613263abab1a8d4ab4af3..c4f528fac063b2f8a4955d00e4220fcbd0867a61 100644 +index d470f7cbd953af86c57ee83d5f9b149abd270b05..1de52b5e6a7fde4acaf6942edad163ed94d9e0a7 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -56,6 +56,7 @@ import net.minecraft.resources.ResourceKey; @@ -16,7 +16,7 @@ index 35825b598778e6b8aef613263abab1a8d4ab4af3..c4f528fac063b2f8a4955d00e4220fcb import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.level.TicketType; -@@ -4018,5 +4019,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -3998,5 +3999,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { public static int nextEntityId() { return ENTITY_COUNTER.incrementAndGet(); } diff --git a/patches/server/0507-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0506-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch similarity index 100% rename from patches/server/0507-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch rename to patches/server/0506-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch diff --git a/patches/server/0508-Fix-Concurrency-issue-in-WeightedList.patch b/patches/server/0507-Fix-Concurrency-issue-in-WeightedList.patch similarity index 100% rename from patches/server/0508-Fix-Concurrency-issue-in-WeightedList.patch rename to patches/server/0507-Fix-Concurrency-issue-in-WeightedList.patch diff --git a/patches/server/0509-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0508-Reset-Ender-Crystals-on-Dragon-Spawn.patch similarity index 100% rename from patches/server/0509-Reset-Ender-Crystals-on-Dragon-Spawn.patch rename to patches/server/0508-Reset-Ender-Crystals-on-Dragon-Spawn.patch diff --git a/patches/server/0510-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0509-Fix-for-large-move-vectors-crashing-server.patch similarity index 100% rename from patches/server/0510-Fix-for-large-move-vectors-crashing-server.patch rename to patches/server/0509-Fix-for-large-move-vectors-crashing-server.patch diff --git a/patches/server/0511-Optimise-getType-calls.patch b/patches/server/0510-Optimise-getType-calls.patch similarity index 100% rename from patches/server/0511-Optimise-getType-calls.patch rename to patches/server/0510-Optimise-getType-calls.patch diff --git a/patches/server/0512-Villager-resetOffers.patch b/patches/server/0511-Villager-resetOffers.patch similarity index 100% rename from patches/server/0512-Villager-resetOffers.patch rename to patches/server/0511-Villager-resetOffers.patch diff --git a/patches/server/0513-Improve-inlinig-for-some-hot-IBlockData-methods.patch b/patches/server/0512-Improve-inlinig-for-some-hot-IBlockData-methods.patch similarity index 100% rename from patches/server/0513-Improve-inlinig-for-some-hot-IBlockData-methods.patch rename to patches/server/0512-Improve-inlinig-for-some-hot-IBlockData-methods.patch diff --git a/patches/server/0514-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0513-Retain-block-place-order-when-capturing-blockstates.patch similarity index 100% rename from patches/server/0514-Retain-block-place-order-when-capturing-blockstates.patch rename to patches/server/0513-Retain-block-place-order-when-capturing-blockstates.patch diff --git a/patches/server/0515-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0514-Reduce-blockpos-allocation-from-pathfinding.patch similarity index 100% rename from patches/server/0515-Reduce-blockpos-allocation-from-pathfinding.patch rename to patches/server/0514-Reduce-blockpos-allocation-from-pathfinding.patch diff --git a/patches/server/0516-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0515-Fix-item-locations-dropped-from-campfires.patch similarity index 100% rename from patches/server/0516-Fix-item-locations-dropped-from-campfires.patch rename to patches/server/0515-Fix-item-locations-dropped-from-campfires.patch diff --git a/patches/server/0517-Player-elytra-boost-API.patch b/patches/server/0516-Player-elytra-boost-API.patch similarity index 100% rename from patches/server/0517-Player-elytra-boost-API.patch rename to patches/server/0516-Player-elytra-boost-API.patch diff --git a/patches/server/0518-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0517-Fixed-TileEntityBell-memory-leak.patch similarity index 100% rename from patches/server/0518-Fixed-TileEntityBell-memory-leak.patch rename to patches/server/0517-Fixed-TileEntityBell-memory-leak.patch diff --git a/patches/server/0519-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0518-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch similarity index 97% rename from patches/server/0519-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch rename to patches/server/0518-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch index 6dc3f348cd44..ced98f733e52 100644 --- a/patches/server/0519-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch +++ b/patches/server/0518-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch @@ -8,7 +8,7 @@ This can realistically only happen if there's custom loot active on fishing which can return 0 items. This would disconnect the player who's fishing. diff --git a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java -index 8162ead7ca524f80b8b4a846273266a837db5924..a4c82bf1d8789adf255fd0fae09d90228cf81ef0 100644 +index ce43f33ffd8726d3fb592348ac1b10f37645eb0e..3789a0db398766f0fbc9e5ac5bf4228a0a0dac88 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java +++ b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java @@ -494,9 +494,15 @@ public class FishingHook extends Projectile { diff --git a/patches/server/0520-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0519-Add-getOfflinePlayerIfCached-String.patch similarity index 93% rename from patches/server/0520-Add-getOfflinePlayerIfCached-String.patch rename to patches/server/0519-Add-getOfflinePlayerIfCached-String.patch index d001255dbca4..c17fd149d246 100644 --- a/patches/server/0520-Add-getOfflinePlayerIfCached-String.patch +++ b/patches/server/0519-Add-getOfflinePlayerIfCached-String.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add getOfflinePlayerIfCached(String) diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index df03883495d1c682726bd17de703bb3b59dded60..841d984292b7d3d7610a671b7f6192d6cbd48835 100644 +index f56626556f747e052a34d28af7cfaf0a0ebd4872..5512437f8c051cbef11817739497c30bfdde81da 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1794,6 +1794,28 @@ public final class CraftServer implements Server { diff --git a/patches/server/0521-Add-ignore-discounts-API.patch b/patches/server/0520-Add-ignore-discounts-API.patch similarity index 100% rename from patches/server/0521-Add-ignore-discounts-API.patch rename to patches/server/0520-Add-ignore-discounts-API.patch diff --git a/patches/server/0522-Toggle-for-removing-existing-dragon.patch b/patches/server/0521-Toggle-for-removing-existing-dragon.patch similarity index 100% rename from patches/server/0522-Toggle-for-removing-existing-dragon.patch rename to patches/server/0521-Toggle-for-removing-existing-dragon.patch diff --git a/patches/server/0523-Fix-client-lag-on-advancement-loading.patch b/patches/server/0522-Fix-client-lag-on-advancement-loading.patch similarity index 100% rename from patches/server/0523-Fix-client-lag-on-advancement-loading.patch rename to patches/server/0522-Fix-client-lag-on-advancement-loading.patch diff --git a/patches/server/0524-Item-no-age-no-player-pickup.patch b/patches/server/0523-Item-no-age-no-player-pickup.patch similarity index 100% rename from patches/server/0524-Item-no-age-no-player-pickup.patch rename to patches/server/0523-Item-no-age-no-player-pickup.patch diff --git a/patches/server/0525-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0524-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch similarity index 100% rename from patches/server/0525-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch rename to patches/server/0524-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch diff --git a/patches/server/0526-Beacon-API-custom-effect-ranges.patch b/patches/server/0525-Beacon-API-custom-effect-ranges.patch similarity index 100% rename from patches/server/0526-Beacon-API-custom-effect-ranges.patch rename to patches/server/0525-Beacon-API-custom-effect-ranges.patch diff --git a/patches/server/0527-Add-API-for-quit-reason.patch b/patches/server/0526-Add-API-for-quit-reason.patch similarity index 100% rename from patches/server/0527-Add-API-for-quit-reason.patch rename to patches/server/0526-Add-API-for-quit-reason.patch diff --git a/patches/server/0528-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0527-Add-Wandering-Trader-spawn-rate-config-options.patch similarity index 100% rename from patches/server/0528-Add-Wandering-Trader-spawn-rate-config-options.patch rename to patches/server/0527-Add-Wandering-Trader-spawn-rate-config-options.patch diff --git a/patches/server/0529-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0528-Significantly-improve-performance-of-the-end-generat.patch similarity index 100% rename from patches/server/0529-Significantly-improve-performance-of-the-end-generat.patch rename to patches/server/0528-Significantly-improve-performance-of-the-end-generat.patch diff --git a/patches/server/0530-Expose-world-spawn-angle.patch b/patches/server/0529-Expose-world-spawn-angle.patch similarity index 95% rename from patches/server/0530-Expose-world-spawn-angle.patch rename to patches/server/0529-Expose-world-spawn-angle.patch index 691463a16a7a..b4b65009a0d1 100644 --- a/patches/server/0530-Expose-world-spawn-angle.patch +++ b/patches/server/0529-Expose-world-spawn-angle.patch @@ -18,7 +18,7 @@ index 0b4d5ab836e861ea87bb72185a513bdf341d5921..30f0b20924d6b778e49761a72b50263c Player respawnPlayer = entityplayer1.getBukkitEntity(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 3f0a35ccb0763b34f735a76b230e30e7840684d1..2c93624bda6919ce0a291d8855cb6e176b010e0c 100644 +index d27a921672a12ad5506c5af080e52cfb2500f7e7..d26fd3ff134fcda2cae0e564443039d47cd50856 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -247,7 +247,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0531-Add-Destroy-Speed-API.patch b/patches/server/0530-Add-Destroy-Speed-API.patch similarity index 100% rename from patches/server/0531-Add-Destroy-Speed-API.patch rename to patches/server/0530-Add-Destroy-Speed-API.patch diff --git a/patches/server/0532-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0531-Fix-Player-spawnParticle-x-y-z-precision-loss.patch similarity index 100% rename from patches/server/0532-Fix-Player-spawnParticle-x-y-z-precision-loss.patch rename to patches/server/0531-Fix-Player-spawnParticle-x-y-z-precision-loss.patch diff --git a/patches/server/0533-Add-LivingEntity-clearActiveItem.patch b/patches/server/0532-Add-LivingEntity-clearActiveItem.patch similarity index 100% rename from patches/server/0533-Add-LivingEntity-clearActiveItem.patch rename to patches/server/0532-Add-LivingEntity-clearActiveItem.patch diff --git a/patches/server/0534-Add-PlayerItemCooldownEvent.patch b/patches/server/0533-Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/server/0534-Add-PlayerItemCooldownEvent.patch rename to patches/server/0533-Add-PlayerItemCooldownEvent.patch diff --git a/patches/server/0535-More-lightning-API.patch b/patches/server/0534-More-lightning-API.patch similarity index 100% rename from patches/server/0535-More-lightning-API.patch rename to patches/server/0534-More-lightning-API.patch diff --git a/patches/server/0536-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0535-Climbing-should-not-bypass-cramming-gamerule.patch similarity index 98% rename from patches/server/0536-Climbing-should-not-bypass-cramming-gamerule.patch rename to patches/server/0535-Climbing-should-not-bypass-cramming-gamerule.patch index 2faa1121c8a1..3d038e5dbd46 100644 --- a/patches/server/0536-Climbing-should-not-bypass-cramming-gamerule.patch +++ b/patches/server/0535-Climbing-should-not-bypass-cramming-gamerule.patch @@ -21,10 +21,10 @@ index 681985c8412562fedea841738656ce0b7391964a..657a199a78262442427b308e94344790 private void keepLoadedRange() { keepLoadedRange = (short) (getInt("keep-spawn-loaded-range", Math.min(spigotConfig.viewDistance, 10)) * 16); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index c4f528fac063b2f8a4955d00e4220fcbd0867a61..1e3436849760430b0db303e716f50555046d6f3e 100644 +index 1de52b5e6a7fde4acaf6942edad163ed94d9e0a7..b3719b657ea75c4b80cf21e115b3ba48f775a3c4 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -1748,6 +1748,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -1748,6 +1748,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } public boolean isPushable() { diff --git a/patches/server/0537-Added-missing-default-perms-for-commands.patch b/patches/server/0536-Added-missing-default-perms-for-commands.patch similarity index 100% rename from patches/server/0537-Added-missing-default-perms-for-commands.patch rename to patches/server/0536-Added-missing-default-perms-for-commands.patch diff --git a/patches/server/0538-Add-PlayerShearBlockEvent.patch b/patches/server/0537-Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/server/0538-Add-PlayerShearBlockEvent.patch rename to patches/server/0537-Add-PlayerShearBlockEvent.patch diff --git a/patches/server/0539-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0538-Fix-curing-zombie-villager-discount-exploit.patch similarity index 100% rename from patches/server/0539-Fix-curing-zombie-villager-discount-exploit.patch rename to patches/server/0538-Fix-curing-zombie-villager-discount-exploit.patch diff --git a/patches/server/0540-Limit-recipe-packets.patch b/patches/server/0539-Limit-recipe-packets.patch similarity index 100% rename from patches/server/0540-Limit-recipe-packets.patch rename to patches/server/0539-Limit-recipe-packets.patch diff --git a/patches/server/0541-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0540-Fix-CraftSound-backwards-compatibility.patch similarity index 100% rename from patches/server/0541-Fix-CraftSound-backwards-compatibility.patch rename to patches/server/0540-Fix-CraftSound-backwards-compatibility.patch diff --git a/patches/server/0542-MC-4-Fix-item-position-desync.patch b/patches/server/0541-MC-4-Fix-item-position-desync.patch similarity index 94% rename from patches/server/0542-MC-4-Fix-item-position-desync.patch rename to patches/server/0541-MC-4-Fix-item-position-desync.patch index f073db3b17b8..7d1f8aaedc72 100644 --- a/patches/server/0542-MC-4-Fix-item-position-desync.patch +++ b/patches/server/0541-MC-4-Fix-item-position-desync.patch @@ -43,10 +43,10 @@ index b30c08bfb8c55161543a4ef09f2e462e0a1fe4ae..ec93f5300cc7d423ec0d292f0f8443f9 public Vec3 updateEntityPosition(Vec3 orig) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 1e3436849760430b0db303e716f50555046d6f3e..86a9cbc0768575138c09217cd300c2d9d08540fc 100644 +index b3719b657ea75c4b80cf21e115b3ba48f775a3c4..dbfe16f904382f3fa3790fc8da0f5c7b5b83a501 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -3828,6 +3828,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -3808,6 +3808,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } public final void setPosRaw(double x, double y, double z, boolean forceBoundingBoxUpdate) { // Paper end diff --git a/patches/server/0543-Player-Chunk-Load-Unload-Events.patch b/patches/server/0542-Player-Chunk-Load-Unload-Events.patch similarity index 100% rename from patches/server/0543-Player-Chunk-Load-Unload-Events.patch rename to patches/server/0542-Player-Chunk-Load-Unload-Events.patch diff --git a/patches/server/0544-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0543-Optimize-Dynamic-get-Missing-Keys.patch similarity index 100% rename from patches/server/0544-Optimize-Dynamic-get-Missing-Keys.patch rename to patches/server/0543-Optimize-Dynamic-get-Missing-Keys.patch diff --git a/patches/server/0545-Expose-LivingEntity-hurt-direction.patch b/patches/server/0544-Expose-LivingEntity-hurt-direction.patch similarity index 100% rename from patches/server/0545-Expose-LivingEntity-hurt-direction.patch rename to patches/server/0544-Expose-LivingEntity-hurt-direction.patch diff --git a/patches/server/0546-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0545-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from patches/server/0546-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/server/0545-Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/patches/server/0547-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0546-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch similarity index 100% rename from patches/server/0547-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch rename to patches/server/0546-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch diff --git a/patches/server/0548-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0547-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch similarity index 100% rename from patches/server/0548-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch rename to patches/server/0547-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch diff --git a/patches/server/0549-Implement-TargetHitEvent.patch b/patches/server/0548-Implement-TargetHitEvent.patch similarity index 100% rename from patches/server/0549-Implement-TargetHitEvent.patch rename to patches/server/0548-Implement-TargetHitEvent.patch diff --git a/patches/server/0550-Additional-Block-Material-API-s.patch b/patches/server/0549-Additional-Block-Material-API-s.patch similarity index 100% rename from patches/server/0550-Additional-Block-Material-API-s.patch rename to patches/server/0549-Additional-Block-Material-API-s.patch diff --git a/patches/server/0551-Fix-harming-potion-dupe.patch b/patches/server/0550-Fix-harming-potion-dupe.patch similarity index 100% rename from patches/server/0551-Fix-harming-potion-dupe.patch rename to patches/server/0550-Fix-harming-potion-dupe.patch diff --git a/patches/server/0552-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0551-Implement-API-to-get-Material-from-Boats-and-Minecar.patch similarity index 100% rename from patches/server/0552-Implement-API-to-get-Material-from-Boats-and-Minecar.patch rename to patches/server/0551-Implement-API-to-get-Material-from-Boats-and-Minecar.patch diff --git a/patches/server/0553-Cache-burn-durations.patch b/patches/server/0552-Cache-burn-durations.patch similarity index 100% rename from patches/server/0553-Cache-burn-durations.patch rename to patches/server/0552-Cache-burn-durations.patch diff --git a/patches/server/0554-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0553-Allow-disabling-mob-spawner-spawn-egg-transformation.patch similarity index 100% rename from patches/server/0554-Allow-disabling-mob-spawner-spawn-egg-transformation.patch rename to patches/server/0553-Allow-disabling-mob-spawner-spawn-egg-transformation.patch diff --git a/patches/server/0555-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0554-Fix-Not-a-string-Map-Conversion-spam.patch similarity index 100% rename from patches/server/0555-Fix-Not-a-string-Map-Conversion-spam.patch rename to patches/server/0554-Fix-Not-a-string-Map-Conversion-spam.patch diff --git a/patches/server/0556-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0555-Implement-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/server/0556-Implement-PlayerFlowerPotManipulateEvent.patch rename to patches/server/0555-Implement-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/server/0557-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0556-Fix-interact-event-not-being-called-in-adventure.patch similarity index 100% rename from patches/server/0557-Fix-interact-event-not-being-called-in-adventure.patch rename to patches/server/0556-Fix-interact-event-not-being-called-in-adventure.patch diff --git a/patches/server/0558-Zombie-API-breaking-doors.patch b/patches/server/0557-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/server/0558-Zombie-API-breaking-doors.patch rename to patches/server/0557-Zombie-API-breaking-doors.patch diff --git a/patches/server/0559-Fix-nerfed-slime-when-splitting.patch b/patches/server/0558-Fix-nerfed-slime-when-splitting.patch similarity index 100% rename from patches/server/0559-Fix-nerfed-slime-when-splitting.patch rename to patches/server/0558-Fix-nerfed-slime-when-splitting.patch diff --git a/patches/server/0560-Add-EntityLoadCrossbowEvent.patch b/patches/server/0559-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/server/0560-Add-EntityLoadCrossbowEvent.patch rename to patches/server/0559-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/server/0561-Guardian-beam-workaround.patch b/patches/server/0560-Guardian-beam-workaround.patch similarity index 100% rename from patches/server/0561-Guardian-beam-workaround.patch rename to patches/server/0560-Guardian-beam-workaround.patch diff --git a/patches/server/0562-Added-WorldGameRuleChangeEvent.patch b/patches/server/0561-Added-WorldGameRuleChangeEvent.patch similarity index 98% rename from patches/server/0562-Added-WorldGameRuleChangeEvent.patch rename to patches/server/0561-Added-WorldGameRuleChangeEvent.patch index aa2a6cc9f1c1..9e56c3120823 100644 --- a/patches/server/0562-Added-WorldGameRuleChangeEvent.patch +++ b/patches/server/0561-Added-WorldGameRuleChangeEvent.patch @@ -64,7 +64,7 @@ index 74e10d581f8c1b0b026d8f940194971efbdef434..798afc145c54306fcf0838d8daef2bdf public int get() { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 2c93624bda6919ce0a291d8855cb6e176b010e0c..5cc1de91e2ccc0d3f0d6ab9adcf39f2f72bdeb9d 100644 +index d26fd3ff134fcda2cae0e564443039d47cd50856..7711591bf57987ea6d787859eba7953285d01da8 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1797,8 +1797,13 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0563-Added-ServerResourcesReloadedEvent.patch b/patches/server/0562-Added-ServerResourcesReloadedEvent.patch similarity index 100% rename from patches/server/0563-Added-ServerResourcesReloadedEvent.patch rename to patches/server/0562-Added-ServerResourcesReloadedEvent.patch diff --git a/patches/server/0564-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0563-Added-world-settings-for-mobs-picking-up-loot.patch similarity index 100% rename from patches/server/0564-Added-world-settings-for-mobs-picking-up-loot.patch rename to patches/server/0563-Added-world-settings-for-mobs-picking-up-loot.patch diff --git a/patches/server/0565-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0564-Implemented-BlockFailedDispenseEvent.patch similarity index 100% rename from patches/server/0565-Implemented-BlockFailedDispenseEvent.patch rename to patches/server/0564-Implemented-BlockFailedDispenseEvent.patch diff --git a/patches/server/0566-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0565-Added-PlayerLecternPageChangeEvent.patch similarity index 100% rename from patches/server/0566-Added-PlayerLecternPageChangeEvent.patch rename to patches/server/0565-Added-PlayerLecternPageChangeEvent.patch diff --git a/patches/server/0567-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0566-Added-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from patches/server/0567-Added-PlayerLoomPatternSelectEvent.patch rename to patches/server/0566-Added-PlayerLoomPatternSelectEvent.patch diff --git a/patches/server/0568-Configurable-door-breaking-difficulty.patch b/patches/server/0567-Configurable-door-breaking-difficulty.patch similarity index 100% rename from patches/server/0568-Configurable-door-breaking-difficulty.patch rename to patches/server/0567-Configurable-door-breaking-difficulty.patch diff --git a/patches/server/0569-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0568-Empty-commands-shall-not-be-dispatched.patch similarity index 100% rename from patches/server/0569-Empty-commands-shall-not-be-dispatched.patch rename to patches/server/0568-Empty-commands-shall-not-be-dispatched.patch diff --git a/patches/server/0570-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0569-Implement-API-to-expose-exact-interaction-point.patch similarity index 100% rename from patches/server/0570-Implement-API-to-expose-exact-interaction-point.patch rename to patches/server/0569-Implement-API-to-expose-exact-interaction-point.patch diff --git a/patches/server/0571-Remove-stale-POIs.patch b/patches/server/0570-Remove-stale-POIs.patch similarity index 100% rename from patches/server/0571-Remove-stale-POIs.patch rename to patches/server/0570-Remove-stale-POIs.patch diff --git a/patches/server/0572-Fix-villager-boat-exploit.patch b/patches/server/0571-Fix-villager-boat-exploit.patch similarity index 100% rename from patches/server/0572-Fix-villager-boat-exploit.patch rename to patches/server/0571-Fix-villager-boat-exploit.patch diff --git a/patches/server/0573-Add-sendOpLevel-API.patch b/patches/server/0572-Add-sendOpLevel-API.patch similarity index 100% rename from patches/server/0573-Add-sendOpLevel-API.patch rename to patches/server/0572-Add-sendOpLevel-API.patch diff --git a/patches/server/0574-Add-PaperRegistry.patch b/patches/server/0573-Add-PaperRegistry.patch similarity index 100% rename from patches/server/0574-Add-PaperRegistry.patch rename to patches/server/0573-Add-PaperRegistry.patch diff --git a/patches/server/0575-Add-StructuresLocateEvent.patch b/patches/server/0574-Add-StructuresLocateEvent.patch similarity index 100% rename from patches/server/0575-Add-StructuresLocateEvent.patch rename to patches/server/0574-Add-StructuresLocateEvent.patch diff --git a/patches/server/0576-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0575-Collision-option-for-requiring-a-player-participant.patch similarity index 96% rename from patches/server/0576-Collision-option-for-requiring-a-player-participant.patch rename to patches/server/0575-Collision-option-for-requiring-a-player-participant.patch index 21d72fe31cab..0a8b7f3c6e7c 100644 --- a/patches/server/0576-Collision-option-for-requiring-a-player-participant.patch +++ b/patches/server/0575-Collision-option-for-requiring-a-player-participant.patch @@ -28,10 +28,10 @@ index 512720c6c13edcdae8f334ee584da8c4bca30c5f..ea5f021c4ce2274869d884b90aeaba35 public int wanderingTraderSpawnDayTicks = 24000; public int wanderingTraderSpawnChanceFailureIncrement = 25; diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 86a9cbc0768575138c09217cd300c2d9d08540fc..b28591ec812aead480fc55c50bce4bd3cbbb2409 100644 +index dbfe16f904382f3fa3790fc8da0f5c7b5b83a501..162542958a331fd0ff0623266c9c62211152b1a6 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -1631,6 +1631,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -1631,6 +1631,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { public void push(Entity entity) { if (!this.isPassengerOfSameVehicle(entity)) { if (!entity.noPhysics && !this.noPhysics) { diff --git a/patches/server/0577-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0576-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch similarity index 100% rename from patches/server/0577-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch rename to patches/server/0576-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch diff --git a/patches/server/0578-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0577-Return-chat-component-with-empty-text-instead-of-thr.patch similarity index 100% rename from patches/server/0578-Return-chat-component-with-empty-text-instead-of-thr.patch rename to patches/server/0577-Return-chat-component-with-empty-text-instead-of-thr.patch diff --git a/patches/server/0579-Make-schedule-command-per-world.patch b/patches/server/0578-Make-schedule-command-per-world.patch similarity index 100% rename from patches/server/0579-Make-schedule-command-per-world.patch rename to patches/server/0578-Make-schedule-command-per-world.patch diff --git a/patches/server/0580-Configurable-max-leash-distance.patch b/patches/server/0579-Configurable-max-leash-distance.patch similarity index 100% rename from patches/server/0580-Configurable-max-leash-distance.patch rename to patches/server/0579-Configurable-max-leash-distance.patch diff --git a/patches/server/0581-Implement-BlockPreDispenseEvent.patch b/patches/server/0580-Implement-BlockPreDispenseEvent.patch similarity index 100% rename from patches/server/0581-Implement-BlockPreDispenseEvent.patch rename to patches/server/0580-Implement-BlockPreDispenseEvent.patch diff --git a/patches/server/0582-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0581-Added-firing-of-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/server/0582-Added-firing-of-PlayerChangeBeaconEffectEvent.patch rename to patches/server/0581-Added-firing-of-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/server/0583-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0582-Add-toggle-for-always-placing-the-dragon-egg.patch similarity index 100% rename from patches/server/0583-Add-toggle-for-always-placing-the-dragon-egg.patch rename to patches/server/0582-Add-toggle-for-always-placing-the-dragon-egg.patch diff --git a/patches/server/0584-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0583-Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/server/0584-Added-PlayerStonecutterRecipeSelectEvent.patch rename to patches/server/0583-Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/server/0585-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0584-Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 100% rename from patches/server/0585-Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to patches/server/0584-Add-dropLeash-variable-to-EntityUnleashEvent.patch diff --git a/patches/server/0586-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0585-Reset-shield-blocking-on-dimension-change.patch similarity index 100% rename from patches/server/0586-Reset-shield-blocking-on-dimension-change.patch rename to patches/server/0585-Reset-shield-blocking-on-dimension-change.patch diff --git a/patches/server/0587-add-DragonEggFormEvent.patch b/patches/server/0586-add-DragonEggFormEvent.patch similarity index 100% rename from patches/server/0587-add-DragonEggFormEvent.patch rename to patches/server/0586-add-DragonEggFormEvent.patch diff --git a/patches/server/0588-EntityMoveEvent.patch b/patches/server/0587-EntityMoveEvent.patch similarity index 97% rename from patches/server/0588-EntityMoveEvent.patch rename to patches/server/0587-EntityMoveEvent.patch index 53db38d2a5f8..89f20bd099eb 100644 --- a/patches/server/0588-EntityMoveEvent.patch +++ b/patches/server/0587-EntityMoveEvent.patch @@ -17,7 +17,7 @@ index e74885c51c2970af13d847ec34a415e5aa18b01c..445efad6a35b819dcb845524a28055a9 this.profiler.push(() -> { diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 4797737c8085012bb898da0313a9ef9bf44e723d..3b5eceaf3a40fee6430864e849d403f5e3c5f9b4 100644 +index f408d59f2b829765e915dfdb09733407012c8524..349f92a10e80f091abca6d86b869800d8c5ea787 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -209,6 +209,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0589-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0588-added-option-to-disable-pathfinding-updates-on-block.patch similarity index 100% rename from patches/server/0589-added-option-to-disable-pathfinding-updates-on-block.patch rename to patches/server/0588-added-option-to-disable-pathfinding-updates-on-block.patch diff --git a/patches/server/0590-Inline-shift-direction-fields.patch b/patches/server/0589-Inline-shift-direction-fields.patch similarity index 100% rename from patches/server/0590-Inline-shift-direction-fields.patch rename to patches/server/0589-Inline-shift-direction-fields.patch diff --git a/patches/server/0591-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0590-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/server/0591-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/server/0590-Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/server/0592-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0591-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/server/0592-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/server/0591-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/server/0593-living-entity-allow-attribute-registration.patch b/patches/server/0592-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/server/0593-living-entity-allow-attribute-registration.patch rename to patches/server/0592-living-entity-allow-attribute-registration.patch diff --git a/patches/server/0594-fix-dead-slime-setSize-invincibility.patch b/patches/server/0593-fix-dead-slime-setSize-invincibility.patch similarity index 100% rename from patches/server/0594-fix-dead-slime-setSize-invincibility.patch rename to patches/server/0593-fix-dead-slime-setSize-invincibility.patch diff --git a/patches/server/0595-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0594-Merchant-getRecipes-should-return-an-immutable-list.patch similarity index 100% rename from patches/server/0595-Merchant-getRecipes-should-return-an-immutable-list.patch rename to patches/server/0594-Merchant-getRecipes-should-return-an-immutable-list.patch diff --git a/patches/server/0596-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0595-Add-support-for-hex-color-codes-in-console.patch similarity index 100% rename from patches/server/0596-Add-support-for-hex-color-codes-in-console.patch rename to patches/server/0595-Add-support-for-hex-color-codes-in-console.patch diff --git a/patches/server/0597-Expose-Tracked-Players.patch b/patches/server/0596-Expose-Tracked-Players.patch similarity index 100% rename from patches/server/0597-Expose-Tracked-Players.patch rename to patches/server/0596-Expose-Tracked-Players.patch diff --git a/patches/server/0598-Remove-streams-from-SensorNearest.patch b/patches/server/0597-Remove-streams-from-SensorNearest.patch similarity index 100% rename from patches/server/0598-Remove-streams-from-SensorNearest.patch rename to patches/server/0597-Remove-streams-from-SensorNearest.patch diff --git a/patches/server/0599-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0598-Throw-proper-exception-on-empty-JsonList-file.patch similarity index 100% rename from patches/server/0599-Throw-proper-exception-on-empty-JsonList-file.patch rename to patches/server/0598-Throw-proper-exception-on-empty-JsonList-file.patch diff --git a/patches/server/0600-Improve-ServerGUI.patch b/patches/server/0599-Improve-ServerGUI.patch similarity index 100% rename from patches/server/0600-Improve-ServerGUI.patch rename to patches/server/0599-Improve-ServerGUI.patch diff --git a/patches/server/0601-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/0600-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch similarity index 100% rename from patches/server/0601-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch rename to patches/server/0600-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch diff --git a/patches/server/0602-fix-converting-txt-to-json-file.patch b/patches/server/0601-fix-converting-txt-to-json-file.patch similarity index 100% rename from patches/server/0602-fix-converting-txt-to-json-file.patch rename to patches/server/0601-fix-converting-txt-to-json-file.patch diff --git a/patches/server/0603-Add-worldborder-events.patch b/patches/server/0602-Add-worldborder-events.patch similarity index 100% rename from patches/server/0603-Add-worldborder-events.patch rename to patches/server/0602-Add-worldborder-events.patch diff --git a/patches/server/0604-added-PlayerNameEntityEvent.patch b/patches/server/0603-added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/server/0604-added-PlayerNameEntityEvent.patch rename to patches/server/0603-added-PlayerNameEntityEvent.patch diff --git a/patches/server/0605-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0604-Prevent-grindstones-from-overstacking-items.patch similarity index 100% rename from patches/server/0605-Prevent-grindstones-from-overstacking-items.patch rename to patches/server/0604-Prevent-grindstones-from-overstacking-items.patch diff --git a/patches/server/0606-Add-recipe-to-cook-events.patch b/patches/server/0605-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/server/0606-Add-recipe-to-cook-events.patch rename to patches/server/0605-Add-recipe-to-cook-events.patch diff --git a/patches/server/0607-Add-Block-isValidTool.patch b/patches/server/0606-Add-Block-isValidTool.patch similarity index 100% rename from patches/server/0607-Add-Block-isValidTool.patch rename to patches/server/0606-Add-Block-isValidTool.patch diff --git a/patches/server/0608-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0607-Allow-using-signs-inside-spawn-protection.patch similarity index 100% rename from patches/server/0608-Allow-using-signs-inside-spawn-protection.patch rename to patches/server/0607-Allow-using-signs-inside-spawn-protection.patch diff --git a/patches/server/0609-Implement-Keyed-on-World.patch b/patches/server/0608-Implement-Keyed-on-World.patch similarity index 93% rename from patches/server/0609-Implement-Keyed-on-World.patch rename to patches/server/0608-Implement-Keyed-on-World.patch index 891f32948711..1f213b20d2c5 100644 --- a/patches/server/0609-Implement-Keyed-on-World.patch +++ b/patches/server/0608-Implement-Keyed-on-World.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Implement Keyed on World diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 841d984292b7d3d7610a671b7f6192d6cbd48835..48e2d5e2b53e32af53387f2e63c67ff9e0a7c5bb 100644 +index 5512437f8c051cbef11817739497c30bfdde81da..555015be2b9f83834b70ecb415aca3807520a6bd 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1231,7 +1231,7 @@ public final class CraftServer implements Server { @@ -34,7 +34,7 @@ index 841d984292b7d3d7610a671b7f6192d6cbd48835..48e2d5e2b53e32af53387f2e63c67ff9 // Check if a World already exists with the UID. if (this.getWorld(world.getUID()) != null) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 5cc1de91e2ccc0d3f0d6ab9adcf39f2f72bdeb9d..65b15946fbac36c4b767127aa1fa8ef59c0aefc0 100644 +index 7711591bf57987ea6d787859eba7953285d01da8..3f8d38a5a0920038b116f36a345a9a5af89a5cb2 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -2020,6 +2020,11 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0610-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0609-Add-fast-alternative-constructor-for-Rotations.patch similarity index 100% rename from patches/server/0610-Add-fast-alternative-constructor-for-Rotations.patch rename to patches/server/0609-Add-fast-alternative-constructor-for-Rotations.patch diff --git a/patches/server/0611-Item-Rarity-API.patch b/patches/server/0610-Item-Rarity-API.patch similarity index 100% rename from patches/server/0611-Item-Rarity-API.patch rename to patches/server/0610-Item-Rarity-API.patch diff --git a/patches/server/0612-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0611-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch similarity index 100% rename from patches/server/0612-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch rename to patches/server/0611-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch diff --git a/patches/server/0613-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0612-copy-TESign-isEditable-from-snapshots.patch similarity index 100% rename from patches/server/0613-copy-TESign-isEditable-from-snapshots.patch rename to patches/server/0612-copy-TESign-isEditable-from-snapshots.patch diff --git a/patches/server/0614-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0613-Drop-carried-item-when-player-has-disconnected.patch similarity index 100% rename from patches/server/0614-Drop-carried-item-when-player-has-disconnected.patch rename to patches/server/0613-Drop-carried-item-when-player-has-disconnected.patch diff --git a/patches/server/0615-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0614-forced-whitelist-use-configurable-kick-message.patch similarity index 94% rename from patches/server/0615-forced-whitelist-use-configurable-kick-message.patch rename to patches/server/0614-forced-whitelist-use-configurable-kick-message.patch index 1335c9be5102..17ef0bf65db7 100644 --- a/patches/server/0615-forced-whitelist-use-configurable-kick-message.patch +++ b/patches/server/0614-forced-whitelist-use-configurable-kick-message.patch @@ -5,7 +5,7 @@ Subject: [PATCH] forced whitelist: use configurable kick message diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 445efad6a35b819dcb845524a28055a90da6e7f6..0e888c2d64cddb8b44e0572cea07fbb3cf0e6987 100644 +index 2914355be3f6c45b2dbd7ceb0ea65c7f22255a6d..2ec8216d19de795bbe0827f6c9b3f9cdc2ce6760 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -73,7 +73,6 @@ import net.minecraft.gametest.framework.GameTestTicker; diff --git a/patches/server/0616-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0615-Don-t-ignore-result-of-PlayerEditBookEvent.patch similarity index 100% rename from patches/server/0616-Don-t-ignore-result-of-PlayerEditBookEvent.patch rename to patches/server/0615-Don-t-ignore-result-of-PlayerEditBookEvent.patch diff --git a/patches/server/0617-Entity-load-save-limit-per-chunk.patch b/patches/server/0616-Entity-load-save-limit-per-chunk.patch similarity index 100% rename from patches/server/0617-Entity-load-save-limit-per-chunk.patch rename to patches/server/0616-Entity-load-save-limit-per-chunk.patch diff --git a/patches/server/0618-Expose-protocol-version.patch b/patches/server/0617-Expose-protocol-version.patch similarity index 100% rename from patches/server/0618-Expose-protocol-version.patch rename to patches/server/0617-Expose-protocol-version.patch diff --git a/patches/server/0619-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/server/0618-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch similarity index 100% rename from patches/server/0619-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch rename to patches/server/0618-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch diff --git a/patches/server/0620-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0619-Enhance-console-tab-completions-for-brigadier-comman.patch similarity index 99% rename from patches/server/0620-Enhance-console-tab-completions-for-brigadier-comman.patch rename to patches/server/0619-Enhance-console-tab-completions-for-brigadier-comman.patch index 9885b939ead7..4fa634b2028a 100644 --- a/patches/server/0620-Enhance-console-tab-completions-for-brigadier-comman.patch +++ b/patches/server/0619-Enhance-console-tab-completions-for-brigadier-comman.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Enhance console tab completions for brigadier commands diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index a0a3cec47c8f9e379a5bc1d43eeda5eb9d81f814..5f22fdedd5456ffde94b038d294fe14ac9c6ad20 100644 +index 23d849872109e43d6e22a953d3a4298565d4621d..fae61ada619d86b6721c7a57fecd485188919a25 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -106,6 +106,13 @@ public class PaperConfig { diff --git a/patches/server/0621-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0620-Fix-PlayerItemConsumeEvent-cancelling-properly.patch similarity index 100% rename from patches/server/0621-Fix-PlayerItemConsumeEvent-cancelling-properly.patch rename to patches/server/0620-Fix-PlayerItemConsumeEvent-cancelling-properly.patch diff --git a/patches/server/0622-Add-bypass-host-check.patch b/patches/server/0621-Add-bypass-host-check.patch similarity index 100% rename from patches/server/0622-Add-bypass-host-check.patch rename to patches/server/0621-Add-bypass-host-check.patch diff --git a/patches/server/0623-Set-area-affect-cloud-rotation.patch b/patches/server/0622-Set-area-affect-cloud-rotation.patch similarity index 100% rename from patches/server/0623-Set-area-affect-cloud-rotation.patch rename to patches/server/0622-Set-area-affect-cloud-rotation.patch diff --git a/patches/server/0624-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0623-add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/server/0624-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/server/0623-add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/server/0625-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0624-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/server/0625-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/server/0624-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/server/0626-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0625-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/server/0626-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/server/0625-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/server/0627-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0626-fix-PigZombieAngerEvent-cancellation.patch similarity index 100% rename from patches/server/0627-fix-PigZombieAngerEvent-cancellation.patch rename to patches/server/0626-fix-PigZombieAngerEvent-cancellation.patch diff --git a/patches/server/0628-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/server/0627-Fix-checkReach-check-for-Shulker-boxes.patch similarity index 100% rename from patches/server/0628-Fix-checkReach-check-for-Shulker-boxes.patch rename to patches/server/0627-Fix-checkReach-check-for-Shulker-boxes.patch diff --git a/patches/server/0629-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0628-fix-PlayerItemHeldEvent-firing-twice.patch similarity index 100% rename from patches/server/0629-fix-PlayerItemHeldEvent-firing-twice.patch rename to patches/server/0628-fix-PlayerItemHeldEvent-firing-twice.patch diff --git a/patches/server/0630-Added-PlayerDeepSleepEvent.patch b/patches/server/0629-Added-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/server/0630-Added-PlayerDeepSleepEvent.patch rename to patches/server/0629-Added-PlayerDeepSleepEvent.patch diff --git a/patches/server/0631-More-World-API.patch b/patches/server/0630-More-World-API.patch similarity index 97% rename from patches/server/0631-More-World-API.patch rename to patches/server/0630-More-World-API.patch index 3fac16090acb..c0575b9af433 100644 --- a/patches/server/0631-More-World-API.patch +++ b/patches/server/0630-More-World-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] More World API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 65b15946fbac36c4b767127aa1fa8ef59c0aefc0..e57f5dfb86e4692455f8876f2183f6f520bc4b5e 100644 +index 3f8d38a5a0920038b116f36a345a9a5af89a5cb2..232a5582032108402d4371d95f68f98b2685c8fd 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1966,6 +1966,65 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0632-Added-PlayerBedFailEnterEvent.patch b/patches/server/0631-Added-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/server/0632-Added-PlayerBedFailEnterEvent.patch rename to patches/server/0631-Added-PlayerBedFailEnterEvent.patch diff --git a/patches/server/0633-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0632-Implement-methods-to-convert-between-Component-and-B.patch similarity index 100% rename from patches/server/0633-Implement-methods-to-convert-between-Component-and-B.patch rename to patches/server/0632-Implement-methods-to-convert-between-Component-and-B.patch diff --git a/patches/server/0634-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0633-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch similarity index 100% rename from patches/server/0634-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch rename to patches/server/0633-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch diff --git a/patches/server/0635-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0634-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/server/0635-Introduce-beacon-activation-deactivation-events.patch rename to patches/server/0634-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/server/0636-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0635-add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 100% rename from patches/server/0636-add-RespawnFlags-to-PlayerRespawnEvent.patch rename to patches/server/0635-add-RespawnFlags-to-PlayerRespawnEvent.patch diff --git a/patches/server/0637-Add-Channel-initialization-listeners.patch b/patches/server/0636-Add-Channel-initialization-listeners.patch similarity index 100% rename from patches/server/0637-Add-Channel-initialization-listeners.patch rename to patches/server/0636-Add-Channel-initialization-listeners.patch diff --git a/patches/server/0638-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0637-Send-empty-commands-if-tab-completion-is-disabled.patch similarity index 100% rename from patches/server/0638-Send-empty-commands-if-tab-completion-is-disabled.patch rename to patches/server/0637-Send-empty-commands-if-tab-completion-is-disabled.patch diff --git a/patches/server/0639-Add-more-WanderingTrader-API.patch b/patches/server/0638-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/server/0639-Add-more-WanderingTrader-API.patch rename to patches/server/0638-Add-more-WanderingTrader-API.patch diff --git a/patches/server/0640-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0639-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/server/0640-Add-EntityBlockStorage-clearEntities.patch rename to patches/server/0639-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/server/0641-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0640-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/server/0641-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/server/0640-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/server/0642-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0641-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0642-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch rename to patches/server/0641-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0643-Inventory-close.patch b/patches/server/0642-Inventory-close.patch similarity index 100% rename from patches/server/0643-Inventory-close.patch rename to patches/server/0642-Inventory-close.patch diff --git a/patches/server/0644-call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/0643-call-PortalCreateEvent-players-and-end-platform.patch similarity index 100% rename from patches/server/0644-call-PortalCreateEvent-players-and-end-platform.patch rename to patches/server/0643-call-PortalCreateEvent-players-and-end-platform.patch diff --git a/patches/server/0645-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0644-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/server/0645-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/server/0644-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/server/0646-Fix-CraftPotionBrewer-cache.patch b/patches/server/0645-Fix-CraftPotionBrewer-cache.patch similarity index 100% rename from patches/server/0646-Fix-CraftPotionBrewer-cache.patch rename to patches/server/0645-Fix-CraftPotionBrewer-cache.patch diff --git a/patches/server/0647-Add-basic-Datapack-API.patch b/patches/server/0646-Add-basic-Datapack-API.patch similarity index 100% rename from patches/server/0647-Add-basic-Datapack-API.patch rename to patches/server/0646-Add-basic-Datapack-API.patch diff --git a/patches/server/0648-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0647-Add-environment-variable-to-disable-server-gui.patch similarity index 100% rename from patches/server/0648-Add-environment-variable-to-disable-server-gui.patch rename to patches/server/0647-Add-environment-variable-to-disable-server-gui.patch diff --git a/patches/server/0649-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0648-additions-to-PlayerGameModeChangeEvent.patch similarity index 100% rename from patches/server/0649-additions-to-PlayerGameModeChangeEvent.patch rename to patches/server/0648-additions-to-PlayerGameModeChangeEvent.patch diff --git a/patches/server/0650-ItemStack-repair-check-API.patch b/patches/server/0649-ItemStack-repair-check-API.patch similarity index 100% rename from patches/server/0650-ItemStack-repair-check-API.patch rename to patches/server/0649-ItemStack-repair-check-API.patch diff --git a/patches/server/0651-More-Enchantment-API.patch b/patches/server/0650-More-Enchantment-API.patch similarity index 100% rename from patches/server/0651-More-Enchantment-API.patch rename to patches/server/0650-More-Enchantment-API.patch diff --git a/patches/server/0652-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0651-Fix-and-optimise-world-force-upgrading.patch similarity index 99% rename from patches/server/0652-Fix-and-optimise-world-force-upgrading.patch rename to patches/server/0651-Fix-and-optimise-world-force-upgrading.patch index f7e34581ab8f..8976eff0721d 100644 --- a/patches/server/0652-Fix-and-optimise-world-force-upgrading.patch +++ b/patches/server/0651-Fix-and-optimise-world-force-upgrading.patch @@ -272,7 +272,7 @@ index 69dc1271be0a3f3f2fb4ce15981ed25d24dce785..1e0d261439255091a6f61485c0747231 Main.LOGGER.info("Forcing world upgrade! {}", session.getLevelId()); // CraftBukkit WorldUpgrader worldupgrader = new WorldUpgrader(session, dataFixer, generatorOptions, eraseCache); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 0e888c2d64cddb8b44e0572cea07fbb3cf0e6987..4a92ea5d6db5873277708d9fba6e1dd04205da78 100644 +index 2ec8216d19de795bbe0827f6c9b3f9cdc2ce6760..b8ffd95bbad81521b9f91e83f63188553c09d4bd 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -555,11 +555,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop type, Level world) { this.id = Entity.ENTITY_COUNTER.incrementAndGet(); -@@ -2561,6 +2591,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -2541,6 +2571,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } this.processPortalCooldown(); diff --git a/patches/server/0669-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0668-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch similarity index 100% rename from patches/server/0669-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch rename to patches/server/0668-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch diff --git a/patches/server/0670-Make-item-validations-configurable.patch b/patches/server/0669-Make-item-validations-configurable.patch similarity index 98% rename from patches/server/0670-Make-item-validations-configurable.patch rename to patches/server/0669-Make-item-validations-configurable.patch index b10a52f5e4b5..82a6f237122f 100644 --- a/patches/server/0670-Make-item-validations-configurable.patch +++ b/patches/server/0669-Make-item-validations-configurable.patch @@ -56,7 +56,7 @@ index 0f753f4868141ecc383877ea3a666a383f2e3339..ebb643fc0477409d1efb4e9af5967504 } } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index 9486dc1c1ec5d997d53277ede2f85e9df153939e..9ce647730d9f7aa121e13f2ba00037fc18625efd 100644 +index 671ac759424eaf9b2573545c6fcbec1f3a0ef731..3b0341fecee0d122d2ddf358bc615daae1c58f8b 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -357,18 +357,18 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { diff --git a/patches/server/0671-Line-Of-Sight-Changes.patch b/patches/server/0670-Line-Of-Sight-Changes.patch similarity index 97% rename from patches/server/0671-Line-Of-Sight-Changes.patch rename to patches/server/0670-Line-Of-Sight-Changes.patch index 28e1141d0b52..f9ee33dbcea6 100644 --- a/patches/server/0671-Line-Of-Sight-Changes.patch +++ b/patches/server/0670-Line-Of-Sight-Changes.patch @@ -19,7 +19,7 @@ index fd2d5e274a3bf889b954bed17d286d1157cd208e..709ca3f249a5c4d3a405e94ca353864d } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 06b3377cbe2808187d9f4af1253be9e787ec7f2f..e2f88425ea748384af18b126c6478a58a3eba176 100644 +index da4aa69b1a0bde186e3d61cdfcd73ca2195c46e0..aeced758b9c9cae7ae53f44c731293bca54310ba 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -199,6 +199,18 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0672-add-per-world-spawn-limits.patch b/patches/server/0671-add-per-world-spawn-limits.patch similarity index 97% rename from patches/server/0672-add-per-world-spawn-limits.patch rename to patches/server/0671-add-per-world-spawn-limits.patch index adf5a719473b..7d4b07ec827e 100644 --- a/patches/server/0672-add-per-world-spawn-limits.patch +++ b/patches/server/0671-add-per-world-spawn-limits.patch @@ -44,7 +44,7 @@ index db4aed53ce28393ac34c06753647cbe1322e89c6..54a2f43e568b0104571abcb5d84aac35 private void lightQueueSize() { lightQueueSize = getInt("light-queue-size", lightQueueSize); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index e2f88425ea748384af18b126c6478a58a3eba176..1d0eb961e3abc980845ff3ecc8a790a98c55e49c 100644 +index aeced758b9c9cae7ae53f44c731293bca54310ba..9767b183630965472414a4197b54e1500573c89b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -221,6 +221,13 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0673-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/server/0672-Fix-PotionSplashEvent-for-water-splash-potions.patch similarity index 100% rename from patches/server/0673-Fix-PotionSplashEvent-for-water-splash-potions.patch rename to patches/server/0672-Fix-PotionSplashEvent-for-water-splash-potions.patch diff --git a/patches/server/0674-Add-more-LimitedRegion-API.patch b/patches/server/0673-Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/server/0674-Add-more-LimitedRegion-API.patch rename to patches/server/0673-Add-more-LimitedRegion-API.patch diff --git a/patches/server/0675-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0674-Fix-PlayerDropItemEvent-using-wrong-item.patch similarity index 100% rename from patches/server/0675-Fix-PlayerDropItemEvent-using-wrong-item.patch rename to patches/server/0674-Fix-PlayerDropItemEvent-using-wrong-item.patch diff --git a/patches/server/0676-Missing-Entity-Behavior-API.patch b/patches/server/0675-Missing-Entity-Behavior-API.patch similarity index 100% rename from patches/server/0676-Missing-Entity-Behavior-API.patch rename to patches/server/0675-Missing-Entity-Behavior-API.patch diff --git a/patches/server/0677-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0676-Ensure-disconnect-for-book-edit-is-called-on-main.patch similarity index 100% rename from patches/server/0677-Ensure-disconnect-for-book-edit-is-called-on-main.patch rename to patches/server/0676-Ensure-disconnect-for-book-edit-is-called-on-main.patch diff --git a/patches/server/0678-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0677-Fix-return-value-of-Block-applyBoneMeal-always-being.patch similarity index 100% rename from patches/server/0678-Fix-return-value-of-Block-applyBoneMeal-always-being.patch rename to patches/server/0677-Fix-return-value-of-Block-applyBoneMeal-always-being.patch diff --git a/patches/server/0679-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0678-Use-getChunkIfLoadedImmediately-in-places.patch similarity index 100% rename from patches/server/0679-Use-getChunkIfLoadedImmediately-in-places.patch rename to patches/server/0678-Use-getChunkIfLoadedImmediately-in-places.patch diff --git a/patches/server/0680-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0679-Fix-commands-from-signs-not-firing-command-events.patch similarity index 100% rename from patches/server/0680-Fix-commands-from-signs-not-firing-command-events.patch rename to patches/server/0679-Fix-commands-from-signs-not-firing-command-events.patch diff --git a/patches/server/0681-Adds-PlayerArmSwingEvent.patch b/patches/server/0680-Adds-PlayerArmSwingEvent.patch similarity index 100% rename from patches/server/0681-Adds-PlayerArmSwingEvent.patch rename to patches/server/0680-Adds-PlayerArmSwingEvent.patch diff --git a/patches/server/0682-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0681-Fixes-kick-event-leave-message-not-being-sent.patch similarity index 100% rename from patches/server/0682-Fixes-kick-event-leave-message-not-being-sent.patch rename to patches/server/0681-Fixes-kick-event-leave-message-not-being-sent.patch diff --git a/patches/server/0683-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0682-Add-config-for-mobs-immune-to-default-effects.patch similarity index 100% rename from patches/server/0683-Add-config-for-mobs-immune-to-default-effects.patch rename to patches/server/0682-Add-config-for-mobs-immune-to-default-effects.patch diff --git a/patches/server/0684-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0683-Fix-incorrect-message-for-outdated-client.patch similarity index 100% rename from patches/server/0684-Fix-incorrect-message-for-outdated-client.patch rename to patches/server/0683-Fix-incorrect-message-for-outdated-client.patch diff --git a/patches/server/0685-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0684-Don-t-apply-cramming-damage-to-players.patch similarity index 100% rename from patches/server/0685-Don-t-apply-cramming-damage-to-players.patch rename to patches/server/0684-Don-t-apply-cramming-damage-to-players.patch diff --git a/patches/server/0686-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0685-Rate-options-and-timings-for-sensors-and-behaviors.patch similarity index 100% rename from patches/server/0686-Rate-options-and-timings-for-sensors-and-behaviors.patch rename to patches/server/0685-Rate-options-and-timings-for-sensors-and-behaviors.patch diff --git a/patches/server/0687-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0686-Add-a-bunch-of-missing-forceDrop-toggles.patch similarity index 96% rename from patches/server/0687-Add-a-bunch-of-missing-forceDrop-toggles.patch rename to patches/server/0686-Add-a-bunch-of-missing-forceDrop-toggles.patch index 8e69a76f25c6..46872564c276 100644 --- a/patches/server/0687-Add-a-bunch-of-missing-forceDrop-toggles.patch +++ b/patches/server/0686-Add-a-bunch-of-missing-forceDrop-toggles.patch @@ -33,7 +33,7 @@ index 306aa8c36be92d66ebcc6b7e0dbb9dee6ec41a9b..8db4fc59b99694d2b15af188fc1c39cc } diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java -index de4e35305f08cc92876f51edadbe69a620a8166e..f65d32245556e2acab927a29626749edea980f0a 100644 +index d202682d0bc0fb22065cda27b23537f526935a5d..84c129fd931596a4cd3aa5b9caa7da1c309b71a7 100644 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java @@ -305,7 +305,9 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento diff --git a/patches/server/0688-Stinger-API.patch b/patches/server/0687-Stinger-API.patch similarity index 100% rename from patches/server/0688-Stinger-API.patch rename to patches/server/0687-Stinger-API.patch diff --git a/patches/server/0689-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0688-Fix-incosistency-issue-with-empty-map-items-in-CB.patch similarity index 100% rename from patches/server/0689-Fix-incosistency-issue-with-empty-map-items-in-CB.patch rename to patches/server/0688-Fix-incosistency-issue-with-empty-map-items-in-CB.patch diff --git a/patches/server/0690-Add-System.out-err-catcher.patch b/patches/server/0689-Add-System.out-err-catcher.patch similarity index 98% rename from patches/server/0690-Add-System.out-err-catcher.patch rename to patches/server/0689-Add-System.out-err-catcher.patch index dde83aa3c80a..8d15e7fb0d38 100644 --- a/patches/server/0690-Add-System.out-err-catcher.patch +++ b/patches/server/0689-Add-System.out-err-catcher.patch @@ -105,7 +105,7 @@ index 0000000000000000000000000000000000000000..76d0d00cd6742991e3f3ec827a75ee87 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 99a679945337f412fe7d1c51280b05b5b0bcfb5b..0537f6661b145f4d0f8dd58dde45fb9eebb40561 100644 +index 38b3404b4c097bbb654886145c34148fd18a17c8..2f05c9d16f6b68db289d0822ea565e5195f61002 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -282,6 +282,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0691-Fix-test-not-bootstrapping.patch b/patches/server/0690-Fix-test-not-bootstrapping.patch similarity index 100% rename from patches/server/0691-Fix-test-not-bootstrapping.patch rename to patches/server/0690-Fix-test-not-bootstrapping.patch diff --git a/patches/server/0692-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0691-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/server/0692-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/server/0691-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/server/0693-Improve-boat-collision-performance.patch b/patches/server/0692-Improve-boat-collision-performance.patch similarity index 100% rename from patches/server/0693-Improve-boat-collision-performance.patch rename to patches/server/0692-Improve-boat-collision-performance.patch diff --git a/patches/server/0694-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0693-Prevent-AFK-kick-while-watching-end-credits.patch similarity index 93% rename from patches/server/0694-Prevent-AFK-kick-while-watching-end-credits.patch rename to patches/server/0693-Prevent-AFK-kick-while-watching-end-credits.patch index 44c6dff957f9..b293b7386583 100644 --- a/patches/server/0694-Prevent-AFK-kick-while-watching-end-credits.patch +++ b/patches/server/0693-Prevent-AFK-kick-while-watching-end-credits.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent AFK kick while watching end credits. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index aaa1466c420e346d20aace4115f2d83cb9fb2d0b..e1f530d8b9faf7258a4d4c6dee689548b43b31a2 100644 +index d9eec6be067b858001c31f25788a63f2d50051ce..cfb827f64eaacf9835f950b963b850609347a708 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -387,7 +387,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0695-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0694-Allow-skipping-writing-of-comments-to-server.propert.patch similarity index 100% rename from patches/server/0695-Allow-skipping-writing-of-comments-to-server.propert.patch rename to patches/server/0694-Allow-skipping-writing-of-comments-to-server.propert.patch diff --git a/patches/server/0696-Add-PlayerSetSpawnEvent.patch b/patches/server/0695-Add-PlayerSetSpawnEvent.patch similarity index 100% rename from patches/server/0696-Add-PlayerSetSpawnEvent.patch rename to patches/server/0695-Add-PlayerSetSpawnEvent.patch diff --git a/patches/server/0697-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0696-Make-hoppers-respect-inventory-max-stack-size.patch similarity index 100% rename from patches/server/0697-Make-hoppers-respect-inventory-max-stack-size.patch rename to patches/server/0696-Make-hoppers-respect-inventory-max-stack-size.patch diff --git a/patches/server/0698-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0697-Optimize-entity-tracker-passenger-checks.patch similarity index 100% rename from patches/server/0698-Optimize-entity-tracker-passenger-checks.patch rename to patches/server/0697-Optimize-entity-tracker-passenger-checks.patch diff --git a/patches/server/0699-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0698-Config-option-for-Piglins-guarding-chests.patch similarity index 100% rename from patches/server/0699-Config-option-for-Piglins-guarding-chests.patch rename to patches/server/0698-Config-option-for-Piglins-guarding-chests.patch diff --git a/patches/server/0700-Added-EntityDamageItemEvent.patch b/patches/server/0699-Added-EntityDamageItemEvent.patch similarity index 100% rename from patches/server/0700-Added-EntityDamageItemEvent.patch rename to patches/server/0699-Added-EntityDamageItemEvent.patch diff --git a/patches/server/0701-Optimize-indirect-passenger-iteration.patch b/patches/server/0700-Optimize-indirect-passenger-iteration.patch similarity index 91% rename from patches/server/0701-Optimize-indirect-passenger-iteration.patch rename to patches/server/0700-Optimize-indirect-passenger-iteration.patch index 3f6f8f2a1fb3..b821bc05660a 100644 --- a/patches/server/0701-Optimize-indirect-passenger-iteration.patch +++ b/patches/server/0700-Optimize-indirect-passenger-iteration.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Optimize indirect passenger iteration diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 62f1c3f197804bb4867ea0aea614038d9c96c283..4da2419e1aafee5f730b0793dc79e44531610e07 100644 +index 337427b4615c918f86a16a899df1d8a7c65351af..289ff2e1bd18ac48c51523eb492cad3920ff856e 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -3534,26 +3534,41 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -3514,26 +3514,41 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } private Stream getIndirectPassengersStream() { diff --git a/patches/server/0702-Fix-block-drops-position-losing-precision-millions-o.patch b/patches/server/0701-Fix-block-drops-position-losing-precision-millions-o.patch similarity index 100% rename from patches/server/0702-Fix-block-drops-position-losing-precision-millions-o.patch rename to patches/server/0701-Fix-block-drops-position-losing-precision-millions-o.patch diff --git a/patches/server/0703-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0702-Configurable-item-frame-map-cursor-update-interval.patch similarity index 100% rename from patches/server/0703-Configurable-item-frame-map-cursor-update-interval.patch rename to patches/server/0702-Configurable-item-frame-map-cursor-update-interval.patch diff --git a/patches/server/0704-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0703-Make-EntityUnleashEvent-cancellable.patch similarity index 100% rename from patches/server/0704-Make-EntityUnleashEvent-cancellable.patch rename to patches/server/0703-Make-EntityUnleashEvent-cancellable.patch diff --git a/patches/server/0705-Clear-bucket-NBT-after-dispense.patch b/patches/server/0704-Clear-bucket-NBT-after-dispense.patch similarity index 100% rename from patches/server/0705-Clear-bucket-NBT-after-dispense.patch rename to patches/server/0704-Clear-bucket-NBT-after-dispense.patch diff --git a/patches/server/0706-Respect-despawn-rate-in-item-merge-check.patch b/patches/server/0705-Respect-despawn-rate-in-item-merge-check.patch similarity index 100% rename from patches/server/0706-Respect-despawn-rate-in-item-merge-check.patch rename to patches/server/0705-Respect-despawn-rate-in-item-merge-check.patch diff --git a/patches/server/0707-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0706-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/server/0707-Change-EnderEye-target-without-changing-other-things.patch rename to patches/server/0706-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/server/0708-Add-BlockBreakBlockEvent.patch b/patches/server/0707-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/server/0708-Add-BlockBreakBlockEvent.patch rename to patches/server/0707-Add-BlockBreakBlockEvent.patch diff --git a/patches/server/0709-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0708-Option-to-prevent-NBT-copy-in-smithing-recipes.patch similarity index 100% rename from patches/server/0709-Option-to-prevent-NBT-copy-in-smithing-recipes.patch rename to patches/server/0708-Option-to-prevent-NBT-copy-in-smithing-recipes.patch diff --git a/patches/server/0710-More-CommandBlock-API.patch b/patches/server/0709-More-CommandBlock-API.patch similarity index 100% rename from patches/server/0710-More-CommandBlock-API.patch rename to patches/server/0709-More-CommandBlock-API.patch diff --git a/patches/server/0711-Add-missing-team-sidebar-display-slots.patch b/patches/server/0710-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/server/0711-Add-missing-team-sidebar-display-slots.patch rename to patches/server/0710-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/server/0712-Add-back-EntityPortalExitEvent.patch b/patches/server/0711-Add-back-EntityPortalExitEvent.patch similarity index 90% rename from patches/server/0712-Add-back-EntityPortalExitEvent.patch rename to patches/server/0711-Add-back-EntityPortalExitEvent.patch index a44e713ebde7..f1405ed36f3c 100644 --- a/patches/server/0712-Add-back-EntityPortalExitEvent.patch +++ b/patches/server/0711-Add-back-EntityPortalExitEvent.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add back EntityPortalExitEvent diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 4da2419e1aafee5f730b0793dc79e44531610e07..f9c11fcb180fda63f2ae4edb8d952106bfe80294 100644 +index 289ff2e1bd18ac48c51523eb492cad3920ff856e..434142b0a1079d924ab0f0d1193482afbb9fda67 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -3039,6 +3039,23 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -3019,6 +3019,23 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } else { // CraftBukkit start worldserver = shapedetectorshape.world; @@ -32,7 +32,7 @@ index 4da2419e1aafee5f730b0793dc79e44531610e07..f9c11fcb180fda63f2ae4edb8d952106 if (worldserver == this.level) { // SPIGOT-6782: Just move the entity if a plugin changed the world to the one the entity is already in this.moveTo(shapedetectorshape.pos.x, shapedetectorshape.pos.y, shapedetectorshape.pos.z, shapedetectorshape.yRot, shapedetectorshape.xRot); -@@ -3058,8 +3075,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -3038,8 +3055,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { if (entity != null) { entity.restoreFrom(this); diff --git a/patches/server/0713-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0712-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 93% rename from patches/server/0713-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/server/0712-Add-methods-to-find-targets-for-lightning-strikes.patch index 742d7716fff9..35a2dcf208e9 100644 --- a/patches/server/0713-Add-methods-to-find-targets-for-lightning-strikes.patch +++ b/patches/server/0712-Add-methods-to-find-targets-for-lightning-strikes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add methods to find targets for lightning strikes diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 6a526474ca4683b8df3d4a61950e661963cbc737..7eeb80e708da11cc0ec41e4eeee53fb370ac17b1 100644 +index 8fbf0b2f6bd0bdc9eef8e9b950a81e258e1cc552..990c16b52ac80df180086d045d56923bb2d69b1e 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -754,6 +754,11 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -29,7 +29,7 @@ index 6a526474ca4683b8df3d4a61950e661963cbc737..7eeb80e708da11cc0ec41e4eeee53fb3 blockposition1 = blockposition1.above(2); } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 1d0eb961e3abc980845ff3ecc8a790a98c55e49c..aa82956d3ea5eb83a348b62c08a9bc8f33a554fc 100644 +index 9767b183630965472414a4197b54e1500573c89b..f0e84b0a37a7fc374fb3f11e77a76a627c39b3e8 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -701,6 +701,23 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0714-Get-entity-default-attributes.patch b/patches/server/0713-Get-entity-default-attributes.patch similarity index 100% rename from patches/server/0714-Get-entity-default-attributes.patch rename to patches/server/0713-Get-entity-default-attributes.patch diff --git a/patches/server/0715-Left-handed-API.patch b/patches/server/0714-Left-handed-API.patch similarity index 100% rename from patches/server/0715-Left-handed-API.patch rename to patches/server/0714-Left-handed-API.patch diff --git a/patches/server/0716-Add-advancement-display-API.patch b/patches/server/0715-Add-advancement-display-API.patch similarity index 100% rename from patches/server/0716-Add-advancement-display-API.patch rename to patches/server/0715-Add-advancement-display-API.patch diff --git a/patches/server/0717-Add-ItemFactory-getMonsterEgg-API.patch b/patches/server/0716-Add-ItemFactory-getMonsterEgg-API.patch similarity index 100% rename from patches/server/0717-Add-ItemFactory-getMonsterEgg-API.patch rename to patches/server/0716-Add-ItemFactory-getMonsterEgg-API.patch diff --git a/patches/server/0718-Add-critical-damage-API.patch b/patches/server/0717-Add-critical-damage-API.patch similarity index 100% rename from patches/server/0718-Add-critical-damage-API.patch rename to patches/server/0717-Add-critical-damage-API.patch diff --git a/patches/server/0719-Fix-issues-with-mob-conversion.patch b/patches/server/0718-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/server/0719-Fix-issues-with-mob-conversion.patch rename to patches/server/0718-Fix-issues-with-mob-conversion.patch diff --git a/patches/server/0720-Add-isCollidable-methods-to-various-places.patch b/patches/server/0719-Add-isCollidable-methods-to-various-places.patch similarity index 100% rename from patches/server/0720-Add-isCollidable-methods-to-various-places.patch rename to patches/server/0719-Add-isCollidable-methods-to-various-places.patch diff --git a/patches/server/0721-Goat-ram-API.patch b/patches/server/0720-Goat-ram-API.patch similarity index 100% rename from patches/server/0721-Goat-ram-API.patch rename to patches/server/0720-Goat-ram-API.patch diff --git a/patches/server/0722-Add-API-for-resetting-a-single-score.patch b/patches/server/0721-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/server/0722-Add-API-for-resetting-a-single-score.patch rename to patches/server/0721-Add-API-for-resetting-a-single-score.patch diff --git a/patches/server/0723-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0722-Add-Raw-Byte-Entity-Serialization.patch similarity index 97% rename from patches/server/0723-Add-Raw-Byte-Entity-Serialization.patch rename to patches/server/0722-Add-Raw-Byte-Entity-Serialization.patch index d7e938d57a37..386d4af369c0 100644 --- a/patches/server/0723-Add-Raw-Byte-Entity-Serialization.patch +++ b/patches/server/0722-Add-Raw-Byte-Entity-Serialization.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add Raw Byte Entity Serialization diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index f9c11fcb180fda63f2ae4edb8d952106bfe80294..614ce90b4a1a6e6385d1bfc4d1df0563ecc33b98 100644 +index 434142b0a1079d924ab0f0d1193482afbb9fda67..dbfd97c2ba09ffd6b83c5b2f787e7463ab61e4a6 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -1837,6 +1837,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -1837,6 +1837,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } } diff --git a/patches/server/0724-Vanilla-command-permission-fixes.patch b/patches/server/0723-Vanilla-command-permission-fixes.patch similarity index 100% rename from patches/server/0724-Vanilla-command-permission-fixes.patch rename to patches/server/0723-Vanilla-command-permission-fixes.patch diff --git a/patches/server/0725-Make-CallbackExecutor-strict-again.patch b/patches/server/0724-Make-CallbackExecutor-strict-again.patch similarity index 100% rename from patches/server/0725-Make-CallbackExecutor-strict-again.patch rename to patches/server/0724-Make-CallbackExecutor-strict-again.patch diff --git a/patches/server/0726-Do-not-allow-the-server-to-unload-chunks-at-request-.patch b/patches/server/0725-Do-not-allow-the-server-to-unload-chunks-at-request-.patch similarity index 100% rename from patches/server/0726-Do-not-allow-the-server-to-unload-chunks-at-request-.patch rename to patches/server/0725-Do-not-allow-the-server-to-unload-chunks-at-request-.patch diff --git a/patches/server/0727-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0726-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch similarity index 100% rename from patches/server/0727-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch rename to patches/server/0726-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch diff --git a/patches/server/0728-Correctly-handle-recursion-for-chunkholder-updates.patch b/patches/server/0727-Correctly-handle-recursion-for-chunkholder-updates.patch similarity index 100% rename from patches/server/0728-Correctly-handle-recursion-for-chunkholder-updates.patch rename to patches/server/0727-Correctly-handle-recursion-for-chunkholder-updates.patch diff --git a/patches/server/0729-Fix-GameProfileCache-concurrency.patch b/patches/server/0728-Fix-GameProfileCache-concurrency.patch similarity index 100% rename from patches/server/0729-Fix-GameProfileCache-concurrency.patch rename to patches/server/0728-Fix-GameProfileCache-concurrency.patch diff --git a/patches/server/0730-Fix-chunks-refusing-to-unload-at-low-TPS.patch b/patches/server/0729-Fix-chunks-refusing-to-unload-at-low-TPS.patch similarity index 100% rename from patches/server/0730-Fix-chunks-refusing-to-unload-at-low-TPS.patch rename to patches/server/0729-Fix-chunks-refusing-to-unload-at-low-TPS.patch diff --git a/patches/server/0731-Do-not-allow-ticket-level-changes-while-unloading-pl.patch b/patches/server/0730-Do-not-allow-ticket-level-changes-while-unloading-pl.patch similarity index 100% rename from patches/server/0731-Do-not-allow-ticket-level-changes-while-unloading-pl.patch rename to patches/server/0730-Do-not-allow-ticket-level-changes-while-unloading-pl.patch diff --git a/patches/server/0732-Do-not-allow-ticket-level-changes-when-updating-chun.patch b/patches/server/0731-Do-not-allow-ticket-level-changes-when-updating-chun.patch similarity index 100% rename from patches/server/0732-Do-not-allow-ticket-level-changes-when-updating-chun.patch rename to patches/server/0731-Do-not-allow-ticket-level-changes-when-updating-chun.patch diff --git a/patches/server/0733-Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/server/0732-Do-not-submit-profile-lookups-to-worldgen-threads.patch similarity index 97% rename from patches/server/0733-Do-not-submit-profile-lookups-to-worldgen-threads.patch rename to patches/server/0732-Do-not-submit-profile-lookups-to-worldgen-threads.patch index 8ae08b04c803..f1e2a4b83da5 100644 --- a/patches/server/0733-Do-not-submit-profile-lookups-to-worldgen-threads.patch +++ b/patches/server/0732-Do-not-submit-profile-lookups-to-worldgen-threads.patch @@ -37,7 +37,7 @@ index c072819c1ebc772f524649c6c2f8b48d919bf805..bbe69b5b2b1b7ccd3358325c9a65e7e1 public static LongSupplier timeSource = System::nanoTime; public static final Ticker TICKER = new Ticker() { diff --git a/src/main/java/net/minecraft/server/players/GameProfileCache.java b/src/main/java/net/minecraft/server/players/GameProfileCache.java -index 534373a1e305942d63ffb0fc97ea3f165eca76b5..e3fbada96b530784fa1de63a322b484865ed194f 100644 +index 764132b38be5a87e09a3bfe5262e59df5b225519..9259eeea54d77ddecf044edf80e0eca6cb95278f 100644 --- a/src/main/java/net/minecraft/server/players/GameProfileCache.java +++ b/src/main/java/net/minecraft/server/players/GameProfileCache.java @@ -206,7 +206,7 @@ public class GameProfileCache { diff --git a/patches/server/0734-Log-when-the-async-catcher-is-tripped.patch b/patches/server/0733-Log-when-the-async-catcher-is-tripped.patch similarity index 100% rename from patches/server/0734-Log-when-the-async-catcher-is-tripped.patch rename to patches/server/0733-Log-when-the-async-catcher-is-tripped.patch diff --git a/patches/server/0735-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0734-Add-paper-mobcaps-and-paper-playermobcaps.patch similarity index 98% rename from patches/server/0735-Add-paper-mobcaps-and-paper-playermobcaps.patch rename to patches/server/0734-Add-paper-mobcaps-and-paper-playermobcaps.patch index f36284ae0ce3..bcecd1b89aef 100644 --- a/patches/server/0735-Add-paper-mobcaps-and-paper-playermobcaps.patch +++ b/patches/server/0734-Add-paper-mobcaps-and-paper-playermobcaps.patch @@ -10,7 +10,7 @@ Also has a hover text on each mob category listing what entity types are in said category diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java -index f436ab35798c9b6e6cb2eb60d2c02cbf9b742e69..be1da6ebf8c1468182cbb92a16e4866bfb2ecfc3 100644 +index 5a30840a2c35d8b721e27e91b4e6816e9b7c1e5a..ddabe0c59a04e6017368c5ba57767b8953cc09f0 100644 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java @@ -3,6 +3,7 @@ package com.destroystokyo.paper; @@ -293,7 +293,7 @@ index 1622450b53e0f0f48c3ca107e4d705b4ad29dadf..f6a225eed29eed364b7e2ea6bc85d55d public static void spawnCategoryForChunk(MobCategory group, ServerLevel world, LevelChunk chunk, NaturalSpawner.SpawnPredicate checker, NaturalSpawner.AfterSpawnCallback runner) { spawnCategoryForChunk(group, world, chunk, checker, runner, Integer.MAX_VALUE, null); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 0537f6661b145f4d0f8dd58dde45fb9eebb40561..eb3e8256f2ce62e1a2354c902226846c96b16ed9 100644 +index 2f05c9d16f6b68db289d0822ea565e5195f61002..a51e2fe2337ba1122dfe86410bb10eddaf21addb 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2137,6 +2137,11 @@ public final class CraftServer implements Server { @@ -309,7 +309,7 @@ index 0537f6661b145f4d0f8dd58dde45fb9eebb40561..eb3e8256f2ce62e1a2354c902226846c } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index aa82956d3ea5eb83a348b62c08a9bc8f33a554fc..2b8352e74f46e397a6f5b27c300153fde7c56af7 100644 +index f0e84b0a37a7fc374fb3f11e77a76a627c39b3e8..df986f97b86ba1fa4da15d969c635333abfdba91 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1717,9 +1717,14 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0736-Prevent-unload-calls-removing-tickets-for-sync-loads.patch b/patches/server/0735-Prevent-unload-calls-removing-tickets-for-sync-loads.patch similarity index 100% rename from patches/server/0736-Prevent-unload-calls-removing-tickets-for-sync-loads.patch rename to patches/server/0735-Prevent-unload-calls-removing-tickets-for-sync-loads.patch diff --git a/patches/server/0737-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0736-Sanitize-ResourceLocation-error-logging.patch similarity index 100% rename from patches/server/0737-Sanitize-ResourceLocation-error-logging.patch rename to patches/server/0736-Sanitize-ResourceLocation-error-logging.patch diff --git a/patches/server/0738-Optimise-general-POI-access.patch b/patches/server/0737-Optimise-general-POI-access.patch similarity index 100% rename from patches/server/0738-Optimise-general-POI-access.patch rename to patches/server/0737-Optimise-general-POI-access.patch diff --git a/patches/server/0739-Allow-controlled-flushing-for-network-manager.patch b/patches/server/0738-Allow-controlled-flushing-for-network-manager.patch similarity index 100% rename from patches/server/0739-Allow-controlled-flushing-for-network-manager.patch rename to patches/server/0738-Allow-controlled-flushing-for-network-manager.patch diff --git a/patches/server/0740-Add-more-async-catchers.patch b/patches/server/0739-Add-more-async-catchers.patch similarity index 100% rename from patches/server/0740-Add-more-async-catchers.patch rename to patches/server/0739-Add-more-async-catchers.patch diff --git a/patches/server/0741-Rewrite-entity-bounding-box-lookup-calls.patch b/patches/server/0740-Rewrite-entity-bounding-box-lookup-calls.patch similarity index 99% rename from patches/server/0741-Rewrite-entity-bounding-box-lookup-calls.patch rename to patches/server/0740-Rewrite-entity-bounding-box-lookup-calls.patch index 0a840e45df12..855a4f6e15ea 100644 --- a/patches/server/0741-Rewrite-entity-bounding-box-lookup-calls.patch +++ b/patches/server/0740-Rewrite-entity-bounding-box-lookup-calls.patch @@ -914,7 +914,7 @@ index 0000000000000000000000000000000000000000..3ba094e640d7fe7803e2bbdab8ff3beb + } +} diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 02b6cdc6b0b90fba7523f5eafb1b5641d6eceb66..eace9e9c97fff7d02326805ce77cc75a650f9b6d 100644 +index 3d00c1bcd5acbeee09f1854076545a1d3628d27e..4800285c5a6262d2f3331a10bb262e37489a47fa 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -431,7 +431,7 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -953,10 +953,10 @@ index 8fdda1e5805534d08c0a06b15e89d85b3d9c21e9..a24f605bd033f249a374e83ba0948801 + // Paper end } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 614ce90b4a1a6e6385d1bfc4d1df0563ecc33b98..78478f6e8bd07c2b4e11b627819a664e706efb8b 100644 +index dbfd97c2ba09ffd6b83c5b2f787e7463ab61e4a6..08e76481ed60c5df64e76edb5b954f008177ca34 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -428,6 +428,56 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -428,6 +428,56 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } // Paper end - make end portalling safe @@ -1013,7 +1013,7 @@ index 614ce90b4a1a6e6385d1bfc4d1df0563ecc33b98..78478f6e8bd07c2b4e11b627819a664e public Entity(EntityType type, Level world) { this.id = Entity.ENTITY_COUNTER.incrementAndGet(); this.passengers = ImmutableList.of(); -@@ -2298,11 +2348,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -2278,11 +2328,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { return InteractionResult.PASS; } diff --git a/patches/server/0742-Optimise-chunk-tick-iteration.patch b/patches/server/0741-Optimise-chunk-tick-iteration.patch similarity index 100% rename from patches/server/0742-Optimise-chunk-tick-iteration.patch rename to patches/server/0741-Optimise-chunk-tick-iteration.patch diff --git a/patches/server/0743-Execute-chunk-tasks-mid-tick.patch b/patches/server/0742-Execute-chunk-tasks-mid-tick.patch similarity index 100% rename from patches/server/0743-Execute-chunk-tasks-mid-tick.patch rename to patches/server/0742-Execute-chunk-tasks-mid-tick.patch diff --git a/patches/server/0744-Do-not-copy-visible-chunks.patch b/patches/server/0743-Do-not-copy-visible-chunks.patch similarity index 99% rename from patches/server/0744-Do-not-copy-visible-chunks.patch rename to patches/server/0743-Do-not-copy-visible-chunks.patch index 817fec675cae..f197972015f1 100644 --- a/patches/server/0744-Do-not-copy-visible-chunks.patch +++ b/patches/server/0743-Do-not-copy-visible-chunks.patch @@ -9,7 +9,7 @@ the function. I saw approximately 1/3rd of the function on the copy. diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java -index 4827fbd901ef7374e7c0a225c6a3ddba3ca462af..a1ed0031cdfa39feef61bd56315391c4c5aeae8a 100644 +index ddabe0c59a04e6017368c5ba57767b8953cc09f0..f57ec991111b45dbc33a81d3162ef58872ee3590 100644 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java @@ -476,7 +476,7 @@ public class PaperCommand extends Command { diff --git a/patches/server/0745-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0744-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch similarity index 100% rename from patches/server/0745-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch rename to patches/server/0744-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch diff --git a/patches/server/0746-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0745-Custom-table-implementation-for-blockstate-state-loo.patch similarity index 100% rename from patches/server/0746-Custom-table-implementation-for-blockstate-state-loo.patch rename to patches/server/0745-Custom-table-implementation-for-blockstate-state-loo.patch diff --git a/patches/server/0747-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0746-Detail-more-information-in-watchdog-dumps.patch similarity index 95% rename from patches/server/0747-Detail-more-information-in-watchdog-dumps.patch rename to patches/server/0746-Detail-more-information-in-watchdog-dumps.patch index 7d2d44d42b26..aec19cc83c89 100644 --- a/patches/server/0747-Detail-more-information-in-watchdog-dumps.patch +++ b/patches/server/0746-Detail-more-information-in-watchdog-dumps.patch @@ -77,7 +77,7 @@ index 97b05b7145c6a3a379de31b8988c909da9b21139..f7bb26e8b7a74a9ae5b469351b2fccc6 }); throw RunningOnDifferentThreadException.RUNNING_ON_DIFFERENT_THREAD; diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 381a4283715290162f445265e61294256e6b3075..9fa7a01db61ba91b79eda4f7e4fd4f0001712808 100644 +index cb872bcd9aba263ec2233aa1555bc99133cc682c..8f27ef86cac71e0a0002093f4eded83f8891876f 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -981,7 +981,26 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -123,10 +123,10 @@ index 381a4283715290162f445265e61294256e6b3075..9fa7a01db61ba91b79eda4f7e4fd4f00 private void tickPassenger(Entity vehicle, Entity passenger) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 78478f6e8bd07c2b4e11b627819a664e706efb8b..1f9f1ff4ccc3f45008df45274b8a154f0f802688 100644 +index 08e76481ed60c5df64e76edb5b954f008177ca34..2fe2cdb86136fdc7c6b44bf521268f1dcd7491b8 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -908,7 +908,42 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -908,7 +908,42 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { return this.onGround; } @@ -169,7 +169,7 @@ index 78478f6e8bd07c2b4e11b627819a664e706efb8b..1f9f1ff4ccc3f45008df45274b8a154f if (this.noPhysics) { this.setPos(this.getX() + movement.x, this.getY() + movement.y, this.getZ() + movement.z); } else { -@@ -1079,6 +1114,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -1079,6 +1114,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { this.level.getProfiler().pop(); } } @@ -183,7 +183,7 @@ index 78478f6e8bd07c2b4e11b627819a664e706efb8b..1f9f1ff4ccc3f45008df45274b8a154f } protected boolean isHorizontalCollisionMinor(Vec3 adjustedMovement) { -@@ -3886,7 +3928,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -3866,7 +3908,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } public void setDeltaMovement(Vec3 velocity) { @@ -193,7 +193,7 @@ index 78478f6e8bd07c2b4e11b627819a664e706efb8b..1f9f1ff4ccc3f45008df45274b8a154f } public void setDeltaMovement(double x, double y, double z) { -@@ -3962,7 +4006,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -3942,7 +3986,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } // Paper end - fix MC-4 if (this.position.x != x || this.position.y != y || this.position.z != z) { @@ -204,7 +204,7 @@ index 78478f6e8bd07c2b4e11b627819a664e706efb8b..1f9f1ff4ccc3f45008df45274b8a154f int j = Mth.floor(y); int k = Mth.floor(z); diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java -index dcfbe77bdb25d9c58ffb7b75c48bdb580bc0de47..bee38307494188800886a1622fed229b88dbd8f1 100644 +index dcfbe77bdb25d9c58ffb7b75c48bdb580bc0de47..24fefa521093448e608e217af7b88a6397a4b054 100644 --- a/src/main/java/org/spigotmc/WatchdogThread.java +++ b/src/main/java/org/spigotmc/WatchdogThread.java @@ -23,6 +23,78 @@ public class WatchdogThread extends Thread @@ -229,7 +229,7 @@ index dcfbe77bdb25d9c58ffb7b75c48bdb580bc0de47..bee38307494188800886a1622fed229b + moveVec = entity.getMoveVector(); + } + -+ String entityType = entity.getMinecraftKey().toString(); ++ String entityType = net.minecraft.world.entity.EntityType.getKey(entity.getType()).toString(); + java.util.UUID entityUUID = entity.getUUID(); + net.minecraft.world.level.Level world = entity.level; + diff --git a/patches/server/0748-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0747-Manually-inline-methods-in-BlockPosition.patch similarity index 100% rename from patches/server/0748-Manually-inline-methods-in-BlockPosition.patch rename to patches/server/0747-Manually-inline-methods-in-BlockPosition.patch diff --git a/patches/server/0749-Distance-manager-tick-timings.patch b/patches/server/0748-Distance-manager-tick-timings.patch similarity index 100% rename from patches/server/0749-Distance-manager-tick-timings.patch rename to patches/server/0748-Distance-manager-tick-timings.patch diff --git a/patches/server/0750-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0749-Name-craft-scheduler-threads-according-to-the-plugin.patch similarity index 100% rename from patches/server/0750-Name-craft-scheduler-threads-according-to-the-plugin.patch rename to patches/server/0749-Name-craft-scheduler-threads-according-to-the-plugin.patch diff --git a/patches/server/0751-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0750-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch similarity index 100% rename from patches/server/0751-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch rename to patches/server/0750-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch diff --git a/patches/server/0752-Add-packet-limiter-config.patch b/patches/server/0751-Add-packet-limiter-config.patch similarity index 100% rename from patches/server/0752-Add-packet-limiter-config.patch rename to patches/server/0751-Add-packet-limiter-config.patch diff --git a/patches/server/0753-Lag-compensate-block-breaking.patch b/patches/server/0752-Lag-compensate-block-breaking.patch similarity index 100% rename from patches/server/0753-Lag-compensate-block-breaking.patch rename to patches/server/0752-Lag-compensate-block-breaking.patch diff --git a/patches/server/0754-Use-correct-LevelStem-registry-when-loading-default-.patch b/patches/server/0753-Use-correct-LevelStem-registry-when-loading-default-.patch similarity index 100% rename from patches/server/0754-Use-correct-LevelStem-registry-when-loading-default-.patch rename to patches/server/0753-Use-correct-LevelStem-registry-when-loading-default-.patch diff --git a/patches/server/0755-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0754-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch similarity index 100% rename from patches/server/0755-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch rename to patches/server/0754-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch diff --git a/patches/server/0756-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/server/0755-Consolidate-flush-calls-for-entity-tracker-packets.patch similarity index 100% rename from patches/server/0756-Consolidate-flush-calls-for-entity-tracker-packets.patch rename to patches/server/0755-Consolidate-flush-calls-for-entity-tracker-packets.patch diff --git a/patches/server/0757-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0756-Don-t-lookup-fluid-state-when-raytracing.patch similarity index 100% rename from patches/server/0757-Don-t-lookup-fluid-state-when-raytracing.patch rename to patches/server/0756-Don-t-lookup-fluid-state-when-raytracing.patch diff --git a/patches/server/0758-Time-scoreboard-search.patch b/patches/server/0757-Time-scoreboard-search.patch similarity index 100% rename from patches/server/0758-Time-scoreboard-search.patch rename to patches/server/0757-Time-scoreboard-search.patch diff --git a/patches/server/0759-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0758-Send-full-pos-packets-for-hard-colliding-entities.patch similarity index 100% rename from patches/server/0759-Send-full-pos-packets-for-hard-colliding-entities.patch rename to patches/server/0758-Send-full-pos-packets-for-hard-colliding-entities.patch diff --git a/patches/server/0760-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0759-Do-not-run-raytrace-logic-for-AIR.patch similarity index 100% rename from patches/server/0760-Do-not-run-raytrace-logic-for-AIR.patch rename to patches/server/0759-Do-not-run-raytrace-logic-for-AIR.patch diff --git a/patches/server/0761-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0760-Oprimise-map-impl-for-tracked-players.patch similarity index 100% rename from patches/server/0761-Oprimise-map-impl-for-tracked-players.patch rename to patches/server/0760-Oprimise-map-impl-for-tracked-players.patch diff --git a/patches/server/0762-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0761-Optimise-BlockSoil-nearby-water-lookup.patch similarity index 100% rename from patches/server/0762-Optimise-BlockSoil-nearby-water-lookup.patch rename to patches/server/0761-Optimise-BlockSoil-nearby-water-lookup.patch diff --git a/patches/server/0763-Allow-removal-addition-of-entities-to-entity-ticklis.patch b/patches/server/0762-Allow-removal-addition-of-entities-to-entity-ticklis.patch similarity index 100% rename from patches/server/0763-Allow-removal-addition-of-entities-to-entity-ticklis.patch rename to patches/server/0762-Allow-removal-addition-of-entities-to-entity-ticklis.patch diff --git a/patches/server/0764-Optimise-random-block-ticking.patch b/patches/server/0763-Optimise-random-block-ticking.patch similarity index 99% rename from patches/server/0764-Optimise-random-block-ticking.patch rename to patches/server/0763-Optimise-random-block-ticking.patch index d035b191bb24..5fab891845e7 100644 --- a/patches/server/0764-Optimise-random-block-ticking.patch +++ b/patches/server/0763-Optimise-random-block-ticking.patch @@ -410,7 +410,7 @@ index cdd17e501c678a4f4bebbaaccdaec1682351e2f2..6afad987f6dd1fd7243dfa6c50549c2a public PalettedContainer getStates() { diff --git a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java -index 83dc9550f4ed2a138d4ece2765273e555cda994a..65afcb24f6274d30ebf8598ffce291537128858a 100644 +index 277b75940d0424051919889b2d0045f313027234..8bdc3f393282c510f1e99636275c61849d6a810c 100644 --- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java +++ b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java @@ -355,6 +355,14 @@ public class PalettedContainer implements PaletteResize { diff --git a/patches/server/0765-Optimise-non-flush-packet-sending.patch b/patches/server/0764-Optimise-non-flush-packet-sending.patch similarity index 100% rename from patches/server/0765-Optimise-non-flush-packet-sending.patch rename to patches/server/0764-Optimise-non-flush-packet-sending.patch diff --git a/patches/server/0766-Optimise-nearby-player-lookups.patch b/patches/server/0765-Optimise-nearby-player-lookups.patch similarity index 100% rename from patches/server/0766-Optimise-nearby-player-lookups.patch rename to patches/server/0765-Optimise-nearby-player-lookups.patch diff --git a/patches/server/0767-Optimise-WorldServer-notify.patch b/patches/server/0766-Optimise-WorldServer-notify.patch similarity index 99% rename from patches/server/0767-Optimise-WorldServer-notify.patch rename to patches/server/0766-Optimise-WorldServer-notify.patch index dfd43700971a..febc55762ae7 100644 --- a/patches/server/0767-Optimise-WorldServer-notify.patch +++ b/patches/server/0766-Optimise-WorldServer-notify.patch @@ -110,7 +110,7 @@ index bc6a4bfe7df804ee22791fb767f059a541a3900f..a578ff8a88ef944516150303e96f8b49 } diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 3d4671dfa6ab878aa0fd076797de482fa8cb9b51..0a11eeaefe39d637fe2f9243b0f8a4b2d9734446 100644 +index c780af51c50c019e7fa0e5aee3d05e3374f79948..524a4bb83afacf02c331f719be2e2c4320626afe 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1096,6 +1096,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0768-Remove-streams-for-villager-AI.patch b/patches/server/0767-Remove-streams-for-villager-AI.patch similarity index 100% rename from patches/server/0768-Remove-streams-for-villager-AI.patch rename to patches/server/0767-Remove-streams-for-villager-AI.patch diff --git a/patches/server/0769-Rewrite-dataconverter-system.patch b/patches/server/0768-Rewrite-dataconverter-system.patch similarity index 100% rename from patches/server/0769-Rewrite-dataconverter-system.patch rename to patches/server/0768-Rewrite-dataconverter-system.patch diff --git a/patches/server/0770-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0769-Use-Velocity-compression-and-cipher-natives.patch similarity index 100% rename from patches/server/0770-Use-Velocity-compression-and-cipher-natives.patch rename to patches/server/0769-Use-Velocity-compression-and-cipher-natives.patch diff --git a/patches/server/0771-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0770-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch similarity index 100% rename from patches/server/0771-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch rename to patches/server/0770-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch diff --git a/patches/server/0772-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch b/patches/server/0771-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch similarity index 100% rename from patches/server/0772-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch rename to patches/server/0771-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch diff --git a/patches/server/0773-Async-catch-modifications-to-critical-entity-state.patch b/patches/server/0772-Async-catch-modifications-to-critical-entity-state.patch similarity index 100% rename from patches/server/0773-Async-catch-modifications-to-critical-entity-state.patch rename to patches/server/0772-Async-catch-modifications-to-critical-entity-state.patch diff --git a/patches/server/0774-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0773-Fix-Bukkit-NamespacedKey-shenanigans.patch similarity index 100% rename from patches/server/0774-Fix-Bukkit-NamespacedKey-shenanigans.patch rename to patches/server/0773-Fix-Bukkit-NamespacedKey-shenanigans.patch diff --git a/patches/server/0775-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0774-Fix-merchant-inventory-not-closing-on-entity-removal.patch similarity index 94% rename from patches/server/0775-Fix-merchant-inventory-not-closing-on-entity-removal.patch rename to patches/server/0774-Fix-merchant-inventory-not-closing-on-entity-removal.patch index cbc189593a56..177d5b681025 100644 --- a/patches/server/0775-Fix-merchant-inventory-not-closing-on-entity-removal.patch +++ b/patches/server/0774-Fix-merchant-inventory-not-closing-on-entity-removal.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix merchant inventory not closing on entity removal diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 0a11eeaefe39d637fe2f9243b0f8a4b2d9734446..1e2c430a8df6afde91e3c5169d2d7b501acdec7f 100644 +index 524a4bb83afacf02c331f719be2e2c4320626afe..46db8458478de3dee83fc03478245ba914c79999 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -2485,6 +2485,11 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0776-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0775-Check-requirement-before-suggesting-root-nodes.patch similarity index 100% rename from patches/server/0776-Check-requirement-before-suggesting-root-nodes.patch rename to patches/server/0775-Check-requirement-before-suggesting-root-nodes.patch diff --git a/patches/server/0777-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0776-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch similarity index 100% rename from patches/server/0777-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch rename to patches/server/0776-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch diff --git a/patches/server/0778-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0777-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch similarity index 97% rename from patches/server/0778-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch rename to patches/server/0777-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch index 31e987614adb..81bcca30afb7 100644 --- a/patches/server/0778-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch +++ b/patches/server/0777-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch @@ -11,7 +11,7 @@ This commit hence simply fixes this by using the proper body colour value when updating the pattern color. diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaTropicalFishBucket.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaTropicalFishBucket.java -index ad9f19ab7d2acf314e87e2cfc6671583de2cfab9..0ea574121c505479607772d761ea829bb6ddb380 100644 +index 41eca0171faa5dc03b4e426a75f29b7bb4c3f6e2..acdc5c81850f9191061d4a804bd3524e717d24a2 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaTropicalFishBucket.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaTropicalFishBucket.java @@ -113,7 +113,7 @@ class CraftMetaTropicalFishBucket extends CraftMetaItem implements TropicalFishB diff --git a/patches/server/0779-Ensure-valid-vehicle-status.patch b/patches/server/0778-Ensure-valid-vehicle-status.patch similarity index 100% rename from patches/server/0779-Ensure-valid-vehicle-status.patch rename to patches/server/0778-Ensure-valid-vehicle-status.patch diff --git a/patches/server/0780-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0779-Prevent-softlocked-end-exit-portal-generation.patch similarity index 100% rename from patches/server/0780-Prevent-softlocked-end-exit-portal-generation.patch rename to patches/server/0779-Prevent-softlocked-end-exit-portal-generation.patch diff --git a/patches/server/0781-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0780-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch similarity index 100% rename from patches/server/0781-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch rename to patches/server/0780-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch diff --git a/patches/server/0782-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0781-Don-t-log-debug-logging-being-disabled.patch similarity index 100% rename from patches/server/0782-Don-t-log-debug-logging-being-disabled.patch rename to patches/server/0781-Don-t-log-debug-logging-being-disabled.patch diff --git a/patches/server/0783-Mark-fish-and-axolotls-from-buckets-as-persistent.patch b/patches/server/0782-Mark-fish-and-axolotls-from-buckets-as-persistent.patch similarity index 100% rename from patches/server/0783-Mark-fish-and-axolotls-from-buckets-as-persistent.patch rename to patches/server/0782-Mark-fish-and-axolotls-from-buckets-as-persistent.patch diff --git a/patches/server/0784-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0783-fix-various-menus-with-empty-level-accesses.patch similarity index 100% rename from patches/server/0784-fix-various-menus-with-empty-level-accesses.patch rename to patches/server/0783-fix-various-menus-with-empty-level-accesses.patch diff --git a/patches/server/0785-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch b/patches/server/0784-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch similarity index 100% rename from patches/server/0785-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch rename to patches/server/0784-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch diff --git a/patches/server/0786-Preserve-overstacked-loot.patch b/patches/server/0785-Preserve-overstacked-loot.patch similarity index 100% rename from patches/server/0786-Preserve-overstacked-loot.patch rename to patches/server/0785-Preserve-overstacked-loot.patch diff --git a/patches/server/0787-Update-head-rotation-in-missing-places.patch b/patches/server/0786-Update-head-rotation-in-missing-places.patch similarity index 87% rename from patches/server/0787-Update-head-rotation-in-missing-places.patch rename to patches/server/0786-Update-head-rotation-in-missing-places.patch index 2dd4efaae97f..a50cf119d2e8 100644 --- a/patches/server/0787-Update-head-rotation-in-missing-places.patch +++ b/patches/server/0786-Update-head-rotation-in-missing-places.patch @@ -8,10 +8,10 @@ This is because bukkit uses a separate head rotation field for yaw. This issue only applies to players. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 1f9f1ff4ccc3f45008df45274b8a154f0f802688..0f3a4d929fd78d3a63427dc01576cefacc24dbe0 100644 +index 2fe2cdb86136fdc7c6b44bf521268f1dcd7491b8..a23ce25a36a5eafa8b68c0bc408fe32717ae304a 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -1665,6 +1665,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -1665,6 +1665,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { this.setXRot(Mth.clamp(pitch, -90.0F, 90.0F) % 360.0F); this.yRotO = this.getYRot(); this.xRotO = this.getXRot(); @@ -19,7 +19,7 @@ index 1f9f1ff4ccc3f45008df45274b8a154f0f802688..0f3a4d929fd78d3a63427dc01576cefa } public void absMoveTo(double x, double y, double z) { -@@ -1703,6 +1704,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -1703,6 +1704,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { this.setXRot(pitch); this.setOldPosAndRot(); this.reapplyPosition(); diff --git a/patches/server/0788-prevent-unintended-light-block-manipulation.patch b/patches/server/0787-prevent-unintended-light-block-manipulation.patch similarity index 100% rename from patches/server/0788-prevent-unintended-light-block-manipulation.patch rename to patches/server/0787-prevent-unintended-light-block-manipulation.patch diff --git a/patches/server/0789-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch b/patches/server/0788-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch similarity index 100% rename from patches/server/0789-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch rename to patches/server/0788-Dont-count-named-piglins-and-hoglins-towards-mob-cap.patch diff --git a/patches/server/0790-Fix-CraftCriteria-defaults-map.patch b/patches/server/0789-Fix-CraftCriteria-defaults-map.patch similarity index 100% rename from patches/server/0790-Fix-CraftCriteria-defaults-map.patch rename to patches/server/0789-Fix-CraftCriteria-defaults-map.patch diff --git a/patches/server/0791-Fix-upstreams-block-state-factories.patch b/patches/server/0790-Fix-upstreams-block-state-factories.patch similarity index 98% rename from patches/server/0791-Fix-upstreams-block-state-factories.patch rename to patches/server/0790-Fix-upstreams-block-state-factories.patch index 4a88c2560883..b5a4b68ac1ce 100644 --- a/patches/server/0791-Fix-upstreams-block-state-factories.patch +++ b/patches/server/0790-Fix-upstreams-block-state-factories.patch @@ -10,10 +10,10 @@ tile entity type to determine the block state factory and falls back on the material type of the block at that location. diff --git a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java -index e838abb6d258a1ab47e95572cf4c30c6ca6144b4..905ec2917fe1e5ef08b8a930afb0c0d8432fa444 100644 +index b0174aedb7358af1e80278e2f5f13e00c35ab3c6..d62181bd8bccfcfdd7da8f635bdf7ebc36294705 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java -@@ -270,7 +270,7 @@ public abstract class BlockEntity implements io.papermc.paper.util.KeyedObject { +@@ -250,7 +250,7 @@ public abstract class BlockEntity { // Paper end if (this.level == null) return null; org.bukkit.block.Block block = this.level.getWorld().getBlockAt(this.worldPosition.getX(), this.worldPosition.getY(), this.worldPosition.getZ()); @@ -23,7 +23,7 @@ index e838abb6d258a1ab47e95572cf4c30c6ca6144b4..905ec2917fe1e5ef08b8a930afb0c0d8 if (state instanceof InventoryHolder) return (InventoryHolder) state; return null; diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java -index d46e3812ef058c119d327cf752e7deaa341736e3..8c847183a398df386ae5a24467378c5c3b889dc7 100644 +index 87c25170fbe8b0591d452612496ee1a627138de7..a2894f02ceb7c58f6eafe055e1ff47b197b100f2 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java @@ -6,7 +6,7 @@ import org.bukkit.World; diff --git a/patches/server/0792-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0791-Add-config-option-for-logging-player-ip-addresses.patch similarity index 98% rename from patches/server/0792-Add-config-option-for-logging-player-ip-addresses.patch rename to patches/server/0791-Add-config-option-for-logging-player-ip-addresses.patch index dab95bb75bed..270aff873d53 100644 --- a/patches/server/0792-Add-config-option-for-logging-player-ip-addresses.patch +++ b/patches/server/0791-Add-config-option-for-logging-player-ip-addresses.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add config option for logging player ip addresses diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 8b641e13f5b13eae2f2969ccb4b4551afcb50299..b7db009e9002bf517ce085fe250a9eba0da58807 100644 +index b8029b11764c67c0fe39bd1a07950f491691c938..5de84dfb6f18f3a0afdd33bf6bf640f48efc6e6b 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -91,6 +91,11 @@ public class PaperConfig { diff --git a/patches/server/0793-Configurable-feature-seeds.patch b/patches/server/0792-Configurable-feature-seeds.patch similarity index 100% rename from patches/server/0793-Configurable-feature-seeds.patch rename to patches/server/0792-Configurable-feature-seeds.patch diff --git a/patches/server/0794-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/server/0793-VanillaCommandWrapper-didnt-account-for-entity-sende.patch similarity index 100% rename from patches/server/0794-VanillaCommandWrapper-didnt-account-for-entity-sende.patch rename to patches/server/0793-VanillaCommandWrapper-didnt-account-for-entity-sende.patch diff --git a/patches/server/0795-Add-root-admin-user-detection.patch b/patches/server/0794-Add-root-admin-user-detection.patch similarity index 100% rename from patches/server/0795-Add-root-admin-user-detection.patch rename to patches/server/0794-Add-root-admin-user-detection.patch diff --git a/patches/server/0796-Always-allow-item-changing-in-Fireball.patch b/patches/server/0795-Always-allow-item-changing-in-Fireball.patch similarity index 100% rename from patches/server/0796-Always-allow-item-changing-in-Fireball.patch rename to patches/server/0795-Always-allow-item-changing-in-Fireball.patch diff --git a/patches/server/0797-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0796-don-t-attempt-to-teleport-dead-entities.patch similarity index 87% rename from patches/server/0797-don-t-attempt-to-teleport-dead-entities.patch rename to patches/server/0796-don-t-attempt-to-teleport-dead-entities.patch index 0d78c1bee52f..1a9e09238fcf 100644 --- a/patches/server/0797-don-t-attempt-to-teleport-dead-entities.patch +++ b/patches/server/0796-don-t-attempt-to-teleport-dead-entities.patch @@ -5,10 +5,10 @@ Subject: [PATCH] don't attempt to teleport dead entities diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 0f3a4d929fd78d3a63427dc01576cefacc24dbe0..b736af871fefc05437d77c57375fbc57dca130f5 100644 +index a23ce25a36a5eafa8b68c0bc408fe32717ae304a..a2988d51d14945397b005c06bbc0b8ba5f9b2308 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -716,7 +716,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -716,7 +716,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { // CraftBukkit start public void postTick() { // No clean way to break out of ticking once the entity has been copied to a new world, so instead we move the portalling later in the tick cycle diff --git a/patches/server/0798-Fix-anvil-prepare-event-not-working-with-zero-xp.patch b/patches/server/0797-Fix-anvil-prepare-event-not-working-with-zero-xp.patch similarity index 100% rename from patches/server/0798-Fix-anvil-prepare-event-not-working-with-zero-xp.patch rename to patches/server/0797-Fix-anvil-prepare-event-not-working-with-zero-xp.patch diff --git a/patches/server/0799-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0798-Prevent-excessive-velocity-through-repeated-crits.patch similarity index 100% rename from patches/server/0799-Prevent-excessive-velocity-through-repeated-crits.patch rename to patches/server/0798-Prevent-excessive-velocity-through-repeated-crits.patch diff --git a/patches/server/0800-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0799-Remove-client-side-code-using-deprecated-for-removal.patch similarity index 100% rename from patches/server/0800-Remove-client-side-code-using-deprecated-for-removal.patch rename to patches/server/0799-Remove-client-side-code-using-deprecated-for-removal.patch diff --git a/patches/server/0801-Rewrite-the-light-engine.patch b/patches/server/0800-Rewrite-the-light-engine.patch similarity index 99% rename from patches/server/0801-Rewrite-the-light-engine.patch rename to patches/server/0800-Rewrite-the-light-engine.patch index e0442546ffe9..81c1dcb09800 100644 --- a/patches/server/0801-Rewrite-the-light-engine.patch +++ b/patches/server/0800-Rewrite-the-light-engine.patch @@ -4345,7 +4345,7 @@ index 0000000000000000000000000000000000000000..dd995e25ae620ae36cd5eecb2fe10ad0 + +} diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java -index c57999061a7a9adb7b5207a13af3d693529a43cd..76d27205b2bd08ba2b3530b46f0d9b4e2315d82e 100644 +index f57ec991111b45dbc33a81d3162ef58872ee3590..d0c55497040158d959693ef2ddf3ff03bd6df05f 100644 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java @@ -700,6 +700,46 @@ public class PaperCommand extends Command { @@ -4419,7 +4419,7 @@ index c57999061a7a9adb7b5207a13af3d693529a43cd..76d27205b2bd08ba2b3530b46f0d9b4e Deque queue = new ArrayDeque<>(MCUtil.getSpiralOutChunks(center, radius)); updateLight(sender, world, lightengine, queue); diff --git a/src/main/java/net/minecraft/server/level/ChunkHolder.java b/src/main/java/net/minecraft/server/level/ChunkHolder.java -index 1a7fc533afced7235162f81b2de8148cef05414a..36b6e7295cf7484675c8c2b9624c1f6fea7aed1d 100644 +index 09616415e8f11d40435dc81282b818ac9cbbdcbe..d061dc4b5de6b629d6ddcdbfe9ca652dfcec8952 100644 --- a/src/main/java/net/minecraft/server/level/ChunkHolder.java +++ b/src/main/java/net/minecraft/server/level/ChunkHolder.java @@ -55,7 +55,7 @@ public class ChunkHolder { @@ -5002,7 +5002,7 @@ index 4c5e3e6aa6c6ec88ce472e8dff10bc591245c4f7..b46648301396930478391967b371bf8d while (iterator.hasNext()) { diff --git a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java -index 65afcb24f6274d30ebf8598ffce291537128858a..a0addbec2ecc8febeb098548897dc5ede0a562e8 100644 +index 8bdc3f393282c510f1e99636275c61849d6a810c..445c02642c6bf220586dfb695f0491506d8c53ef 100644 --- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java +++ b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java @@ -186,7 +186,7 @@ public class PalettedContainer implements PaletteResize { diff --git a/patches/server/0802-Always-parse-protochunk-light-sources-unless-it-is-m.patch b/patches/server/0801-Always-parse-protochunk-light-sources-unless-it-is-m.patch similarity index 100% rename from patches/server/0802-Always-parse-protochunk-light-sources-unless-it-is-m.patch rename to patches/server/0801-Always-parse-protochunk-light-sources-unless-it-is-m.patch diff --git a/patches/server/0803-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0802-Fix-removing-recipes-from-RecipeIterator.patch similarity index 100% rename from patches/server/0803-Fix-removing-recipes-from-RecipeIterator.patch rename to patches/server/0802-Fix-removing-recipes-from-RecipeIterator.patch diff --git a/patches/server/0804-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0803-Prevent-sending-oversized-item-data-in-equipment-and.patch similarity index 100% rename from patches/server/0804-Prevent-sending-oversized-item-data-in-equipment-and.patch rename to patches/server/0803-Prevent-sending-oversized-item-data-in-equipment-and.patch diff --git a/patches/server/0805-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0804-Hide-unnecessary-itemmeta-from-clients.patch similarity index 100% rename from patches/server/0805-Hide-unnecessary-itemmeta-from-clients.patch rename to patches/server/0804-Hide-unnecessary-itemmeta-from-clients.patch diff --git a/patches/server/0806-Fix-kelp-modifier-changing-growth-for-other-crops.patch b/patches/server/0805-Fix-kelp-modifier-changing-growth-for-other-crops.patch similarity index 100% rename from patches/server/0806-Fix-kelp-modifier-changing-growth-for-other-crops.patch rename to patches/server/0805-Fix-kelp-modifier-changing-growth-for-other-crops.patch diff --git a/patches/server/0807-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0806-Prevent-ContainerOpenersCounter-openCount-from-going.patch similarity index 100% rename from patches/server/0807-Prevent-ContainerOpenersCounter-openCount-from-going.patch rename to patches/server/0806-Prevent-ContainerOpenersCounter-openCount-from-going.patch diff --git a/patches/server/0808-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0807-Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/server/0808-Add-PlayerItemFrameChangeEvent.patch rename to patches/server/0807-Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/server/0809-Add-player-health-update-API.patch b/patches/server/0808-Add-player-health-update-API.patch similarity index 100% rename from patches/server/0809-Add-player-health-update-API.patch rename to patches/server/0808-Add-player-health-update-API.patch diff --git a/patches/server/0810-Optimize-HashMapPalette.patch b/patches/server/0809-Optimize-HashMapPalette.patch similarity index 100% rename from patches/server/0810-Optimize-HashMapPalette.patch rename to patches/server/0809-Optimize-HashMapPalette.patch diff --git a/patches/server/0811-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0810-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 98% rename from patches/server/0811-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/server/0810-Allow-delegation-to-vanilla-chunk-gen.patch index 13bdd0f1d782..5b1747b66bfb 100644 --- a/patches/server/0811-Allow-delegation-to-vanilla-chunk-gen.patch +++ b/patches/server/0810-Allow-delegation-to-vanilla-chunk-gen.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow delegation to vanilla chunk gen diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index eb3e8256f2ce62e1a2354c902226846c96b16ed9..e6163f2eab88fd1d77d5fb4878e2913c25df862c 100644 +index a51e2fe2337ba1122dfe86410bb10eddaf21addb..d8a522a473af6639ad4c8c87765a13e080069e7f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2305,6 +2305,90 @@ public final class CraftServer implements Server { diff --git a/patches/server/0812-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0811-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch similarity index 99% rename from patches/server/0812-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch rename to patches/server/0811-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch index 99a5334c5974..622aa8d1eb26 100644 --- a/patches/server/0812-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch +++ b/patches/server/0811-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch @@ -1215,10 +1215,10 @@ index 03d4d4d95e0cf617726a39ebd7191cd2d10ffdb7..6a3d444fcac8c7d561dcadb02f64eaa3 } // CraftBukkit start diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index b736af871fefc05437d77c57375fbc57dca130f5..98a8a00d55f87fb210fa6d3825a7ff476f601021 100644 +index a2988d51d14945397b005c06bbc0b8ba5f9b2308..921023b823e7b23e0005a763ad58f49dab805e9b 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -1095,9 +1095,44 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -1095,9 +1095,44 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { float f2 = this.getBlockSpeedFactor(); this.setDeltaMovement(this.getDeltaMovement().multiply((double) f2, 1.0D, (double) f2)); @@ -1266,7 +1266,7 @@ index b736af871fefc05437d77c57375fbc57dca130f5..98a8a00d55f87fb210fa6d3825a7ff47 if (this.remainingFireTicks <= 0) { this.setRemainingFireTicks(-this.getFireImmuneTicks()); } -@@ -1231,32 +1266,78 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -1231,32 +1266,78 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } private Vec3 collide(Vec3 movement) { @@ -1366,7 +1366,7 @@ index b736af871fefc05437d77c57375fbc57dca130f5..98a8a00d55f87fb210fa6d3825a7ff47 } public static Vec3 collideBoundingBox(@Nullable Entity entity, Vec3 movement, AABB entityBoundingBox, Level world, List collisions) { -@@ -2380,11 +2461,30 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -2360,11 +2441,30 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { float f = this.dimensions.width * 0.8F; AABB axisalignedbb = AABB.ofSize(this.getEyePosition(), (double) f, 1.0E-6D, (double) f); diff --git a/patches/server/0813-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0812-Optimise-collision-checking-in-player-move-packet-ha.patch similarity index 100% rename from patches/server/0813-Optimise-collision-checking-in-player-move-packet-ha.patch rename to patches/server/0812-Optimise-collision-checking-in-player-move-packet-ha.patch diff --git a/patches/server/0814-Actually-unload-POI-data.patch b/patches/server/0813-Actually-unload-POI-data.patch similarity index 100% rename from patches/server/0814-Actually-unload-POI-data.patch rename to patches/server/0813-Actually-unload-POI-data.patch diff --git a/patches/server/0815-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0814-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch similarity index 100% rename from patches/server/0815-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch rename to patches/server/0814-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch diff --git a/patches/server/0816-Update-Log4j.patch b/patches/server/0815-Update-Log4j.patch similarity index 100% rename from patches/server/0816-Update-Log4j.patch rename to patches/server/0815-Update-Log4j.patch diff --git a/patches/server/0817-Add-more-Campfire-API.patch b/patches/server/0816-Add-more-Campfire-API.patch similarity index 100% rename from patches/server/0817-Add-more-Campfire-API.patch rename to patches/server/0816-Add-more-Campfire-API.patch diff --git a/patches/server/0818-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0817-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch similarity index 100% rename from patches/server/0818-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch rename to patches/server/0817-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch diff --git a/patches/server/0819-Fix-tripwire-state-inconsistency.patch b/patches/server/0818-Fix-tripwire-state-inconsistency.patch similarity index 100% rename from patches/server/0819-Fix-tripwire-state-inconsistency.patch rename to patches/server/0818-Fix-tripwire-state-inconsistency.patch diff --git a/patches/server/0820-Fix-fluid-logging-on-Block-breakNaturally.patch b/patches/server/0819-Fix-fluid-logging-on-Block-breakNaturally.patch similarity index 100% rename from patches/server/0820-Fix-fluid-logging-on-Block-breakNaturally.patch rename to patches/server/0819-Fix-fluid-logging-on-Block-breakNaturally.patch diff --git a/patches/server/0821-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0820-Forward-CraftEntity-in-teleport-command.patch similarity index 84% rename from patches/server/0821-Forward-CraftEntity-in-teleport-command.patch rename to patches/server/0820-Forward-CraftEntity-in-teleport-command.patch index 9eec59ce99c1..f50b4cd52967 100644 --- a/patches/server/0821-Forward-CraftEntity-in-teleport-command.patch +++ b/patches/server/0820-Forward-CraftEntity-in-teleport-command.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Forward CraftEntity in teleport command diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 98a8a00d55f87fb210fa6d3825a7ff476f601021..27eb30d02d08ff61fb9916961d99e4ce01341290 100644 +index 921023b823e7b23e0005a763ad58f49dab805e9b..ed13725945d8f090b279ae8cabc584857ba8a852 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -3203,6 +3203,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -3183,6 +3183,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } public void restoreFrom(Entity original) { @@ -22,7 +22,7 @@ index 98a8a00d55f87fb210fa6d3825a7ff476f601021..27eb30d02d08ff61fb9916961d99e4ce CompoundTag nbttagcompound = original.saveWithoutId(new CompoundTag()); nbttagcompound.remove("Dimension"); -@@ -3284,10 +3291,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i +@@ -3264,10 +3271,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { if (worldserver.getTypeKey() == LevelStem.END) { // CraftBukkit ServerLevel.makeObsidianPlatform(worldserver, this); // CraftBukkit } diff --git a/patches/server/0822-Improve-scoreboard-entries.patch b/patches/server/0821-Improve-scoreboard-entries.patch similarity index 100% rename from patches/server/0822-Improve-scoreboard-entries.patch rename to patches/server/0821-Improve-scoreboard-entries.patch diff --git a/patches/server/0823-Entity-powdered-snow-API.patch b/patches/server/0822-Entity-powdered-snow-API.patch similarity index 100% rename from patches/server/0823-Entity-powdered-snow-API.patch rename to patches/server/0822-Entity-powdered-snow-API.patch diff --git a/patches/server/0824-Add-API-for-item-entity-health.patch b/patches/server/0823-Add-API-for-item-entity-health.patch similarity index 100% rename from patches/server/0824-Add-API-for-item-entity-health.patch rename to patches/server/0823-Add-API-for-item-entity-health.patch diff --git a/patches/server/0825-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0824-Fix-entity-type-tags-suggestions-in-selectors.patch similarity index 100% rename from patches/server/0825-Fix-entity-type-tags-suggestions-in-selectors.patch rename to patches/server/0824-Fix-entity-type-tags-suggestions-in-selectors.patch diff --git a/patches/server/0826-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0825-Configurable-max-block-light-for-monster-spawning.patch similarity index 100% rename from patches/server/0826-Configurable-max-block-light-for-monster-spawning.patch rename to patches/server/0825-Configurable-max-block-light-for-monster-spawning.patch diff --git a/patches/server/0827-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0826-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch similarity index 100% rename from patches/server/0827-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch rename to patches/server/0826-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch diff --git a/patches/server/0828-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0827-Load-effect-amplifiers-greater-than-127-correctly.patch similarity index 100% rename from patches/server/0828-Load-effect-amplifiers-greater-than-127-correctly.patch rename to patches/server/0827-Load-effect-amplifiers-greater-than-127-correctly.patch diff --git a/patches/server/0829-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0828-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/server/0829-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/server/0828-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/server/0830-Fix-bees-aging-inside-hives.patch b/patches/server/0829-Fix-bees-aging-inside-hives.patch similarity index 100% rename from patches/server/0830-Fix-bees-aging-inside-hives.patch rename to patches/server/0829-Fix-bees-aging-inside-hives.patch diff --git a/patches/server/0831-Bucketable-API.patch b/patches/server/0830-Bucketable-API.patch similarity index 100% rename from patches/server/0831-Bucketable-API.patch rename to patches/server/0830-Bucketable-API.patch diff --git a/patches/server/0832-Check-player-world-in-endPortalSoundRadius.patch b/patches/server/0831-Check-player-world-in-endPortalSoundRadius.patch similarity index 100% rename from patches/server/0832-Check-player-world-in-endPortalSoundRadius.patch rename to patches/server/0831-Check-player-world-in-endPortalSoundRadius.patch diff --git a/patches/server/0833-Validate-usernames.patch b/patches/server/0832-Validate-usernames.patch similarity index 100% rename from patches/server/0833-Validate-usernames.patch rename to patches/server/0832-Validate-usernames.patch diff --git a/patches/server/0834-Fix-saving-configs-with-more-long-comments.patch b/patches/server/0833-Fix-saving-configs-with-more-long-comments.patch similarity index 100% rename from patches/server/0834-Fix-saving-configs-with-more-long-comments.patch rename to patches/server/0833-Fix-saving-configs-with-more-long-comments.patch diff --git a/patches/server/0835-Make-water-animal-spawn-height-configurable.patch b/patches/server/0834-Make-water-animal-spawn-height-configurable.patch similarity index 100% rename from patches/server/0835-Make-water-animal-spawn-height-configurable.patch rename to patches/server/0834-Make-water-animal-spawn-height-configurable.patch diff --git a/patches/server/0836-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0835-Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 96% rename from patches/server/0836-Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/server/0835-Expose-vanilla-BiomeProvider-from-WorldInfo.patch index 9f61505995a7..d48fa9a07d61 100644 --- a/patches/server/0836-Expose-vanilla-BiomeProvider-from-WorldInfo.patch +++ b/patches/server/0835-Expose-vanilla-BiomeProvider-from-WorldInfo.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Expose vanilla BiomeProvider from WorldInfo diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index f877b956859643b4f3d969992f2e515dc490f90c..88db383a1527301332e8a047066afa5ed827db32 100644 +index df955666723a8cb1e612311f0b8e77fb577d6be5..01aefce226ae82d707b38b0d56d2580d411a3c9a 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -582,7 +582,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 7dcaa657f1488a922c14537a673d6c4bd158411c..7e8be67b85fc28ecf9d27241e1a7157b976885a5 100644 +index fcbde4deb6c3947bd514c9d0bd8a638589941899..b3dff7979aeec8ff4eff1233b551023309f580ae 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -132,6 +132,7 @@ import org.bukkit.util.Vector; diff --git a/patches/server/0854-Log-exceptions-thrown-during-chat-processing.patch b/patches/server/0853-Log-exceptions-thrown-during-chat-processing.patch similarity index 100% rename from patches/server/0854-Log-exceptions-thrown-during-chat-processing.patch rename to patches/server/0853-Log-exceptions-thrown-during-chat-processing.patch diff --git a/patches/server/0855-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0854-Fix-cancelled-powdered-snow-bucket-placement.patch similarity index 100% rename from patches/server/0855-Fix-cancelled-powdered-snow-bucket-placement.patch rename to patches/server/0854-Fix-cancelled-powdered-snow-bucket-placement.patch diff --git a/patches/server/0856-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0855-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch similarity index 91% rename from patches/server/0856-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch rename to patches/server/0855-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch index 82fcd35c3fa6..5f3289bbdad3 100644 --- a/patches/server/0856-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch +++ b/patches/server/0855-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add missing Validate calls to CraftServer#getSpawnLimit Copies appropriate checks from CraftWorld#getSpawnLimit diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 607b44cacb5788128f3546a5cb2671e64a13e7b9..1e7d817479c58c7fc070322328fbff7d0cdc419b 100644 +index d0d5b32d7abb99a62f5a0c3f340174b929a37480..46907b10d2c29e69761fd2807acc99737e0e8bd8 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2145,6 +2145,8 @@ public final class CraftServer implements Server { diff --git a/patches/server/0857-Add-GameEvent-tags.patch b/patches/server/0856-Add-GameEvent-tags.patch similarity index 97% rename from patches/server/0857-Add-GameEvent-tags.patch rename to patches/server/0856-Add-GameEvent-tags.patch index ad8dc46e85e7..58312e32647f 100644 --- a/patches/server/0857-Add-GameEvent-tags.patch +++ b/patches/server/0856-Add-GameEvent-tags.patch @@ -41,7 +41,7 @@ index 0000000000000000000000000000000000000000..d5d3c66afb408026513ac436eb1f4fdd + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 1e7d817479c58c7fc070322328fbff7d0cdc419b..4b86fb9ace58533c5d85aa05cc8a4af7644c66de 100644 +index 46907b10d2c29e69761fd2807acc99737e0e8bd8..f867f5b1ffbe9f2c2dcddcef1c0f39eec44acc04 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -97,6 +97,7 @@ import net.minecraft.world.level.biome.BiomeSource; diff --git a/patches/server/0858-Replace-player-chunk-loader-system.patch b/patches/server/0857-Replace-player-chunk-loader-system.patch similarity index 100% rename from patches/server/0858-Replace-player-chunk-loader-system.patch rename to patches/server/0857-Replace-player-chunk-loader-system.patch diff --git a/patches/server/0859-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0858-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch similarity index 94% rename from patches/server/0859-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch rename to patches/server/0858-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch index 5421744dc365..acba477db3a1 100644 --- a/patches/server/0859-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch +++ b/patches/server/0858-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch @@ -9,7 +9,7 @@ This might result in chunks loading far slower in the nether, for example. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 88db383a1527301332e8a047066afa5ed827db32..dc94d0a99af26a61b1309ea556b0df2d5f525ea3 100644 +index 01aefce226ae82d707b38b0d56d2580d411a3c9a..c2c1242bcf26c73b3520c797e77c3c2d430dfac7 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1354,6 +1354,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop