From d9b764aefd04408c0471b5598cb2f77bc5c27d2c Mon Sep 17 00:00:00 2001 From: Anna Clemens Date: Mon, 31 May 2021 01:02:56 -0400 Subject: [PATCH] fix(housing): handle null for current ward --- RoleplayersToolbox/Tools/Housing/HousingTool.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/RoleplayersToolbox/Tools/Housing/HousingTool.cs b/RoleplayersToolbox/Tools/Housing/HousingTool.cs index ed3d54e..232b77d 100755 --- a/RoleplayersToolbox/Tools/Housing/HousingTool.cs +++ b/RoleplayersToolbox/Tools/Housing/HousingTool.cs @@ -51,9 +51,13 @@ namespace RoleplayersToolbox.Tools.Housing { // Updated: 5.55 // 48 89 5C 24 ?? 48 89 6C 24 ?? 48 89 74 24 ?? 57 41 56 41 57 48 83 EC 20 49 8B 00 - private unsafe ushort CurrentWard { + private unsafe ushort? CurrentWard { get { var objPtr = Util.FollowPointerChain(this._housingPointer, new[] { 0, 8 }); + if (objPtr == IntPtr.Zero) { + return null; + } + return (ushort) (*(ushort*) (objPtr + 0x96a2) + 1); } }