Pixis/Deliveroo
1
0
Fork 0
forked from liza/Deliveroo
Code Pull Requests Activity

Fix exception when changing zones

Browse Source
This commit is contained in:
Liza 2023-10-13 01:03:08 +02:00
parent fbb9df392c
commit 66689fee59
Signed by: liza
GPG Key ID: 7199F8D727D55F67
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Deliveroo/Deliveroo.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework> <TargetFramework>net7.0-windows</TargetFramework>
<Version>2.8</Version> <Version>2.9</Version>
<LangVersion>11.0</LangVersion> <LangVersion>11.0</LangVersion>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>

12
Deliveroo/DeliverooPlugin.GameFunctions.cs
View File

@ -50,26 +50,18 @@ partial class DeliverooPlugin
internal unsafe byte GetGrandCompanyRank() => PlayerState.Instance()->GetGrandCompanyRank(); internal unsafe byte GetGrandCompanyRank() => PlayerState.Instance()->GetGrandCompanyRank();
private float GetDistanceToNpc(int npcId, out GameObject? o) private float GetDistanceToNpc(int npcId, out GameObject? o)
{
try
{ {
foreach (var obj in _objectTable) foreach (var obj in _objectTable)
{ {
// ReSharper disable once ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract if (obj.ObjectKind == ObjectKind.EventNpc && obj is Character c)
if (obj != null && obj.ObjectKind == ObjectKind.EventNpc && obj is Character c)
{ {
if (GetNpcId(obj) == npcId) if (GetNpcId(obj) == npcId)
{ {
o = obj; o = obj;
return Vector3.Distance(_clientState.LocalPlayer!.Position, c.Position); return Vector3.Distance(_clientState.LocalPlayer?.Position ?? Vector3.Zero, c.Position);
} }
} }
} }
}
catch (Exception)
{
// ignore
}
o = null; o = null;
return float.MaxValue; return float.MaxValue;