From 871522590a314dee113f67a867acd10748cbf244 Mon Sep 17 00:00:00 2001 From: Rutherther Date: Sun, 23 Jan 2022 14:59:16 +0100 Subject: [PATCH] fix(localbinding): correctly get pet managers --- Local/NosSmooth.LocalBinding/Structs/PetManager.cs | 2 +- Local/NosSmooth.LocalBinding/Structs/PetManagerList.cs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Local/NosSmooth.LocalBinding/Structs/PetManager.cs b/Local/NosSmooth.LocalBinding/Structs/PetManager.cs index a929ba2..8ef429a 100644 --- a/Local/NosSmooth.LocalBinding/Structs/PetManager.cs +++ b/Local/NosSmooth.LocalBinding/Structs/PetManager.cs @@ -42,7 +42,7 @@ public class PetManager : ControlManager { get { - _memory.SafeRead(Address + 0x20, out int playerAddress); + _memory.SafeRead(Address + 0x7C, out int playerAddress); return new MapNpcObj(_memory, (IntPtr)playerAddress); } } diff --git a/Local/NosSmooth.LocalBinding/Structs/PetManagerList.cs b/Local/NosSmooth.LocalBinding/Structs/PetManagerList.cs index 774cae9..bb042c4 100644 --- a/Local/NosSmooth.LocalBinding/Structs/PetManagerList.cs +++ b/Local/NosSmooth.LocalBinding/Structs/PetManagerList.cs @@ -88,7 +88,7 @@ public class PetManagerList /// Get the first pet. /// /// First pet, if exists. - public MapNpcObj? GetFirst() + public PetManager? GetFirst() { if (Length == 0) { @@ -96,14 +96,14 @@ public class PetManagerList } _memory.SafeRead(List, out int firstAddress); - return new MapNpcObj(_memory, (IntPtr)firstAddress); + return new PetManager(_memory, (IntPtr)firstAddress); } /// /// Get the second pet. /// /// Second pet, if exists. - public MapNpcObj? GetSecond() + public PetManager? GetSecond() { if (Length < 2) { @@ -111,6 +111,6 @@ public class PetManagerList } _memory.SafeRead(List + 0x04, out int secondAddress); - return new MapNpcObj(_memory, (IntPtr)secondAddress); + return new PetManager(_memory, (IntPtr)secondAddress); } } \ No newline at end of file -- 2.48.1