fix: Handle if world travel fails

nt153133 · Aug 24, 2024 · 9656686 · 9656686
1 parent de6daf8
commit 9656686
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/Helpers/WorldTravel/WorldTravel.cs b/Helpers/WorldTravel/WorldTravel.cs
@@ -179,11 +179,25 @@ public static async Task<bool> GoToWorld(ushort worldId, TravelCity travelCity =
 
                         Log.Information($"Going to: {((World)Choices[i].WorldID).WorldName()}");
                         WorldTravelSelect.Instance.SelectWorld(i);
-                        await Coroutine.Wait(5000, () => SelectYesno.IsOpen);
+                        if (!await Coroutine.Wait(5000, () => SelectYesno.IsOpen))
+                        {
+                            Log.Error("Select Yesno did not open");
+                            WorldTravelSelect.Instance.Close();
+                            return false;
+                        }
+
                         if (SelectYesno.IsOpen)
                         {
                             SelectYesno.Yes();
-                            await Coroutine.Wait(1_200_000, () => WorldTravelFinderReady.Instance.IsOpen);
+                            await Coroutine.Wait(5000, () => !SelectYesno.IsOpen);
+                            if (!await Coroutine.Wait(1_200_000, () => WorldTravelFinderReady.Instance.IsOpen))
+                            {
+                                Log.Error("WorldTravelFinderReady did not open");
+                                WorldTravelSelect.Instance.Close();
+                                await Coroutine.Wait(5000, () => !WorldTravelSelect.Instance.IsOpen);
+                                return false;
+                            }
+
                             if (WorldTravelFinderReady.Instance.IsOpen)
                             {
                                 await Coroutine.Wait(-1, () => !WorldTravelFinderReady.Instance.IsOpen);