diff --git a/patches/server/0245-Option-to-disable-kick-for-out-of-order-chat.patch b/patches/server/0245-Option-to-disable-kick-for-out-of-order-chat.patch index a16f9f8c1..ff7e7b350 100644 --- a/patches/server/0245-Option-to-disable-kick-for-out-of-order-chat.patch +++ b/patches/server/0245-Option-to-disable-kick-for-out-of-order-chat.patch @@ -4,19 +4,19 @@ Date: Sun, 3 Jul 2022 04:13:57 -0500 Subject: [PATCH] Option to disable kick for out of order chat -diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index efb72ae3ce609117258dfc9f09b53add4ef0fd8e..3f388240694709c198c7d16be56127101f5e6df3 100644 ---- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -1662,7 +1662,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl - - do { - if (!iterator.hasNext()) { -- return false; -+ return !org.purpurmc.purpur.PurpurConfig.kickForOutOfOrderChat; // Purpur - } - - voxelshape1 = (VoxelShape) iterator.next(); +diff --git a/src/main/java/net/minecraft/network/chat/SignedMessageChain.java b/src/main/java/net/minecraft/network/chat/SignedMessageChain.java +index 300929a406905f5ff1ede664d5b99fb0938d4d2e..a4e9ac0e07f08e0b6aa682e8c1587d9c84fc3c6c 100644 +--- a/src/main/java/net/minecraft/network/chat/SignedMessageChain.java ++++ b/src/main/java/net/minecraft/network/chat/SignedMessageChain.java +@@ -45,7 +45,7 @@ public class SignedMessageChain { + SignedMessageLink signedMessageLink = SignedMessageChain.this.nextLink; + if (signedMessageLink == null) { + throw new SignedMessageChain.DecodeException(SignedMessageChain.DecodeException.CHAIN_BROKEN); +- } else if (body.timeStamp().isBefore(SignedMessageChain.this.lastTimeStamp)) { ++ } else if (org.purpurmc.purpur.PurpurConfig.kickForOutOfOrderChat && body.timeStamp().isBefore(SignedMessageChain.this.lastTimeStamp)) { + this.setChainBroken(); + throw new SignedMessageChain.DecodeException(SignedMessageChain.DecodeException.OUT_OF_ORDER_CHAT, org.bukkit.event.player.PlayerKickEvent.Cause.OUT_OF_ORDER_CHAT); // Paper - kick event causes + } else { diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java index a78dcf4e4298a02b8bef3519eecbfb1c880563d9..3750c8b3e011772700a1d07145f81625fd2c1b01 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java