Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@1c3c47a Correctly check enchants for ItemStack#damage (#11240) PaperMC/Paper@1187544 Fix teleport event getTo returning null (#11239) PaperMC/Paper@dd941cc Re-add patches for can-place/can-destroy API (#11238) PaperMC/Paper@ab0d24a Configuration for horizontal-only item merging (#11219) PaperMC/Paper@098bd39 Remove arbitrary book page limit (#11228) PaperMC/Paper@f97aff7 [ci skip] Fix Effect javadocs (#11182)
2025-12-28 02:59:12 +00:00 · 2024-08-12 00:13:12 +00:00
parent f2ee091748
commit dc228bb8dd
5 changed files with 13 additions and 13 deletions
--- 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=7d7f123e98e63d466f771e63eff33b9d615544fe
+paperRef=f97aff74b6f7fd4940c0c0b6cca3f8ac6e1afdef

 org.gradle.caching=false
 org.gradle.parallel=true
--- a/patches/server/0044-Do-not-process-chat-commands-before-player-has-joine.patch
+++ b/patches/server/0044-Do-not-process-chat-commands-before-player-has-joine.patch
@@ -13,7 +13,7 @@ As part of: EmpireCraft (https://github.com/starlis/empirecraft)
 Licensed under: MIT (https://opensource.org/licenses/MIT)

 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index e2633083327853b87a265aab93d7eba5c5f980a7..36d009fb72351457fc238b250b097878f30db246 100644
+index 347422389337444bba4454d71b7f75db368ccbdf..b01994af95b2399d34dd63661a70f03ef2533342 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -297,6 +297,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple
@@ -25,10 +25,10 @@ index e2633083327853b87a265aab93d7eba5c5f980a7..36d009fb72351457fc238b250b097878
     public boolean isRealPlayer; // Paper
     public com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper - PlayerNaturallySpawnCreaturesEvent
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 0563a4273f8cbb4ca9af52f6f708d43967575252..3581cd89052f6cc304bbf16ef406e6132b1a7e50 100644
+index c3b6bc82144218671ca89814e0f34f8a7bdefa4f..ed260aa3e8d31d451230727a6458f2235744176c 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2285,7 +2285,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2280,7 +2280,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
             this.disconnect((Component) Component.translatable("multiplayer.disconnect.illegal_characters"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_CHARACTERS); // Paper
         } 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));
--- a/patches/server/0046-Do-not-log-empty-message-warnings.patch
+++ b/patches/server/0046-Do-not-log-empty-message-warnings.patch
@@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org

 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3581cd89052f6cc304bbf16ef406e6132b1a7e50..966c93c1fe51ff07d92b90d5e0ae0aa7a632172b 100644
+index ed260aa3e8d31d451230727a6458f2235744176c..ffeab99978f2fb45c7fdf7ab923e8aecf6d33b3e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -194,6 +194,7 @@ import net.minecraft.world.phys.shapes.BooleanOp;
@@ -18,7 +18,7 @@ index 3581cd89052f6cc304bbf16ef406e6132b1a7e50..966c93c1fe51ff07d92b90d5e0ae0aa7
 import org.galemc.gale.configuration.GaleGlobalConfiguration;
 import org.slf4j.Logger;
 
-@@ -2443,7 +2444,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2438,7 +2439,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
         // CraftBukkit start
         String s = message.signedContent();
         if (s.isEmpty()) {
--- a/patches/server/0067-Reduce-array-allocations.patch
+++ b/patches/server/0067-Reduce-array-allocations.patch
@@ -312,7 +312,7 @@ index 4aa6232bf0f72fcde32d257100bd15b1c5192aaa..2d3f002f85721ff25d95f3f251077926
     private static final Codec<Object> ARG_CODEC = Codec.either(PRIMITIVE_ARG_CODEC, ComponentSerialization.CODEC)
         .xmap(
 diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetEquipmentPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetEquipmentPacket.java
-index 3945ca04ede578121b370592482ac917f2d4cf96..ad0c87b8955a5cfa2b0011864756d68248e8c353 100644
+index d152871142d3def2ac04f50037db53b0527f7894..bf0db5e46a530a8d4c5ebaa58d0e14c4b457036b 100644
 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetEquipmentPacket.java
 +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetEquipmentPacket.java
@@ -32,7 +32,7 @@ public class ClientboundSetEquipmentPacket implements Packet<ClientGamePacketLis
@@ -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 966c93c1fe51ff07d92b90d5e0ae0aa7a632172b..bb96ee69a76a1acd29e680df8de55b92c72aa21a 100644
+index ffeab99978f2fb45c7fdf7ab923e8aecf6d33b3e..a81e3ef427b2ece00ecbf94b31cf10f88bb10df3 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2741,7 +2741,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2736,7 +2736,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
                                 entity.refreshEntityData(ServerGamePacketListenerImpl.this.player);
                                 // SPIGOT-7136 - Allays
                                 if (entity instanceof Allay) {
@@ -502,7 +502,7 @@ index d75673cc8a5aeb7051b1d4fe729faf408e266dc4..0b8e5c2da9f57dbf8703baa1de3e1cf8
 
     private static Map<EquipmentSlot, Float> createForAllSlots(List<EquipmentSlot> slots, float dropChance) {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 045abc7dfebce2501abcc1bebee18d5ba8aea1b0..0650254d7de55829c5d3c118ccf08ceec1cd08ac 100644
+index 79ed54c658059e62b16704e5d5fe1527be2717e3..5bf7c9050df8beddd71ecb2fc14414f5e4016d79 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3275,7 +3275,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -564,7 +564,7 @@ index 02dd200670b02aeab934554b280f7f5d26af0df1..1e433f75b83c3013e7ee962a20773c8b
 
                     for (int j = 0; j < i; ++j) {
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 2c312c0b741fb96a008881e9e01fa660a1fb63ab..96427414e5af8663587a70608d66cf98516cf224 100644
+index b6a2f3e4f22f36e75a1630bd456c2f471edbb398..51b1244b7a1f1beeac66a2763dced74798aa6d1b 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
@@ -1124,7 +1124,7 @@ public final class ItemStack implements DataComponentHolder {
--- a/patches/server/0095-Send-multiple-keep-alive-packets.patch
+++ b/patches/server/0095-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 bb96ee69a76a1acd29e680df8de55b92c72aa21a..08199435320f31421cd2b70b221fd519fdac0b59 100644
+index a81e3ef427b2ece00ecbf94b31cf10f88bb10df3..511cf5e64a12974c9cccba7b20a7cf51f9531dd1 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 bb96ee69a76a1acd29e680df8de55b92c72aa21a..08199435320f31421cd2b70b221fd519
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.objects.ObjectIterator;
 import java.net.SocketAddress;
-@@ -3413,6 +3415,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3408,6 +3410,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
     }
 
     @Override