Feature: Color Choice for Mark Name (#664)

Option to change the color of Marked Players in chat. #664

2 files changed, 6 insertions, 2 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt
index 8448627f5..43db53499 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt
@@ -41,7 +41,9 @@ class PlayerDeathMessages {
                 !LorenzUtils.inDungeons && !LorenzUtils.inKuudraFight && MarkedPlayerManager.isMarkedPlayer(name)
             ) {
                 val reason = group("reason").removeColor()
-                LorenzUtils.chat(" §c☠ §e$name §7$reason", false)
+
+                val color = SkyHanniMod.feature.markedPlayers.chatColor.get().getChatColor()
+                LorenzUtils.chat(" §c☠ $color$name §7$reason", false)
                 event.blockedReason = "marked_player_death"
                 return
             }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatModifier.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatModifier.kt
index 60ed955a3..7b52f6c60 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatModifier.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatModifier.kt
@@ -79,11 +79,13 @@ class PlayerChatModifier {
         }
 
         if (SkyHanniMod.feature.markedPlayers.highlightInChat) {
+            val color = SkyHanniMod.feature.markedPlayers.chatColor.get().getChatColor()
             for (markedPlayer in MarkedPlayerManager.playerNamesToMark) {
-                string = string.replace(markedPlayer, "§e$markedPlayer§r")
+                string = string.replace(markedPlayer, "$color$markedPlayer§r")
             }
         }
 
+
         return string
     }