aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/combat/mobs/MobHighlight.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/MobHighlight.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/MobHighlight.kt
index c3df8091d..410f6ea98 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/MobHighlight.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/mobs/MobHighlight.kt
@@ -9,6 +9,7 @@ import at.hannibal2.skyhanni.utils.EntityUtils.hasNameTagWith
import at.hannibal2.skyhanni.utils.LorenzColor
import at.hannibal2.skyhanni.utils.LorenzUtils
import at.hannibal2.skyhanni.utils.LorenzUtils.baseMaxHealth
+import at.hannibal2.skyhanni.utils.LorenzUtils.ignoreDerpy
import net.minecraft.client.entity.EntityOtherPlayerMP
import net.minecraft.entity.EntityLivingBase
import net.minecraft.entity.monster.EntityCaveSpider
@@ -60,7 +61,8 @@ class MobHighlight {
}
}
- if (config.specialZealotHighlighter && maxHealth == 2_000 && entity is EntityEnderman) {
+ // Special Zealots are not impacted by derpy
+ if (config.specialZealotHighlighter && maxHealth.ignoreDerpy() == 2_000 && entity is EntityEnderman) {
RenderLivingEntityHelper.setEntityColor(entity, LorenzColor.DARK_RED.toColor().withAlpha(50))
{ config.specialZealotHighlighter }
RenderLivingEntityHelper.setNoHurtTime(entity) { config.specialZealotHighlighter }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
index a216b88e1..3c9432638 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
@@ -602,6 +602,8 @@ object LorenzUtils {
fun Int.derpy() = if (isDerpy) this / 2 else this
+ fun Int.ignoreDerpy() = if (isDerpy) this * 2 else this
+
fun runDelayed(duration: Duration, runnable: () -> Unit) {
Timer().schedule(object : TimerTask() {
override fun run() {