From a0c458ba41ba2f5e33d3cec8b9a2167eb0ec7315 Mon Sep 17 00:00:00 2001 From: violetc <58360096+s-yh-china@users.noreply.github.com> Date: Tue, 10 Jan 2023 19:56:22 +0800 Subject: [PATCH] Update Paper --- build.gradle.kts | 2 +- gradle.properties | 2 +- patches/server/0018-No-chat-sign.patch | 6 +++--- patches/server/0047-BBOR-Protocol.patch | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 30eae8fc..d8ba1e7a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ plugins { java id("com.github.johnrengelman.shadow") version "7.1.2" apply false - id("io.papermc.paperweight.patcher") version "1.4.0" + id("io.papermc.paperweight.patcher") version "1.4.1" } repositories { diff --git a/gradle.properties b/gradle.properties index 49f27cfc..cf0a285d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,4 +4,4 @@ version=1.19.3-R0.1-SNAPSHOT mcVersion=1.19.3 packageVersion=1_19_R2 org.gradle.jvmargs=-Xmx2G -paperRef=51cfcc88da1d5277cf83a95d9f790699bc4d107a +paperRef=92c1a3e392ab63b3c0bf328adc3f9a5c4b2d251c diff --git a/patches/server/0018-No-chat-sign.patch b/patches/server/0018-No-chat-sign.patch index 5769b3ca..d14ca7e0 100644 --- a/patches/server/0018-No-chat-sign.patch +++ b/patches/server/0018-No-chat-sign.patch @@ -113,7 +113,7 @@ index deafca06331e19105a1e19ae11f271b05af7b982..41d9f243c0b56c81b70e64cfd3ca05b9 protected boolean convertOldUsers() { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 50d8d16b1856c0c875ccabbcfc240379a7669559..cfcc76eec4af149621208993ecd41b1d8555190d 100644 +index 3472f7f9b98d6d9c9f6465872803ef17fa67486d..af8d49e22ee3447ea6acc4b64fcb5713734c8fd3 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2140,10 +2140,27 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -145,10 +145,10 @@ index 50d8d16b1856c0c875ccabbcfc240379a7669559..cfcc76eec4af149621208993ecd41b1d if (packet == null || this.processedDisconnect) { // Spigot return; diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 2ea10cb889df8f3a3ad228933232c0bf591be6dc..7d4a5b064b817827ff7faa36556e6dc17685e2bc 100644 +index 26b640df56afe5109a7f8ee8498bb7b45999ec0f..ecd955842c8a0b1cd1b791a6e27b4b34226cde85 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java -@@ -1405,7 +1405,7 @@ public abstract class PlayerList { +@@ -1411,7 +1411,7 @@ public abstract class PlayerList { } public boolean verifyChatTrusted(PlayerChatMessage message) { // Paper - private -> public diff --git a/patches/server/0047-BBOR-Protocol.patch b/patches/server/0047-BBOR-Protocol.patch index d56c6526..32e412fc 100644 --- a/patches/server/0047-BBOR-Protocol.patch +++ b/patches/server/0047-BBOR-Protocol.patch @@ -18,7 +18,7 @@ index f834a809431ca3667be0c74d8fcbe9db46cbda22..f6bc15c331f22aba5cbb41261dbc10a4 for (int i = 0; i < this.tickables.size(); ++i) { ((Runnable) this.tickables.get(i)).run(); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index e1428d9a9f428b6e7b5b08f7f7e8adb7acb26e2f..8a2d4d348953173d055426a680e9b78706cb65f8 100644 +index 78f112575c2f8973e8aa66fb0fc44a18ec4758b5..308879d9b04aa95a83926ba795da53ce39bff5ae 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3551,6 +3551,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -32,7 +32,7 @@ index e1428d9a9f428b6e7b5b08f7f7e8adb7acb26e2f..8a2d4d348953173d055426a680e9b787 ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex); this.disconnect("Invalid custom payload!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD); diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 60c600df7777d473c50847715fda62b1e1f6d055..f020ac48036a039ccb5e28b3199191aaf06be31c 100644 +index aedb759607afcfa7a6127709506e798c25b81a37..57b60e25f407ff0b8b2283f92a8ef00e9cb10d42 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -335,6 +335,7 @@ public abstract class PlayerList { @@ -43,7 +43,7 @@ index 60c600df7777d473c50847715fda62b1e1f6d055..f020ac48036a039ccb5e28b3199191aa final net.kyori.adventure.text.Component jm = playerJoinEvent.joinMessage(); -@@ -571,6 +572,7 @@ public abstract class PlayerList { +@@ -577,6 +578,7 @@ public abstract class PlayerList { return this.remove(entityplayer, net.kyori.adventure.text.Component.translatable("multiplayer.player.left", net.kyori.adventure.text.format.NamedTextColor.YELLOW, io.papermc.paper.configuration.GlobalConfiguration.get().messages.useDisplayNameInQuitMessage ? entityplayer.getBukkitEntity().displayName() : PaperAdventure.asAdventure(entityplayer.getDisplayName()))); } public net.kyori.adventure.text.Component remove(ServerPlayer entityplayer, net.kyori.adventure.text.Component leaveMessage) { @@ -51,7 +51,7 @@ index 60c600df7777d473c50847715fda62b1e1f6d055..f020ac48036a039ccb5e28b3199191aa // Paper end ServerLevel worldserver = entityplayer.getLevel(); -@@ -1525,7 +1527,7 @@ public abstract class PlayerList { +@@ -1531,7 +1533,7 @@ public abstract class PlayerList { entityplayer.connection.send(packetplayoutrecipeupdate); entityplayer.getRecipeBook().sendInitialRecipeBook(entityplayer); }