From bea888478ee96307dc78f300faae8fe24d010126 Mon Sep 17 00:00:00 2001 From: violetc <58360096+s-yh-china@users.noreply.github.com> Date: Tue, 25 Mar 2025 23:37:59 +0800 Subject: [PATCH] Update Paper --- gradle.properties | 2 +- .../features/0004-Force-peaceful-mode-switch.patch | 4 ++-- .../features/0032-Stackable-ShulkerBoxes.patch | 4 ++-- .../paper-patches/features/0009-Disable-packet-limit.patch | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gradle.properties b/gradle.properties index f30190ee..b6104770 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group=org.leavesmc.leaves version=1.21.4-R0.1-SNAPSHOT mcVersion=1.21.4 -paperRef=894631f0d091a3de52aed4b6ec0c4f6c7584d697 +paperRef=c467df95a29e6c3d42b7e6f49513e924f9ba2ece preVersion=false org.gradle.jvmargs=-Xmx2G org.gradle.caching=true diff --git a/leaves-api/paper-patches/features/0004-Force-peaceful-mode-switch.patch b/leaves-api/paper-patches/features/0004-Force-peaceful-mode-switch.patch index e1eda138..fb121ba7 100644 --- a/leaves-api/paper-patches/features/0004-Force-peaceful-mode-switch.patch +++ b/leaves-api/paper-patches/features/0004-Force-peaceful-mode-switch.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Force peaceful mode switch diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 96120ce0e00f902ba6139af8e21d7174d647c8ce..1e840cf229b20096ba982869b5d20982f804215a 100644 +index bff01411f4b2d3ecd9e6d807c3f450d72c108323..aae996e55cfda36adcca50065e05b5ecc4129614 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -4345,6 +4345,12 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient +@@ -4351,6 +4351,12 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient void setSendViewDistance(int viewDistance); // Paper end - view distance api diff --git a/leaves-server/minecraft-patches/features/0032-Stackable-ShulkerBoxes.patch b/leaves-server/minecraft-patches/features/0032-Stackable-ShulkerBoxes.patch index 4bef46e5..114266bb 100644 --- a/leaves-server/minecraft-patches/features/0032-Stackable-ShulkerBoxes.patch +++ b/leaves-server/minecraft-patches/features/0032-Stackable-ShulkerBoxes.patch @@ -32,10 +32,10 @@ index c1130f596cf3443eeb62eb1b12587172fe0859ee..ad51ad9f104f8f7238298b025e2d7485 private ClientboundContainerSetSlotPacket(RegistryFriendlyByteBuf buffer) { diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index b4a284a0617167fd12e9d9414b17f86c169ba563..771abbc4aeea227b99b069d9d6f58a6b8df4ee5d 100644 +index 876d207996724727ca26b139af759eab2e6f4131..7ad093e90299b9d3d6667e7425ac1bf13c61e1a5 100644 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -3393,7 +3393,7 @@ public class ServerGamePacketListenerImpl +@@ -3395,7 +3395,7 @@ public class ServerGamePacketListenerImpl } boolean flag1 = packet.slotNum() >= 1 && packet.slotNum() <= 45; diff --git a/leaves-server/paper-patches/features/0009-Disable-packet-limit.patch b/leaves-server/paper-patches/features/0009-Disable-packet-limit.patch index 8e5d4ab0..ecfcb83d 100644 --- a/leaves-server/paper-patches/features/0009-Disable-packet-limit.patch +++ b/leaves-server/paper-patches/features/0009-Disable-packet-limit.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Disable packet limit diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java -index e3a7e6937122413bff911fe1188e3bb0297f6ffa..2a5a0c53c23a1ffa3bdfc4926d71e9bfce0d597c 100644 +index 8b70a8e9b0aacbe7964b0441b5bbbaab228962d8..46318779cd0321d00a503d8be2b055efd69cab38 100644 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java -@@ -286,7 +286,7 @@ public class GlobalConfiguration extends ConfigurationPart { +@@ -287,7 +287,7 @@ public class GlobalConfiguration extends ConfigurationPart { } public boolean isEnabled() {