From 87049ddf530ff9da72989620fab1a51c4f4e045a Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Tue, 15 Aug 2023 19:16:44 +0200 Subject: Fixed arachne minis falsely show in damage indicator. --- .../java/at/hannibal2/skyhanni/features/damageindicator/MobFinder.kt | 5 +++++ src/main/java/at/hannibal2/skyhanni/features/mobs/MobHighlight.kt | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/MobFinder.kt b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/MobFinder.kt index c981beac3..31a3a3c44 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/MobFinder.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/MobFinder.kt @@ -374,11 +374,16 @@ class MobFinder { if (entity.hasNameTagWith(1, "[§7Lv300§8] §cArachne") || entity.hasNameTagWith(1, "[§7Lv300§8] §lArachne") ) { + val maxHealth = entity.baseMaxHealth + // Ignore the minis + if (maxHealth == 12 || maxHealth == 4000) return null return EntityResult(bossType = BossType.ARACHNE_SMALL) } if (entity.hasNameTagWith(1, "[§7Lv500§8] §cArachne") || entity.hasNameTagWith(1, "[§7Lv500§8] §lArachne") ) { + val maxHealth = entity.baseMaxHealth + if (maxHealth == 12 || maxHealth == 4000) return null return EntityResult(bossType = BossType.ARACHNE_BIG) } diff --git a/src/main/java/at/hannibal2/skyhanni/features/mobs/MobHighlight.kt b/src/main/java/at/hannibal2/skyhanni/features/mobs/MobHighlight.kt index accf478bd..fcfedc5ca 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/mobs/MobHighlight.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/mobs/MobHighlight.kt @@ -86,7 +86,7 @@ class MobHighlight { ) return val maxHealth = entity.baseMaxHealth - if (maxHealth == 12 || maxHealth == 4000 || maxHealth == 20000) { + if (maxHealth == 12 || maxHealth == 4000) { markArachneMinis(entity) } else { markArachne(entity) -- cgit