From b996f29164bda75ced3884031c45a23cde139507 Mon Sep 17 00:00:00 2001 From: Samsuik Date: Fri, 13 Dec 2024 13:03:13 +0000 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@dae475b Switch Impl types to Holderable (#11662) PaperMC/Paper@bdfa1f6 Brigadier: fix simpleUnwrap not keeping redirect modifier and forks properties from original node (#11654) PaperMC/Paper@fabd859 Add command block material tags (#11720) PaperMC/Paper@07ef2bb Fix incorrect command serialization by creating new Command (#11671) PaperMC/Paper@15b2aa1 Readd shear methods from bukkit Shearable (#11715) PaperMC/Paper@c17ef64 Fix/scoreboard delegate (#11453) PaperMC/Paper@8dc76e7 [ci skip] Move back more PaperMC/Paper@4803421 Fix Player.setPlayerListOrder to send update to clients (#11729) PaperMC/Paper@b746d9d Add missing UPDATE_HAT and UPDATE_LIST_ORDER to some paper-added functions in ClientboundPlayerInfoUpdatePacket (#11731) --- gradle.properties | 2 +- patches/server/0005-Client-Visibility-Settings.patch | 10 +++++----- .../server/0072-Entity-tracking-range-modifier.patch | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gradle.properties b/gradle.properties index 20a1ad4..7e784e7 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=71a367ec8489c8a61a4c009f6a3c536438707158 +paperRef=b746d9df0b6b7765478b2a72c2d963b6e668fa35 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 eef992b..9c697b8 100644 --- a/patches/server/0005-Client-Visibility-Settings.patch +++ b/patches/server/0005-Client-Visibility-Settings.patch @@ -857,7 +857,7 @@ index 84fa24880d02dc7ba1ec8bda3575be38447fd4b2..52f79a8d1b7890ffba3495ca9390f0ed if (this.player.containerMenu != oldContainer) { return; diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 1b547be0fe97119edf4f29666cfe0037e0c778e0..29045a4857aadbc7f9ae0c612555743ad404682d 100644 +index 7ac7d0729705cb02f22277be3c467aed4f69ec0e..34a8c152a4570802d1e96430a6de9d937375fedd 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -568,6 +568,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -896,10 +896,10 @@ index 809f5e847e2f5bb594c130cebd2cb897ea768d82..eebd53ac889da265cb259ba3cb8c1ce4 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 20f64850cb42d986358f01ffcdb42187e1684bca..f3f4b4df097e1e593ac5028f7d3db92fc407d831 100644 +index 6a647cab8b2e476987931486e290703b8726f2c7..5455f78d4417f3f8b2e4820619ad24d91054d986 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -2395,6 +2395,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2403,6 +2403,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { handle.keepLevel = data.getBoolean("keepLevel"); } } @@ -913,7 +913,7 @@ index 20f64850cb42d986358f01ffcdb42187e1684bca..f3f4b4df097e1e593ac5028f7d3db92f } public void setExtraData(CompoundTag nbttagcompound) { -@@ -2424,6 +2431,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2432,6 +2439,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { paper.putLong("LastLogin", handle.loginTime); paper.putLong("LastSeen", System.currentTimeMillis()); // Paper end @@ -925,7 +925,7 @@ index 20f64850cb42d986358f01ffcdb42187e1684bca..f3f4b4df097e1e593ac5028f7d3db92f } @Override -@@ -3083,6 +3095,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -3091,6 +3103,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { return this.getHandle().allowsListing(); } diff --git a/patches/server/0072-Entity-tracking-range-modifier.patch b/patches/server/0072-Entity-tracking-range-modifier.patch index 1cdae0a..550e380 100644 --- a/patches/server/0072-Entity-tracking-range-modifier.patch +++ b/patches/server/0072-Entity-tracking-range-modifier.patch @@ -33,10 +33,10 @@ index 2a9659158d39d4d5505328afd7a2d8dc9ecf456f..5f7945c852ef9eb0d1183cc0ce33db5a 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 f3f4b4df097e1e593ac5028f7d3db92fc407d831..12e6681470575564a0833aa68cc62f7b399cef66 100644 +index 5455f78d4417f3f8b2e4820619ad24d91054d986..c01abfb8746c1280b9c48d22a5c7a33d5ba1cd61 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -3025,6 +3025,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -3033,6 +3033,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player { return (this.getHandle().requestedViewDistance() == 0) ? Bukkit.getViewDistance() : this.getHandle().requestedViewDistance(); }