From 953b772bfa4740ffb8418236517f3f4f1183817f Mon Sep 17 00:00:00 2001
From: SByte <stormybytes@gmail.com>
Date: Fri, 5 Jan 2024 17:30:23 +0700
Subject: [PATCH] Fix gamejointext not firing

---
 core/src/mindustry/client/ClientLogic.kt | 27 ++++++++++++------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/core/src/mindustry/client/ClientLogic.kt b/core/src/mindustry/client/ClientLogic.kt
index 4b68aa0268..d8a3615d93 100644
--- a/core/src/mindustry/client/ClientLogic.kt
+++ b/core/src/mindustry/client/ClientLogic.kt
@@ -2,7 +2,7 @@ package mindustry.client
 
 import arc.*
 import arc.Core.*
-import arc.graphics.g2d.SortedSpriteBatch
+import arc.graphics.g2d.*
 import arc.math.geom.*
 import arc.struct.*
 import arc.util.*
@@ -55,20 +55,19 @@ class ClientLogic {
                             if (arg is UnitType) ui.unitPicker.pickUnit(arg)
                             switchTo = null
                         }
-                        // Game join text after hh
-                        if (settings.getString("gamejointext")?.isNotBlank() == true) {
-                            val input = settings.getString("gamejointext").split("(?<!\\\\);".toRegex()) // Hacky way to allow escaping the split
-                            val out = StringBuilder()
-                            Log.debug("The split input: $input")
-                            input.forEach { // Try running each bit as a command, this code is terribly inefficient but should get the job done so I don't care
-                                val clean = if (!it.endsWith("\\\\;")) it.removeSuffix(";") else it // FINISHME: Remove the \ before the ; if needed
-                                Log.debug("Input part: '$it' ('$clean')")
-                                val res = ChatFragment.handleClientCommand(clean, false)
-                                if (res.type == CommandHandler.ResponseType.noCommand) out.append(clean) // If the command doesn't exist we pass the text through to the output, otherwise we don't pass it to the output. this is kind of hacky but i don't care.
-                            }
-                            Log.debug("Sent message: $out")
-                            Call.sendChatMessage(out.toString())
+                    }
+                    if (settings.getString("gamejointext")?.isNotBlank() == true) {
+                        val input = settings.getString("gamejointext").split("(?<!\\\\);".toRegex()) // Hacky way to allow escaping the split
+                        val out = StringBuilder()
+                        Log.debug("The split input: $input")
+                        input.forEach { // Try running each bit as a command, this code is terribly inefficient but should get the job done so I don't care
+                            val clean = if (!it.endsWith("\\\\;")) it.removeSuffix(";") else it // FINISHME: Remove the \ before the ; if needed
+                            Log.debug("Input part: '$it' ('$clean')")
+                            val res = ChatFragment.handleClientCommand(clean, false)
+                            if (res.type == CommandHandler.ResponseType.noCommand) out.append(clean) // If the command doesn't exist we pass the text through to the output, otherwise we don't pass it to the output. this is kind of hacky but i don't care.
                         }
+                        Log.debug("Sent message: $out")
+                        Call.sendChatMessage(out.toString())
                     }
                 }
             }, .1F)