Few minor adjustments

bdawg1989 · Aug 2, 2024 · 0a5a7dc · 0a5a7dc
1 parent d507913
commit 0a5a7dc
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/SysBot.Pokemon/SV/BotRaid/RotatingRaidBotSV.cs b/SysBot.Pokemon/SV/BotRaid/RotatingRaidBotSV.cs
@@ -1698,7 +1698,7 @@ private async Task<int> PrepareForRaid(CancellationToken token)
             await SwitchPartyPokemon(token).ConfigureAwait(false);
             await Task.Delay(1_500, token).ConfigureAwait(false);
 
-            if (!await IsOnOverworld(OverworldOffset, token).ConfigureAwait(false))
+            if (!await RecoverToOverworld(token).ConfigureAwait(false))
                 return 0;
 
             await Click(A, 3_000, token).ConfigureAwait(false);
@@ -1741,7 +1741,6 @@ private async Task SwitchPartyPokemon(CancellationToken token)
                 await Click(Y, 0_500, token).ConfigureAwait(false);
                 await Click(DLEFT, 0_800, token).ConfigureAwait(false);
                 await Click(Y, 0_500, token).ConfigureAwait(false);
-                await RecoverToOverworld(token).ConfigureAwait(false);
                 Log("PartyPK switch successful.");
             }
         }
@@ -1769,7 +1768,7 @@ private async Task<bool> RecoverToOverworld(CancellationToken token)
             if (!await IsOnOverworld(OverworldOffset, token).ConfigureAwait(false))
             {
                 Log("Failed to recover to overworld, rebooting the game.");
-                await ReOpenGame(Hub.Config, token).ConfigureAwait(false);
+                return false; // Return false instead of rebooting here
             }
             await Task.Delay(1_000, token).ConfigureAwait(false);
             return true;