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
2022-12-09 12:30:55 +01:00
index 7dff3cff9ec9c87fea7be838a6a34c02f2eeb3b1..25b2bdca86b62e0c76059d87da9214c0bb41fe51 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
2022-12-07 22:35:34 +01:00
@@ -2172,7 +2172,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
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());
@@ -2206,7 +2208,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
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());
@@ -2286,7 +2290,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
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
2022-12-07 22:35:34 +01:00
this.disconnect(Component.translatable("multiplayer.disconnect.out_of_order_chat"), org.bukkit.event.player.PlayerKickEvent.Cause.OUT_OF_ORDER_CHAT); // Paper - kick event ca
2022-06-12 03:11:18 +02:00
+ }); // Paper - push to main
2022-12-07 22:35:34 +01:00
return Optional.empty();
2022-07-27 23:32:15 +02:00
} else if (this.player.isRemoved() || this.player.getChatVisibility() == ChatVisiblity.HIDDEN) { // CraftBukkit - dead men tell no tales
this.send(new ClientboundSystemChatPacket(Component.translatable("chat.disabled.options").withStyle(ChatFormatting.RED), false));