From d5de603d76af0afd7cf8b0c9afc2e215ce8577ba Mon Sep 17 00:00:00 2001
From: KingRainbow44 <kobedo11@gmail.com>
Date: Sat, 20 May 2023 03:03:13 -0400
Subject: [PATCH] Fix changing target UID when talking to the server

---
 .../java/emu/grasscutter/game/chat/ChatSystem.java  | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/java/emu/grasscutter/game/chat/ChatSystem.java b/src/main/java/emu/grasscutter/game/chat/ChatSystem.java
index d95138acb..fc80b5d05 100644
--- a/src/main/java/emu/grasscutter/game/chat/ChatSystem.java
+++ b/src/main/java/emu/grasscutter/game/chat/ChatSystem.java
@@ -145,8 +145,11 @@ public class ChatSystem implements ChatSystemHandler {
         event.call(); if (event.isCanceled()) return;
 
         // Fetch the new target.
-        targetUid = event.getTargetUid();
-        if (targetUid == -1) return;
+        if (targetUid != GameConstants.SERVER_CONSOLE_UID) {
+            targetUid = event.getTargetUid();
+            if (targetUid == -1) return;
+        }
+
         // Fetch the new message.
         message = event.getMessage();
         if (message == null || message.length() == 0) return;
@@ -179,8 +182,10 @@ public class ChatSystem implements ChatSystemHandler {
         event.call(); if (event.isCanceled()) return;
 
         // Fetch the new target.
-        targetUid = event.getTargetUid();
-        if (targetUid == -1) return;
+        if (targetUid != GameConstants.SERVER_CONSOLE_UID) {
+            targetUid = event.getTargetUid();
+            if (targetUid == -1) return;
+        }
         // Fetch the new emote.
         emote = event.getMessageAsInt();
         if (emote == -1) return;