diff --git a/gradle.properties b/gradle.properties
index f4d383a..8008a98 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group=me.samsuik.sakura
 version=1.21.4-R0.1-SNAPSHOT
 mcVersion=1.21.4
 
-paperRef=5538d24d72a418491b80e89d6f7710548ac46687
+paperRef=6ea42025a49f232f47861c6ca943b0fc66b7effe
 
 org.gradle.jvmargs=-Xmx2G
 org.gradle.vfs.watch=false
diff --git a/sakura-server/minecraft-patches/features/0002-Client-Visibility-Settings.patch b/sakura-server/minecraft-patches/features/0002-Client-Visibility-Settings.patch
index 77f6ebd..0a9a666 100644
--- a/sakura-server/minecraft-patches/features/0002-Client-Visibility-Settings.patch
+++ b/sakura-server/minecraft-patches/features/0002-Client-Visibility-Settings.patch
@@ -78,7 +78,7 @@ index 8f9f759885a9cda57ae7d665ec309a57e12969fd..e096463443639e9eef5311d7154f6d2a
                  if (flag && !player.getBukkitEntity().canSee(this.entity.getBukkitEntity())) { // Paper - only consider hits
                      flag = false;
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index ca41cfe5f36b5820238df4ec4d2c749668b750f1..f2c0cd46a64fbc3fc7e6cb77acac353bb84d4073 100644
+index 86792b4573ca12f0b106c3322a0d2678b2634e2a..d22d5252ee7b8932e03a5ebe3ea1b45d26cb5227 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
 @@ -569,6 +569,21 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
@@ -132,10 +132,10 @@ index ca41cfe5f36b5820238df4ec4d2c749668b750f1..f2c0cd46a64fbc3fc7e6cb77acac353b
          }
  
 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index 4bf7e288b9e9643ac161fcf017d0194419290a54..8a27d202854e083d9c29abcd8486fc760a7bddd8 100644
+index d5dd3f5d4f38ed7281d896275012e3a6697cce9c..ab38dbe13d1dd0c9cb7a4fac223f4b523d550b17 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
-@@ -424,6 +424,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
+@@ -431,6 +431,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
      }
      // Paper end - rewrite chunk system
      public double trackingRangeModifier = 1.0; // Sakura - entity tracking range modifier
@@ -195,10 +195,10 @@ index e71c1a564e5d4ac43460f89879ff709ee685706f..7d2fe5df38db1d492ae65aa729592002
          }
      }
 diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 660f9d44739909150635beaa2082e85dfde915c4..648d9219cd496b1793198d5914665c346449b22e 100644
+index b4a284a0617167fd12e9d9414b17f86c169ba563..ef9b227a622790663f7a68eadbe2c4feee681134 100644
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3192,6 +3192,7 @@ public class ServerGamePacketListenerImpl
+@@ -3203,6 +3203,7 @@ public class ServerGamePacketListenerImpl
  
                          event.setCancelled(cancelled);
                          AbstractContainerMenu oldContainer = this.player.containerMenu; // SPIGOT-1224
@@ -207,7 +207,7 @@ index 660f9d44739909150635beaa2082e85dfde915c4..648d9219cd496b1793198d5914665c34
                          if (this.player.containerMenu != oldContainer) {
                              return;
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 362c9516850fa20719a234309d2416fde5e5b324..789a64f13185b8d761e290e931ed31f8c04c6255 100644
+index 30c330cfa6d675eb409b96725248d34474013867..f911d552e5d76c1af29c9abae083fe68cb051749 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -523,6 +523,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/sakura-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayer.java.patch b/sakura-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayer.java.patch
index d06d034..f21a4c2 100644
--- a/sakura-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayer.java.patch
+++ b/sakura-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayer.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
-@@ -423,6 +_,7 @@
+@@ -430,6 +_,7 @@
          return this.viewDistanceHolder;
      }
      // Paper end - rewrite chunk system
diff --git a/sakura-server/paper-patches/features/0001-Client-Visibility-Settings.patch b/sakura-server/paper-patches/features/0001-Client-Visibility-Settings.patch
index 6858bb0..8a495c4 100644
--- a/sakura-server/paper-patches/features/0001-Client-Visibility-Settings.patch
+++ b/sakura-server/paper-patches/features/0001-Client-Visibility-Settings.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Client Visibility Settings
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 900ea27111dccce70f2c2af891d0064c487dce2e..93fead843e419817e8a0ae46d77896c8c674096a 100644
+index 892445c90083376f6026a965a7c82df63027094d..389dcbcabe6b5662a5dc846e2c150d9348208a46 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2405,6 +2405,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2407,6 +2407,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
                  handle.keepLevel = data.getBoolean("keepLevel");
              }
          }
@@ -22,7 +22,7 @@ index 900ea27111dccce70f2c2af891d0064c487dce2e..93fead843e419817e8a0ae46d77896c8
      }
  
      public void setExtraData(CompoundTag nbttagcompound) {
-@@ -2434,6 +2441,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2436,6 +2443,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          paper.putLong("LastLogin", handle.loginTime);
          paper.putLong("LastSeen", System.currentTimeMillis());
          // Paper end
@@ -34,7 +34,7 @@ index 900ea27111dccce70f2c2af891d0064c487dce2e..93fead843e419817e8a0ae46d77896c8
      }
  
      @Override
-@@ -3095,6 +3107,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3094,6 +3106,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.getHandle().allowsListing();
      }
  
diff --git a/sakura-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java.patch b/sakura-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java.patch
index 6367f79..c5f2be1 100644
--- a/sakura-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java.patch
+++ b/sakura-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java.patch
@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -233,6 +_,18 @@
+@@ -235,6 +_,18 @@
          this.firstPlayed = System.currentTimeMillis();
      }