diff --git a/gradle.properties b/gradle.properties
index 287cde8..4d6b095 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=5395ae37bd372235390d28292ed582d0c4fc23dd
+paperRef=edacfdf4624735d093413e64b4efd192f72d844e
 
 org.gradle.jvmargs=-Xmx2G
 org.gradle.vfs.watch=false
diff --git a/sakura-api/paper-patches/features/0001-Client-Visibility-Settings-API.patch b/sakura-api/paper-patches/features/0001-Client-Visibility-Settings-API.patch
index 6b6dd4d..4177e03 100644
--- a/sakura-api/paper-patches/features/0001-Client-Visibility-Settings-API.patch
+++ b/sakura-api/paper-patches/features/0001-Client-Visibility-Settings-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Client Visibility Settings API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 1b5f3007a0afa7d007da84ba6afeb8b0185f6997..7dbfa59c02b0ce7d96796ff984d4a5879e9d6f95 100644
+index c9fd51cc77d1155d3fe779f28618073287cdb488..c96b0d49556da54c9682c4cee576fd1be391530a 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -66,6 +66,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -69,6 +69,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
  
      void setTrackingRangeModifier(double mod);
      // Sakura end - entity tracking range modifier
diff --git a/sakura-api/paper-patches/files/src/main/java/org/bukkit/entity/Player.java.patch b/sakura-api/paper-patches/files/src/main/java/org/bukkit/entity/Player.java.patch
index a9ff07b..a2eba9e 100644
--- a/sakura-api/paper-patches/files/src/main/java/org/bukkit/entity/Player.java.patch
+++ b/sakura-api/paper-patches/files/src/main/java/org/bukkit/entity/Player.java.patch
@@ -1,7 +1,7 @@
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -61,6 +_,12 @@
-  */
+@@ -64,6 +_,12 @@
+ @NullMarked
  public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginMessageRecipient, net.kyori.adventure.identity.Identified, net.kyori.adventure.bossbar.BossBarViewer, com.destroystokyo.paper.network.NetworkClient { // Paper
  
 +    // Sakura start - entity tracking range modifier
@@ -12,4 +12,4 @@
 +
      // Paper start
      @Override
-     default net.kyori.adventure.identity.@NotNull Identity identity() {
+     default net.kyori.adventure.identity.Identity identity() {