From 2fcc0c76ef7b48526aa319737a6a0b4cd59608f0 Mon Sep 17 00:00:00 2001
From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
Date: Thu, 19 Oct 2023 10:06:31 +0800
Subject: [PATCH] Fix: Confirm discarding blessings

---
 tasks/map/control/control.py     | 3 ++-
 tasks/rogue/bleesing/blessing.py | 2 ++
 tasks/rogue/bleesing/curio.py    | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/tasks/map/control/control.py b/tasks/map/control/control.py
index 367b5c36e..10cb74bc8 100644
--- a/tasks/map/control/control.py
+++ b/tasks/map/control/control.py
@@ -211,7 +211,8 @@ class MapControl(Combat, AimDetectorMixin):
                         return result
             if waypoint.interact_radius > 0:
                 if diff < waypoint.interact_radius:
-                    self.handle_combat_interact(interval=1)
+                    if self.handle_combat_interact(interval=1):
+                        contact.up()
 
             # Arrive
             if near := self.minimap.is_position_near(waypoint.position, threshold=waypoint.get_threshold(end_opt)):
diff --git a/tasks/rogue/bleesing/blessing.py b/tasks/rogue/bleesing/blessing.py
index 73eb11009..3285429ab 100644
--- a/tasks/rogue/bleesing/blessing.py
+++ b/tasks/rogue/bleesing/blessing.py
@@ -204,6 +204,8 @@ class RogueBlessingSelector(RogueSelector):
             if is_select_blessing_complete():
                 logger.info("Select blessing complete")
                 break
+            if self.main.handle_popup_confirm():
+                continue
             if interval.reached():
                 self.main.device.click(BLESSING_CONFIRM)
                 interval.reset()
diff --git a/tasks/rogue/bleesing/curio.py b/tasks/rogue/bleesing/curio.py
index 6da4868a8..2a68466f2 100644
--- a/tasks/rogue/bleesing/curio.py
+++ b/tasks/rogue/bleesing/curio.py
@@ -120,6 +120,8 @@ class RogueCurioSelector(RogueSelector):
 
             if is_select_curio_complete():
                 break
+            if self.main.handle_popup_confirm():
+                continue
             if interval.reached():
                 self.main.device.click(BLESSING_CONFIRM)
                 interval.reset()