Skip to content
This repository was archived by the owner on Apr 13, 2025. It is now read-only.

Commit 1492410

Browse files
BillyGalbreathgranny
authored andcommitted
Option to disable kick for out of order chat
1 parent 7dbdd07 commit 1492410

3 files changed

Lines changed: 13 additions & 35 deletions

File tree

patches/server/0244-Option-to-disable-kick-for-out-of-order-chat.patch

Lines changed: 0 additions & 35 deletions
This file was deleted.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- a/net/minecraft/network/chat/SignedMessageChain.java
2+
+++ b/net/minecraft/network/chat/SignedMessageChain.java
3+
@@ -45,7 +_,7 @@
4+
SignedMessageLink signedMessageLink = SignedMessageChain.this.nextLink;
5+
if (signedMessageLink == null) {
6+
throw new SignedMessageChain.DecodeException(SignedMessageChain.DecodeException.CHAIN_BROKEN);
7+
- } else if (body.timeStamp().isBefore(SignedMessageChain.this.lastTimeStamp)) {
8+
+ } else if (org.purpurmc.purpur.PurpurConfig.kickForOutOfOrderChat && body.timeStamp().isBefore(SignedMessageChain.this.lastTimeStamp)) { // Purpur - Option to disable kick for out of order chat
9+
this.setChainBroken();
10+
throw new SignedMessageChain.DecodeException(SignedMessageChain.DecodeException.OUT_OF_ORDER_CHAT, org.bukkit.event.player.PlayerKickEvent.Cause.OUT_OF_ORDER_CHAT); // Paper - kick event causes
11+
} else {

purpur-server/src/main/java/org/purpurmc/purpur/PurpurConfig.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -455,9 +455,11 @@ private static void tpsCatchup() {
455455

456456
public static boolean useUPnP = false;
457457
public static boolean maxJoinsPerSecond = false;
458+
public static boolean kickForOutOfOrderChat = true;
458459
private static void networkSettings() {
459460
useUPnP = getBoolean("settings.network.upnp-port-forwarding", useUPnP);
460461
maxJoinsPerSecond = getBoolean("settings.network.max-joins-per-second", maxJoinsPerSecond);
462+
kickForOutOfOrderChat = getBoolean("settings.network.kick-for-out-of-order-chat", kickForOutOfOrderChat);
461463
}
462464

463465
public static Pattern usernameValidCharactersPattern;

0 commit comments

Comments
 (0)