2022-06-08 15:12:28 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2022-08-01 16:01:20 +02:00
From: Nassim Jahnke <nassim@njahnke.dev>
2022-06-08 15:12:28 +02:00
Date: Mon, 17 Jan 2022 19:47:19 +0100
2022-06-12 03:11:18 +02:00
Subject: [PATCH] Kick on main for illegal chat
2022-06-08 15:12:28 +02:00
2022-06-12 03:11:18 +02:00
Makes the PlayerKickEvent fire on the main thread for
illegal characters or chat out-of-order errors.
2022-06-08 15:12:28 +02:00
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
2023-11-11 21:25:45 +01:00
index 5911fc7009a4bdf99f8016d440fbeb1ae9b44441..69d72c411ad6d8f9ee35bd71307d088c17564aa0 100644
2022-06-08 15:12:28 +02:00
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
2023-11-11 21:25:45 +01:00
@@ -2022,7 +2022,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
2022-06-08 15:12:28 +02:00
}
// CraftBukkit end
2022-07-27 23:32:15 +02:00
if (ServerGamePacketListenerImpl.isChatMessageIllegal(packet.message())) {
2022-06-08 15:12:28 +02:00
+ this.server.scheduleOnMain(() -> { // Paper - push to main for event firing
this.disconnect(Component.translatable("multiplayer.disconnect.illegal_characters"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_CHARACTERS); // Paper - add cause
+ }); // Paper - push to main for event firing
} else {
2022-12-07 22:35:34 +01:00
Optional<LastSeenMessages> optional = this.tryHandleChat(packet.message(), packet.timeStamp(), packet.lastSeenMessages());
2023-11-11 21:25:45 +01:00
@@ -2055,7 +2057,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
2022-06-08 15:12:28 +02:00
@Override
public void handleChatCommand(ServerboundChatCommandPacket packet) {
if (ServerGamePacketListenerImpl.isChatMessageIllegal(packet.command())) {
+ this.server.scheduleOnMain(() -> { // Paper - push to main for event firing
2022-07-29 18:31:02 +02:00
this.disconnect(Component.translatable("multiplayer.disconnect.illegal_characters"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_CHARACTERS); // Paper
2022-06-08 15:12:28 +02:00
+ }); // Paper - push to main for event firing
} else {
2022-12-07 22:35:34 +01:00
Optional<LastSeenMessages> optional = this.tryHandleChat(packet.command(), packet.timeStamp(), packet.lastSeenMessages());
2023-11-11 21:25:45 +01:00
@@ -2141,7 +2145,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
2022-12-07 22:35:34 +01:00
private Optional<LastSeenMessages> tryHandleChat(String message, Instant timestamp, LastSeenMessages.Update acknowledgment) {
2022-07-27 23:32:15 +02:00
if (!this.updateChatOrder(timestamp)) {
ServerGamePacketListenerImpl.LOGGER.warn("{} sent out-of-order chat: '{}'", this.player.getName().getString(), message);
2022-06-12 03:11:18 +02:00
+ this.server.scheduleOnMain(() -> { // Paper - push to main
2023-09-17 00:54:33 +02:00
this.disconnect(Component.translatable("multiplayer.disconnect.out_of_order_chat"), org.bukkit.event.player.PlayerKickEvent.Cause.OUT_OF_ORDER_CHAT); // Paper - kick event causes
2022-06-12 03:11:18 +02:00
+ }); // Paper - push to main
2022-12-07 22:35:34 +01:00
return Optional.empty();
2023-03-14 21:55:49 +01:00
} else {
Optional<LastSeenMessages> optional = this.unpackAndApplyLastSeen(acknowledgment);