diff --git a/leaves-server/minecraft-patches/features/0007-Leaves-Fakeplayer.patch b/leaves-server/minecraft-patches/features/0007-Leaves-Fakeplayer.patch
index c111bc55..13f92ccb 100644
--- a/leaves-server/minecraft-patches/features/0007-Leaves-Fakeplayer.patch
+++ b/leaves-server/minecraft-patches/features/0007-Leaves-Fakeplayer.patch
@@ -349,7 +349,7 @@ index 3dc78b91cc853cfa6dce69979273b5f35b5f87f1..0625ebf19b5c514e096e6a91539c807c
      @Override
      public Optional<NameAndId> get(String name) {
 +        // Leaves start - fix bot
-+        org.leavesmc.leaves.bot.ServerBot bot = org.leavesmc.leaves.bot.BotList.INSTANCE.getBotByName(username);
++        org.leavesmc.leaves.bot.ServerBot bot = org.leavesmc.leaves.bot.BotList.INSTANCE.getBotByName(name);
 +        if (bot != null) {
 +            return Optional.of(bot.nameAndId());
 +        }
@@ -690,7 +690,7 @@ index 670090c4466d6472a83263e1769f19e3e491c927..4e53e7c05af11cae2ce8cf313c69a833
  
      private void doClick(int slotIndex, int button, ClickType clickType, Player player) {
          Inventory inventory = player.getInventory();
-+        if (!doClickCheck(slotId, button, clickType, player)) return; // Leaves - doClick check
++        if (!doClickCheck(slotIndex, button, clickType, player)) return; // Leaves - doClick check
          if (clickType == ClickType.QUICK_CRAFT) {
              int i = this.quickcraftStatus;
              this.quickcraftStatus = getQuickcraftHeader(button);
diff --git a/leaves-server/paper-patches/features/0001-Build-changes.patch b/leaves-server/paper-patches/features/0001-Build-changes.patch
index 87779147..69390475 100644
--- a/leaves-server/paper-patches/features/0001-Build-changes.patch
+++ b/leaves-server/paper-patches/features/0001-Build-changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Build changes
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
-index 6abc57669e87f7f98f3b76af3c0e50825fea6eb1..c7ee6d3a158ca7d3de54bc12622affbf01584e7b 100644
+index 9f4d73fd321f6f0cd19fdd1b63068d2ea6c0816b..339d4c13daafc3fd7fdf6fc8909a7e7f80ba8ece 100644
 --- a/src/main/java/com/destroystokyo/paper/Metrics.java
 +++ b/src/main/java/com/destroystokyo/paper/Metrics.java
 @@ -593,7 +593,8 @@ public class Metrics {
@@ -106,20 +106,28 @@ index 74ffdc823e66fc5ec027c4b7c462382bcbfe2be2..f38f8e5851ec65a8f3f98018d55de74e
      private static final String BUILD_DEV = "DEV";
  
 diff --git a/src/main/java/io/papermc/paper/command/PaperVersionCommand.java b/src/main/java/io/papermc/paper/command/PaperVersionCommand.java
-index a7d1a959af6a810c0ce6d5baa08e4429e14d4f5b..88dbb30dd736b63f562918fb166678ba5f757fca 100644
+index bfacb856623b5cb6af4f1b65ee89200cdfb1ef13..a427a962ea90b089bef1a8177b187f4ba1063582 100644
 --- a/src/main/java/io/papermc/paper/command/PaperVersionCommand.java
 +++ b/src/main/java/io/papermc/paper/command/PaperVersionCommand.java
-@@ -45,7 +45,7 @@ public class PaperVersionCommand {
+@@ -24,7 +24,6 @@ import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
+ import net.minecraft.server.MinecraftServer;
+ import org.bukkit.Bukkit;
+ import org.bukkit.command.CommandSender;
+-import org.bukkit.craftbukkit.util.CraftMagicNumbers;
+ import org.bukkit.plugin.Plugin;
+ import org.bukkit.util.StringUtil;
+ import org.jspecify.annotations.NullMarked;
+@@ -45,7 +44,7 @@ public class PaperVersionCommand {
      private static final Component FAILED_TO_FETCH = Component.text("Could not fetch version information!", NamedTextColor.RED);
      private static final Component FETCHING = Component.text("Checking version, please wait...", NamedTextColor.WHITE, TextDecoration.ITALIC);
  
--    private final VersionFetcher versionFetcher = new PaperVersionFetcher();
+-    private final VersionFetcher versionFetcher = CraftMagicNumbers.INSTANCE.getVersionFetcher();
 +    private final VersionFetcher versionFetcher = new org.leavesmc.leaves.util.LeavesVersionFetcher(); // Leaves - build change
      private CompletableFuture<ComputedVersion> computedVersion = CompletableFuture.completedFuture(new ComputedVersion(Component.empty(), -1)); // Precompute-- someday move that stuff out of bukkit
  
      public static LiteralCommandNode<CommandSourceStack> create() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 7675acdca2162e403f4ff523bcdd6efe0cb42d49..a950bfb0c6aeb0b19150c59cea13337005c2752a 100644
+index 5bd6da467a1f536eb56c93ea00f98050cfaa36d0..26b30fac9a12c88b3e8ed114a9225f57603b937e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -231,7 +231,7 @@ public class Main {
@@ -132,7 +140,7 @@ index 7675acdca2162e403f4ff523bcdd6efe0cb42d49..a950bfb0c6aeb0b19150c59cea133370
                      }
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index c1aad9203af20102e560571435dfa75150b37c1b..ea97ea679b1ba64c9d33e52f39d010a923ef4385 100644
+index f83067eaa4eedc8108460c254782ba45a2933372..98baec88662eb1519468eb0095b0a23ae7dfe876 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -481,7 +481,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -158,7 +166,7 @@ index 774556a62eb240da42e84db4502e2ed43495be17..fdef98a7796d84c7b0ee61241859e10c
  
          if (stream != null) {
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index c77748061f1c8bb2b0dc8dbd80f608d431752015..7dac2652e3d4964682982e50f533bd4b38ee5b4b 100644
+index e2dc6644ae44ce02821100275ede4b0712cf260d..c7a7870199065aa853b4848f9aea75cc952eb6e6 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -75,14 +75,14 @@ public class WatchdogThread extends ca.spottedleaf.moonrise.common.util.TickThre
diff --git a/leaves-server/paper-patches/features/0003-Leaves-Server-Config.patch b/leaves-server/paper-patches/features/0003-Leaves-Server-Config.patch
index a057fb6e..62fe9d52 100644
--- a/leaves-server/paper-patches/features/0003-Leaves-Server-Config.patch
+++ b/leaves-server/paper-patches/features/0003-Leaves-Server-Config.patch
@@ -18,10 +18,10 @@ index 62e2d5704c348955bc8284dc2d54c933b7bcdd06..7ef20f0138fad39a1d23edd7b26ddc88
              public void executeAsync(final Runnable runnable) {
                  MCUtil.scheduleAsyncTask(this.catching(runnable, "asynchronous"));
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 51cffc9d2eda3ba1746e7b7d01e2936915e66b7e..500ba3cd2bc9c34489dacc49c6bdb7d053e18874 100644
+index 34d74014fd042f6eeafafadb6237a838b1ddd47c..01672aff7c4028da9714448bb3386b7d8369db59 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1021,6 +1021,7 @@ public final class CraftServer implements Server {
+@@ -1020,6 +1020,7 @@ public final class CraftServer implements Server {
              playerMetadata.removeAll(plugin);
          }
          // Paper end
diff --git a/leaves-server/paper-patches/features/0004-Leaves-Protocol-Core.patch b/leaves-server/paper-patches/features/0004-Leaves-Protocol-Core.patch
index b16c74d9..b5201933 100644
--- a/leaves-server/paper-patches/features/0004-Leaves-Protocol-Core.patch
+++ b/leaves-server/paper-patches/features/0004-Leaves-Protocol-Core.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Leaves Protocol Core
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 500ba3cd2bc9c34489dacc49c6bdb7d053e18874..a54e471971a554164c3d6d3b5d6e08841e1d0f3f 100644
+index 01672aff7c4028da9714448bb3386b7d8369db59..3a81b4c659d35fd273542a8bb343c256c29dfccc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -485,6 +485,7 @@ public final class CraftServer implements Server {
@@ -16,7 +16,7 @@ index 500ba3cd2bc9c34489dacc49c6bdb7d053e18874..a54e471971a554164c3d6d3b5d6e0884
      }
  
      public boolean getCommandBlockOverride(String command) {
-@@ -1028,6 +1029,7 @@ public final class CraftServer implements Server {
+@@ -1027,6 +1028,7 @@ public final class CraftServer implements Server {
          this.spark.registerCommandBeforePlugins(this); // Paper - spark
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
diff --git a/leaves-server/paper-patches/features/0005-Leaves-Fakeplayer.patch b/leaves-server/paper-patches/features/0005-Leaves-Fakeplayer.patch
index 3173064e..305e9b1b 100644
--- a/leaves-server/paper-patches/features/0005-Leaves-Fakeplayer.patch
+++ b/leaves-server/paper-patches/features/0005-Leaves-Fakeplayer.patch
@@ -32,7 +32,7 @@ index a589689e3a9de1fffef62e0e3dcd79bb2e848c5b..c0910f908ffad3bb94563836c032bb1d
          RegisteredListener[] listeners = handlers.getRegisteredListeners();
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index a760b60f6e46fa0dc3293014c979d19f59ea6511..674523b0e2d08b73d10f3bc64c22588ca926ec58 100644
+index 119f4c23e351eab0a503f78b48136dc6ae55bf60..7d99e7f29156723a3f20f1daba21aed2bc6649c6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -373,6 +373,7 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
@@ -42,9 +42,9 @@ index a760b60f6e46fa0dc3293014c979d19f59ea6511..674523b0e2d08b73d10f3bc64c22588c
 +        Preconditions.checkState(!(entity instanceof org.leavesmc.leaves.entity.bot.CraftBot), "[Leaves] Fakeplayers do not support changing world, Please use leaves fakeplayer-api instead!");
          net.minecraft.world.entity.Entity nmsEntity = ((CraftEntity) entity).getHandle();
          if (nmsEntity.level() != this.getHandle().getLevel()) {
-             nmsEntity = nmsEntity.teleport(new TeleportTransition(this.getHandle().getLevel(), nmsEntity, TeleportTransition.DO_NOTHING));
+             throw new IllegalArgumentException(entity + " wasn't created with this world, you must create the entity with the world you want to add it to.");
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a54e471971a554164c3d6d3b5d6e08841e1d0f3f..269de25a3ae32510d94a24860c2a20717fd491e2 100644
+index 3a81b4c659d35fd273542a8bb343c256c29dfccc..dd132b146a694ac60348b0a3173d12fdd064f29e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -305,6 +305,7 @@ public final class CraftServer implements Server {
@@ -63,7 +63,7 @@ index a54e471971a554164c3d6d3b5d6e08841e1d0f3f..269de25a3ae32510d94a24860c2a2071
      }
  
      public boolean getCommandBlockOverride(String command) {
-@@ -1342,7 +1344,7 @@ public final class CraftServer implements Server {
+@@ -1341,7 +1343,7 @@ public final class CraftServer implements Server {
              return false;
          }
  
@@ -72,7 +72,7 @@ index a54e471971a554164c3d6d3b5d6e08841e1d0f3f..269de25a3ae32510d94a24860c2a2071
              return false;
          }
  
-@@ -2966,4 +2968,11 @@ public final class CraftServer implements Server {
+@@ -2965,4 +2967,11 @@ public final class CraftServer implements Server {
      public void allowPausing(final Plugin plugin, final boolean value) {
          this.console.addPluginAllowingSleep(plugin.getName(), value);
      }
@@ -85,10 +85,10 @@ index a54e471971a554164c3d6d3b5d6e08841e1d0f3f..269de25a3ae32510d94a24860c2a2071
 +    // Leaves end - Bot API
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 48f6f41d59983e52b9db41a7555423d6e9a416d4..2ac8f4c0f58f9031273941fbf10848e7c0fd0320 100644
+index e92827b83d2cd7f18ed214ce389ac423b6d2d922..7fca335bb7db5b85ee5fc155cc4341b808db9a07 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -250,7 +250,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -251,7 +251,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public int getPlayerCount() {
@@ -97,7 +97,7 @@ index 48f6f41d59983e52b9db41a7555423d6e9a416d4..2ac8f4c0f58f9031273941fbf10848e7
      }
  
      @Override
-@@ -1110,9 +1110,9 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1111,9 +1111,9 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public List<Player> getPlayers() {
@@ -109,7 +109,7 @@ index 48f6f41d59983e52b9db41a7555423d6e9a416d4..2ac8f4c0f58f9031273941fbf10848e7
              HumanEntity bukkitEntity = human.getBukkitEntity();
  
              if ((bukkitEntity != null) && (bukkitEntity instanceof Player)) {
-@@ -1599,7 +1599,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1600,7 +1600,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      public void playSound(final net.kyori.adventure.sound.Sound sound) {
          org.spigotmc.AsyncCatcher.catchOp("play sound"); // Paper
          final long seed = sound.seed().orElseGet(this.world.getRandom()::nextLong);
@@ -118,7 +118,7 @@ index 48f6f41d59983e52b9db41a7555423d6e9a416d4..2ac8f4c0f58f9031273941fbf10848e7
              player.connection.send(io.papermc.paper.adventure.PaperAdventure.asSoundPacket(sound, player.getX(), player.getY(), player.getZ(), seed, null));
          }
      }
-@@ -1627,7 +1627,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1628,7 +1628,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          org.spigotmc.AsyncCatcher.catchOp("play sound"); // Paper
          final long seed = sound.seed().orElseGet(this.getHandle().getRandom()::nextLong);
          if (emitter == net.kyori.adventure.sound.Sound.Emitter.self()) {
@@ -127,20 +127,20 @@ index 48f6f41d59983e52b9db41a7555423d6e9a416d4..2ac8f4c0f58f9031273941fbf10848e7
                  player.connection.send(io.papermc.paper.adventure.PaperAdventure.asSoundPacket(sound, player, seed, null));
              }
          } else if (emitter instanceof CraftEntity craftEntity) {
-@@ -1791,7 +1791,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1792,7 +1792,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
              Preconditions.checkArgument(particle.getDataType().isInstance(data), "data (%s) should be %s", data.getClass(), particle.getDataType());
          }
          this.getHandle().sendParticlesSource(
--                receivers == null ? this.getHandle().players() : receivers.stream().map(player -> ((CraftPlayer) player).getHandle()).collect(java.util.stream.Collectors.toList()), // Paper -  Particle API
-+                receivers == null ? this.getHandle().realPlayers() : receivers.stream().map(player -> ((CraftPlayer) player).getHandle()).collect(java.util.stream.Collectors.toList()), // Paper -  Particle API // Leaves - skip
+-                receivers == null ? this.getHandle().players() : Lists.transform(receivers, player -> ((CraftPlayer) player).getHandle()), // Paper -  Particle API
++                receivers == null ? this.getHandle().realPlayers() : Lists.transform(receivers, player -> ((CraftPlayer) player).getHandle()), // Paper -  Particle API
                  sender != null ? ((CraftPlayer) sender).getHandle() : null, // Sender // Paper - Particle API
                  CraftParticle.createParticleParam(particle, data), // Particle
                  force,
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 2d1e007effffdbef3e2f942871d184665c241501..7a28328c3b688b82fe32cbdeae3101ba956c85e7 100644
+index b177e23db960323b901909a3f845a9ae0426d0df..b28129242d13afc72ea863aaf405063c38663e0e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -120,6 +120,8 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -121,6 +121,8 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
              return new CraftHumanEntity(server, (net.minecraft.world.entity.player.Player) entity);
          }
  
@@ -150,10 +150,10 @@ index 2d1e007effffdbef3e2f942871d184665c241501..7a28328c3b688b82fe32cbdeae3101ba
          if (entity instanceof EnderDragonPart complexPart) {
              if (complexPart.parentMob instanceof EnderDragon) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 6744a9f4cfe813a2593bad67b433bfb2c774a636..a507446aa11c5ba71b02ab553753fe1a00896fa7 100644
+index d5496e5fbb5fcd65df2933ebc7cb39df7d832923..250a7d5427fc59478d8a540cfb2319939a489e65 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -889,7 +889,11 @@ public class CraftEventFactory {
+@@ -882,7 +882,11 @@ public class CraftEventFactory {
          event.setKeepInventory(keepInventory);
          event.setKeepLevel(victim.keepLevel); // SPIGOT-2222: pre-set keepLevel
          populateFields(victim, event); // Paper - make cancellable
diff --git a/leaves-server/paper-patches/features/0010-Replay-Mod-API.patch b/leaves-server/paper-patches/features/0010-Replay-Mod-API.patch
index f6c82f4e..a0bf9113 100644
--- a/leaves-server/paper-patches/features/0010-Replay-Mod-API.patch
+++ b/leaves-server/paper-patches/features/0010-Replay-Mod-API.patch
@@ -18,7 +18,7 @@ index c0910f908ffad3bb94563836c032bb1d6d50c4ed..ecd25243b55a00d7c8a04385c2695d55
          }
          // Leaves end - skip bot
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 269de25a3ae32510d94a24860c2a20717fd491e2..411706b947ff462f47377e8055e58e7d8e15f2f8 100644
+index dd132b146a694ac60348b0a3173d12fdd064f29e..a03af9f74ba16a09b631cd1f6a17168e184e00b6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -306,6 +306,7 @@ public final class CraftServer implements Server {
@@ -38,7 +38,7 @@ index 269de25a3ae32510d94a24860c2a20717fd491e2..411706b947ff462f47377e8055e58e7d
              @Override
              public CraftPlayer apply(ServerPlayer player) {
                  return player.getBukkitEntity();
-@@ -2975,4 +2976,11 @@ public final class CraftServer implements Server {
+@@ -2974,4 +2975,11 @@ public final class CraftServer implements Server {
          return botManager;
      }
      // Leaves end - Bot API
@@ -51,10 +51,10 @@ index 269de25a3ae32510d94a24860c2a20717fd491e2..411706b947ff462f47377e8055e58e7d
 +    // 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 7a28328c3b688b82fe32cbdeae3101ba956c85e7..750c308098dc3aec3acbd351a1c215a5b51103dc 100644
+index b28129242d13afc72ea863aaf405063c38663e0e..f1d1bfe0779c80e152ad5483bf37f69a3262387a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -121,6 +121,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -122,6 +122,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          }
  
          if (entity instanceof org.leavesmc.leaves.bot.ServerBot bot) { return new org.leavesmc.leaves.entity.bot.CraftBot(server, bot); }
@@ -63,10 +63,10 @@ index 7a28328c3b688b82fe32cbdeae3101ba956c85e7..750c308098dc3aec3acbd351a1c215a5
          // Special case complex part, since there is no extra entity type for them
          if (entity instanceof EnderDragonPart complexPart) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 975bc2bf7c19208a524cbd828e66c8eb60953aca..5cc72a292f718633fc42ad016275a8fee109ea46 100644
+index 7c9f48d22b933b92f21ceea8752b3dfe6ba071b2..ef8b5bcd7c076bce509e44dc170eb29ac308bba1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2153,7 +2153,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa
+@@ -2055,7 +2055,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa
  
      @Override
      public boolean canSee(Player player) {
diff --git a/leaves-server/paper-patches/features/0012-Bytebuf-API.patch b/leaves-server/paper-patches/features/0012-Bytebuf-API.patch
index de862aff..88ad2842 100644
--- a/leaves-server/paper-patches/features/0012-Bytebuf-API.patch
+++ b/leaves-server/paper-patches/features/0012-Bytebuf-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Bytebuf API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 411706b947ff462f47377e8055e58e7d8e15f2f8..8cb2417afe2cc56c1d8770921e8c811d5bab5e34 100644
+index a03af9f74ba16a09b631cd1f6a17168e184e00b6..6167dfe78793bd23748fcbd86a37618b8a4f76ea 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -307,6 +307,7 @@ public final class CraftServer implements Server {
@@ -16,7 +16,7 @@ index 411706b947ff462f47377e8055e58e7d8e15f2f8..8cb2417afe2cc56c1d8770921e8c811d
  
      // Paper start - Folia region threading API
      private final io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler regionizedScheduler = new io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler();
-@@ -2983,4 +2984,15 @@ public final class CraftServer implements Server {
+@@ -2982,4 +2983,15 @@ public final class CraftServer implements Server {
          return photographerManager;
      }
      // Leaves end - replay mod api
@@ -33,10 +33,10 @@ index 411706b947ff462f47377e8055e58e7d8e15f2f8..8cb2417afe2cc56c1d8770921e8c811d
 +    // Leaves end - Bytebuf API
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 5cc72a292f718633fc42ad016275a8fee109ea46..983aa8dd34af957710d76e87f5d938f83696ed4e 100644
+index ef8b5bcd7c076bce509e44dc170eb29ac308bba1..ef4c1c127873439c87c4a4087f631783a4c11c46 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3447,4 +3447,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa
+@@ -3351,4 +3351,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa
              entity.remove();
          }
      }
diff --git a/leaves-server/paper-patches/features/0013-Leaves-Plugin.patch b/leaves-server/paper-patches/features/0013-Leaves-Plugin.patch
index 544f51ea..6912b66f 100644
--- a/leaves-server/paper-patches/features/0013-Leaves-Plugin.patch
+++ b/leaves-server/paper-patches/features/0013-Leaves-Plugin.patch
@@ -261,10 +261,10 @@ index fbad4a2242aa1ab910b2e2ae4cce973ff63fda84..89d4fa952d072dd6e071dc9eef51f405
          } catch (final IOException ex) {
              return CompletableFuture.failedFuture(new RuntimeException("Failed to open plugin jar " + inputFile, ex));
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8cb2417afe2cc56c1d8770921e8c811d5bab5e34..7b6d3710906c4aa88e60ef8435c5188bf8a819e0 100644
+index 6167dfe78793bd23748fcbd86a37618b8a4f76ea..8481618e09ed02afa04393a36c384237d0cca59d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2971,6 +2971,13 @@ public final class CraftServer implements Server {
+@@ -2970,6 +2970,13 @@ public final class CraftServer implements Server {
          this.console.addPluginAllowingSleep(plugin.getName(), value);
      }
  
diff --git a/leaves-server/paper-patches/features/0014-Fix-SculkCatalyst-exp-skip.patch b/leaves-server/paper-patches/features/0014-Fix-SculkCatalyst-exp-skip.patch
index 762837da..5fecf9d9 100644
--- a/leaves-server/paper-patches/features/0014-Fix-SculkCatalyst-exp-skip.patch
+++ b/leaves-server/paper-patches/features/0014-Fix-SculkCatalyst-exp-skip.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix SculkCatalyst exp skip
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index a507446aa11c5ba71b02ab553753fe1a00896fa7..c3acfe47d3b272b07cab41739f18e936854da232 100644
+index 250a7d5427fc59478d8a540cfb2319939a489e65..3697a98306601030a0c717fb46823aa976d411c0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -855,7 +855,7 @@ public class CraftEventFactory {
+@@ -848,7 +848,7 @@ public class CraftEventFactory {
          CraftLivingEntity entity = (CraftLivingEntity) victim.getBukkitEntity();
          CraftDamageSource bukkitDamageSource = new CraftDamageSource(damageSource);
          CraftWorld world = (CraftWorld) entity.getWorld();
@@ -17,7 +17,7 @@ index a507446aa11c5ba71b02ab553753fe1a00896fa7..c3acfe47d3b272b07cab41739f18e936
          populateFields(victim, event); // Paper - make cancellable
          Bukkit.getServer().getPluginManager().callEvent(event);
  
-@@ -866,6 +866,7 @@ public class CraftEventFactory {
+@@ -859,6 +859,7 @@ public class CraftEventFactory {
          playDeathSound(victim, event, damageSource);
          // Paper end
          victim.expToDrop = event.getDroppedExp();
@@ -25,7 +25,7 @@ index a507446aa11c5ba71b02ab553753fe1a00896fa7..c3acfe47d3b272b07cab41739f18e936
          lootCheck.run(); // Paper - advancement triggers before destroying items
  
          // Paper start - Restore vanilla drops behavior
-@@ -905,6 +906,7 @@ public class CraftEventFactory {
+@@ -898,6 +899,7 @@ public class CraftEventFactory {
          victim.newLevel = event.getNewLevel();
          victim.newTotalExp = event.getNewTotalExp();
          victim.expToDrop = event.getDroppedExp();
diff --git a/leaves-server/paper-patches/features/0015-Leaves-Config-API.patch b/leaves-server/paper-patches/features/0015-Leaves-Config-API.patch
index 458a115c..e6c2af56 100644
--- a/leaves-server/paper-patches/features/0015-Leaves-Config-API.patch
+++ b/leaves-server/paper-patches/features/0015-Leaves-Config-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Leaves Config API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7b6d3710906c4aa88e60ef8435c5188bf8a819e0..5b92276b462169b7225ec59ae3ffccb67c93b339 100644
+index 8481618e09ed02afa04393a36c384237d0cca59d..9504f84d4a75419bc5551534ce7914f9a33c09f9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -3002,4 +3002,11 @@ public final class CraftServer implements Server {
+@@ -3001,4 +3001,11 @@ public final class CraftServer implements Server {
          return internalBytebufHandler;
      }
      // Leaves end - Bytebuf API