From 962aa7e78aeececb91ef327de5b78d56c5633b62 Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal002@users.noreply.github.com> Date: Sun, 18 Aug 2024 09:26:14 +0200 Subject: Fix: Wrong Slayer alert Bladesoul (#2367) Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com> --- .../at/hannibal2/skyhanni/features/slayer/SlayerQuestWarning.kt | 9 +++++++-- 1 file 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 } -- cgit