Skip to content

Commit 919e594

Browse files
authored
Push illegal char kick to main thread (#7363)
1 parent 048e030 commit 919e594

File tree

1 file changed

+20
-0
lines changed

1 file changed

+20
-0
lines changed
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Nassim Jahnke <jahnke.nassim@gmail.com>
3+
Date: Mon, 17 Jan 2022 19:47:19 +0100
4+
Subject: [PATCH] Kick on main for illegal chars
5+
6+
7+
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
8+
index 926d0a80cbb55184955ac6720948d2e86683cc57..5c9310fe424943a7256f6f77c414147384bad0aa 100644
9+
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
10+
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
11+
@@ -2067,7 +2067,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
12+
13+
for (int i = 0; i < s.length(); ++i) {
14+
if (!SharedConstants.isAllowedChatCharacter(s.charAt(i))) {
15+
+ this.server.scheduleOnMain(() -> { // Paper - push to main for event firing
16+
this.disconnect(new TranslatableComponent("multiplayer.disconnect.illegal_characters"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_CHARACTERS); // Paper - add cause
17+
+ }); // Paper - push to main for event firing
18+
return;
19+
}
20+
}

0 commit comments

Comments
 (0)