From d9a7cf0a2327f912e6b07330c659909c7a168902 Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Tue, 27 Aug 2024 00:12:59 +0000 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@e08e667 Fix: synchronise sending chat to client with updating message signature cache (#11332) --- gradle.properties | 2 +- patches/server/0067-Reduce-array-allocations.patch | 4 ++-- patches/server/0096-Send-multiple-keep-alive-packets.patch | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 050aa65..558e9ed 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=org.galemc.gale version=1.21.1-R0.1-SNAPSHOT mcVersion=1.21.1 -paperRef=789a267e93240f9e918014dd88bab89fe50a64d3 +paperRef=e08e6679fcaf5ce8b91db628309ed530e58a4133 org.gradle.caching=false org.gradle.parallel=true diff --git a/patches/server/0067-Reduce-array-allocations.patch b/patches/server/0067-Reduce-array-allocations.patch index 4737569..3bade31 100644 --- a/patches/server/0067-Reduce-array-allocations.patch +++ b/patches/server/0067-Reduce-array-allocations.patch @@ -364,10 +364,10 @@ index 20b5a81d50397438b3200322f31b62db44ebdb3b..c80be65d190c85e7f0ea8233ebbbdbc1 for (int j = 0; j < i; ++j) { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 401b738d3b0aa1e102a00a68840b8f5eda21a427..11e86d83b2bd8242203062b381a313190d673f63 100644 +index 423d4bb88501f462e3d5761f45c3dbee64930d50..f4b7ac0d9571daf751196e342016601dbd2f2787 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2812,7 +2812,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -2816,7 +2816,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl entity.refreshEntityData(ServerGamePacketListenerImpl.this.player); // SPIGOT-7136 - Allays if (entity instanceof Allay) { diff --git a/patches/server/0096-Send-multiple-keep-alive-packets.patch b/patches/server/0096-Send-multiple-keep-alive-packets.patch index 3ffaef8..c1edb35 100644 --- a/patches/server/0096-Send-multiple-keep-alive-packets.patch +++ b/patches/server/0096-Send-multiple-keep-alive-packets.patch @@ -130,7 +130,7 @@ index 8757a6ac609d463f94846d66fe04f50e859e7ce8..a720a05c47b2137a07515461960603cc } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 11e86d83b2bd8242203062b381a313190d673f63..58893266a4ee8b4cc8cfc0e99872840ad2869eb6 100644 +index f4b7ac0d9571daf751196e342016601dbd2f2787..ec3f2907cd850c163d2e703fcbb8c025c0eaeedb 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -9,6 +9,8 @@ import com.mojang.brigadier.suggestion.Suggestions; @@ -142,7 +142,7 @@ index 11e86d83b2bd8242203062b381a313190d673f63..58893266a4ee8b4cc8cfc0e99872840a import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import it.unimi.dsi.fastutil.objects.ObjectIterator; import java.net.SocketAddress; -@@ -3503,6 +3505,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -3507,6 +3509,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl } @Override