diff options
| author | Lorenz <lo.scherf@gmail.com> | 2022-09-11 23:02:45 +0200 |
|---|---|---|
| committer | Lorenz <lo.scherf@gmail.com> | 2022-09-11 23:02:45 +0200 |
| commit | fc68fe7115eb940a4ecbf102ebe993072982b110 (patch) | |
| tree | fbfd0019e856f802bfd294788200bc366b6322a8 /src/main/java/at/hannibal2/skyhanni/features/damageindicator | |
| parent | cc51a4d20ee09143c195e2da0c8c7fd55d9fed84 (diff) | |
| download | SkyHanni-fc68fe7115eb940a4ecbf102ebe993072982b110.tar.gz SkyHanni-fc68fe7115eb940a4ecbf102ebe993072982b110.tar.bz2 SkyHanni-fc68fe7115eb940a4ecbf102ebe993072982b110.zip | |
code cleanup
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/damageindicator')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt | 18 |
1 files changed, 6 insertions, 12 deletions
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 e9ccc363b..1d8c0771c 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt @@ -190,8 +190,7 @@ class DamageIndicatorManager { if (now > damageCounter.firstTick + 1_000) { damageCounter.oldDamages.add( - 0, - OldDamage(now, damageCounter.currentDamage, damageCounter.currentHealing) + 0, OldDamage(now, damageCounter.currentDamage, damageCounter.currentHealing) ) damageCounter.firstTick = 0L damageCounter.currentDamage = 0 @@ -281,11 +280,7 @@ class DamageIndicatorManager { return checkThorn(health) } - if (entityData.bossType == BossType.SLAYER_ENDERMAN_1 || - entityData.bossType == BossType.SLAYER_ENDERMAN_2 || - entityData.bossType == BossType.SLAYER_ENDERMAN_3 || - entityData.bossType == BossType.SLAYER_ENDERMAN_4 - ) { + if (entityData.bossType == BossType.SLAYER_ENDERMAN_1 || entityData.bossType == BossType.SLAYER_ENDERMAN_2 || entityData.bossType == BossType.SLAYER_ENDERMAN_3 || entityData.bossType == BossType.SLAYER_ENDERMAN_4) { if (entity is EntityEnderman) { return checkEnderSlayer(entity, entityData, health.toInt(), maxHealth.toInt()) } @@ -310,9 +305,7 @@ class DamageIndicatorManager { } } - if (entityData.bossType == BossType.SLAYER_WOLF_3 || - entityData.bossType == BossType.SLAYER_WOLF_4 - ) { + if (entityData.bossType == BossType.SLAYER_WOLF_3 || entityData.bossType == BossType.SLAYER_WOLF_4) { if (entity is EntityWolf) { if (entity.hasNameTagWith(2, "§bCalling the pups!")) { return "Pups!" @@ -431,8 +424,9 @@ class DamageIndicatorManager { else -> return null } - val result = - NumberUtil.percentageColor(calcHealth.toLong(), calcMaxHealth.toLong()).getChatColor() + NumberUtil.format(calcHealth) + val result = NumberUtil.percentageColor( + calcHealth.toLong(), calcMaxHealth.toLong() + ).getChatColor() + NumberUtil.format(calcHealth) //Hit phase |