Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@73f7736 Drop patch for MC-273635 fixed in MC 1.21.4 (#11987)
PaperMC/Paper@30fdfb1 [ci skip] Fix docs for DamageResistant (#11992)
PaperMC/Paper@6b7650d Only add goat horn once (#12001)
PaperMC/Paper@30046e0 Fix a rare crash with a concurrent modification of scaled health attributes (#12002)
PaperMC/Paper@88bbead Flush regionfiles on save configuration option
PaperMC/Paper@336ea9d Check for empty when sending equipment changes (#12008)
PaperMC/Paper@939bb78 Add RayTraceConfigurationBuilder (#11907)
PaperMC/Paper@81bb82f Fix wrong piston world border check (#12007)
PaperMC/Paper@ce95b5d Use proper default for setting null display background color (#12010)
PaperMC/Paper@2477f1f [ci skip] fix and improvements for docs in ConsumeEffect component (#11998)
PaperMC/Paper@fb5b173 Add PlayerClientLoadedWorldEvent (#11940)

gradle.properties

@@ -2,7 +2,7 @@ group=me.samsuik.sakura
 version=1.21.4-R0.1-SNAPSHOT
 mcVersion=1.21.4
 
-paperRef=a35cfe93f9f3686279ac44649783ca5a71475a6a
+paperRef=fb5b173c6a742c584413c8fc8b7c871d79234756
 
 org.gradle.jvmargs=-Xmx2G
 org.gradle.vfs.watch=false

sakura-server/minecraft-patches/features/0001-Client-Visibility-Settings.patch

@@ -199,10 +199,10 @@ index e71c1a564e5d4ac43460f89879ff709ee685706f..7d2fe5df38db1d492ae65aa729592002
          }
      }
 diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 27ef385a85b13ceb58e8d149849983107c539b31..c44c9399ddbb34408b255550a98f5c54ecdf6aff 100644
+index 5738709f5fa6fee2ed88ba41a7718c976b780e96..b8953cdfe5de16f7e5aab1fc2b06cb53693386e1 100644
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3185,6 +3185,7 @@ public class ServerGamePacketListenerImpl
+@@ -3192,6 +3192,7 @@ public class ServerGamePacketListenerImpl
  
                          event.setCancelled(cancelled);
                          AbstractContainerMenu oldContainer = this.player.containerMenu; // SPIGOT-1224
@@ -226,7 +226,7 @@ index 54a3ac38b70a9733173fb2ce4a7f86b534de1136..c4ace72f2eaf6a15c98490d18d3478b9
      public Entity(EntityType<?> entityType, Level level) {
          this.type = entityType;
 diff --git a/net/minecraft/world/entity/item/FallingBlockEntity.java b/net/minecraft/world/entity/item/FallingBlockEntity.java
-index 6b708503367f989665b89a39d367935c80210d1d..5462a423be1317a306ca12ed10edcab636cd0c7f 100644
+index 6ccc7810c81e5acb81b0cc21aeeeb464214a7b1c..a36c1c93012ce825b3dfdcf88e4da86c149bfa65 100644
 --- a/net/minecraft/world/entity/item/FallingBlockEntity.java
 +++ b/net/minecraft/world/entity/item/FallingBlockEntity.java
 @@ -73,6 +73,7 @@ public class FallingBlockEntity extends Entity {
@@ -238,7 +238,7 @@ index 6b708503367f989665b89a39d367935c80210d1d..5462a423be1317a306ca12ed10edcab6
  
      public FallingBlockEntity(Level level, double x, double y, double z, BlockState state) {
 diff --git a/net/minecraft/world/entity/item/PrimedTnt.java b/net/minecraft/world/entity/item/PrimedTnt.java
-index 3c673e5b8a52e322d41ed442ed06337cacb58771..8118911019f7fc81218a656e1ecbd7eada505741 100644
+index 6f14584c5e06864d449ebc045f4875476bbe4320..c5b9ebbd159284ae2650b0698e06011104d4b70f 100644
 --- a/net/minecraft/world/entity/item/PrimedTnt.java
 +++ b/net/minecraft/world/entity/item/PrimedTnt.java
 @@ -61,6 +61,7 @@ public class PrimedTnt extends Entity implements TraceableEntity {

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 65630cd6cf77a3fe21c19968d1e84f781b300f88..62b09cac9e0e6c1bef426b0d3a42753c20c5e739 100644
+index ebbb257de54812f277324bc2ddd9da00d773073e..a3ca7477db487ed906005232cf648aa24de8a211 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2397,6 +2397,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2399,6 +2399,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
                  handle.keepLevel = data.getBoolean("keepLevel");
              }
          }
@@ -22,7 +22,7 @@ index 65630cd6cf77a3fe21c19968d1e84f781b300f88..62b09cac9e0e6c1bef426b0d3a42753c
      }
  
      public void setExtraData(CompoundTag nbttagcompound) {
-@@ -2426,6 +2433,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2428,6 +2435,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 65630cd6cf77a3fe21c19968d1e84f781b300f88..62b09cac9e0e6c1bef426b0d3a42753c
      }
  
      @Override
-@@ -3085,6 +3097,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3089,6 +3101,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.getHandle().allowsListing();
      }
  

sakura-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftWorld.java.patch

@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -285,6 +_,12 @@
+@@ -288,6 +_,12 @@
          ).isValid();
      }
      // Paper end

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
-@@ -226,6 +_,18 @@
+@@ -227,6 +_,18 @@
          this.firstPlayed = System.currentTimeMillis();
      }