mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-22 10:57:43 +01:00
54656e9755
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@4f9575e Break redstone on top of trap doors early PaperMC/Paper@83da4b6 Fix DamageSource for Falling Blocks (#9175) PaperMC/Paper@9846d0d Fix some NPE for EntityCompostItemEvent (#9169) PaperMC/Paper@813d039 Make sure the player didn't disconnect when processing commands PaperMC/Paper@1d4c780 Fix BlockPosition#offset(double,double,double) (#9190)
36 lines
2.0 KiB
Diff
36 lines
2.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: BillyGalbreath <blake.galbreath@gmail.com>
|
|
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 6111c8fc9454c45c18f24017a1a52e5124694628..cc04c5904547a678d507d4f6f9f3a0534370c546 100644
|
|
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
@@ -2446,7 +2446,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
|
|
do {
|
|
instant1 = (Instant) this.lastChatTimeStamp.get();
|
|
if (timestamp.isBefore(instant1)) {
|
|
- return false;
|
|
+ return !org.purpurmc.purpur.PurpurConfig.kickForOutOfOrderChat; // Purpur
|
|
}
|
|
} while (!this.lastChatTimeStamp.compareAndSet(instant1, timestamp));
|
|
|
|
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
|
|
index bab204904dd8e7bc949d83c59d075cc6f90ce60c..3bfa8021a7da677fd15d3f2827b271fe17f514a1 100644
|
|
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
|
|
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
|
|
@@ -459,9 +459,11 @@ public class PurpurConfig {
|
|
|
|
public static boolean useUPnP = false;
|
|
public static boolean maxJoinsPerSecond = false;
|
|
+ public static boolean kickForOutOfOrderChat = true;
|
|
private static void networkSettings() {
|
|
useUPnP = getBoolean("settings.network.upnp-port-forwarding", useUPnP);
|
|
maxJoinsPerSecond = getBoolean("settings.network.max-joins-per-second", maxJoinsPerSecond);
|
|
+ kickForOutOfOrderChat = getBoolean("settings.network.kick-for-out-of-order-chat", kickForOutOfOrderChat);
|
|
}
|
|
|
|
public static java.util.regex.Pattern usernameValidCharactersPattern;
|