diff options
author | J10a1n15 <45315647+j10a1n15@users.noreply.github.com> | 2024-04-09 20:49:52 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-09 20:49:52 +0200 |
commit | 58f1fec99d532c517aaf309772874ad5629ea39b (patch) | |
tree | e4c52e21f7bbbc6920253584680dae33770693d1 /src/main/java/at/hannibal2/skyhanni/features/combat | |
parent | 259acef3cffac049f20c528cb21740e0ec394f3e (diff) | |
download | skyhanni-58f1fec99d532c517aaf309772874ad5629ea39b.tar.gz skyhanni-58f1fec99d532c517aaf309772874ad5629ea39b.tar.bz2 skyhanni-58f1fec99d532c517aaf309772874ad5629ea39b.zip |
Backend: Switch from LorenzUtils.inDungeons to DungeonAPI.inDungeon() (#1378)
Co-authored-by: Cal <cwolfson58@gmail.com>
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/combat')
-rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt | 2 | ||||
-rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/MobFinder.kt | 7 |
2 files changed, 4 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 563917cd3..57096d6de 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 @@ -333,7 +333,7 @@ class DamageIndicatorManager { private fun checkEntity(entity: EntityLivingBase): Pair<UUID, EntityData>? { try { val entityData = grabData(entity) ?: return null - if (LorenzUtils.inDungeons) { + if (DungeonAPI.inDungeon()) { checkFinalBoss(entityData.finalDungeonBoss, entity.entityId) } 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 6c284d596..5d0be14de 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 @@ -11,7 +11,6 @@ import at.hannibal2.skyhanni.utils.EntityUtils.hasBossHealth import at.hannibal2.skyhanni.utils.EntityUtils.hasMaxHealth import at.hannibal2.skyhanni.utils.EntityUtils.hasNameTagWith import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer -import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.LorenzUtils.baseMaxHealth import at.hannibal2.skyhanni.utils.LorenzUtils.derpy import at.hannibal2.skyhanni.utils.LorenzUtils.ignoreDerpy @@ -83,7 +82,7 @@ class MobFinder { private var floor6SadanSpawnTime = 0L internal fun tryAdd(entity: EntityLivingBase) = when { - LorenzUtils.inDungeons -> tryAddDungeon(entity) + DungeonAPI.inDungeon() -> tryAddDungeon(entity) RiftAPI.inRift() -> tryAddRift(entity) GardenAPI.inGarden() -> tryAddGarden(entity) else -> { @@ -512,7 +511,7 @@ class MobFinder { } fun handleChat(message: String) { - if (!LorenzUtils.inDungeons) return + if (!DungeonAPI.inDungeon()) return when (message) { // F1 "§c[BOSS] Bonzo§r§f: Gratz for making it this far, but I'm basically unbeatable." -> { @@ -609,7 +608,7 @@ class MobFinder { } fun handleNewEntity(entity: Entity) { - if (LorenzUtils.inDungeons && floor3ProfessorGuardian && entity is EntityGuardian && floor3ProfessorGuardianEntity == null) { + if (DungeonAPI.inDungeon() && floor3ProfessorGuardian && entity is EntityGuardian && floor3ProfessorGuardianEntity == null) { floor3ProfessorGuardianEntity = entity floor3ProfessorGuardianPrepare = false } |