From 0b8d6923d93cbd5c6c7f0dc218b5d7333ecd5fda Mon Sep 17 00:00:00 2001
From: Samsuik <kfian294ma4@gmail.com>
Date: Sat, 30 Nov 2024 22:37:34 +0000
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@cb2ab7d Remove string dupe exploit setting (#11670)
PaperMC/Paper@5f6a796 deprecate adventure key() methods where applicable
PaperMC/Paper@78fd8f9 Copy items when constructing ClientboundSetCursorItemPacket
PaperMC/Paper@0cc7bd4 Use Player view distance for PlayerNaturallySpawnCreaturesEvent
PaperMC/Paper@da9d110 Remove chunk save reattempt patch
PaperMC/Paper@9953384 [ci skip] leaf
PaperMC/Paper@64828f3 Clean up thread pool usage (#11681)
PaperMC/Paper@5ab6789 Copy dispatcher root children before passing it into async tree building
PaperMC/Paper@47f2071 Deprecate ChatVisibility#UNKNOWN (#11683)
PaperMC/Paper@9039c39 Add back discard policy
PaperMC/Paper@27e4ddc Fix item_model adapter, rename internal classes
---
 gradle.properties                                  |  2 +-
 .../server/0005-Client-Visibility-Settings.patch   | 14 +++++++-------
 ...0045-Reduce-entity-tracker-player-updates.patch |  6 +++---
 .../0072-Entity-tracking-range-modifier.patch      |  6 +++---
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index b2ea394..1c69e46 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group=me.samsuik.sakura
 version=1.21.3-R0.1-SNAPSHOT
 mcVersion=1.21.3
 
-paperRef=d38624bdd8757f167552a278e6a355289aec7c48
+paperRef=27e4ddcd067d4825eb01cb05d6975c46252eeafa
 
 org.gradle.jvmargs=-Xmx2G
 org.gradle.vfs.watch=false
diff --git a/patches/server/0005-Client-Visibility-Settings.patch b/patches/server/0005-Client-Visibility-Settings.patch
index 3613c3e..b92dd75 100644
--- a/patches/server/0005-Client-Visibility-Settings.patch
+++ b/patches/server/0005-Client-Visibility-Settings.patch
@@ -649,7 +649,7 @@ index 1a37654aff9a9c86c9f7af10a1cf721371f0c5ec..82644b34a77dc5e5af38260b7b07b3ec
      public ClientboundSectionBlocksUpdatePacket(SectionPos sectionPos, ShortSet positions, LevelChunkSection section) {
          this.sectionPos = sectionPos;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 08ff63ee9241102d211d9db6a32586167491cf58..02009fe5365022bd365a572c5a4f000c374db23e 100644
+index 2c3cacaaccb57273f1b20a6bddadbfdb9c952930..eeb87ebc51ddd4e909c124ec11e2822bde260270 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1889,6 +1889,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -661,7 +661,7 @@ index 08ff63ee9241102d211d9db6a32586167491cf58..02009fe5365022bd365a572c5a4f000c
          this.isIteratingOverLevels = false; // Paper - Throw exception on world create while being ticked
  
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index e6af9b8793812e2007971c9040fb54b6af068081..16fde1dbf3932fbbd1806a343f6a8cc7313db403 100644
+index 52a6a4badace15a983f0acb431036bd704d9cebd..31383a3282b34265ab799c12652d7473d03214ee 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -179,6 +179,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -683,7 +683,7 @@ index e6af9b8793812e2007971c9040fb54b6af068081..16fde1dbf3932fbbd1806a343f6a8cc7
      }
  
      private void setChunkUnsaved(ChunkPos pos) {
-@@ -979,6 +984,8 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -973,6 +978,8 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
                  tracker.serverEntity.sendChanges();
              }
          }
@@ -692,7 +692,7 @@ index e6af9b8793812e2007971c9040fb54b6af068081..16fde1dbf3932fbbd1806a343f6a8cc7
      }
      // Paper end - optimise entity tracker
  
-@@ -1216,6 +1223,32 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1210,6 +1217,32 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
              return !this.seenBy.isEmpty();
          }
          // Paper end - optimise entity tracker
@@ -725,7 +725,7 @@ index e6af9b8793812e2007971c9040fb54b6af068081..16fde1dbf3932fbbd1806a343f6a8cc7
  
          public TrackedEntity(final Entity entity, final int i, final int j, final boolean flag) {
              this.serverEntity = new ServerEntity(ChunkMap.this.level, entity, j, flag, this::broadcast, this.seenBy); // CraftBukkit
-@@ -1293,6 +1326,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1287,6 +1320,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
                  }
                  flag = flag && this.entity.broadcastToPlayer(player) && ChunkMap.this.isChunkTracked(player, this.entity.chunkPosition().x, this.entity.chunkPosition().z);
                  // Paper end - Configurable entity tracking range by Y
@@ -845,7 +845,7 @@ index b0bc66dc7248aae691dcab68b925b52a1695e63f..2f9413b9442cc7f95e1974a772812fe3
              throw new ReportedException(crashreport);
          }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b5d5dbc50a7b8c40739a15f164ffd08fdc534f9c..5cfcc7a1e9461fd7dfd6d7100bdc978945c369ad 100644
+index cd1b6b539a62fa5237d6dab2d1c09a2e631d9941..b4e7e6ccc25a373f571c32f0328b90e04111e00b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3247,6 +3247,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -896,7 +896,7 @@ index de87483600e55d88176fe25db621bbd3e464729f..5bd189fad703ac99d57258fa448dbcc1
  
      public PrimedTnt(Level world, double x, double y, double z, @Nullable LivingEntity igniter) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7aa3ba20f63be469ec82637e79f864262e41f3c6..329e1e93df4f369031d045129b1eb4020b0cc579 100644
+index 554714e449d1d2439b05d7e15f72afccd17d4df5..ab38f0913b7adf3593c5d0b5a65441afefeeffbc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2394,6 +2394,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0045-Reduce-entity-tracker-player-updates.patch b/patches/server/0045-Reduce-entity-tracker-player-updates.patch
index d27bf36..2e5672e 100644
--- a/patches/server/0045-Reduce-entity-tracker-player-updates.patch
+++ b/patches/server/0045-Reduce-entity-tracker-player-updates.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Reduce entity tracker player updates
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 04f76f15370fd308b3b264f3a2d2b17b32a8a560..fa77e44a33dd2da678f8ad711f26ce60d3d7d7aa 100644
+index ed7ae4617c992b4e5f5ce14f998b9c763ee1b7e2..54bfe3dfda0e023cc3d25ddcf1fe366a6cf50c90 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -978,7 +978,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -972,7 +972,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
              if (tracker == null) {
                  continue;
              }
@@ -21,7 +21,7 @@ index 04f76f15370fd308b3b264f3a2d2b17b32a8a560..fa77e44a33dd2da678f8ad711f26ce60
              if (((ca.spottedleaf.moonrise.patches.entity_tracker.EntityTrackerTrackedEntity)tracker).moonrise$hasPlayers()
                  || ((ca.spottedleaf.moonrise.patches.chunk_system.entity.ChunkSystemEntity)entity).moonrise$getChunkStatus().isOrAfter(FullChunkStatus.ENTITY_TICKING)) {
                  tracker.serverEntity.sendChanges();
-@@ -1249,12 +1253,28 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1243,12 +1247,28 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
              return state != me.samsuik.sakura.player.visibility.VisibilityState.OFF;
          }
          // Sakura end - client visibility settings; entity visibility
diff --git a/patches/server/0072-Entity-tracking-range-modifier.patch b/patches/server/0072-Entity-tracking-range-modifier.patch
index 15aba24..1171ef5 100644
--- a/patches/server/0072-Entity-tracking-range-modifier.patch
+++ b/patches/server/0072-Entity-tracking-range-modifier.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Entity tracking range modifier
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 606a2626fe0b693049c69924e479a6d875f22480..b2aca1d458d2ea40952b047f991e356aa35b02fb 100644
+index 54bfe3dfda0e023cc3d25ddcf1fe366a6cf50c90..0b9783c473585aed6a63f870e66a1809d00c0aee 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1332,7 +1332,10 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1326,7 +1326,10 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
                  double vec3d_dz = player.getZ() - this.entity.getZ();
                  // Paper end - remove allocation of Vec3D here
                  int i = ChunkMap.this.getPlayerViewDistance(player);
@@ -33,7 +33,7 @@ index ac8308be5b200237aa61a21404e558f245356546..c9c39cbdf7e0ff715630fc98712db0f2
      public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile, ClientInformation clientOptions) {
          super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 329e1e93df4f369031d045129b1eb4020b0cc579..b391b5384a455b44f2c857d11fadb9197ab31dc8 100644
+index ab38f0913b7adf3593c5d0b5a65441afefeeffbc..de2c9dcaf3b481ef4762598a7df0968a67d2d41a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3039,6 +3039,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {