From: Liza Carvelli <liza@carvel.li>
Date: Thu, 16 Jan 2025 21:55:22 +0000 (+0100)
Subject: Throw an exception if using aethernet doesn't work and the destination is in another... 
X-Git-Tag: v4.15~7
X-Git-Url: https://git.jacobcasper.com/?a=commitdiff_plain;h=7734692b0fbe61f32a5ca5ec1d0b4abf5a8441c2;p=Questionable.git

Throw an exception if using aethernet doesn't work and the destination is in another territory
---

diff --git a/Questionable/Controller/Steps/Shared/AethernetShortcut.cs b/Questionable/Controller/Steps/Shared/AethernetShortcut.cs
index bfb2cc3f..e63b69c0 100644
--- a/Questionable/Controller/Steps/Shared/AethernetShortcut.cs
+++ b/Questionable/Controller/Steps/Shared/AethernetShortcut.cs
@@ -179,10 +179,12 @@ internal static class AethernetShortcut
                     }
                 }
             }
-            else
+            else if (clientState.TerritoryType == aetheryteData.TerritoryIds[Task.To])
                 logger.LogWarning(
-                    "Aethernet shortcut not unlocked (from: {FromAetheryte}, to: {ToAetheryte}), walking manually",
+                    "Aethernet shortcut not unlocked (from: {FromAetheryte}, to: {ToAetheryte}), skipping as we are already in the destination territory",
                     Task.From, Task.To);
+            else
+                throw new TaskException($"Aethernet shortcut not unlocked (from: {Task.From}, to: {Task.To})");
 
             return false;
         }