diff --git a/gradle.properties b/gradle.properties
index 3055c1b6..04c61834 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group = cn.dreeam.leaf
 mcVersion = 1.21
 version = 1.21-R0.1-SNAPSHOT
 
-galeCommit = c38aecb7c8248b568554078b299fdaf3e968def3
+galeCommit = 6e3b9bdf5b1b6f233c4c311730b460ba794e9ac2
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/api/0004-Purpur-API-Changes.patch b/patches/api/0004-Purpur-API-Changes.patch
index 771f3138..6849efa0 100644
--- a/patches/api/0004-Purpur-API-Changes.patch
+++ b/patches/api/0004-Purpur-API-Changes.patch
@@ -1,12 +1,12 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Github Actions <no-reply@github.com>
-Date: Mon, 17 Jun 2024 04:06:53 +0000
+Date: Fri, 21 Jun 2024 03:34:00 +0000
 Subject: [PATCH] Purpur API Changes
 
 Original license: MIT
 Original project: https://github.com/PurpurMC/Purpur
 
-Commit: ea406a0e2b34442110fb963035ca5ea8f01b33be
+Commit: b5f1c487e796a8e55f4441237d9ca830b4423573
 
 Patches below are removed in this patch:
 Pufferfish-API-Changes.patch
@@ -1208,10 +1208,10 @@ index c9f395064656dd0126410eb3c6e197baa450c063..13156a12e5df50cdc1e465dc0bd9d941
           * When a player gets bad omen after killing a patrol captain.
           */
 diff --git a/src/main/java/org/bukkit/event/inventory/InventoryType.java b/src/main/java/org/bukkit/event/inventory/InventoryType.java
-index 851e40dc8af6dcb5670785e006b078af7e72fb76..e814e4f9cf12cd7c783981278f110ccf144263b2 100644
+index 398f74ba0d2e890fb556cd964f61da7c623a7c6d..29090acd16d8f5a41c8653d0e68692f0e07e3bf1 100644
 --- a/src/main/java/org/bukkit/event/inventory/InventoryType.java
 +++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java
-@@ -163,7 +163,7 @@ public enum InventoryType {
+@@ -162,7 +162,7 @@ public enum InventoryType {
      SMITHING_NEW(4, "Upgrade Gear"),
      ;
  
@@ -1240,7 +1240,7 @@ index c60be4fd24c7fdf65251dd6169e5e1ac3b588d95..569deccd2f1cf21da9b5906433ac493c
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 7f5633e7689b82b937d5b985c3e6ae15dc94a20f..e77842896654088cedc19822a99361778336057a 100644
+index 8bbd98ea729755e7666403b96f277fd419560951..cb37a8af9e54349fc8a3eb70bbe2fddaaa3767d6 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -19,6 +19,17 @@ import org.bukkit.inventory.meta.ItemMeta;
@@ -1261,7 +1261,7 @@ index 7f5633e7689b82b937d5b985c3e6ae15dc94a20f..e77842896654088cedc19822a9936177
  
  /**
   * Represents a stack of items.
-@@ -1089,4 +1100,565 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -1033,4 +1044,551 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
          return Bukkit.getUnsafe().computeTooltipLines(this, tooltipContext, player);
      }
      // Paper end - expose itemstack tooltip lines
@@ -1703,20 +1703,6 @@ index 7f5633e7689b82b937d5b985c3e6ae15dc94a20f..e77842896654088cedc19822a9936177
 +    }
 +
 +    /**
-+     * Returns a custom tag container capable of storing tags on the object.
-+     *
-+     * Note that the tags stored on this container are all stored under their
-+     * own custom namespace therefore modifying default tags using this
-+     * {@link PersistentDataHolder} is impossible.
-+     *
-+     * @return the persistent metadata container
-+     */
-+    @NotNull
-+    public PersistentDataContainer getPersistentDataContainer() {
-+        return getItemMeta().getPersistentDataContainer();
-+    }
-+
-+    /**
 +     * Checks to see if this item has damage
 +     *
 +     * @return true if this has damage
diff --git a/patches/generated-api/0001-Purpur-generated-api-Changes.patch b/patches/generated-api/0001-Purpur-generated-api-Changes.patch
index aebbb467..026e0e0a 100644
--- a/patches/generated-api/0001-Purpur-generated-api-Changes.patch
+++ b/patches/generated-api/0001-Purpur-generated-api-Changes.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Purpur generated-api Changes
 Original license: MIT
 Original project: https://github.com/PurpurMC/Purpur
 
-Commit: ea406a0e2b34442110fb963035ca5ea8f01b33be
+Commit: b5f1c487e796a8e55f4441237d9ca830b4423573
 
 diff --git a/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/com/destroystokyo/paper/entity/ai/VanillaGoal.java
 index 3add91218dd3f07052aa932f0503d1f10ac3799b..3e41a4141095bce989c75e989293deb3f47e8e6d 100644
diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch
index 54e5afcf..ab48d509 100644
--- a/patches/server/0001-Rebrand.patch
+++ b/patches/server/0001-Rebrand.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index e2cc87a762c88a6360c265e66ed3bb0592eab2e3..4ee48737f52e24f6e7148709068c568b36a736da 100644
+index 13d1908b378e5311d8bb7f9317b4b1c2d82ea042..4c35e52cd78963238a457ba3efece5c8a1bcc260 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -13,7 +13,7 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
@@ -38,7 +38,7 @@ index e2cc87a762c88a6360c265e66ed3bb0592eab2e3..4ee48737f52e24f6e7148709068c568b
              "Build-Time" to Instant.now().toString(),
              "Git-Branch" to gitBranch, // Paper
 diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
-index 88102f6ba8352a080125512d0bbfacdf779f4f38..fe50cc484ebfe4d3ab8795c222b2abd45fe64310 100644
+index ac23c85f17e0a5cd9702888a873cc470428b3e34..6c5c0cc59ff9901b22288f3cd62228c1e52794c5 100644
 --- a/src/main/java/com/destroystokyo/paper/Metrics.java
 +++ b/src/main/java/com/destroystokyo/paper/Metrics.java
 @@ -593,7 +593,7 @@ public class Metrics {
@@ -120,29 +120,30 @@ index 2596e0ee4df5b96f181e28a742ef345981fc97e3..023016de1732f0b299428ec0544128cc
  
      @Override
 diff --git a/src/main/java/net/minecraft/CrashReport.java b/src/main/java/net/minecraft/CrashReport.java
-index 4f3cc14d48690bb183d09bb7a5ba1e23e8a0c08a..d8ebcd1c94ce0f78e9d16c603a79a492263990fd 100644
+index b24265573fdef5d9a964bcd76146f34542c420cf..ae219897f0085b758dcc1b0ad4893336336e6a49 100644
 --- a/src/main/java/net/minecraft/CrashReport.java
 +++ b/src/main/java/net/minecraft/CrashReport.java
-@@ -125,6 +125,10 @@ public class CrashReport {
+@@ -125,6 +125,11 @@ public class CrashReport {
          StringBuilder stringbuilder = new StringBuilder();
  
-         stringbuilder.append("---- Minecraft Crash Report ----\n");
+         type.appendHeader(stringbuilder, extraInfo);
 +        // Leaf start - Purpur
 +        stringbuilder.append("// ");
 +        stringbuilder.append("// DO NOT REPORT THIS TO PAPER OR GALE! REPORT TO LEAF INSTEAD!");
 +        // Leaf end - Purpur
-         stringbuilder.append("// ");
-         stringbuilder.append(CrashReport.getErrorComment());
-         stringbuilder.append("\n\n");
++        stringbuilder.append("// ");
+         stringbuilder.append("Time: ");
+         stringbuilder.append(CrashReport.DATE_TIME_FORMATTER.format(ZonedDateTime.now()));
+         stringbuilder.append("\n");
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 964f981123b5ea3f2c8f8545739c09fd29e855a9..d88a74af3e6eaa523033b245221c4159b0aa544a 100644
+index 25d1b4512f81802c658a5e0a03c8212ad69ac04e..f583b65fcb3f93e701bf1af0da9a1f975a216750 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -946,7 +946,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -956,7 +956,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              We do not want people to report thread issues to Paper,
              but we do want people to report thread issues to Gale.
-              */
--            MinecraftServer.LOGGER.info("Stopping main thread (Ignore any thread death message you see! - DO NOT REPORT THREAD DEATH TO PAPER - If you think this is a Gale bug, please report it at https://github.com/GaleMC/Gale/issues )");
+             */
+-            MinecraftServer.LOGGER.info("Stopping main thread (Ignore any thread death message you see! - DO NOT REPORT THREAD DEATH TO PAPER - If you think this is a Gale bug, please report it at https://github.com/GaleMC/Gale/issues)");
 +            MinecraftServer.LOGGER.info("Stopping main thread (Ignore any thread death message you see! - DO NOT REPORT THREAD DEATH TO PAPER - If you think this is a Leaf bug, please report it at https://github.com/Winds-Studio/Leaf/issues )"); // Leaf
              // Gale end - branding changes
              while (this.getRunningThread().isAlive()) {
@@ -187,10 +188,10 @@ index 3d674eca7d20202d8f811c5c3e3946a12046028a..1c087ae6daaa0cdf23f3930eca0af390
  
  }
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 5e556d7f3e444a7b7d7de70fa4efd50ef2a6dc8b..2adbd6472e78bb7f417dcae4fab90fd924486529 100644
+index ddfdd4db7643fddbc626a525923707d2be980005..bdc4e2e99f0a489aa58f8ccddad75647379c2b3c 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
-@@ -96,7 +96,7 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
+@@ -24,7 +24,7 @@ public class WatchdogThread extends Thread
  
      private WatchdogThread(long timeoutTime, boolean restart)
      {
@@ -199,7 +200,7 @@ index 5e556d7f3e444a7b7d7de70fa4efd50ef2a6dc8b..2adbd6472e78bb7f417dcae4fab90fd9
          this.timeoutTime = timeoutTime;
          this.restart = restart;
          earlyWarningEvery = Math.min(io.papermc.paper.configuration.GlobalConfiguration.get().watchdog.earlyWarningEvery, timeoutTime); // Paper
-@@ -160,15 +160,15 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
+@@ -88,15 +88,15 @@ public class WatchdogThread extends Thread
                  We do not want people to report thread issues to Paper,
                  but we do want people to report thread issues to Gale.
                   */
@@ -218,10 +219,10 @@ index 5e556d7f3e444a7b7d7de70fa4efd50ef2a6dc8b..2adbd6472e78bb7f417dcae4fab90fd9
                  //
                  if ( net.minecraft.world.level.Level.lastPhysicsProblem != null )
                  {
-@@ -195,13 +195,13 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
+@@ -123,13 +123,13 @@ public class WatchdogThread extends Thread
                      We do not want people to report thread issues to Paper,
                      but we do want people to report thread issues to Gale.
-                      */
+                     */
 -                    log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO PAPER - If you think this is a Gale bug, please report it at https://github.com/GaleMC/Gale/issues - THIS IS NOT A PAPER BUG OR CRASH - " + Bukkit.getServer().getVersion() + " ---");
 +                    log.log(Level.SEVERE, "--- DO NOT REPORT THIS TO PAPER - If you think this is a Leaf bug, please report it at https://github.com/Winds-Studio/Leaf/issues - THIS IS NOT A PAPER BUG OR CRASH - " + Bukkit.getServer().getVersion() + " ---"); // Leaf
                      // Gale end - branding changes
@@ -231,10 +232,10 @@ index 5e556d7f3e444a7b7d7de70fa4efd50ef2a6dc8b..2adbd6472e78bb7f417dcae4fab90fd9
                  log.log( Level.SEVERE, "------------------------------" );
 -                log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Gale!):" ); // Paper // Gale - branding changes
 +                log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Leaf!):" ); // Paper // Gale - branding changes // Leaf
-                 io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.dumpAllChunkLoadInfo(isLongTimeout); // Paper - rewrite chunk system
-                 this.dumpTickingInfo(); // Paper - log detailed tick information
+                 ca.spottedleaf.moonrise.patches.chunk_system.scheduling.ChunkTaskScheduler.dumpAllChunkLoadInfo(MinecraftServer.getServer(), isLongTimeout); // Paper - rewrite chunk system
                  WatchdogThread.dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE ), log );
-@@ -222,7 +222,7 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa
+                 log.log( Level.SEVERE, "------------------------------" );
+@@ -149,7 +149,7 @@ public class WatchdogThread extends Thread
                      We do not want people to report thread issues to Paper,
                      but we do want people to report thread issues to Gale.
                       */
diff --git a/patches/server/0008-Pufferfish-Dynamic-Activation-of-Brain.patch b/patches/server/0007-Pufferfish-Dynamic-Activation-of-Brain.patch
similarity index 88%
rename from patches/server/0008-Pufferfish-Dynamic-Activation-of-Brain.patch
rename to patches/server/0007-Pufferfish-Dynamic-Activation-of-Brain.patch
index 4895c93f..86c22576 100644
--- a/patches/server/0008-Pufferfish-Dynamic-Activation-of-Brain.patch
+++ b/patches/server/0007-Pufferfish-Dynamic-Activation-of-Brain.patch
@@ -32,10 +32,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index d27be346b91f390e06702d654058cab4d3f39b8c..e3fdd0677b3029be0ddc5f59489f66e28f5c2853 100644
+index c1100bfd6e2651185a124849833b24c76f395462..7e9bfd51a33c9b39cbec99decc49179e421e1a57 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -886,6 +886,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -700,6 +700,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
              org.spigotmc.ActivationRange.activateEntities(this); // Spigot
              this.timings.entityTick.startTiming(); // Spigot
              this.entityTickList.forEach((entity) -> {
@@ -44,10 +44,10 @@ index d27be346b91f390e06702d654058cab4d3f39b8c..e3fdd0677b3029be0ddc5f59489f66e2
                      if (false && this.shouldDiscardEntity(entity)) { // CraftBukkit - We prevent spawning in general, so this butchering is not needed
                          entity.discard();
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f30b3aba1ee92aa6cb5425862502b0fdfe6e9768..16993e38aeb0748e298f9b0a91d0e8bc722066a6 100644
+index 1a4c212ec1aabd8d9b9f9a7e30d40aa2fbdc060b..1fc95388c3391082f19455c5cff65e98c856b797 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -426,6 +426,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -430,6 +430,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      private UUID originWorld;
      public boolean freezeLocked = false; // Paper - Freeze Tick Lock API
      public boolean fixedPose = false; // Paper - Expand Pose API
@@ -57,7 +57,7 @@ index f30b3aba1ee92aa6cb5425862502b0fdfe6e9768..16993e38aeb0748e298f9b0a91d0e8bc
      public void setOrigin(@javax.annotation.Nonnull Location location) {
          this.origin = location.toVector();
 diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
-index a46bf73c608641bf1f00fd55242de71a0f2ee06e..58298a1f85f462abc4f07deffe913abb1bac9f99 100644
+index cb61462d4691a055a4b25f7b953609d8a154fdfe..b2d8a858d8767bd6ca52e0b8db84757986c6ed61 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityType.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityType.java
 @@ -316,6 +316,7 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
@@ -69,10 +69,10 @@ index a46bf73c608641bf1f00fd55242de71a0f2ee06e..58298a1f85f462abc4f07deffe913abb
      private String descriptionId;
      @Nullable
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 2d91941eb780de588202113700f68cca853eb62b..1eb7d8ac91e0799c012fabb503558ae9da69ac72 100644
+index 316d1ef3975aab5565078dad11a8f4ca8133c836..d170c4604161364508ecb96e15b39c720b44e412 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -242,10 +242,10 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti
+@@ -237,10 +237,10 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
      @Override
      public void inactiveTick() {
          super.inactiveTick();
@@ -85,7 +85,7 @@ index 2d91941eb780de588202113700f68cca853eb62b..1eb7d8ac91e0799c012fabb503558ae9
              this.targetSelector.tick();
          }
      }
-@@ -963,10 +963,14 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti
+@@ -918,10 +918,14 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
          int i = this.tickCount + this.getId();
  
          if (i % 2 != 0 && this.tickCount > 1) {
@@ -138,10 +138,10 @@ index 8ac1a3b86bf0eee6a27985d6b9dbc98b6fedbb15..95d20cd10ef0b3da32a6168c5d4a9bc4
      public boolean hasTasks() {
          for (WrappedGoal task : this.availableGoals) {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
-index 29802fa506042c80bd1a03cf88f4ab326dfb94b5..34c1df5bd7655bfbcba3ae872a8eec621ace5835 100644
+index a6b8c6540886af41ef1bccbd76784fe327e8277b..d908b7723d1810a91a7bc8783bb72c64231ac8c3 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
-@@ -215,8 +215,10 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationS
+@@ -217,8 +217,10 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationS
          return 0.4F;
      }
  
@@ -153,10 +153,10 @@ index 29802fa506042c80bd1a03cf88f4ab326dfb94b5..34c1df5bd7655bfbcba3ae872a8eec62
          AllayAi.updateActivity(this);
          super.customServerAiStep();
 diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
-index 8a14e3c2bd2162e36634f532fa86a7fba0548541..d339e9c0b81a50d20048375bd8b4141618fc1d2a 100644
+index 1147bf32f6efe02e51c838eb371f11c6430a80a9..c75dccb977e0d620e3834ca0197e8fd51bf3bfd4 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
-@@ -268,8 +268,10 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
+@@ -269,8 +269,10 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
          return true;
      }
  
@@ -183,7 +183,7 @@ index 22b84f4d84ca749a2094627b4dd4f4718f60cc74..29df5e116f8a7061081250622fd367e4
          FrogAi.updateActivity(this);
          super.customServerAiStep();
 diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
-index 53dbe9d296a89d23b19f2551b20b464731ee800e..40dad395aabb04c21ac26fadce823ce8b4f79b3a 100644
+index ab27bfb8b5a036eb13e77c8baeaa47e86a9ed2d6..d3cf26a3bdf40f6c827880bc394e7034a1adf4dc 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
 @@ -83,8 +83,10 @@ public class Tadpole extends AbstractFish {
@@ -213,7 +213,7 @@ index a6b6dd1715f7cb278b66381cbb0dd9d7069ce6ed..79ef4a1a4f4d404121087e2e6bcc3855
          GoatAi.updateActivity(this);
          super.customServerAiStep();
 diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
-index 910c3df3e8232db8b7140c51df010f0a9bdcad68..837ae63b1621a4fabba4a44145279d5f95f57f6b 100644
+index 8453c20a4b5f3a1205d0530b5c3b9f2c38a234a2..14878f825cc80296ffa09b5b2c0d8ed9a134491b 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
 @@ -153,8 +153,10 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
@@ -228,10 +228,10 @@ index 910c3df3e8232db8b7140c51df010f0a9bdcad68..837ae63b1621a4fabba4a44145279d5f
          HoglinAi.updateActivity(this);
          if (this.isConverting()) {
 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 74ffc0c8ac95590c39e86893bb4f270eb63efd49..5ea7cc29c2f9c4e2ee7741b4cead8ea78c296c5d 100644
+index 37452ff83fe07c9fa14a337cbf5018bfc7543f5a..6da1335186a6d31d8e78542f8b3bd11d214ef13c 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
-@@ -294,8 +294,10 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
+@@ -293,8 +293,10 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
          return !this.cannotHunt;
      }
  
@@ -243,10 +243,10 @@ index 74ffc0c8ac95590c39e86893bb4f270eb63efd49..5ea7cc29c2f9c4e2ee7741b4cead8ea7
          PiglinAi.updateActivity(this);
          super.customServerAiStep();
 diff --git a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
-index f41898080a0cce6e1c2d50c3a7f1a0d67df5605a..7350e339c673c3c59bc36843f03f86ab1ef5e925 100644
+index 1cb55c9240dfa46cf117ac5b8923b064a96788c3..37e682452ecc30646faf1ae8da47f91779619d42 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
-@@ -271,10 +271,12 @@ public class Warden extends Monster implements VibrationSystem {
+@@ -272,10 +272,12 @@ public class Warden extends Monster implements VibrationSystem {
  
      }
  
@@ -260,10 +260,10 @@ index f41898080a0cce6e1c2d50c3a7f1a0d67df5605a..7350e339c673c3c59bc36843f03f86ab
          super.customServerAiStep();
          if ((this.tickCount + this.getId()) % 120 == 0) {
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index de41f5b57cb4220daf312cc8724cc32d3dd6f7a6..e32c928dc21def1df0f6d334405cff5dc8e999cd 100644
+index ba49442ed0b7c05c50dbc2a640f5759e391902f2..c96d612f0b3efc96f3f60f35449811cacc93123c 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-@@ -145,6 +145,8 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -143,6 +143,8 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
          return holder.is(PoiTypes.MEETING);
      });
  
@@ -272,7 +272,7 @@ index de41f5b57cb4220daf312cc8724cc32d3dd6f7a6..e32c928dc21def1df0f6d334405cff5d
      public Villager(EntityType<? extends Villager> entityType, Level world) {
          this(entityType, world, VillagerType.PLAINS);
      }
-@@ -248,6 +250,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -246,6 +248,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
      }
      // Spigot End
  
@@ -280,7 +280,7 @@ index de41f5b57cb4220daf312cc8724cc32d3dd6f7a6..e32c928dc21def1df0f6d334405cff5d
      @Override
      @Deprecated // Paper
      protected void customServerAiStep() {
-@@ -256,7 +259,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -254,7 +257,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
      }
      protected void customServerAiStep(final boolean inactive) {
          // Paper end
@@ -361,20 +361,10 @@ index 0000000000000000000000000000000000000000..2769eba9841ec866265e814e16f930a5
 +    }
 +}
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 5e24b70b102cbf4dce2dec748dab1949a77b0d4d..df50c32482067368b11d2928bd353f4fbe595afe 100644
+index 86b678aa745e125ceaa271deec00d6290a02d88b..4956e37d0cfeb73135966e76723bb4a0da219704 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
-@@ -40,6 +40,9 @@ import net.minecraft.world.level.Level;
- import net.minecraft.world.phys.AABB;
- import org.galemc.gale.configuration.GaleGlobalConfiguration;
- import org.galemc.gale.configuration.GaleWorldConfiguration;
-+// Pufferfish start
-+import net.minecraft.world.phys.Vec3;
-+// Pufferfish end
- 
- public class ActivationRange
- {
-@@ -238,6 +241,25 @@ public class ActivationRange
+@@ -237,6 +237,25 @@ public class ActivationRange
                  }
                  // Paper end - Configurable marker ticking
                  ActivationRange.activateEntity(entity);
@@ -385,8 +375,8 @@ index 5e24b70b102cbf4dce2dec748dab1949a77b0d4d..df50c32482067368b11d2928bd353f4f
 +                        entity.activatedPriorityReset = true;
 +                        entity.activatedPriority = org.dreeam.leaf.config.modules.opt.DynamicActivationofBrain.maximumActivationPrio;
 +                    }
-+                    Vec3 playerVec = player.position();
-+                    Vec3 entityVec = entity.position();
++                    net.minecraft.world.phys.Vec3 playerVec = player.position();
++                    net.minecraft.world.phys.Vec3 entityVec = entity.position();
 +                    double diffX = playerVec.x - entityVec.x, diffY = playerVec.y - entityVec.y, diffZ = playerVec.z - entityVec.z;
 +                    int squaredDistance = (int) (diffX * diffX + diffY * diffY + diffZ * diffZ);
 +                    entity.activatedPriority = squaredDistance > org.dreeam.leaf.config.modules.opt.DynamicActivationofBrain.startDistanceSquared ?
@@ -400,7 +390,7 @@ index 5e24b70b102cbf4dce2dec748dab1949a77b0d4d..df50c32482067368b11d2928bd353f4f
              }
              // Paper end
          }
-@@ -254,12 +276,12 @@ public class ActivationRange
+@@ -253,12 +272,12 @@ public class ActivationRange
          if ( MinecraftServer.currentTick > entity.activatedTick )
          {
              if ( entity.defaultActivationState )
diff --git a/patches/server/0009-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch b/patches/server/0008-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch
similarity index 93%
rename from patches/server/0009-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch
rename to patches/server/0008-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch
index 198f55d8..536704e5 100644
--- a/patches/server/0009-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch
+++ b/patches/server/0008-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch
@@ -7,10 +7,10 @@ Original license: GPL v3
 Original project: https://github.com/pufferfish-gg/Pufferfish
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index c9240785d65227b33f2b1cce28cb3de9d854ad8b..ad08008a9d3f50bab1ae05603aab4cf3be8e2d54 100644
+index d170c4604161364508ecb96e15b39c720b44e412..460cd5faf391414bff32c92fc295e29352c7d596 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -238,11 +238,13 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti
+@@ -233,11 +233,13 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
          return this.lookControl;
      }
  
diff --git a/patches/server/0010-Pufferfish-Entity-TTL.patch b/patches/server/0009-Pufferfish-Entity-TTL.patch
similarity index 92%
rename from patches/server/0010-Pufferfish-Entity-TTL.patch
rename to patches/server/0009-Pufferfish-Entity-TTL.patch
index d381f0cb..45c7cdbd 100644
--- a/patches/server/0010-Pufferfish-Entity-TTL.patch
+++ b/patches/server/0009-Pufferfish-Entity-TTL.patch
@@ -7,10 +7,10 @@ Original license: GPL v3
 Original project: https://github.com/pufferfish-gg/Pufferfish
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 16993e38aeb0748e298f9b0a91d0e8bc722066a6..1ea7d87ce569af8c693c63f33f5479bd20f41bf4 100644
+index 1fc95388c3391082f19455c5cff65e98c856b797..55f544a7a7253cd6619ef43d26f17b38ccb375ea 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -867,6 +867,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -828,6 +828,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      }
  
      public void tick() {
@@ -24,7 +24,7 @@ index 16993e38aeb0748e298f9b0a91d0e8bc722066a6..1ea7d87ce569af8c693c63f33f5479bd
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
-index 58298a1f85f462abc4f07deffe913abb1bac9f99..e6edbe6177b168d85759bd9c414dc87ea8a394fe 100644
+index b2d8a858d8767bd6ca52e0b8db84757986c6ed61..f9440014ab2fe753c16b9383f5fffbb8adb76e79 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityType.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityType.java
 @@ -317,6 +317,7 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
diff --git a/patches/server/0007-Pufferfish-Optimize-mob-spawning.patch b/patches/work/server/0007-Pufferfish-Optimize-mob-spawning.patch
similarity index 100%
rename from patches/server/0007-Pufferfish-Optimize-mob-spawning.patch
rename to patches/work/server/0007-Pufferfish-Optimize-mob-spawning.patch