summaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/features/chat
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal002@users.noreply.github.com>2024-03-28 10:07:28 +0100
committerGitHub <noreply@github.com>2024-03-28 10:07:28 +0100
commit07a41cc61d1aa4373e925d240e067d720580b486 (patch)
tree185d8a6c4ccfe6e2811511f35c67d39aec129202 /src/main/java/at/hannibal2/skyhanni/features/chat
parent0beb9e3b3132bcc14c99759628732625ee97d6a8 (diff)
downloadskyhanni-07a41cc61d1aa4373e925d240e067d720580b486.tar.gz
skyhanni-07a41cc61d1aa4373e925d240e067d720580b486.tar.bz2
skyhanni-07a41cc61d1aa4373e925d240e067d720580b486.zip
Improvement: Config Move (#1300)
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/chat')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatModifier.kt4
2 files changed, 4 insertions, 4 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 5516cbe77..05b4a0cd7 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt
@@ -41,12 +41,12 @@ class PlayerDeathMessages {
val message = event.message
deathMessagePattern.matchMatcher(message) {
val name = group("name")
- if (SkyHanniMod.feature.markedPlayers.highlightInChat &&
+ if (MarkedPlayerManager.config.highlightInChat &&
!LorenzUtils.inDungeons && !LorenzUtils.inKuudraFight && MarkedPlayerManager.isMarkedPlayer(name)
) {
val reason = group("reason").removeColor()
- val color = SkyHanniMod.feature.markedPlayers.chatColor.getChatColor()
+ val color = MarkedPlayerManager.config.chatColor.getChatColor()
ChatUtils.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 a9c302021..a8b7cdada 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
@@ -78,8 +78,8 @@ class PlayerChatModifier {
string = string.replace("§r§f: ", "§r§7: ")
}
- if (SkyHanniMod.feature.markedPlayers.highlightInChat) {
- val color = SkyHanniMod.feature.markedPlayers.chatColor.getChatColor()
+ if (MarkedPlayerManager.config.highlightInChat) {
+ val color = MarkedPlayerManager.config.chatColor.getChatColor()
for (markedPlayer in MarkedPlayerManager.playerNamesToMark) {
string = string.replace(markedPlayer, "$color$markedPlayer§r")
}