From 0f88a2a292b4322c4e6559dce346c8a44387c418 Mon Sep 17 00:00:00 2001
From: uye <99072975+ABA2396@users.noreply.github.com>
Date: Fri, 15 Dec 2023 00:26:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=82=89=E9=B8=BD=E5=AE=A3=E5=91=8A?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=E5=90=8E=E9=97=AA=E9=80=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RoguelikeFoldartalUseTaskPlugin.cpp          | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/MaaCore/Task/Roguelike/RoguelikeFoldartalUseTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/RoguelikeFoldartalUseTaskPlugin.cpp
index 41deb7590c..20182ec81d 100644
--- a/src/MaaCore/Task/Roguelike/RoguelikeFoldartalUseTaskPlugin.cpp
+++ b/src/MaaCore/Task/Roguelike/RoguelikeFoldartalUseTaskPlugin.cpp
@@ -101,8 +101,7 @@ void asst::RoguelikeFoldartalUseTaskPlugin::use_enable_pair(std::vector<std::str
             if (need_exit()) {
                 return;
             }
-            auto iter_up = ranges::find(list, up_board);
-            if (iter_up == list.end() || boards_to_skip.contains(up_board)) {
+            if (auto iter_up = ranges::find(list, up_board); iter_up == list.end() || boards_to_skip.contains(up_board)) {
                 continue;
             }
 
@@ -111,8 +110,7 @@ void asst::RoguelikeFoldartalUseTaskPlugin::use_enable_pair(std::vector<std::str
                 if (need_exit()) {
                     return;
                 }
-                auto iter_down = ranges::find(list, down_board);
-                if (iter_down == list.end() || boards_to_skip.contains(down_board)) {
+                if (auto iter_down = ranges::find(list, down_board); iter_down == list.end() || boards_to_skip.contains(down_board)) {
                     continue;
                 }
                 const auto result = use_board(up_board, down_board);
@@ -138,7 +136,7 @@ void asst::RoguelikeFoldartalUseTaskPlugin::use_enable_pair(std::vector<std::str
                     break;
                 }
                 if (result == UseBoardResult::UpBoardNotFound) {
-                    list.erase(iter_up);
+                    list.erase(ranges::find(list, up_board));
                     Log.info("Up board not found! Delete up board:", up_board);
                     break;
                 }
@@ -149,16 +147,16 @@ void asst::RoguelikeFoldartalUseTaskPlugin::use_enable_pair(std::vector<std::str
                     continue;
                 }
                 if (result == UseBoardResult::DownBoardNotFound) {
-                    list.erase(iter_down);
+                    list.erase(ranges::find(list, down_board));
                     Log.info("Down board not found! Delete down board:", down_board);
                     continue;
                 }
                 // 正常使用板子，用完删除上板子和下板子
                 if (result == UseBoardResult::UseBoardResultSuccess) {
-                    list.erase(iter_up);
-                    iter_down = ranges::find(list, down_board);
-                    list.erase(iter_down);
+                    list.erase(ranges::find(list, up_board));
+                    list.erase(ranges::find(list, down_board));
                     Log.trace("Board pair used, up:", up_board, ", down:", down_board);
+                    break;
                 }
             }
         }