diff options
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/combat')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt index 4d7ed5593..4f202fc62 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt @@ -158,7 +158,7 @@ class DamageIndicatorManager { // data.bossType == BossType.END_ENDSTONE_PROTECTOR && Minecraft.getMinecraft().thePlayer.isSneaking if (!data.ignoreBlocks && !player.canEntityBeSeen(data.entity)) continue - if (data.bossType.bossTypeToggle !in config.bossesToShow) continue + if (!data.isConfigEnabled()) continue val entity = data.entity @@ -254,6 +254,8 @@ class DamageIndicatorManager { GlStateManager.enableCull() } + private fun EntityData.isConfigEnabled() = bossType.bossTypeToggle in config.bossesToShow + private fun noDeathDisplay(bossType: BossType): Boolean { return when (bossType) { BossType.SLAYER_BLAZE_TYPHOEUS_1, @@ -835,7 +837,7 @@ class DamageIndicatorManager { } } } else { - if (entityData != null && isEnabled() && config.hideVanillaNametag) { + if (entityData != null && isEnabled() && config.hideVanillaNametag && entityData.isConfigEnabled()) { val name = entity.name if (name.contains("Plaesmaflux")) return if (name.contains("Overflux")) return |