Update Paper

gradle.properties

@@ -4,5 +4,5 @@ version=1.20.1-R0.1-SNAPSHOT
 mcVersion=1.20.1
 packageVersion=1_20_R1
 org.gradle.jvmargs=-Xmx2G
-paperRef=3b4839ee329c82126ca79f68e929c8264a4bdd87
+paperRef=eb8f2bb2a183746381738b5ccf08d209efa542b8
 preVersion=false

patches/server/0008-Fakeplayer-support.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Fakeplayer support
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 18b10f1d1d62e1184a562ef52e1625b4927aec45..307d4fd4b52aa654f859aab34126048b6a127dde 100644
+index c13dccd56b81b88e984e866da199dd8fd7e005e8..3ac048de85febb5ff005c3e7a53326e3fd4623cc 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -127,6 +127,7 @@ import net.minecraft.util.profiling.metrics.storage.MetricsPersister;
@@ -300,10 +300,10 @@ index 4302f90f80ce8aeef4107ce63806fe53840f8d0e..136168dd1d1aaa8357f1e4b7e4b3bbf1
 +    // Leaves end - Bot API
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index fc0dc8e607cc24020106ea1af92b4421a5f9393d..81670f76c4d7ccec6f9e95465687c83b37c544bd 100644
+index 6e600f9d81178f4ad10967a1aba802c9ac853d82..9d6b1550302eb552872d91380e79ac28716ebb83 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -191,6 +191,8 @@ import org.bukkit.plugin.Plugin;
+@@ -194,6 +194,8 @@ import org.bukkit.plugin.Plugin;
  import org.bukkit.util.BoundingBox;
  import org.bukkit.util.NumberConversions;
  import org.bukkit.util.Vector;
@@ -312,7 +312,7 @@ index fc0dc8e607cc24020106ea1af92b4421a5f9393d..81670f76c4d7ccec6f9e95465687c83b
  
  import net.md_5.bungee.api.chat.BaseComponent; // Spigot
  
-@@ -226,7 +228,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -232,7 +234,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          if (entity instanceof LivingEntity) {
              // Players
              if (entity instanceof net.minecraft.world.entity.player.Player) {
@@ -327,7 +327,7 @@ index fc0dc8e607cc24020106ea1af92b4421a5f9393d..81670f76c4d7ccec6f9e95465687c83b
              }
              // Water Animals
 diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
-index 10d09c21a1c3c7048d309294fdf4206a603d5164..cfe51379e2006bb74f7ec40572e04e07ef003ced 100644
+index c5c89964d60f291a4625545bb39f314850945ae6..45e865b1e09da36830609a8a3fe10a5b20a8583a 100644
 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 @@ -8,6 +8,9 @@ import org.bukkit.command.Command;

patches/server/0021-Optimize-entity-coordinate-key.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Optimize entity coordinate key
 This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
 
 diff --git a/src/main/java/io/papermc/paper/util/MCUtil.java b/src/main/java/io/papermc/paper/util/MCUtil.java
-index cb4379268b191d331c71be44642baac381ffaaf6..f5db4e41b9f3d90138076e8b30a81e4c22497136 100644
+index c69088a2ec374b2d236fec61e267f42afa2967b1..da7ee46893d99a4abe6c3089c6651b8e1a453e82 100644
 --- a/src/main/java/io/papermc/paper/util/MCUtil.java
 +++ b/src/main/java/io/papermc/paper/util/MCUtil.java
-@@ -211,7 +211,13 @@ public final class MCUtil {
+@@ -215,7 +215,13 @@ public final class MCUtil {
      }
  
      public static long getCoordinateKey(final Entity entity) {
@@ -25,7 +25,7 @@ index cb4379268b191d331c71be44642baac381ffaaf6..f5db4e41b9f3d90138076e8b30a81e4c
  
      public static long getCoordinateKey(final ChunkPos pair) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0d59e39b321f0fb4fdd927f5bf2eed3b70d72aaf..531046d494328dda8f0333470e18840f3391b8e6 100644
+index 82cf724352396f949ebc60da9146514672b76e45..6200217b8cb13bc4c6b7b7b194215c7766626c61 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -306,7 +306,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

patches/server/0043-PCA-sync-protocol.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] PCA sync protocol
 This patch is Powered by plusls-carpet-addition(https://github.com/plusls/plusls-carpet-addition)
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index eb5fc12c50690c59146cc0c9c59682b525620316..292b60916091e544d87311afb16258c00c71c5c3 100644
+index 3f3e953630bf709b5926a6b6a421bda1ec327d44..dc5f67e6d16eec7bf7bb4bcbf4840e0845d5dc54 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -247,6 +247,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -17,7 +17,7 @@ index eb5fc12c50690c59146cc0c9c59682b525620316..292b60916091e544d87311afb16258c0
  // CraftBukkit end
  
  public class ServerGamePacketListenerImpl implements ServerPlayerConnection, TickablePacketListener, ServerGamePacketListener {
-@@ -3622,6 +3623,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3623,6 +3624,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                  this.disconnect("Invalid payload UNREGISTER!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD); // Paper - kick event cause
              }
          } else {

patches/server/0044-BBOR-Protocol.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] BBOR Protocol
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a93018a2797bc1a1c134f810eaa067d0a0b4bb8a..41fcf8abe96be28cdc79eba6eebe753deb38de2f 100644
+index 64149614643b77792fec42793fa0af0f3189c5b8..5bdfe75075118c6a2347bc6c9764be4352a83944 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1603,6 +1603,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -18,10 +18,10 @@ index a93018a2797bc1a1c134f810eaa067d0a0b4bb8a..41fcf8abe96be28cdc79eba6eebe753d
          for (int i = 0; i < this.tickables.size(); ++i) {
              ((Runnable) this.tickables.get(i)).run();
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 292b60916091e544d87311afb16258c00c71c5c3..7c480370311360a2ee23046e2ec91af714177a54 100644
+index dc5f67e6d16eec7bf7bb4bcbf4840e0845d5dc54..428bfc3c59aa32ab09c6508e7c50de005dbee1ea 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3628,6 +3628,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3629,6 +3629,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                  if (top.leavesmc.leaves.LeavesConfig.pcaSyncProtocol && ProtocolUtils.isNamespacePacket(packet, top.leavesmc.leaves.protocol.PcaSyncProtocol.PROTOCOL_ID)) {
                      top.leavesmc.leaves.protocol.PcaSyncProtocol.handlePacket(server, player, packet);
                  }

patches/server/0047-Jade-Protocol.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Jade Protocol
 This patch is Powered by Jade(https://github.com/Snownee/Jade)
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7c480370311360a2ee23046e2ec91af714177a54..3d77af234f5035b391717679f1e93d8965dc7a13 100644
+index 428bfc3c59aa32ab09c6508e7c50de005dbee1ea..dac97d0c32a8801e6dfddfe47b2c9de4ed9f6ae6 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3631,6 +3631,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3632,6 +3632,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                  if (top.leavesmc.leaves.LeavesConfig.bborProtocol && packet.identifier.equals(top.leavesmc.leaves.protocol.BBORProtocol.SUBSCRIBE)) {
                      top.leavesmc.leaves.protocol.BBORProtocol.onPlayerSubscribed(player);
                  }

patches/server/0053-MC-Technical-Survival-Mode.patch

@@ -19,10 +19,10 @@ index abd0217cf0bff183c8e262edc173a53403797c1a..f2659e1973e7ef5c5b64ba0bf3b27e5d
                  final long timeout;
                  if (type == RegionizedPlayerChunkLoader.REGION_PLAYER_TICKET && delayTimeout > 0) {
 diff --git a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
-index ad2177cdbc61a6f41c7e2ed81af262d4ffe7d861..4a0da4436998fc21506996216bd9c094806eb6c9 100644
+index e471960e0443392f6f54732b052a4debf2a8fd97..08f61d48f3484cb04a94955b0b4b2981bf169358 100644
 --- a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
 +++ b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
-@@ -293,6 +293,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
+@@ -295,6 +295,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
              for (ServerLevel level : server.getAllLevels()) {
                  this.createWorldConfig(createWorldContextMap(level), reloader(this.worldConfigClass, level.paperConfig()));
              }
@@ -109,7 +109,7 @@ index b0f23ebceb2f492b21eb95ee9496621f46c975c7..79f8e34032cde65a7d2a1f21bc32e0c2
                          entity.spawnReason == org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.CHUNK_GEN)) {
                      continue;
 diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
-index c29cd78a80182fabd8ef43abf97962857736abb7..168ef6606b579ab0d2780736090934f430e56912 100644
+index fda5a0b0f93c903d033d086da2b79887ed829bdc..7a967fa53c427aea52c33f6e6b857c804fb8fe63 100644
 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 @@ -2,6 +2,7 @@ package top.leavesmc.leaves;

patches/server/0061-Syncmatica-Protocol.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Syncmatica Protocol
 This patch is Powered by Syncmatica(https://github.com/End-Tech/syncmatica)
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3d77af234f5035b391717679f1e93d8965dc7a13..30ed248d933ef31af041ccbf60f57cdbde97b91c 100644
+index dac97d0c32a8801e6dfddfe47b2c9de4ed9f6ae6..b898c0c4dc108ea111935fa32eaaf0ef25de9d60 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -324,6 +324,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -43,7 +43,7 @@ index 3d77af234f5035b391717679f1e93d8965dc7a13..30ed248d933ef31af041ccbf60f57cdb
          this.chatMessageChain.close();
          ServerGamePacketListenerImpl.LOGGER.info("{} lost connection: {}", this.player.getName().getString(), reason.getString());
          // CraftBukkit start - Replace vanilla quit message handling with our own.
-@@ -3634,6 +3647,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3635,6 +3648,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                  if (top.leavesmc.leaves.LeavesConfig.jadeProtocol && ProtocolUtils.isNamespacePacket(packet, top.leavesmc.leaves.protocol.JadeProtocol.PROTOCOL_ID)) {
                      top.leavesmc.leaves.protocol.JadeProtocol.handlePacket(server, player, packet);
                  }
@@ -54,7 +54,7 @@ index 3d77af234f5035b391717679f1e93d8965dc7a13..30ed248d933ef31af041ccbf60f57cdb
                  ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex);
                  this.disconnect("Invalid custom payload!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD);
 diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
-index 586975025875295963100c3c84928518c8c3a7d7..7c67320f38ca380aaef3b80222502d6bd46b4714 100644
+index 11a0353a2fd698a66e7ecfa3df22221a056c1069..7f9c9ddbd16a25b7f2b1d267901aade4452d64b2 100644
 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 @@ -12,6 +12,7 @@ import top.leavesmc.leaves.command.LeavesCommand;

patches/server/0070-Leaves-carpet-support.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Leaves carpet support
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 30b806329d450f5fe4e10862176360d09116efe0..eb46b1376c8d9bd81734811d9e27cfa0f4572f2d 100644
+index cdf61407ccdc61fd0c63367273b70bbf2f4cc8e0..0aa1f96d113c055df1abb9e2832870d62336421c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3650,6 +3650,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3651,6 +3651,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                  if (top.leavesmc.leaves.LeavesConfig.syncmaticaProtocol && ProtocolUtils.isNamespacePacket(packet, top.leavesmc.leaves.protocol.syncmatica.SyncmaticaProtocol.PROTOCOL_ID)) {
                      top.leavesmc.leaves.protocol.syncmatica.SyncmaticaProtocol.getCommunicationManager().onPacketGet(packet, this);
                  }
@@ -31,7 +31,7 @@ index a5ca7132bfbdc6bdf57262707fdf93de993b7c61..e50305b51a3759f53a9425ba6487db30
          final net.kyori.adventure.text.Component jm = playerJoinEvent.joinMessage();
  
 diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
-index 22b9c5d88ec56c35e148f0a73a544089828930f3..9586d8ee8d23c36407ee92bea63fcedc55d9bfe6 100644
+index 7f9c9ddbd16a25b7f2b1d267901aade4452d64b2..a1ee8c10b03bf8788b038e12588622660b7445af 100644
 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 @@ -14,6 +14,8 @@ import top.leavesmc.leaves.bot.agent.Actions;

patches/server/0078-Bladeren-mspt-sync-protocol.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Bladeren mspt sync protocol
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 16fd5af5f0f5018f87bf143926b6ec6b4bfc1a76..87bb9de0403339d3f14fa9065d0a0515fad3e767 100644
+index ab008fdf7b7d9e3e17fbd8524729f4434aefc1f3..49fc9c750d7696789649081430b262b084a21022 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1612,6 +1612,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -17,10 +17,10 @@ index 16fd5af5f0f5018f87bf143926b6ec6b4bfc1a76..87bb9de0403339d3f14fa9065d0a0515
          MinecraftTimings.tickablesTimer.startTiming(); // Spigot // Paper
          for (int i = 0; i < this.tickables.size(); ++i) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 192f9cff213b01df280d5bdc9b8eef45d841b8f0..733b50fc4e4170c16175146f3f8067831ab69d30 100644
+index 02853df54fca8364bf5e0386a9b77c6e55da9802..090d73eeef3bd97c60a9434200e099b6dd1dec28 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3653,6 +3653,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3654,6 +3654,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                  if (top.leavesmc.leaves.LeavesConfig.leavesCarpetSupport && ProtocolUtils.isNamespacePacket(packet, top.leavesmc.leaves.protocol.CarpetServerProtocol.PROTOCOL_ID)) {
                      top.leavesmc.leaves.protocol.CarpetServerProtocol.handlePacket(player, packet);
                  }

patches/server/0098-Reduce-array-allocations.patch

@@ -266,7 +266,7 @@ index 55ef6d5ffebe04e678dc89ec2740f031af361cb8..4c86d1836c8b4ac9c535cf5bccd71dec
          return ret;
      }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 733b50fc4e4170c16175146f3f8067831ab69d30..b932ccd51d336f138103549026c9b178e46ab62b 100644
+index 090d73eeef3bd97c60a9434200e099b6dd1dec28..71a7adea17b6909c1390e11004055867dc14d2fa 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -249,6 +249,7 @@ import org.bukkit.inventory.InventoryView;
@@ -302,7 +302,7 @@ index 733b50fc4e4170c16175146f3f8067831ab69d30..b932ccd51d336f138103549026c9b178
              return;
          }
          // Paper end
-@@ -3367,7 +3368,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3368,7 +3369,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          // Paper start
          if (!org.bukkit.Bukkit.isPrimaryThread()) {
              if (this.recipeSpamPackets.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamLimit) {

patches/server/0117-Replay-Mod-API.patch

@@ -358,10 +358,10 @@ index 3948b88cf2fb407ebf228de93d42330ff1df0634..6bd1ef55b2d171025132ccb158fe5163
 +    // Leaves end - replay mod api
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 81670f76c4d7ccec6f9e95465687c83b37c544bd..d6d1a867872c6c8968829825daa820662bc544ce 100644
+index 9d6b1550302eb552872d91380e79ac28716ebb83..78b1303996078493a0787135691479d05af1d52e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -195,6 +195,8 @@ import top.leavesmc.leaves.bot.ServerBot;
+@@ -198,6 +198,8 @@ import top.leavesmc.leaves.bot.ServerBot;
  import top.leavesmc.leaves.entity.CraftBot;
  
  import net.md_5.bungee.api.chat.BaseComponent; // Spigot
@@ -370,7 +370,7 @@ index 81670f76c4d7ccec6f9e95465687c83b37c544bd..d6d1a867872c6c8968829825daa82066
  
  public abstract class CraftEntity implements org.bukkit.entity.Entity {
      private static PermissibleBase perm;
-@@ -231,6 +233,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -237,6 +239,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
                  // Leaves start - add CraftBot
                  if (entity instanceof ServerPlayer) {
                      if (entity instanceof ServerBot) { return new CraftBot(server, (ServerBot) entity); }