diff options
| author | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-12-24 14:04:27 +0100 |
|---|---|---|
| committer | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-12-24 14:04:27 +0100 |
| commit | 5802191d2bf2b2245c67c69b716b134131ddd7b1 (patch) | |
| tree | 5cd1cdf0ff5af881bfa3f4924ce7ae73c3f36923 /src/main | |
| parent | c4beb4ff064d5e73f253db3f8701777ace557ac2 (diff) | |
| download | skyhanni-5802191d2bf2b2245c67c69b716b134131ddd7b1.tar.gz skyhanni-5802191d2bf2b2245c67c69b716b134131ddd7b1.tar.bz2 skyhanni-5802191d2bf2b2245c67c69b716b134131ddd7b1.zip | |
code cleanup
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/combat/mobs/AreaMiniBossFeatures.kt | 4 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreatureFeatures.kt | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/AreaMiniBossFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/AreaMiniBossFeatures.kt index 25851c0f8..f41f8ea0d 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/AreaMiniBossFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/AreaMiniBossFeatures.kt @@ -11,7 +11,7 @@ import at.hannibal2.skyhanni.utils.EntityUtils.hasMaxHealth import at.hannibal2.skyhanni.utils.LocationUtils import at.hannibal2.skyhanni.utils.LorenzColor import at.hannibal2.skyhanni.utils.LorenzUtils -import at.hannibal2.skyhanni.utils.LorenzUtils.derpy +import at.hannibal2.skyhanni.utils.LorenzUtils.ignoreDerpy import at.hannibal2.skyhanni.utils.LorenzVec import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText import at.hannibal2.skyhanni.utils.TimeUtils @@ -34,7 +34,7 @@ class AreaMiniBossFeatures { val entity = event.entity // TODO remove workaround by change derpy logic either in hasMaxHealth or in EntityMaxHealthUpdateEvent - val maxHealth = (event.maxHealth.derpy() * if (LorenzUtils.isDerpy) 4.0 else 1.0).toInt() + val maxHealth = event.maxHealth.ignoreDerpy() for (bossType in AreaMiniBossType.entries) { if (!bossType.clazz.isInstance(entity)) continue if (!entity.hasMaxHealth(bossType.health, false, maxHealth)) continue diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreatureFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreatureFeatures.kt index 53fecc189..c02643a65 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreatureFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreatureFeatures.kt @@ -42,6 +42,7 @@ class SeaCreatureFeatures { val entity = event.entity as? EntityLivingBase ?: return if (DamageIndicatorManager.isBoss(entity)) return + // TODO remove workaround by change derpy logic either in hasMaxHealth or in EntityMaxHealthUpdateEvent val maxHealth = event.maxHealth.ignoreDerpy() for (creatureType in RareSeaCreatureType.entries) { if (!creatureType.health.any { entity.hasMaxHealth(it, false, maxHealth) }) continue |