From 526455929f24f41bb76b956af4b10efce5681b36 Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Sun, 9 Mar 2025 15:01:23 -0400 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@743346a5 Force update attributes PaperMC/Paper@1a7288aa Adjust unloaded chunk check for block digging --- .../features/0022-Make-book-writing-configurable.patch | 4 ++-- ...Do-not-process-chat-commands-before-player-has-joine.patch | 4 ++-- .../features/0032-Do-not-log-empty-message-warnings.patch | 4 ++-- .../features/0047-Reduce-array-allocations.patch | 4 ++-- gradle.properties | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gale-server/minecraft-patches/features/0022-Make-book-writing-configurable.patch b/gale-server/minecraft-patches/features/0022-Make-book-writing-configurable.patch index db4d135..636898a 100644 --- a/gale-server/minecraft-patches/features/0022-Make-book-writing-configurable.patch +++ b/gale-server/minecraft-patches/features/0022-Make-book-writing-configurable.patch @@ -22,10 +22,10 @@ you to easily disable books, should you want to preemptively remove this functionality before additional exploits are found. diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 727792ca1a2c9044abb1d404fbf8420652e1507c..cc7d0dde2ec7b0cc1656295291eba95e6fa0d70f 100644 +index 1205307b7d2336fa6c5395a65be6643228c49d72..bac7225ea6095a746a71d5be2ba4bf147971827b 100644 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -1170,6 +1170,11 @@ public class ServerGamePacketListenerImpl +@@ -1171,6 +1171,11 @@ public class ServerGamePacketListenerImpl @Override public void handleEditBook(ServerboundEditBookPacket packet) { diff --git a/gale-server/minecraft-patches/features/0030-Do-not-process-chat-commands-before-player-has-joine.patch b/gale-server/minecraft-patches/features/0030-Do-not-process-chat-commands-before-player-has-joine.patch index 0166249..30199ff 100644 --- a/gale-server/minecraft-patches/features/0030-Do-not-process-chat-commands-before-player-has-joine.patch +++ b/gale-server/minecraft-patches/features/0030-Do-not-process-chat-commands-before-player-has-joine.patch @@ -25,10 +25,10 @@ index dff1e84584c66045c58f0a6fe8102a27a54716a6..6efb636b0a4443daa4861d35116905d5 public boolean isRealPlayer; // Paper public com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper - PlayerNaturallySpawnCreaturesEvent diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index cc7d0dde2ec7b0cc1656295291eba95e6fa0d70f..fc77b81dd87162129742963ea633b19250062b2c 100644 +index bac7225ea6095a746a71d5be2ba4bf147971827b..aab9786db66740d281cf0be3ad921ccdfbc8c27e 100644 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2334,7 +2334,7 @@ public class ServerGamePacketListenerImpl +@@ -2342,7 +2342,7 @@ public class ServerGamePacketListenerImpl this.disconnectAsync(Component.translatable("multiplayer.disconnect.illegal_characters"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_CHARACTERS); // Paper - add proper async disconnect } else if (this.player.isRemoved() || this.player.getChatVisibility() == ChatVisiblity.HIDDEN) { // CraftBukkit - dead men tell no tales this.send(new ClientboundSystemChatPacket(Component.translatable("chat.disabled.options").withStyle(ChatFormatting.RED), false)); diff --git a/gale-server/minecraft-patches/features/0032-Do-not-log-empty-message-warnings.patch b/gale-server/minecraft-patches/features/0032-Do-not-log-empty-message-warnings.patch index bade566..ed4db5c 100644 --- a/gale-server/minecraft-patches/features/0032-Do-not-log-empty-message-warnings.patch +++ b/gale-server/minecraft-patches/features/0032-Do-not-log-empty-message-warnings.patch @@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) Gale - https://galemc.org diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index fc77b81dd87162129742963ea633b19250062b2c..df6f3fb2d2f9b51afbfff8ec41d286cb7d0cde84 100644 +index aab9786db66740d281cf0be3ad921ccdfbc8c27e..52cb71a46161fd8b910b4b9afde2cb489c3a3c8b 100644 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2488,7 +2488,7 @@ public class ServerGamePacketListenerImpl +@@ -2496,7 +2496,7 @@ public class ServerGamePacketListenerImpl // CraftBukkit start String rawMessage = message.signedContent(); if (rawMessage.isEmpty()) { diff --git a/gale-server/minecraft-patches/features/0047-Reduce-array-allocations.patch b/gale-server/minecraft-patches/features/0047-Reduce-array-allocations.patch index bf7abb1..1dd65df 100644 --- a/gale-server/minecraft-patches/features/0047-Reduce-array-allocations.patch +++ b/gale-server/minecraft-patches/features/0047-Reduce-array-allocations.patch @@ -192,10 +192,10 @@ index acb1168aba0069f9ac7f47d96f0f4945b37c3888..148be9d5e10d7a770814a10dc40bfb70 return ret; } diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index df6f3fb2d2f9b51afbfff8ec41d286cb7d0cde84..32bee1b855766d02905aca495db065f015e37385 100644 +index 52cb71a46161fd8b910b4b9afde2cb489c3a3c8b..d2b3f0a45c70f06fa7ff5c291cf3f79e9b264a09 100644 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2776,7 +2776,7 @@ public class ServerGamePacketListenerImpl +@@ -2784,7 +2784,7 @@ public class ServerGamePacketListenerImpl target.refreshEntityData(ServerGamePacketListenerImpl.this.player); // SPIGOT-7136 - Allays if (target instanceof Allay || target instanceof net.minecraft.world.entity.animal.horse.AbstractHorse) { // Paper - Fix horse armor desync diff --git a/gradle.properties b/gradle.properties index 01f28de..773ebb2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=org.galemc.gale version=1.21.4-R0.1-SNAPSHOT mcVersion=1.21.4 -paperRef=e5d988df858e24fc94a5a5ccd91e382e7f404724 +paperRef=1a7288aa05cfb0a168850a7cc879f55235fe5934 org.gradle.configuration-cache=true org.gradle.caching=true