diff options
author | hannibal2 <24389977+hannibal002@users.noreply.github.com> | 2024-08-18 09:26:14 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-08-18 09:26:14 +0200 |
commit | 962aa7e78aeececb91ef327de5b78d56c5633b62 (patch) | |
tree | ab114c80703b73de66b14f1a5730962ddf36e6a8 /src | |
parent | 79be3ba0ae38ee390a9a1c2c4968cbe1c99ff715 (diff) | |
download | skyhanni-962aa7e78aeececb91ef327de5b78d56c5633b62.tar.gz skyhanni-962aa7e78aeececb91ef327de5b78d56c5633b62.tar.bz2 skyhanni-962aa7e78aeececb91ef327de5b78d56c5633b62.zip |
Fix: Wrong Slayer alert Bladesoul (#2367)
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerQuestWarning.kt | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerQuestWarning.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerQuestWarning.kt index 52afc0256..be7e16482 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerQuestWarning.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerQuestWarning.kt @@ -125,6 +125,11 @@ object SlayerQuestWarning { private fun isSlayerMob(entity: EntityLivingBase): Boolean { val slayerType = SlayerAPI.getSlayerTypeForCurrentArea() ?: return false + // workaround for rift mob that is unrelated to slayer + if (entity.name == "Oubliette Guard") return false + // workaround for Bladesoul in Crimson Isle + if (LorenzUtils.skyBlockArea == "Stronghold" && entity.name == "Skeleton") return false + val activeSlayer = SlayerAPI.activeSlayer if (activeSlayer != null) { @@ -138,8 +143,8 @@ object SlayerQuestWarning { ) } } - // workaround for rift mob that is unrelated to slayer - val isSlayer = slayerType.clazz.isInstance(entity) && entity.name != "Oubliette Guard" + + val isSlayer = slayerType.clazz.isInstance(entity) return (getSlayerData().lastSlayerType == slayerType) && isSlayer } |