Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@6e598f8 Fix incorrect createPath overload arguments, fixes #12043 (#12794) PaperMC/Paper@f7d5a0a [ci skip] Add remote build cache configuration through Gradle properties (#12797) PaperMC/Paper@b4466ec Dialog API (#12671) PaperMC/Paper@a939945 Fixup sendAllDataToRemote calls PaperMC/Paper@cb47e01 Remove more dead code, fix pre-existing desync when cancelling and closing container PaperMC/Paper@4076453 Specify the class loader when loading services (#12829) PaperMC/Paper@1bf6364 Update Mache for horse decompile fix PaperMC/Paper@76fb506 Add vanilla error message to precondition for DialogBaseImpl (#12831) PaperMC/Paper@fcfc6c3 Expose HexColor argument type (#12833) PaperMC/Paper@4000fcc Fix typo in PluginBootstrap javadocs (#12821) PaperMC/Paper@25d358c [ci skip] javadoc: Fix grammatical error for getState (#12817) PaperMC/Paper@ba7c982 Add missing Range annotations to dialog types PaperMC/Paper@533d93c Don't consume anchor charge if loc changes (#12835) PaperMC/Paper@d9b5003 Dried Ghast events and Happy Ghast spawn reason (#12788) PaperMC/Paper@bda8406 [ci skip] fix typo in AttributeInstance (#12843) PaperMC/Paper@94d60e1 Copy thrown pearls list for removal (#12840) PaperMC/Paper@21fb542 Do not write fall_distance tag unless it already existed before PaperMC/Paper@04f9519 Fix spawners converted from 1.21.4 not running finalisation logic PaperMC/Paper@22d80a3 [ci skip] Update Gradle wrapper and Fill plugin (#12846) PaperMC/Paper@a6e0c08 Add getRotation to Location (#12799) PaperMC/Paper@e792779 Allow AreaEffectCloud#setColor to reset color for null (#12760)
2026-01-04 15:31:43 +00:00 · 2025-07-20 21:32:03 +01:00
parent 761208f2eb
commit 5ed9d4b83c
14 changed files with 48 additions and 48 deletions
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group=me.samsuik.sakura
 version=1.21.7-R0.1-SNAPSHOT
 mcVersion=1.21.7

-paperRef=0cadaefc094c1d25eb19332cfebc02f9b5885c4a
+paperRef=e792779dd8d8ba06d6448ca34bdd98da1daed481

 org.gradle.jvmargs=-Xmx2G
 org.gradle.vfs.watch=false
--- a/sakura-api/build.gradle.kts.patch
+++ b/sakura-api/build.gradle.kts.patch
@@ -30,7 +30,7 @@
 }
@@ -166,7 +_,7 @@
 
- tasks.withType<Javadoc> {
+ tasks.withType<Javadoc>().configureEach {
     val options = options as StandardJavadocDocletOptions
 -    options.overview = "src/main/javadoc/overview.html"
 +    options.overview = "../paper-api/src/main/javadoc/overview.html"
--- a/sakura-server/build.gradle.kts.patch
+++ b/sakura-server/build.gradle.kts.patch
@@ -7,7 +7,7 @@
 +val serverBrand = rootProject.name
 
 dependencies {
-     mache("io.papermc:mache:1.21.7+build.1")
+     mache("io.papermc:mache:1.21.7+build.2")
@@ -26,6 +_,17 @@
     minecraftVersion = providers.gradleProperty("mcVersion")
     gitFilePatches = false
--- a/sakura-server/minecraft-patches/features/0001-Track-block-changes-and-level-tick-scheduler.patch
+++ b/sakura-server/minecraft-patches/features/0001-Track-block-changes-and-level-tick-scheduler.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Track block changes and level tick scheduler


 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index c86973892e2af63911eef1a00ea957eb33a96a03..1ade8d6da1a28044a354699293f4cfbda6133008 100644
+index 3f8d66d26b498d88f225b446ec76379ec7df1e7b..f13c8afe65119b80653cac8dfb0499a40430f1f5 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -1748,6 +1748,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1749,6 +1749,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
             profilerFiller.pop();
             profilerFiller.pop();
             serverLevel.explosionDensityCache.clear(); // Paper - Optimize explosions
--- a/sakura-server/minecraft-patches/features/0002-Client-Visibility-Settings.patch
+++ b/sakura-server/minecraft-patches/features/0002-Client-Visibility-Settings.patch
@@ -163,7 +163,7 @@ index 03a157f6c96b0f39effa24ae278eeac689c83ee8..5f38281763419123a0611cbb34d9a02a
         }
 
 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index 7b341b8c65ebab8e352252df2b47f40ce3c0db4f..5c812e81a74d8f1df8a1a7ac98f84f44aec264c3 100644
+index f3723436b65f64866af695209983b0ca4ad4f716..a7d71e5bd99a02aa156e1301dc5169e2c35f046d 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
@@ -460,6 +460,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
@@ -175,7 +175,7 @@ index 7b341b8c65ebab8e352252df2b47f40ce3c0db4f..5c812e81a74d8f1df8a1a7ac98f84f44
     public ServerPlayer(MinecraftServer server, ServerLevel level, GameProfile gameProfile, ClientInformation clientInformation) {
         super(level, gameProfile);
 diff --git a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
-index 2e7c4c74818befd25e296b58ef9f20319544c2fb..edb8af128184966304afa6d47331c193387fc0b4 100644
+index 08c59d603fca038fc2dde36384eea1b6c971e659..a366ada9090fc680940f06af41fbf0d873e30da9 100644
 --- a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
@@ -2,14 +2,30 @@ package net.minecraft.server.network;
@@ -321,7 +321,7 @@ index 2e7c4c74818befd25e296b58ef9f20319544c2fb..edb8af128184966304afa6d47331c193
 
     public ServerCommonPacketListenerImpl(MinecraftServer server, Connection connection, CommonListenerCookie cookie) {
         this.server = server;
-@@ -97,11 +186,11 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -103,11 +192,11 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
     public void handleKeepAlive(ServerboundKeepAlivePacket packet) {
         // Paper start - improve keepalives
         long now = System.nanoTime();
@@ -335,7 +335,7 @@ index 2e7c4c74818befd25e296b58ef9f20319544c2fb..edb8af128184966304afa6d47331c193
 
             this.keepAlive.pingCalculator1m.update(response);
             this.keepAlive.pingCalculator5s.update(response);
-@@ -110,14 +199,14 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -116,14 +205,14 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
             return;
         }
 
@@ -353,7 +353,7 @@ index 2e7c4c74818befd25e296b58ef9f20319544c2fb..edb8af128184966304afa6d47331c193
                     return;
                 }
                 break;
-@@ -126,7 +215,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -132,7 +221,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
 
         if (!this.processedDisconnect) {
             LOGGER.info("Disconnecting {} for sending keepalive response ({}) without matching challenge!", this.playerProfile().getName(), packet.getId());
@@ -362,7 +362,7 @@ index 2e7c4c74818befd25e296b58ef9f20319544c2fb..edb8af128184966304afa6d47331c193
             return;
         }
         // Paper end - improve keepalives
-@@ -137,20 +226,20 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -143,20 +232,20 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
     }
 
     // Paper start
@@ -388,7 +388,7 @@ index 2e7c4c74818befd25e296b58ef9f20319544c2fb..edb8af128184966304afa6d47331c193
         final byte[] data = discardedPayload.data();
         try {
             final boolean registerChannel = CUSTOM_REGISTER.equals(identifier);
-@@ -173,18 +262,18 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -179,18 +268,18 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
             }
 
             if (identifier.equals(MINECRAFT_BRAND)) {
@@ -410,7 +410,7 @@ index 2e7c4c74818befd25e296b58ef9f20319544c2fb..edb8af128184966304afa6d47331c193
             case ServerGamePacketListenerImpl gamePacketListener -> gamePacketListener.player.getBukkitEntity();
             case ServerConfigurationPacketListenerImpl commonPacketListener -> commonPacketListener.paperConnection;
             default -> null;
-@@ -199,7 +288,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -205,7 +294,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
             return;
         }
 
@@ -419,7 +419,7 @@ index 2e7c4c74818befd25e296b58ef9f20319544c2fb..edb8af128184966304afa6d47331c193
         if (register) {
             bridge.addChannel(channel);
         } else {
-@@ -219,24 +308,24 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -231,24 +320,24 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
         PacketUtils.ensureRunningOnSameThread(packet, this, this.server);
         if (packet.action() == ServerboundResourcePackPacket.Action.DECLINED && this.server.isResourcePackRequired()) {
             LOGGER.info("Disconnecting {} due to resource pack {} rejection", this.playerProfile().getName(), packet.id());
@@ -448,7 +448,7 @@ index 2e7c4c74818befd25e296b58ef9f20319544c2fb..edb8af128184966304afa6d47331c193
         }
         // Paper end
     }
-@@ -244,7 +333,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -256,7 +345,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
     @Override
     public void handleCookieResponse(ServerboundCookieResponsePacket packet) {
         if (this.paperConnection().handleCookieResponse(packet)) return; // Paper
@@ -457,7 +457,7 @@ index 2e7c4c74818befd25e296b58ef9f20319544c2fb..edb8af128184966304afa6d47331c193
     }
 
     protected void keepConnectionAlive() {
-@@ -254,18 +343,18 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -266,18 +355,18 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
         if (this.checkIfClosed(millis) && !this.processedDisconnect) {
             long currTime = System.nanoTime();
 
@@ -481,7 +481,7 @@ index 2e7c4c74818befd25e296b58ef9f20319544c2fb..edb8af128184966304afa6d47331c193
                 // Paper end - improve keepalives
             }
         }
-@@ -276,7 +365,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -288,7 +377,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
     private boolean checkIfClosed(long time) {
         if (this.closed) {
             if (time - this.closedListenerTime >= 15000L) {
@@ -490,7 +490,7 @@ index 2e7c4c74818befd25e296b58ef9f20319544c2fb..edb8af128184966304afa6d47331c193
             }
 
             return false;
-@@ -302,9 +391,15 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -314,9 +403,15 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
         // CraftBukkit start
         if (packet == null || this.processedDisconnect) { // Spigot
             return;
@@ -508,7 +508,7 @@ index 2e7c4c74818befd25e296b58ef9f20319544c2fb..edb8af128184966304afa6d47331c193
         // CraftBukkit end
         if (packet.isTerminal()) {
             this.close();
-@@ -317,19 +412,22 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -329,19 +424,22 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
         } catch (Throwable var7) {
             CrashReport crashReport = CrashReport.forThrowable(var7, "Sending packet");
             CrashReportCategory crashReportCategory = crashReport.addCategory("Packet being sent");
@@ -536,7 +536,7 @@ index 2e7c4c74818befd25e296b58ef9f20319544c2fb..edb8af128184966304afa6d47331c193
         // Paper end - kick event causes
     }
 
-@@ -339,7 +437,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -351,7 +449,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
             return;
         }
         if (!this.cserver.isPrimaryThread()) {
@@ -545,7 +545,7 @@ index 2e7c4c74818befd25e296b58ef9f20319544c2fb..edb8af128184966304afa6d47331c193
                 @Override
                 protected Object evaluate() {
                     ServerCommonPacketListenerImpl.this.disconnect(disconnectionDetails);
-@@ -353,7 +451,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -365,7 +463,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
                 waitable.get();
             } catch (InterruptedException e) {
                 Thread.currentThread().interrupt();
@@ -554,7 +554,7 @@ index 2e7c4c74818befd25e296b58ef9f20319544c2fb..edb8af128184966304afa6d47331c193
                 throw new RuntimeException(e);
             }
             return;
-@@ -362,13 +460,13 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -374,13 +472,13 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
         Component reason;
         Component leaveMessage;
         if (this instanceof ServerGamePacketListenerImpl serverGamePacketListener) {
@@ -573,7 +573,7 @@ index 2e7c4c74818befd25e296b58ef9f20319544c2fb..edb8af128184966304afa6d47331c193
                     rawLeaveMessage, cause
 
             );
-@@ -382,9 +480,9 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -394,9 +492,9 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
                 return;
             }
 
@@ -586,7 +586,7 @@ index 2e7c4c74818befd25e296b58ef9f20319544c2fb..edb8af128184966304afa6d47331c193
             // Log kick to console *after* event was processed.
             switch (cause) {
                 case FLYING_PLAYER -> LOGGER.warn("{} was kicked for floating too long!", player.getName().getString());
-@@ -397,7 +495,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -409,7 +507,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
         }
 
         // Send the possibly modified leave message
@@ -595,7 +595,7 @@ index 2e7c4c74818befd25e296b58ef9f20319544c2fb..edb8af128184966304afa6d47331c193
     }
 
     private void disconnect0(DisconnectionDetails disconnectionDetails) {
-@@ -413,8 +511,8 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -425,8 +523,8 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
     }
 
     // Paper start - add proper async disconnect
@@ -606,7 +606,7 @@ index 2e7c4c74818befd25e296b58ef9f20319544c2fb..edb8af128184966304afa6d47331c193
     }
 
     public final void disconnectAsync(Component component) {
-@@ -427,7 +525,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+@@ -439,7 +537,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
         return this.transferred;
     }
 
@@ -616,19 +616,19 @@ index 2e7c4c74818befd25e296b58ef9f20319544c2fb..edb8af128184966304afa6d47331c193
 
     protected boolean isSingleplayerOwner() {
 diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3bb431da22aaf4ed1965aa9bc89732b25b1e3648..1c4e4b95edae75c212e071e656cf36c007a1dce9 100644
+index 5bba860a5f913d3a83c1d469f0f4854b6e063a49..ce8ea023bbf09178507f324634c11353cf204c8c 100644
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3202,6 +3202,7 @@ public class ServerGamePacketListenerImpl
+@@ -3204,6 +3204,7 @@ public class ServerGamePacketListenerImpl
 
                         event.setCancelled(cancelled);
                         net.minecraft.world.inventory.AbstractContainerMenu oldContainer = this.player.containerMenu; // SPIGOT-1224
 +                        me.samsuik.sakura.player.gui.FeatureGui.clickEvent(event); // Sakura - client visibility settings
                         this.cserver.getPluginManager().callEvent(event);
                         if (this.player.containerMenu != oldContainer) {
-                             return;
+                             this.player.containerMenu.resumeRemoteUpdates();
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 46461fae4d4472bfdae75d12ac9cdaecafef848e..057ed507b8f8d6c45a8a49458d087d892ec29d8a 100644
+index d0727a05addee3e13fc65c2a2337565288f7cf98..ef6f91f35d8725fa3df81b23d86adc900a5df5ce 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
@@ -533,6 +533,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
--- a/sakura-server/minecraft-patches/features/0003-Load-Chunks-on-Movement.patch
+++ b/sakura-server/minecraft-patches/features/0003-Load-Chunks-on-Movement.patch
@@ -55,7 +55,7 @@ index 6a7dae136691fb2476633fa12897424daa6bb5b3..372fceb03ee24f0d9c0dc970824f3b63
     public static TicketType register(String name, long timeout, boolean persist, TicketType.TicketUse use) {
         return Registry.register(BuiltInRegistries.TICKET_TYPE, name, new TicketType(timeout, persist, use));
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 057ed507b8f8d6c45a8a49458d087d892ec29d8a..dcfe52f72efde7c2e9cbdb611d5e72bf4aaaeb23 100644
+index ef6f91f35d8725fa3df81b23d86adc900a5df5ce..9345d8f00496cc3becb84ab52bde2d5914911b68 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
@@ -537,6 +537,20 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -88,7 +88,7 @@ index 057ed507b8f8d6c45a8a49458d087d892ec29d8a..dcfe52f72efde7c2e9cbdb611d5e72bf
         );
         potentialCollisionsBB.addAll(entityAABBs);
         final Vec3 collided = ca.spottedleaf.moonrise.patches.collisions.CollisionUtil.performCollisions(movement, currentBox, potentialCollisionsVoxel, potentialCollisionsBB);
-@@ -5184,13 +5198,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -5183,13 +5197,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
     @Override
     public boolean shouldBeSaved() {
         return (this.removalReason == null || this.removalReason.shouldSave())
--- a/sakura-server/minecraft-patches/features/0004-Slice-Packet-obfuscation-and-reduction.patch
+++ b/sakura-server/minecraft-patches/features/0004-Slice-Packet-obfuscation-and-reduction.patch
@@ -153,10 +153,10 @@ index e96d4dee14c05f2fa329bfb1588ec795d4e3d730..ba9393e474ae213316c693d73ef2641e
 
         if (this.entity instanceof LivingEntity) {
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index dcfe52f72efde7c2e9cbdb611d5e72bf4aaaeb23..ce39193b14b43c215930cde7c311f88f756b0b81 100644
+index 9345d8f00496cc3becb84ab52bde2d5914911b68..d3333cc7b1cb8c63f1bdbf1df5d12935fdeb6a2d 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
-@@ -3639,7 +3639,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -3638,7 +3638,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
             this.entityData.markDirty(Entity.DATA_AIR_SUPPLY_ID);
             return;
         }
@@ -196,7 +196,7 @@ index 2420999c5399333bed122ee0a1f252ac894adfcb..2e7f6e3941b34323768e43870541c8e4
 
     public int getFuse() {
 diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java
-index 9b1b7385b823e97a5a6e059c75a68cadc190e967..eca187bf6e3ccb55ce78ee341d4efafc9a728612 100644
+index fd841f99213860c310a3c1c9fada12fd871b8a79..653e40d77d88e3ff1ae451c0744e26db9369954e 100644
 --- a/net/minecraft/world/entity/player/Player.java
 +++ b/net/minecraft/world/entity/player/Player.java
@@ -689,7 +689,7 @@ public abstract class Player extends LivingEntity {
--- a/sakura-server/minecraft-patches/features/0008-Merge-Cannon-Entities.patch
+++ b/sakura-server/minecraft-patches/features/0008-Merge-Cannon-Entities.patch
@@ -41,7 +41,7 @@ index 5f38281763419123a0611cbb34d9a02a0e0302ea..5ddfbddbef13b58bf509e4c60bbd72cd
                                     this.guardEntityTick(this::tickNonPassenger, entity);
                                     profilerFiller.pop();
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index f8b1b6850013b70218aa2eefe9371774a45a6033..46843fb00310923dc4da31e4554a40696eba57b8 100644
+index b0b611e641ff1b81fb9dbee31de3e8e94be08338..1dab546bcf31c4c773cff99a8f28c5c4b0da4747 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
@@ -566,6 +566,27 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -72,7 +72,7 @@ index f8b1b6850013b70218aa2eefe9371774a45a6033..46843fb00310923dc4da31e4554a4069
 
     public Entity(EntityType<?> entityType, Level level) {
         this.type = entityType;
-@@ -5178,6 +5199,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -5177,6 +5198,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
         if (this.removalReason != Entity.RemovalReason.UNLOADED_TO_CHUNK) { this.getPassengers().forEach(Entity::stopRiding); } // Paper - rewrite chunk system
         this.levelCallback.onRemove(removalReason);
         this.onRemoval(removalReason);
--- a/sakura-server/minecraft-patches/sources/net/minecraft/world/entity/Entity.java.patch
+++ b/sakura-server/minecraft-patches/sources/net/minecraft/world/entity/Entity.java.patch
@@ -8,7 +8,7 @@
 
     public Entity(EntityType<?> entityType, Level level) {
         this.type = entityType;
-@@ -4228,7 +_,7 @@
+@@ -4227,7 +_,7 @@
     }
 
     public boolean isPushedByFluid() {
--- a/sakura-server/minecraft-patches/sources/net/minecraft/world/entity/LivingEntity.java.patch
+++ b/sakura-server/minecraft-patches/sources/net/minecraft/world/entity/LivingEntity.java.patch
@@ -201,7 +201,7 @@
             this.hurtServer(serverLevel, this.damageSources().drown(), 1.0F);
         }
     }
-@@ -4163,6 +_,13 @@
+@@ -4157,6 +_,13 @@
         if (!this.isUsingItem()) {
             return null;
         } else {
--- a/sakura-server/minecraft-patches/sources/net/minecraft/world/entity/player/Player.java.patch
+++ b/sakura-server/minecraft-patches/sources/net/minecraft/world/entity/player/Player.java.patch
@@ -108,7 +108,7 @@
                                     int i = (int)(f7 * 0.5);
                                     ((ServerLevel)this.level())
                                         .sendParticles(ParticleTypes.DAMAGE_INDICATOR, target.getX(), target.getY(0.5), target.getZ(), i, 0.1, 0.0, 0.1, 0.2);
-@@ -1765,6 +_,7 @@
+@@ -1764,6 +_,7 @@
 
     // Paper start - send while respecting visibility
     private static void sendSoundEffect(Player fromEntity, double x, double y, double z, SoundEvent soundEffect, SoundSource soundCategory, float volume, float pitch) {
@@ -116,7 +116,7 @@
         fromEntity.level().playSound(fromEntity, x, y, z, soundEffect, soundCategory, volume, pitch); // This will not send the effect to the entity itself
         if (fromEntity instanceof ServerPlayer serverPlayer) {
             serverPlayer.connection.send(new net.minecraft.network.protocol.game.ClientboundSoundPacket(net.minecraft.core.registries.BuiltInRegistries.SOUND_EVENT.wrapAsHolder(soundEffect), soundCategory, x, y, z, volume, pitch, fromEntity.random.nextLong()));
-@@ -2119,7 +_,13 @@
+@@ -2118,7 +_,13 @@
 
     @Override
     public EntityDimensions getDefaultDimensions(Pose pose) {
--- a/sakura-server/minecraft-patches/sources/net/minecraft/world/item/ItemStack.java.patch
+++ b/sakura-server/minecraft-patches/sources/net/minecraft/world/item/ItemStack.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/item/ItemStack.java
 +++ b/net/minecraft/world/item/ItemStack.java
-@@ -826,6 +_,15 @@
+@@ -822,6 +_,15 @@
         }
     }
 
--- 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 18a15c5eb122e420bc2d429572e74be620ccd400..d4a5f6d6b3530deb563d9c712a805290ea88117f 100644
+index ca1c6c4c36046fd71a0495c2cb23912d5a34909a..fceb393ba0bca6f6ce0daa3b379dfecafc5c5863 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2324,6 +2324,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa
+@@ -2450,6 +2450,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 18a15c5eb122e420bc2d429572e74be620ccd400..d4a5f6d6b3530deb563d9c712a805290
     }
 
     public void setExtraData(ValueOutput output) {
-@@ -2345,6 +2350,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa
+@@ -2471,6 +2476,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 18a15c5eb122e420bc2d429572e74be620ccd400..d4a5f6d6b3530deb563d9c712a805290
     }
 
     @Override
-@@ -3003,6 +3012,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa
+@@ -3175,6 +3184,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa
         return this.getHandle().allowsListing();
     }
 
--- 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,8 +1,8 @@
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -234,6 +_,18 @@
-         this.firstPlayed = System.currentTimeMillis();
+@@ -348,6 +_,18 @@
     }
+     // Paper end
 
 +    // Sakura start - entity tracking range modifier
 +    @Override