From 14588f55c41c7927c40de0c2c24bbefaef24abdc Mon Sep 17 00:00:00 2001
From: Bixilon <bixilon@bixilon.de>
Date: Wed, 14 Dec 2022 17:59:58 +0100
Subject: [PATCH] chat message: set sender to null if uuid is 0

---
 .../minosoft/protocol/packets/s2c/play/chat/ChatMessageS2CP.kt | 3 ++-
 src/main/java/de/bixilon/minosoft/util/KUtil.kt                | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chat/ChatMessageS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chat/ChatMessageS2CP.kt
index 3f26fe437..d52648cc3 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chat/ChatMessageS2CP.kt
+++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/chat/ChatMessageS2CP.kt
@@ -26,6 +26,7 @@ import de.bixilon.minosoft.protocol.packets.s2c.PlayS2CPacket
 import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer
 import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition
 import de.bixilon.minosoft.protocol.protocol.ProtocolVersions
+import de.bixilon.minosoft.util.KUtil
 import de.bixilon.minosoft.util.logging.Log
 import de.bixilon.minosoft.util.logging.LogLevels
 import de.bixilon.minosoft.util.logging.LogMessageType
@@ -58,7 +59,7 @@ class ChatMessageS2CP(buffer: PlayInByteBuffer) : PlayS2CPacket {
     override fun handle(connection: PlayConnection) {
         val type = if (overlay) connection.registries.messageTypeRegistry[DefaultMessageTypes.GAME]!! else type
         val sender = sender
-        val message: ChatMessage = if (sender == null) {
+        val message: ChatMessage = if (sender == null || sender == KUtil.NULL_UUID) {
             SimpleChatMessage(text, type)
         } else {
             PlayerChatMessage(text, type, connection.getMessageSender(sender))
diff --git a/src/main/java/de/bixilon/minosoft/util/KUtil.kt b/src/main/java/de/bixilon/minosoft/util/KUtil.kt
index 426f4b0c9..5dd37da77 100644
--- a/src/main/java/de/bixilon/minosoft/util/KUtil.kt
+++ b/src/main/java/de/bixilon/minosoft/util/KUtil.kt
@@ -57,6 +57,7 @@ import javax.net.ssl.SSLContext
 
 
 object KUtil {
+    val NULL_UUID = UUID(0L, 0L)
     val RANDOM = Random()
     val EMPTY_BYTE_ARRAY = ByteArray(0)