diff options
| author | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2022-09-18 17:32:59 +0200 |
|---|---|---|
| committer | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2022-09-18 17:32:59 +0200 |
| commit | 157b1107f818e1b8a9c89ca15cb627cad537371d (patch) | |
| tree | f96696882fb63ca8aff60bb744f0c6b82f2ddf33 | |
| parent | 173b1ac9d87cc7485ccd746fcb04d7139b39f31f (diff) | |
| download | SkyHanni-157b1107f818e1b8a9c89ca15cb627cad537371d.tar.gz SkyHanni-157b1107f818e1b8a9c89ca15cb627cad537371d.tar.bz2 SkyHanni-157b1107f818e1b8a9c89ca15cb627cad537371d.zip | |
overload damage gets detected as damage splash correctly
3 files changed, 3 insertions, 3 deletions
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 } |