From f9dad248e60cb7c34caf2cf82ba0ad0a59e07f5a Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Tue, 27 Dec 2022 18:49:28 +0100
Subject: Add two more chat filter categories: Powder Mining and Winter Gifts

---
 .../at/hannibal2/skyhanni/features/dungeon/DungeonBossMessages.kt   | 3 ++-
 .../java/at/hannibal2/skyhanni/features/dungeon/DungeonCopilot.kt   | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/main/java/at/hannibal2/skyhanni/features/dungeon')

diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonBossMessages.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonBossMessages.kt
index 1ffd0fc70..e8636ed7c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonBossMessages.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonBossMessages.kt
@@ -24,7 +24,8 @@ class DungeonBossMessages {
         when {
             message.matchRegex("§([cd4])\\[BOSS] (.*)") -> {
                 when {
-                    message.contains(" The Watcher§r§f: ") -> return true
+                    message.contains(" The Watcher§r§f: ") ->
+                        message != "§c[BOSS] The Watcher§r§f: You have proven yourself. You may pass."
                     message.contains(" Bonzo§r§f: ") -> return true
                     message.contains(" Scarf§r§f:") -> return true
                     message.contains("Professor§r§f") -> return true
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCopilot.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCopilot.kt
index b4620ece4..ef19d53ec 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCopilot.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCopilot.kt
@@ -18,7 +18,7 @@ class DungeonCopilot {
 
     @SubscribeEvent
     fun onChatMessage(event: LorenzChatEvent) {
-        if (!LorenzUtils.inDungeons) return
+        if (!isEnabled()) return
 
         val message = event.message
 
@@ -71,6 +71,7 @@ class DungeonCopilot {
         }
 
         if (message == "§c[BOSS] The Watcher§r§f: You have proven yourself. You may pass.") {
+            event.blockedReason = "dungeon copilot"
             changeNextStep("Enter Boss Room")
         }
     }
@@ -127,8 +128,7 @@ class DungeonCopilot {
     @SubscribeEvent
     fun renderOverlay(event: RenderGameOverlayEvent.Post) {
         if (event.type != RenderGameOverlayEvent.ElementType.ALL) return
-        if (!LorenzUtils.inDungeons) return
-        if (!SkyHanniMod.feature.dungeon.copilotEnabled) return
+        if (!isEnabled()) return
 
         SkyHanniMod.feature.dungeon.copilotPos.renderString(nextStep)
     }
-- 
cgit