From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: chickeneer Date: Tue, 3 Aug 2021 10:39:44 -0500 Subject: [PATCH] Do not process chat/commands before player has joined Original code by Starlis, licensed under GNU General Public License v3.0 You can find the original code on https://github.com/starlis/empirecraft diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java index 9fc769d019cedee1f6014e5db45180b2259743c6..65833c8f66858b7f98ffbd06f097e50169d5a300 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2093,6 +2093,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser private void handleChat(TextFilter.FilteredText message) { if (this.player.isRemoved() || this.player.getChatVisibility() == ChatVisiblity.HIDDEN) { // CraftBukkit - dead men tell no tales this.send(new ClientboundChatPacket((new TranslatableComponent("chat.disabled.options")).withStyle(ChatFormatting.RED), ChatType.SYSTEM, Util.NIL_UUID)); + } else if (!player.didPlayerJoinEvent) { return; // EMC - do not handle chat messages before they joined } else { this.player.resetLastActionTime(); String s = message.getRaw();