From b58122072df17e30354685521168e84f84e9dd68 Mon Sep 17 00:00:00 2001
From: NotAlexNoyle <alexnoyle@icloud.com>
Date: Mon, 4 May 2026 15:42:40 -0400
Subject: [PATCH] Fix Unions-OG null prefixes

---
 src/main/kotlin/nl/skbotnl/chatog/Events.kt                 | 2 +-
 .../skbotnl/chatog/translation/command/TranslateMessage.kt  | 6 +++---
 src/main/kotlin/nl/skbotnl/chatog/util/ChatUtil.kt          | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/kotlin/nl/skbotnl/chatog/Events.kt b/src/main/kotlin/nl/skbotnl/chatog/Events.kt
index 9136ab4..7b8b4a1 100755
--- a/src/main/kotlin/nl/skbotnl/chatog/Events.kt
+++ b/src/main/kotlin/nl/skbotnl/chatog/Events.kt
@@ -192,7 +192,7 @@ internal class Events : Listener {
         var nameString = "${PlayerAffix.getPrefix(event.player.uniqueId)}${event.player.name}"
 
         val unionColorTag = PlaceholderAPI.setPlaceholders(event.player, "%simpleclans_union_color_tag%")
-        if (unionColorTag.isNotEmpty() && unionColorTag != "None") {
+        if (unionColorTag.isNotEmpty() && unionColorTag != "&8None") {
             nameString = "&8[$unionColorTag&8] $nameString"
         }
         val nameComponent = UtilitiesOG.trueogColorize(legacyToMm(nameString))
diff --git a/src/main/kotlin/nl/skbotnl/chatog/translation/command/TranslateMessage.kt b/src/main/kotlin/nl/skbotnl/chatog/translation/command/TranslateMessage.kt
index a0cfe3f..716e350 100755
--- a/src/main/kotlin/nl/skbotnl/chatog/translation/command/TranslateMessage.kt
+++ b/src/main/kotlin/nl/skbotnl/chatog/translation/command/TranslateMessage.kt
@@ -142,9 +142,9 @@ internal class TranslateMessage : CommandExecutor {
                     "${PlayerAffix.getPrefix(sentChatMessage.player.uniqueId)}${sentChatMessage.player.name} ${
                         PlayerAffix.getSuffix(sentChatMessage.player.uniqueId)
                     }"
-                val clanColorTag = PlaceholderAPI.setPlaceholders(sentMessage.player, "%simpleclans_clan_color_tag%")
-                if (clanColorTag.isNotEmpty() && clanColorTag != "None") {
-                    playerString = "&8[$clanColorTag&8] $playerString"
+                val unionColorTag = PlaceholderAPI.setPlaceholders(sentMessage.player, "%simpleclans_clan_color_tag%")
+                if (unionColorTag.isNotEmpty() && unionColorTag != "&8None") {
+                    playerString = "&8[$unionColorTag&8] $playerString"
                 }
                 val playerComponent =
                     UtilitiesOG.trueogColorize(
diff --git a/src/main/kotlin/nl/skbotnl/chatog/util/ChatUtil.kt b/src/main/kotlin/nl/skbotnl/chatog/util/ChatUtil.kt
index 401eac1..4029c3e 100644
--- a/src/main/kotlin/nl/skbotnl/chatog/util/ChatUtil.kt
+++ b/src/main/kotlin/nl/skbotnl/chatog/util/ChatUtil.kt
@@ -29,9 +29,9 @@ internal object ChatUtil {
     fun getPlayerPartString(player: Player): String {
         var playerPart = "${PlayerAffix.getPrefix(player.uniqueId)}${player.name}"
 
-        val clanColorTag = PlaceholderAPI.setPlaceholders(player, "%simpleclans_clan_color_tag%")
-        if (clanColorTag.isNotEmpty() && clanColorTag != "None") {
-            playerPart = "&8[$clanColorTag&8] $playerPart"
+        val unionColorTag = PlaceholderAPI.setPlaceholders(player, "%simpleclans_clan_color_tag%")
+        if (unionColorTag.isNotEmpty() && unionColorTag != "&8None") {
+            playerPart = "&8[$unionColorTag&8] $playerPart"
         }
 
         return playerPart