From 66689fee59a24622d421fe8be76026bd2d730059 Mon Sep 17 00:00:00 2001
From: Liza Carvelli <liza@carvel.li>
Date: Fri, 13 Oct 2023 01:03:08 +0200
Subject: [PATCH] Fix exception when changing zones

---
 Deliveroo/Deliveroo.csproj                 |  2 +-
 Deliveroo/DeliverooPlugin.GameFunctions.cs | 18 +++++-------------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/Deliveroo/Deliveroo.csproj b/Deliveroo/Deliveroo.csproj
index c9dccd3..230dcad 100644
--- a/Deliveroo/Deliveroo.csproj
+++ b/Deliveroo/Deliveroo.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFramework>net7.0-windows</TargetFramework>
-        <Version>2.8</Version>
+        <Version>2.9</Version>
         <LangVersion>11.0</LangVersion>
         <Nullable>enable</Nullable>
         <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
diff --git a/Deliveroo/DeliverooPlugin.GameFunctions.cs b/Deliveroo/DeliverooPlugin.GameFunctions.cs
index 1894eb4..fdd16b5 100644
--- a/Deliveroo/DeliverooPlugin.GameFunctions.cs
+++ b/Deliveroo/DeliverooPlugin.GameFunctions.cs
@@ -51,25 +51,17 @@ partial class DeliverooPlugin
 
     private float GetDistanceToNpc(int npcId, out GameObject? o)
     {
-        try
+        foreach (var obj in _objectTable)
         {
-            foreach (var obj in _objectTable)
+            if (obj.ObjectKind == ObjectKind.EventNpc && obj is Character c)
             {
-                // ReSharper disable once ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract
-                if (obj != null && obj.ObjectKind == ObjectKind.EventNpc && obj is Character c)
+                if (GetNpcId(obj) == npcId)
                 {
-                    if (GetNpcId(obj) == npcId)
-                    {
-                        o = obj;
-                        return Vector3.Distance(_clientState.LocalPlayer!.Position, c.Position);
-                    }
+                    o = obj;
+                    return Vector3.Distance(_clientState.LocalPlayer?.Position ?? Vector3.Zero, c.Position);
                 }
             }
         }
-        catch (Exception)
-        {
-            // ignore
-        }
 
         o = null;
         return float.MaxValue;