2 files changed, 19 insertions, 5 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
index 4a67184f2..df636e0ae 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
@@ -234,13 +234,17 @@ object LorenzUtils {
         return this
     }
 
-    private var lastCommandSent = 0L
+    private var lastMessageSent = 0L
 
     fun sendCommandToServer(command: String) {
-        if (System.currentTimeMillis() > lastCommandSent + 2_000) {
-            lastCommandSent = System.currentTimeMillis()
+        sendMessageToServer("/$command")
+    }
+
+    fun sendMessageToServer(message: String) {
+        if (System.currentTimeMillis() > lastMessageSent + 2_000) {
+            lastMessageSent = System.currentTimeMillis()
             val thePlayer = Minecraft.getMinecraft().thePlayer
-            thePlayer.sendChatMessage("/$command")
+            thePlayer.sendChatMessage(message)
         }
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt
index 06187da3c..b13dbc59a 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt
@@ -57,9 +57,19 @@ object StringUtils {
 
     fun String.matchRegex(@Language("RegExp") regex: String): Boolean = regex.toRegex().matches(this)
 
-    private fun String.removeAtBeginning(text: String): String = if (this.startsWith(text)) substring(text.length) else this
+    private fun String.removeAtBeginning(text: String): String =
+        if (this.startsWith(text)) substring(text.length) else this
 
     // TODO find better name for this method
     inline fun <T> Pattern.matchMatcher(text: String, consumer: Matcher.() -> T) =
         matcher(text).let { if (it.matches()) consumer(it) else null }
+
+    fun String.cleanPlayerName(): String {
+        val split = split(" ")
+        return if (split.size > 1) {
+            split[1].removeColor()
+        } else {
+            split[0].removeColor()
+        }
+    }
 }