From 9a9f946665aed7e60e7e58aefc4129fddba57659 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sun, 18 Sep 2022 17:32:59 +0200
Subject: overload damage gets detected as damage splash correctly

---
 src/main/java/at/hannibal2/skyhanni/features/MarkedPlayerManager.kt     | 2 +-
 .../at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatFilter.kt  | 2 +-
 .../skyhanni/features/damageindicator/DamageIndicatorManager.kt         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/main/java/at/hannibal2/skyhanni/features/MarkedPlayerManager.kt b/src/main/java/at/hannibal2/skyhanni/features/MarkedPlayerManager.kt
index 48570898d..e8dba9735 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/MarkedPlayerManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/MarkedPlayerManager.kt
@@ -121,7 +121,7 @@ class MarkedPlayerManager {
         }
     }
 
-    @SubscribeEvent(receiveCanceled = true)
+    @SubscribeEvent
     fun onMarkedChatMessage(event: PlayerSendChatEvent) {
         if (!LorenzUtils.inSkyblock) return
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatFilter.kt
index fe0cc52b7..ef1191844 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatFilter.kt
@@ -43,7 +43,7 @@ class PlayerChatFilter {
         }
     }
 
-    @SubscribeEvent(priority = EventPriority.HIGH, receiveCanceled = true)
+    @SubscribeEvent(priority = EventPriority.HIGH)
     fun onEvent(event: PlayerSendChatEvent) {
         if (!SkyHanniMod.feature.chat.chatFilter) return
         if (event.channel != PlayerMessageChannel.ALL) return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt
index c6fb65c26..328ab2bbe 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt
@@ -40,7 +40,7 @@ class DamageIndicatorManager {
 
     companion object {
         private var data = mutableMapOf<UUID, EntityData>()
-        private val damagePattern: Pattern = Pattern.compile("✧?(\\d+[⚔+✧❤♞☄✷ﬗ]*)")
+        private val damagePattern: Pattern = Pattern.compile("[✧✯]?(\\d+[⚔+✧❤♞☄✷ﬗ✯]*)")
 
         fun isBoss(entity: EntityLivingBase): Boolean {
             return data.values.any { it.entity == entity }
-- 
cgit