From e503c2d84c869afef39c7835028a8d04c67742db Mon Sep 17 00:00:00 2001 From: violetc <58360096+s-yh-china@users.noreply.github.com> Date: Wed, 28 Dec 2022 18:06:09 +0800 Subject: [PATCH] Update Paper --- gradle.properties | 2 +- patches/server/0010-Fakeplayer-support.patch | 6 +++--- patches/server/0046-PCA-sync-protocol.patch | 6 +++--- patches/server/0047-BBOR-Protocol.patch | 8 ++++---- patches/server/0050-Jade-Protocol.patch | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/gradle.properties b/gradle.properties index 5f35ce17..e6501641 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=f26e9ccdd0d08d765f96a32d1d124f0f6b9bb3a2 +paperRef=90750a6591cce9afda52093951ab1f4e438b64de diff --git a/patches/server/0010-Fakeplayer-support.patch b/patches/server/0010-Fakeplayer-support.patch index f4deef0a..f84bbfda 100644 --- a/patches/server/0010-Fakeplayer-support.patch +++ b/patches/server/0010-Fakeplayer-support.patch @@ -83,7 +83,7 @@ index 7d6d3c8556033d289fdadc489e73fba478fce41a..2bdd75f4e48a232d2cc7c24475caafa2 PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver1.getWorld()); this.level.getCraftServer().getPluginManager().callEvent(changeEvent); diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index c0b599b1835d28ddda3690b29f29bd8c6f03e215..a85c64dd537bada0dff312a7a6326131314ed0ca 100644 +index f381bf9064be548a4a603e0042886d8a5e70ba5b..6c060b35834e0513e21d4f9546c0a7d0f1ec7911 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -80,6 +80,7 @@ import net.minecraft.server.ServerScoreboard; @@ -130,10 +130,10 @@ index c0b599b1835d28ddda3690b29f29bd8c6f03e215..a85c64dd537bada0dff312a7a6326131 if (jm != null && !jm.equals(net.kyori.adventure.text.Component.empty())) { // Paper - Adventure diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 2e6557a19523d18aecff709de30cb4466b46a9fa..b884439a537a938f0636ccdcd1447891c10bb691 100644 +index 61597ebe2f9faff43994c475074b87d11905e582..179d49336ec6ff0ac345a9df1c1236afa096af4c 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java -@@ -1282,7 +1282,7 @@ public abstract class Player extends LivingEntity { +@@ -1283,7 +1283,7 @@ public abstract class Player extends LivingEntity { boolean flag3 = false; double d0 = (double) (this.walkDist - this.walkDistO); diff --git a/patches/server/0046-PCA-sync-protocol.patch b/patches/server/0046-PCA-sync-protocol.patch index f8eed6cf..8986d01d 100644 --- a/patches/server/0046-PCA-sync-protocol.patch +++ b/patches/server/0046-PCA-sync-protocol.patch @@ -6,7 +6,7 @@ Subject: [PATCH] PCA sync protocol This patch is Powered by plusls-carpet-addition(https://github.com/plusls/plusls-carpet-addition) diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 5efb183d28dd90c42a546a87f9a362e70f19082e..f686bedc5fe15bde6bb23b317eecc1efdb5f1c1b 100644 +index cfcc76eec4af149621208993ecd41b1d8555190d..e1428d9a9f428b6e7b5b08f7f7e8adb7acb26e2f 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -241,6 +241,7 @@ import org.bukkit.inventory.CraftingInventory; @@ -17,7 +17,7 @@ index 5efb183d28dd90c42a546a87f9a362e70f19082e..f686bedc5fe15bde6bb23b317eecc1ef // CraftBukkit end public class ServerGamePacketListenerImpl implements ServerPlayerConnection, TickablePacketListener, ServerGamePacketListener { -@@ -3543,6 +3544,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3545,6 +3546,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic this.disconnect("Invalid payload UNREGISTER!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD); // Paper - kick event cause } } else { @@ -35,7 +35,7 @@ index 5efb183d28dd90c42a546a87f9a362e70f19082e..f686bedc5fe15bde6bb23b317eecc1ef byte[] data = new byte[packet.data.readableBytes()]; packet.data.readBytes(data); diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 0fe653af5d6bb287cb81dea89019a3df2e606cd8..c24bcbd0227d1230fe12e490584f8cd15fb54c9e 100644 +index 2dcaae80940ae03f9f305d5d673657d4cfa03518..71863f9102fc55221740ae9f5ccb9293095a45a7 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -334,6 +334,7 @@ public abstract class PlayerList { diff --git a/patches/server/0047-BBOR-Protocol.patch b/patches/server/0047-BBOR-Protocol.patch index f9e93297..dfd9f134 100644 --- a/patches/server/0047-BBOR-Protocol.patch +++ b/patches/server/0047-BBOR-Protocol.patch @@ -18,10 +18,10 @@ 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 f686bedc5fe15bde6bb23b317eecc1efdb5f1c1b..eaaabc85945b349bf94274feda738fed0862bd03 100644 +index e1428d9a9f428b6e7b5b08f7f7e8adb7acb26e2f..8a2d4d348953173d055426a680e9b78706cb65f8 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -3549,6 +3549,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3551,6 +3551,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic if (top.leavesmc.leaves.LeavesConfig.pcaSyncProtocol && ProtocolUtils.isNamespacePacket(packet, top.leavesmc.leaves.protocol.PcaSyncProtocol.PROTOCOL_ID)) { top.leavesmc.leaves.protocol.PcaSyncProtocol.handlePacket(server, player, packet); } @@ -32,7 +32,7 @@ index f686bedc5fe15bde6bb23b317eecc1efdb5f1c1b..eaaabc85945b349bf94274feda738fed 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 c24bcbd0227d1230fe12e490584f8cd15fb54c9e..24e33c12d04ff13283f442e75c5124a62854ce01 100644 +index 71863f9102fc55221740ae9f5ccb9293095a45a7..35343ab687c8841603d502386758e63fbd849932 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 { @@ -44,7 +44,7 @@ index c24bcbd0227d1230fe12e490584f8cd15fb54c9e..24e33c12d04ff13283f442e75c5124a6 final net.kyori.adventure.text.Component jm = playerJoinEvent.joinMessage(); @@ -571,6 +572,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() : net.kyori.adventure.text.Component.text(entityplayer.getScoreboardName()))); + 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) { + top.leavesmc.leaves.protocol.BBORProtocol.onPlayerLoggedOut(entityplayer); // Leaves - bbor diff --git a/patches/server/0050-Jade-Protocol.patch b/patches/server/0050-Jade-Protocol.patch index 2aa19b13..c2e7bb36 100644 --- a/patches/server/0050-Jade-Protocol.patch +++ b/patches/server/0050-Jade-Protocol.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Jade Protocol This patch is Powered by Jade(https://github.com/Snownee/Jade) diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index eaaabc85945b349bf94274feda738fed0862bd03..78696fc0878f8c0996b1fb37953f6223ce37e920 100644 +index 8a2d4d348953173d055426a680e9b78706cb65f8..383691cd1da59087aa7783abc13534c987fd165e 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -3552,6 +3552,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3554,6 +3554,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic if (top.leavesmc.leaves.LeavesConfig.bborProtocol && packet.identifier.equals(top.leavesmc.leaves.protocol.BBORProtocol.SUBSCRIBE)) { top.leavesmc.leaves.protocol.BBORProtocol.onPlayerSubscribed(player); } @@ -20,7 +20,7 @@ index eaaabc85945b349bf94274feda738fed0862bd03..78696fc0878f8c0996b1fb37953f6223 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 24e33c12d04ff13283f442e75c5124a62854ce01..0e04c1e14d6e3b1dfffa9e1bde563bf864823b62 100644 +index 35343ab687c8841603d502386758e63fbd849932..0d5f7375a293ec8fbdd9f9d77adad07073237350 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -336,6 +336,7 @@ public abstract class PlayerList {