Remove KeyedObject interface (#7680)

PaperMC · Mar 30, 2022 · 7f47b9b · 7f47b9b
1 parent d3c1023
commit 7f47b9b
Show file tree

Hide file tree

Showing 877 changed files with 270 additions and 394 deletions.
diff --git 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<Integer, Map<ChunkPos, Integer>> 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
diff --git a/patches/server/0012-Timings-v2.patch → patches/server/0011-Timings-v2.patch b/patches/server/0012-Timings-v2.patch → 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,23 +1416,23 @@ 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;
 -    public CustomTimingsHandler tickTimer = org.bukkit.craftbukkit.SpigotTimings.getEntityTimings(this); // Spigot
      // 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) {
 -        org.bukkit.craftbukkit.SpigotTimings.entityMoveTimer.startTiming(); // Spigot
          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/...option-to-load-extra-plugin-jars-no.patch → ...option-to-load-extra-plugin-jars-no.patch b/...option-to-load-extra-plugin-jars-no.patch → ...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/...ctus-bamboo-and-reed-growth-heights.patch → ...ctus-bamboo-and-reed-growth-heights.patch b/...ctus-bamboo-and-reed-growth-heights.patch → ...ctus-bamboo-and-reed-growth-heights.patch
diff --git a/...igurable-baby-zombie-movement-speed.patch → ...igurable-baby-zombie-movement-speed.patch b/...igurable-baby-zombie-movement-speed.patch → ...igurable-baby-zombie-movement-speed.patch
diff --git a/...16-Configurable-fishing-time-ranges.patch → ...15-Configurable-fishing-time-ranges.patch b/...16-Configurable-fishing-time-ranges.patch → ...15-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/...-mobs-to-jump-and-take-water-damage.patch → ...-mobs-to-jump-and-take-water-damage.patch b/...-mobs-to-jump-and-take-water-damage.patch → ...-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/...despawn-distances-for-living-entiti.patch → ...despawn-distances-for-living-entiti.patch b/...despawn-distances-for-living-entiti.patch → ...despawn-distances-for-living-entiti.patch
diff --git a/...-Allow-for-toggling-of-spawn-chunks.patch → ...-Allow-for-toggling-of-spawn-chunks.patch b/...-Allow-for-toggling-of-spawn-chunks.patch → ...-Allow-for-toggling-of-spawn-chunks.patch
diff --git a/...k-and-tnt-entities-at-the-specified.patch → ...k-and-tnt-entities-at-the-specified.patch b/...k-and-tnt-entities-at-the-specified.patch → ...k-and-tnt-entities-at-the-specified.patch
diff --git a/...ent-crashes-server-lists-and-Mojang.patch → ...ent-crashes-server-lists-and-Mojang.patch b/...ent-crashes-server-lists-and-Mojang.patch → ...ent-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/...0022-Implement-Paper-VersionChecker.patch → ...0021-Implement-Paper-VersionChecker.patch b/...0022-Implement-Paper-VersionChecker.patch → ...0021-Implement-Paper-VersionChecker.patch
diff --git a/...-version-history-to-version-command.patch → ...-version-history-to-version-command.patch b/...-version-history-to-version-command.patch → ...-version-history-to-version-command.patch
diff --git a/...er/0024-Player-affects-spawning-API.patch → ...er/0023-Player-affects-spawning-API.patch b/...er/0024-Player-affects-spawning-API.patch → ...er/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/...25-Further-improve-server-tick-loop.patch → ...24-Further-improve-server-tick-loop.patch b/...25-Further-improve-server-tick-loop.patch → ...24-Further-improve-server-tick-loop.patch
diff --git a/...26-Only-refresh-abilities-if-needed.patch → ...25-Only-refresh-abilities-if-needed.patch b/...26-Only-refresh-abilities-if-needed.patch → ...25-Only-refresh-abilities-if-needed.patch
diff --git a/patches/server/0027-Entity-Origin-API.patch → patches/server/0026-Entity-Origin-API.patch b/patches/server/0027-Entity-Origin-API.patch → 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/...vent-tile-entity-and-entity-crashes.patch → ...vent-tile-entity-and-entity-crashes.patch b/...vent-tile-entity-and-entity-crashes.patch → ...vent-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/...figurable-top-of-nether-void-damage.patch → ...figurable-top-of-nether-void-damage.patch b/...figurable-top-of-nether-void-damage.patch → ...figurable-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/...-before-converting-and-renaming-pla.patch → ...-before-converting-and-renaming-pla.patch b/...-before-converting-and-renaming-pla.patch → ...-before-converting-and-renaming-pla.patch
diff --git a/...ver/0031-Always-tick-falling-blocks.patch → ...ver/0030-Always-tick-falling-blocks.patch b/...ver/0031-Always-tick-falling-blocks.patch → ...ver/0030-Always-tick-falling-blocks.patch
diff --git a/...erver/0032-Configurable-end-credits.patch → ...erver/0031-Configurable-end-credits.patch b/...erver/0032-Configurable-end-credits.patch → ...erver/0031-Configurable-end-credits.patch
diff --git a/...explosions-processing-dead-entities.patch → ...explosions-processing-dead-entities.patch b/...explosions-processing-dead-entities.patch → ...explosions-processing-dead-entities.patch
diff --git a/...hes/server/0034-Optimize-explosions.patch → ...hes/server/0033-Optimize-explosions.patch b/...hes/server/0034-Optimize-explosions.patch → ...hes/server/0033-Optimize-explosions.patch
diff --git a/...er/0035-Disable-explosion-knockback.patch → ...er/0034-Disable-explosion-knockback.patch b/...er/0035-Disable-explosion-knockback.patch → ...er/0034-Disable-explosion-knockback.patch
diff --git a/patches/server/0036-Disable-thunder.patch → patches/server/0035-Disable-thunder.patch b/patches/server/0036-Disable-thunder.patch → 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/...es/server/0037-Disable-ice-and-snow.patch → ...es/server/0036-Disable-ice-and-snow.patch b/...es/server/0037-Disable-ice-and-snow.patch → ...es/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/...-Configurable-mob-spawner-tick-rate.patch → ...-Configurable-mob-spawner-tick-rate.patch b/...-Configurable-mob-spawner-tick-rate.patch → ...-Configurable-mob-spawner-tick-rate.patch
diff --git a/...9-Implement-PlayerLocaleChangeEvent.patch → ...8-Implement-PlayerLocaleChangeEvent.patch b/...9-Implement-PlayerLocaleChangeEvent.patch → ...8-Implement-PlayerLocaleChangeEvent.patch
diff --git a/...ayer-View-Distance-API-placeholders.patch → ...ayer-View-Distance-API-placeholders.patch b/...ayer-View-Distance-API-placeholders.patch → ...ayer-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/...s/server/0041-Add-BeaconEffectEvent.patch → ...s/server/0040-Add-BeaconEffectEvent.patch b/...s/server/0041-Add-BeaconEffectEvent.patch → ...s/server/0040-Add-BeaconEffectEvent.patch
diff --git a/...igurable-container-update-tick-rate.patch → ...igurable-container-update-tick-rate.patch b/...igurable-container-update-tick-rate.patch → ...igurable-container-update-tick-rate.patch
diff --git a/...0043-Use-UserCache-for-player-heads.patch → ...0042-Use-UserCache-for-player-heads.patch b/...0043-Use-UserCache-for-player-heads.patch → ...0042-Use-UserCache-for-player-heads.patch
diff --git a/...r/0044-Disable-spigot-tick-limiters.patch → ...r/0043-Disable-spigot-tick-limiters.patch b/...r/0044-Disable-spigot-tick-limiters.patch → ...r/0043-Disable-spigot-tick-limiters.patch
diff --git a/...er/0045-Add-PlayerInitialSpawnEvent.patch → ...er/0044-Add-PlayerInitialSpawnEvent.patch b/...er/0045-Add-PlayerInitialSpawnEvent.patch → ...er/0044-Add-PlayerInitialSpawnEvent.patch
diff --git a/...rable-Disabling-Cat-Chest-Detection.patch → ...rable-Disabling-Cat-Chest-Detection.patch b/...rable-Disabling-Cat-Chest-Detection.patch → ...rable-Disabling-Cat-Chest-Detection.patch
diff --git a/...7-Ensure-commands-are-not-ran-async.patch → ...6-Ensure-commands-are-not-ran-async.patch b/...7-Ensure-commands-are-not-ran-async.patch → ...6-Ensure-commands-are-not-ran-async.patch
diff --git a/...hunks-are-slime-spawn-chunks-toggle.patch → ...hunks-are-slime-spawn-chunks-toggle.patch b/...hunks-are-slime-spawn-chunks-toggle.patch → ...hunks-are-slime-spawn-chunks-toggle.patch
diff --git a/...erver/0049-Expose-server-CommandMap.patch → ...erver/0048-Expose-server-CommandMap.patch b/...erver/0049-Expose-server-CommandMap.patch → ...erver/0048-Expose-server-CommandMap.patch
diff --git a/...-informative-in-maxHealth-exception.patch → ...-informative-in-maxHealth-exception.patch b/...-informative-in-maxHealth-exception.patch → ...-informative-in-maxHealth-exception.patch
diff --git a/...r/0051-Ensure-inv-drag-is-in-bounds.patch → ...r/0050-Ensure-inv-drag-is-in-bounds.patch b/...r/0051-Ensure-inv-drag-is-in-bounds.patch → ...r/0050-Ensure-inv-drag-is-in-bounds.patch
diff --git a/...0052-Player-Tab-List-and-Title-APIs.patch → ...0051-Player-Tab-List-and-Title-APIs.patch b/...0052-Player-Tab-List-and-Title-APIs.patch → ...0051-Player-Tab-List-and-Title-APIs.patch