aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2024-01-24 17:21:01 +0100
committerhannibal2 <24389977+hannibal00212@users.noreply.github.com>2024-01-24 17:21:01 +0100
commit7bf7bd6326aa3c3f6627d5af67f0d734b327e4cd (patch)
treea2748d65d2eb3ba4f1814932aa6a2b77834a4cb2
parent71ae94993bd032413de4a75e712e063e3817d195 (diff)
downloadskyhanni-7bf7bd6326aa3c3f6627d5af67f0d734b327e4cd.tar.gz
skyhanni-7bf7bd6326aa3c3f6627d5af67f0d734b327e4cd.tar.bz2
skyhanni-7bf7bd6326aa3c3f6627d5af67f0d734b327e4cd.zip
Removed floor 3 guardian Damage Indicators on professor spawn.
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt7
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/MobFinder.kt6
2 files changed, 8 insertions, 5 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 679c6e97c..791fbf9e4 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
@@ -103,6 +103,12 @@ class DamageIndicatorManager {
.map { it.entity.getLorenzVec() }
.minOfOrNull { it.distance(location) } ?: Double.MAX_VALUE
}
+
+ fun removeDamageIndicator(type: BossType) {
+ data = data.editCopy {
+ values.removeIf {it.bossType == type}
+ }
+ }
}
@SubscribeEvent
@@ -897,7 +903,6 @@ class DamageIndicatorManager {
result
}
-
}
fun isEnabled() = LorenzUtils.inSkyBlock && config.enabled
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/MobFinder.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/MobFinder.kt
index e80b7aebb..dc52915cc 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/MobFinder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/MobFinder.kt
@@ -555,11 +555,9 @@ class MobFinder {
floor3GuardianShieldSpawnTime = System.currentTimeMillis() + 16_400
}
- "§c[BOSS] The Professor§r§f: Even if you took my barrier down, I can still fight." -> {
- floor3GuardianShield = false
- }
-
"§c[BOSS] The Professor§r§f: Oh? You found my Guardians' one weakness?" -> {
+ floor3GuardianShield = false
+ DamageIndicatorManager.removeDamageIndicator(BossType.DUNGEON_F3_GUARDIAN)
floor3Professor = true
floor3ProfessorSpawnTime = System.currentTimeMillis() + 10_300
}