From 8e63c9eb93210f971d298f3e5a969c2bd9b49214 Mon Sep 17 00:00:00 2001
From: Samsuik <kfian294ma4@gmail.com>
Date: Mon, 4 Aug 2025 12:35:01 +0100
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@4d44b5f Remove @Experimental annotation from the org.bukkit.damage package (#12898)
PaperMC/Paper@4f79e9e [ci skip] no need to ever import non-library files ever again (#12765)
PaperMC/Paper@a4da45e Fix typo in give command (#12905)
PaperMC/Paper@ec9c83f Adventure 4.24.0 (#12908)
PaperMC/Paper@0c8efe4 [ci skip] Remove redundant adventure version specification
PaperMC/Paper@ed31825 HIDE_ADDITIONAL_TOOLTIP backwards compat. not hiding disc names (#12900)
PaperMC/Paper@bf465e0 Cancel hit for all vanished entities, not only players (#12906)
---
 gradle.properties                                         | 2 +-
 .../features/0001-Client-Visibility-Settings.patch        | 8 ++++----
 .../org/bukkit/craftbukkit/entity/CraftPlayer.java.patch  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 6c114ed..4ed06fb 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group=me.samsuik.sakura
 version=1.21.8-R0.1-SNAPSHOT
 mcVersion=1.21.8
 
-paperRef=dbc367ba2d696fec2433b15ed23a893a34895638
+paperRef=bf465e002971815f08326af18efd9974056dd8f2
 
 org.gradle.jvmargs=-Xmx2G
 org.gradle.vfs.watch=false
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 43608d3..0c01669 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 651e8ecb382e031af63677e5fb3a16ba58fb4dc6..26bff17f1a5e800bbfc067c5734227403ec61c59 100644
+index 5e6fed659a9c10697e8a029e484fdb25594bfb51..3f437cbafc601af4f37ed875cf2159c87d6c7c67 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2327,6 +2327,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa
+@@ -2328,6 +2328,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa
              handle.expToDrop = data.getIntOr("expToDrop", 0);
              handle.keepLevel = data.getBooleanOr("keepLevel", false);
          });
@@ -20,7 +20,7 @@ index 651e8ecb382e031af63677e5fb3a16ba58fb4dc6..26bff17f1a5e800bbfc067c573422740
      }
  
      public void setExtraData(ValueOutput output) {
-@@ -2348,6 +2353,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa
+@@ -2349,6 +2354,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa
          paper.putLong("LastLogin", handle.loginTime);
          paper.putLong("LastSeen", System.currentTimeMillis());
          // Paper end
@@ -31,7 +31,7 @@ index 651e8ecb382e031af63677e5fb3a16ba58fb4dc6..26bff17f1a5e800bbfc067c573422740
      }
  
      @Override
-@@ -3015,6 +3024,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa
+@@ -3022,6 +3031,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa
          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 895b25c..207a7bb 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
-@@ -236,6 +_,18 @@
+@@ -237,6 +_,18 @@
          this.firstPlayed = System.currentTimeMillis();
      }