diff --git a/gradle.properties b/gradle.properties
index 543abd8..aa60f2e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group=org.galemc.gale
 version=1.21.1-R0.1-SNAPSHOT
 
 mcVersion=1.21.1
-paperRef=52ae4ad4666b34d637f2de573ed03c02b0fc6a24
+paperRef=64c9ee6584ce15e5b486bdc7183fe902e22fddf3
 
 org.gradle.caching=false
 org.gradle.parallel=true
diff --git a/patches/server/0008-Gale-configuration.patch b/patches/server/0008-Gale-configuration.patch
index a79272f..0a88015 100644
--- a/patches/server/0008-Gale-configuration.patch
+++ b/patches/server/0008-Gale-configuration.patch
@@ -107,10 +107,10 @@ index 87e5f614ba988547a827486740db217e28585773..38d99d73a33911afa71d02a456bb4df6
 +
  }
 diff --git a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
-index 783eac6e458c6f1a0584301fb84a2fe341868f34..6b563fde8d9ca8afaf5ea3bdc10b91acc0644e0d 100644
+index 715d572351c295cd48c558bb1dfbef6126fc51d0..39d7fa7cd604fbd3374d58de9e3f97e3b163c852 100644
 --- a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
 +++ b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
-@@ -322,7 +322,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
+@@ -324,7 +324,7 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
          }
      }
  
@@ -119,7 +119,7 @@ index 783eac6e458c6f1a0584301fb84a2fe341868f34..6b563fde8d9ca8afaf5ea3bdc10b91ac
          return createWorldContextMap(level.convertable.levelDirectory.path(), level.serverLevelData.getLevelName(), level.dimension().location(), level.spigotConfig, level.registryAccess(), level.getGameRules());
      }
  
-@@ -425,17 +425,6 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
+@@ -427,17 +427,6 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
          return Files.exists(legacyConfig) && Files.isRegularFile(legacyConfig);
      }
  
@@ -137,7 +137,7 @@ index 783eac6e458c6f1a0584301fb84a2fe341868f34..6b563fde8d9ca8afaf5ea3bdc10b91ac
      @Deprecated
      public static YamlConfiguration loadLegacyConfigFile(File configFile) throws Exception {
          YamlConfiguration config = new YamlConfiguration();
-@@ -458,9 +447,16 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
+@@ -460,9 +449,16 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
      }
  
      // Symlinks are not correctly checked in createDirectories
@@ -356,7 +356,7 @@ index e2a0487089eb5a7bdc1433e4c75f69d8e9f9d5f9..90fc52bb3c8c48e055965f2f822c6199
          this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c8b82bc41f2042bb4b067f06265a3a22e51f7629..a01e30045b02526db835f2e763d987146eec4c35 100644
+index f6de1c6e8fd9086b7bd725f75ee2606583591d6a..0c8fb79691bf03eb07b90e8c08134dcb5550d6a3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1070,6 +1070,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0011-Remove-vanilla-profiler.patch b/patches/server/0011-Remove-vanilla-profiler.patch
index 8be7ccf..b903bb6 100644
--- a/patches/server/0011-Remove-vanilla-profiler.patch
+++ b/patches/server/0011-Remove-vanilla-profiler.patch
@@ -1327,7 +1327,7 @@ index ccd9dff20a60f019e0c320acfb526b8bf3e5f806..18491055d3e139b8ee91fd33773929ce
          if (((ServerLevel) this.level()).hasEntityMoveEvent && !(this instanceof net.minecraft.world.entity.player.Player)) {
              if (this.xo != this.getX() || this.yo != this.getY() || this.zo != this.getZ() || this.yRotO != this.getYRot() || this.xRotO != this.getXRot()) {
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index bd7c6ce15698aed70376c109ba36f52d6794a2f8..02dd200670b02aeab934554b280f7f5d26af0df1 100644
+index f36a814bfd90af6457171512c131601b19905737..aa8ff09f440f7c7257ea2dafe4d7277c82554f12 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -34,7 +34,6 @@ import net.minecraft.sounds.SoundEvent;
@@ -1382,7 +1382,7 @@ index bd7c6ce15698aed70376c109ba36f52d6794a2f8..02dd200670b02aeab934554b280f7f5d
      }
  
      protected Vec3i getPickupReach() {
-@@ -916,44 +911,23 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -923,44 +918,23 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
              return;
          }
          // Paper end - Allow nerfed mobs to jump and float
diff --git a/patches/server/0067-Reduce-array-allocations.patch b/patches/server/0067-Reduce-array-allocations.patch
index 0dd3397..08bfbb3 100644
--- a/patches/server/0067-Reduce-array-allocations.patch
+++ b/patches/server/0067-Reduce-array-allocations.patch
@@ -364,7 +364,7 @@ index 20b5a81d50397438b3200322f31b62db44ebdb3b..c80be65d190c85e7f0ea8233ebbbdbc1
  
              for (int j = 0; j < i; ++j) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 959ad817b4fc969a2fc7e7b64ca05e5ae5fecac4..a07786c80beb6222115843f233dd489140fa0eef 100644
+index c54f29181bbcd178ff5ab577baca419ec071f3b1..be229f74385da0f6459cd23c8502926b173408b6 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2808,7 +2808,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -515,10 +515,10 @@ index 79ed54c658059e62b16704e5d5fe1527be2717e3..5bf7c9050df8beddd71ecb2fc14414f5
  
          for (int j = 0; j < i; ++j) {
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 02dd200670b02aeab934554b280f7f5d26af0df1..1e433f75b83c3013e7ee962a20773c8ba753a872 100644
+index aa8ff09f440f7c7257ea2dafe4d7277c82554f12..ce9829108a4ae1b9f715c8338fff66d62f184b75 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -1122,7 +1122,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -1129,7 +1129,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
      @Override
      protected void dropCustomDeathLoot(ServerLevel world, DamageSource source, boolean causedByPlayer) {
          super.dropCustomDeathLoot(world, source, causedByPlayer);
@@ -527,7 +527,7 @@ index 02dd200670b02aeab934554b280f7f5d26af0df1..1e433f75b83c3013e7ee962a20773c8b
          int i = aenumitemslot.length;
  
          for (int j = 0; j < i; ++j) {
-@@ -1193,7 +1193,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -1200,7 +1200,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
  
      public Set<EquipmentSlot> dropPreservedEquipment(Predicate<ItemStack> dropPredicate) {
          Set<EquipmentSlot> set = new HashSet();
@@ -536,7 +536,7 @@ index 02dd200670b02aeab934554b280f7f5d26af0df1..1e433f75b83c3013e7ee962a20773c8b
          int i = aenumitemslot.length;
  
          for (int j = 0; j < i; ++j) {
-@@ -1252,7 +1252,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -1259,7 +1259,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
              }
  
              boolean flag = true;
@@ -545,7 +545,7 @@ index 02dd200670b02aeab934554b280f7f5d26af0df1..1e433f75b83c3013e7ee962a20773c8b
              int j = aenumitemslot.length;
  
              for (int k = 0; k < j; ++k) {
-@@ -1337,7 +1337,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -1344,7 +1344,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
  
      protected void populateDefaultEquipmentEnchantments(ServerLevelAccessor world, RandomSource random, DifficultyInstance localDifficulty) {
          this.enchantSpawnedWeapon(world, random, localDifficulty);
@@ -554,7 +554,7 @@ index 02dd200670b02aeab934554b280f7f5d26af0df1..1e433f75b83c3013e7ee962a20773c8b
          int i = aenumitemslot.length;
  
          for (int j = 0; j < i; ++j) {
-@@ -1542,7 +1542,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -1549,7 +1549,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
                  t0.setInvulnerable(this.isInvulnerable());
                  if (flag) {
                      t0.setCanPickUpLoot(this.canPickUpLoot());
diff --git a/patches/server/0068-Optimize-sun-burn-tick.patch b/patches/server/0068-Optimize-sun-burn-tick.patch
index 4a5a776..fbb375b 100644
--- a/patches/server/0068-Optimize-sun-burn-tick.patch
+++ b/patches/server/0068-Optimize-sun-burn-tick.patch
@@ -47,10 +47,10 @@ index 8e79c569eb6b49382d1335ab8a247506db6afe95..8fe992f191819f828ebc5c1986572569
          this.absMoveTo(x, y, z);
          this.absRotateTo(yaw, pitch);
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 1e433f75b83c3013e7ee962a20773c8ba753a872..6e6095e8bfab28d8c1ac8bf65bb9a0c8ee19088e 100644
+index ce9829108a4ae1b9f715c8338fff66d62f184b75..5f5265631641171345fc6564eb93b68dd8131b28 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -1722,13 +1722,29 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -1729,13 +1729,29 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
  
      protected void playAttackSound() {}
  
diff --git a/patches/server/0095-Send-multiple-keep-alive-packets.patch b/patches/server/0095-Send-multiple-keep-alive-packets.patch
index 1590d92..e4682fe 100644
--- a/patches/server/0095-Send-multiple-keep-alive-packets.patch
+++ b/patches/server/0095-Send-multiple-keep-alive-packets.patch
@@ -130,7 +130,7 @@ index 8757a6ac609d463f94846d66fe04f50e859e7ce8..a720a05c47b2137a07515461960603cc
  
      }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a07786c80beb6222115843f233dd489140fa0eef..1651ca01ac503a5ca06227b36f845015bfac0403 100644
+index 8e985f458c4dd88eb5e4fc98e630824320b023f7..73fb88a1c52aef0bc151b7857d1225884e81e9ae 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -9,6 +9,8 @@ import com.mojang.brigadier.suggestion.Suggestions;
@@ -142,7 +142,7 @@ index a07786c80beb6222115843f233dd489140fa0eef..1651ca01ac503a5ca06227b36f845015
  import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
  import it.unimi.dsi.fastutil.objects.ObjectIterator;
  import java.net.SocketAddress;
-@@ -3480,6 +3482,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3499,6 +3501,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
      }
  
      @Override