aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/features/chat
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-11-22 12:53:20 +0100
committerhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-11-22 12:53:20 +0100
commit7137b0a07ba4c4efe65282a18ebc68f25ffa1796 (patch)
treeba69ae6e3ba3c758906dfad41b9035af258e923c /src/main/java/at/hannibal2/skyhanni/features/chat
parent4ff0a7de8109b748cdaa707e9714478140095171 (diff)
downloadskyhanni-7137b0a07ba4c4efe65282a18ebc68f25ffa1796.tar.gz
skyhanni-7137b0a07ba4c4efe65282a18ebc68f25ffa1796.tar.bz2
skyhanni-7137b0a07ba4c4efe65282a18ebc68f25ffa1796.zip
The cleanup after the cleanup
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/chat')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt13
1 files changed, 4 insertions, 9 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 b9088bac6..8448627f5 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt
@@ -37,9 +37,8 @@ class PlayerDeathMessages {
val message = event.message
deathMessagePattern.matchMatcher(message) {
val name = group("name")
- if (SkyHanniMod.feature.markedPlayers.highlightInChat && !LorenzUtils.inDungeons && !LorenzUtils.inKuudraFight && MarkedPlayerManager.isMarkedPlayer(
- name
- )
+ if (SkyHanniMod.feature.markedPlayers.highlightInChat &&
+ !LorenzUtils.inDungeons && !LorenzUtils.inKuudraFight && MarkedPlayerManager.isMarkedPlayer(name)
) {
val reason = group("reason").removeColor()
LorenzUtils.chat(" §c☠ §e$name §7$reason", false)
@@ -47,12 +46,8 @@ class PlayerDeathMessages {
return
}
-
- if (isHideFarDeathsEnabled() && System.currentTimeMillis() > lastTimePlayerSeen.getOrDefault(
- name,
- 0
- ) + 30_000
- ) {
+ val time = System.currentTimeMillis() > lastTimePlayerSeen.getOrDefault(name, 0) + 30_000
+ if (isHideFarDeathsEnabled() && time) {
event.blockedReason = "far_away_player_death"
}
}