From 7734692b0fbe61f32a5ca5ec1d0b4abf5a8441c2 Mon Sep 17 00:00:00 2001
From: Liza Carvelli <liza@carvel.li>
Date: Thu, 16 Jan 2025 22:55:22 +0100
Subject: [PATCH] Throw an exception if using aethernet doesn't work and the
 destination is in another territory

---
 Questionable/Controller/Steps/Shared/AethernetShortcut.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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;
         }