diff options
| author | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-12-24 12:54:08 +0100 |
|---|---|---|
| committer | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-12-24 12:54:08 +0100 |
| commit | 6cc4452dfc42a845261ebbb6b4558020bf715ae7 (patch) | |
| tree | 4f08870c92c8cc9809bc4670273312bb444c9c65 /src/main/java | |
| parent | 6e38916afbc66c8cc623f6d61b96101e64319c73 (diff) | |
| download | skyhanni-6cc4452dfc42a845261ebbb6b4558020bf715ae7.tar.gz skyhanni-6cc4452dfc42a845261ebbb6b4558020bf715ae7.tar.bz2 skyhanni-6cc4452dfc42a845261ebbb6b4558020bf715ae7.zip | |
Fixed special zealot detection during Derpy.
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/combat/mobs/MobHighlight.kt | 4 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt | 2 |
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() { |