From 1316e8819bdd021cee13f12fce8ee4c1139cc0c3 Mon Sep 17 00:00:00 2001 From: Samsuik Date: Fri, 28 Mar 2025 21:16:05 +0000 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@2d3a138 [ci skip] Refine recipe management API documentation. (#12287) PaperMC/Paper@aaaeb4e [ci skip] Make compilation logs actually readable (#12276) PaperMC/Paper@bb1beda feat: add event to wind charge explode (#12248) PaperMC/Paper@9f00461 Update a whole lot of deprecated annotations PaperMC/Paper@72f13f8 [ci skip] Mention API Checks for CONTRIBUTING.md (#12315) PaperMC/Paper@7cc6cb5 Check for trailing input in ItemFactory#createItemStack (#12312) PaperMC/Paper@f49d18d Add get/set customName to Skull block (#12302) PaperMC/Paper@894631f Make advancement ordering predictable (#12292) PaperMC/Paper@2aad131 Add config option for command spam whitelist PaperMC/Paper@bb3b7e6 Fix annotation mistakes PaperMC/Paper@058455e InventoryView QOL open method (#12282) PaperMC/Paper@f225858 Fix firework entity not being removed when FireworkExplodeEvent is cancelled (#12268) PaperMC/Paper@7819df1 Add getHeight method to ChunkData (#12311) PaperMC/Paper@37b9ca1 Add flush parameter to World#save (#12330) PaperMC/Paper@515e12c Check if BUNDLE_CONTENTS is present in InventoryClickEvent (#12321) PaperMC/Paper@5a6ab97 Add config to remove player as vehicle restriction in /ride (#12327) PaperMC/Paper@c467df9 Add ItemStack#copyDataFrom (#12224) PaperMC/Paper@9b1798d Simplify custom payload handling (#12347) --- gradle.properties | 2 +- .../files/src/main/java/org/bukkit/World.java.patch | 2 +- .../features/0002-Client-Visibility-Settings.patch | 10 +++++----- .../features/0001-Client-Visibility-Settings.patch | 8 ++++---- .../bukkit/craftbukkit/entity/CraftPlayer.java.patch | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/gradle.properties b/gradle.properties index 8008a98..d9bd998 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=6ea42025a49f232f47861c6ca943b0fc66b7effe +paperRef=9b1798d6438107fdf0d5939b79a8cf71f4d16e2c org.gradle.jvmargs=-Xmx2G org.gradle.vfs.watch=false diff --git a/sakura-api/paper-patches/files/src/main/java/org/bukkit/World.java.patch b/sakura-api/paper-patches/files/src/main/java/org/bukkit/World.java.patch index 012edd3..b6d1737 100644 --- a/sakura-api/paper-patches/files/src/main/java/org/bukkit/World.java.patch +++ b/sakura-api/paper-patches/files/src/main/java/org/bukkit/World.java.patch @@ -1,6 +1,6 @@ --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -206,6 +_,10 @@ +@@ -204,6 +_,10 @@ return new Location(this, x, y, z); } // Paper end diff --git a/sakura-server/minecraft-patches/features/0002-Client-Visibility-Settings.patch b/sakura-server/minecraft-patches/features/0002-Client-Visibility-Settings.patch index 0a9a666..59557cd 100644 --- a/sakura-server/minecraft-patches/features/0002-Client-Visibility-Settings.patch +++ b/sakura-server/minecraft-patches/features/0002-Client-Visibility-Settings.patch @@ -144,7 +144,7 @@ index d5dd3f5d4f38ed7281d896275012e3a6697cce9c..ab38dbe13d1dd0c9cb7a4fac223f4b52 public ServerPlayer(MinecraftServer server, ServerLevel level, GameProfile gameProfile, ClientInformation clientInformation) { super(level, level.getSharedSpawnPos(), level.getSharedSpawnAngle(), gameProfile); diff --git a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java -index e71c1a564e5d4ac43460f89879ff709ee685706f..7d2fe5df38db1d492ae65aa72959200221cf32d5 100644 +index af75f1ca60dc01045f27cb550ac9e3deacf1a1cf..6cfdd613f1dd1d9246b76c865b58412dba2053ce 100644 --- a/net/minecraft/server/network/ServerCommonPacketListenerImpl.java +++ b/net/minecraft/server/network/ServerCommonPacketListenerImpl.java @@ -51,6 +51,21 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack @@ -169,7 +169,7 @@ index e71c1a564e5d4ac43460f89879ff709ee685706f..7d2fe5df38db1d492ae65aa729592002 public ServerCommonPacketListenerImpl(MinecraftServer server, Connection connection, CommonListenerCookie cookie, net.minecraft.server.level.ServerPlayer player) { // CraftBukkit this.server = server; -@@ -287,6 +302,12 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack +@@ -291,6 +306,12 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack } else if (packet instanceof net.minecraft.network.protocol.game.ClientboundSetDefaultSpawnPositionPacket defaultSpawnPositionPacket) { this.player.compassTarget = org.bukkit.craftbukkit.util.CraftLocation.toBukkit(defaultSpawnPositionPacket.getPos(), this.getCraftPlayer().getWorld()); } @@ -182,7 +182,7 @@ index e71c1a564e5d4ac43460f89879ff709ee685706f..7d2fe5df38db1d492ae65aa729592002 // CraftBukkit end if (packet.isTerminal()) { this.close(); -@@ -299,7 +320,10 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack +@@ -303,7 +324,10 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack } catch (Throwable var7) { CrashReport crashReport = CrashReport.forThrowable(var7, "Sending packet"); CrashReportCategory crashReportCategory = crashReport.addCategory("Packet being sent"); @@ -195,10 +195,10 @@ index e71c1a564e5d4ac43460f89879ff709ee685706f..7d2fe5df38db1d492ae65aa729592002 } } diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index b4a284a0617167fd12e9d9414b17f86c169ba563..ef9b227a622790663f7a68eadbe2c4feee681134 100644 +index 876d207996724727ca26b139af759eab2e6f4131..dabcba79b30c5dd44e61f03cbff94fdbc2681fda 100644 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -3203,6 +3203,7 @@ public class ServerGamePacketListenerImpl +@@ -3205,6 +3205,7 @@ public class ServerGamePacketListenerImpl event.setCancelled(cancelled); AbstractContainerMenu oldContainer = this.player.containerMenu; // SPIGOT-1224 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 8a495c4..198a7c6 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 892445c90083376f6026a965a7c82df63027094d..389dcbcabe6b5662a5dc846e2c150d9348208a46 100644 +index 60861027f99a12d8364b6ebe495cc6b576cf0f48..97c36fb75d4c20946aa17295992d153abed7d28c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -2407,6 +2407,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2402,6 +2402,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { handle.keepLevel = data.getBoolean("keepLevel"); } } @@ -22,7 +22,7 @@ index 892445c90083376f6026a965a7c82df63027094d..389dcbcabe6b5662a5dc846e2c150d93 } public void setExtraData(CompoundTag nbttagcompound) { -@@ -2436,6 +2443,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2431,6 +2438,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 892445c90083376f6026a965a7c82df63027094d..389dcbcabe6b5662a5dc846e2c150d93 } @Override -@@ -3094,6 +3106,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -3089,6 +3101,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { 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 c5f2be1..116a45f 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 -@@ -235,6 +_,18 @@ +@@ -230,6 +_,18 @@ this.firstPlayed = System.currentTimeMillis(); }