Merge branch 'development'

jhett12321 · jhett12321 · commit 971f6db718bd · 2025-06-15T17:26:49.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## 8193.37.2
+https://github.com/nwn-dotnet/Anvil/compare/v8193.37.1...v8193.37.2
+
+### Changed
+- Improved invalid object detection in some edge cases.
+
 ## 8193.37.1
 https://github.com/nwn-dotnet/Anvil/compare/v8193.37.0...v8193.37.1
 
diff --git a/NWN.Anvil/src/main/API/Objects/NwArea.cs b/NWN.Anvil/src/main/API/Objects/NwArea.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Numerics;
+using Anvil.Native;
 using Anvil.Services;
 using NWN.Core;
 using NWN.Native.API;
@@ -30,6 +31,8 @@ internal NwArea(CNWSArea area) : base(area)
       this.area = area;
     }
 
+    public override bool IsValid => NWNXUtils.AsNWSArea(NWNXUtils.GetGameObject(ObjectId)) == area.Pointer;
+
     /// <summary>
     /// Sets the daytime ambient track for this area.<br/>
     /// See "ambientsound.2da" for track numbers.
diff --git a/NWN.Anvil/src/main/API/Objects/NwAreaOfEffect.cs b/NWN.Anvil/src/main/API/Objects/NwAreaOfEffect.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Anvil.Native;
 using NWN.Core;
 using NWN.Native.API;
 
@@ -28,6 +29,8 @@ internal NwAreaOfEffect(CNWSAreaOfEffectObject areaOfEffect) : base(areaOfEffect
       this.areaOfEffect = areaOfEffect;
     }
 
+    public override bool IsValid => NWNXUtils.AsNWSAreaOfEffectObject(NWNXUtils.GetGameObject(ObjectId)) == areaOfEffect.Pointer;
+
     /// <summary>
     /// Gets the creator of this Area of Effect.
     /// </summary>
diff --git a/NWN.Anvil/src/main/API/Objects/NwCreature.cs b/NWN.Anvil/src/main/API/Objects/NwCreature.cs
@@ -57,6 +57,8 @@ internal NwCreature(CNWSCreature creature) : base(creature)
       Inventory = new Inventory(this, Creature.m_pcItemRepository);
     }
 
+    public override bool IsValid => NWNXUtils.AsNWSCreature(NWNXUtils.GetGameObject(ObjectId)) == creature.Pointer;
+
     /// <summary>
     /// Gets this creature's armour class.
     /// </summary>
diff --git a/NWN.Anvil/src/main/API/Objects/NwDoor.cs b/NWN.Anvil/src/main/API/Objects/NwDoor.cs
@@ -29,6 +29,8 @@ internal NwDoor(CNWSDoor door) : base(door)
       this.door = door;
     }
 
+    public override bool IsValid => NWNXUtils.AsNWSDoor(NWNXUtils.GetGameObject(ObjectId)) == door.Pointer;
+
     /// <summary>
     /// Gets or sets the dialog ResRef for this door.
     /// </summary>
diff --git a/NWN.Anvil/src/main/API/Objects/NwEncounter.cs b/NWN.Anvil/src/main/API/Objects/NwEncounter.cs
@@ -29,6 +29,8 @@ internal NwEncounter(CNWSEncounter encounter) : base(encounter)
       this.encounter = encounter;
     }
 
+    public override bool IsValid => NWNXUtils.AsNWSEncounter(NWNXUtils.GetGameObject(ObjectId)) == encounter.Pointer;
+
     /// <summary>
     /// Gets or sets a value indicating whether this encounter is spawned and active.
     /// </summary>
diff --git a/NWN.Anvil/src/main/API/Objects/NwItem.cs b/NWN.Anvil/src/main/API/Objects/NwItem.cs
@@ -38,6 +38,8 @@ internal NwItem(CNWSItem item) : base(item)
       Appearance = new ItemAppearance(this);
     }
 
+    public override bool IsValid => NWNXUtils.AsNWSItem(NWNXUtils.GetGameObject(ObjectId)) == item.Pointer;
+
     /// <summary>
     /// Gets the armor class of this item.
     /// <remarks>
diff --git a/NWN.Anvil/src/main/API/Objects/NwModule.cs b/NWN.Anvil/src/main/API/Objects/NwModule.cs
@@ -32,6 +32,8 @@ internal NwModule(CNWSModule module) : base(module)
       this.module = module;
     }
 
+    public override bool IsValid => true;
+
     /// <summary>
     /// Gets or sets the max possible ability score penalty from temporary effects/items (Default: 30).
     /// </summary>
diff --git a/NWN.Anvil/src/main/API/Objects/NwObject.Create.cs b/NWN.Anvil/src/main/API/Objects/NwObject.Create.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Reflection;
 using Anvil.Internal;
+using Anvil.Native;
 using NWN.Core;
 using NWN.Native.API;
 
@@ -126,18 +127,18 @@ public static IEnumerable<T> FindObjectsWithTag<T>(params string[] tags) where T
     {
       return (ObjectType)gameObject.m_nObjectType switch
       {
-        ObjectType.Creature => new NwCreature(gameObject.AsNWSCreature()),
-        ObjectType.Item => new NwItem(gameObject.AsNWSItem()),
-        ObjectType.Placeable => new NwPlaceable(gameObject.AsNWSPlaceable()),
+        ObjectType.Creature => new NwCreature(CNWSCreature.FromPointer(NWNXUtils.AsNWSCreature(gameObject.Pointer))),
+        ObjectType.Item => new NwItem(CNWSItem.FromPointer(NWNXUtils.AsNWSItem(gameObject.Pointer))),
+        ObjectType.Placeable => new NwPlaceable(CNWSPlaceable.FromPointer(NWNXUtils.AsNWSPlaceable(gameObject.Pointer))),
         ObjectType.Module => NwModule.Instance,
-        ObjectType.Area => new NwArea(gameObject.AsNWSArea()),
-        ObjectType.Trigger => new NwTrigger(gameObject.AsNWSTrigger()),
-        ObjectType.Door => new NwDoor(gameObject.AsNWSDoor()),
-        ObjectType.Waypoint => new NwWaypoint(gameObject.AsNWSWaypoint()),
-        ObjectType.Encounter => new NwEncounter(gameObject.AsNWSEncounter()),
-        ObjectType.Store => new NwStore(gameObject.AsNWSStore()),
-        ObjectType.Sound => new NwSound(gameObject.AsNWSSoundObject()),
-        ObjectType.AreaOfEffect => new NwAreaOfEffect(gameObject.AsNWSAreaOfEffectObject()),
+        ObjectType.Area => new NwArea(CNWSArea.FromPointer(NWNXUtils.AsNWSArea(gameObject.Pointer))),
+        ObjectType.Trigger => new NwTrigger(CNWSTrigger.FromPointer(NWNXUtils.AsNWSTrigger(gameObject.Pointer))),
+        ObjectType.Door => new NwDoor(CNWSDoor.FromPointer(NWNXUtils.AsNWSDoor(gameObject.Pointer))),
+        ObjectType.Waypoint => new NwWaypoint(CNWSWaypoint.FromPointer(NWNXUtils.AsNWSWaypoint(gameObject.Pointer))),
+        ObjectType.Encounter => new NwEncounter(CNWSEncounter.FromPointer(NWNXUtils.AsNWSEncounter(gameObject.Pointer))),
+        ObjectType.Store => new NwStore(CNWSStore.FromPointer(NWNXUtils.AsNWSStore(gameObject.Pointer))),
+        ObjectType.Sound => new NwSound(CNWSSoundObject.FromPointer(NWNXUtils.AsNWSSoundObject(gameObject.Pointer))),
+        ObjectType.AreaOfEffect => new NwAreaOfEffect(CNWSAreaOfEffectObject.FromPointer(NWNXUtils.AsNWSAreaOfEffectObject(gameObject.Pointer))),
         _ => null,
       };
     }
diff --git a/NWN.Anvil/src/main/API/Objects/NwObject.cs b/NWN.Anvil/src/main/API/Objects/NwObject.cs
@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
-using Anvil.Internal;
 using Anvil.Services;
 using NWN.Core;
 using NWN.Native.API;
@@ -63,7 +61,7 @@ public string Description
     /// <summary>
     /// Gets a value indicating whether this is a valid object.
     /// </summary>
-    public bool IsValid => LowLevel.ServerExoApp.GetGameObject(ObjectId) != null;
+    public abstract bool IsValid { get; }
 
     /// <summary>
     /// Gets all local variables assigned on this object.
@@ -382,10 +380,9 @@ public async Task WaitForObjectContext()
       await tcs.Task;
     }
 
-    [MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
     protected void AssertObjectValid()
     {
-      if (LowLevel.ServerExoApp.GetGameObject(ObjectId) == null)
+      if (!IsValid)
       {
         throw new InvalidOperationException("Object is not valid.");
       }
diff --git a/NWN.Anvil/src/main/API/Objects/NwPlaceable.cs b/NWN.Anvil/src/main/API/Objects/NwPlaceable.cs
@@ -31,6 +31,8 @@ internal NwPlaceable(CNWSPlaceable placeable) : base(placeable)
       Inventory = new Inventory(this, placeable.m_pcItemRepository);
     }
 
+    public override bool IsValid => NWNXUtils.AsNWSPlaceable(NWNXUtils.GetGameObject(ObjectId)) == placeable.Pointer;
+
     /// <summary>
     /// Gets or sets the appearance of this placeable.
     /// </summary>
diff --git a/NWN.Anvil/src/main/API/Objects/NwSound.cs b/NWN.Anvil/src/main/API/Objects/NwSound.cs
@@ -10,8 +10,10 @@ namespace Anvil.API
   /// </summary>
   [ObjectType(ObjectTypes.All)]
   [ObjectFilter(ObjectTypes.All)]
-  public sealed class NwSound(CNWSSoundObject soundObject) : NwGameObject(soundObject)
+  public sealed class NwSound : NwGameObject
   {
+    private readonly CNWSSoundObject soundObject;
+
     internal CNWSSoundObject SoundObject
     {
       get
@@ -21,6 +23,13 @@ internal CNWSSoundObject SoundObject
       }
     }
 
+    internal NwSound(CNWSSoundObject soundObject) : base(soundObject)
+    {
+      this.soundObject = soundObject;
+    }
+
+    public override bool IsValid => NWNXUtils.AsNWSSoundObject(NWNXUtils.GetGameObject(ObjectId)) == soundObject.Pointer;
+
     /// <summary>
     /// Sets the volume for this sound object (0-127).
     /// </summary>
diff --git a/NWN.Anvil/src/main/API/Objects/NwStore.cs b/NWN.Anvil/src/main/API/Objects/NwStore.cs
@@ -29,6 +29,8 @@ internal NwStore(CNWSStore store) : base(store)
       this.store = store;
     }
 
+    public override bool IsValid => NWNXUtils.AsNWSStore(NWNXUtils.GetGameObject(ObjectId)) == store.Pointer;
+
     /// <summary>
     /// Gets or sets if this store purchases stolen goods.
     /// </summary>
diff --git a/NWN.Anvil/src/main/API/Objects/NwTrigger.cs b/NWN.Anvil/src/main/API/Objects/NwTrigger.cs
@@ -29,6 +29,8 @@ internal NwTrigger(CNWSTrigger trigger) : base(trigger)
       this.trigger = trigger;
     }
 
+    public override bool IsValid => NWNXUtils.AsNWSTrigger(NWNXUtils.GetGameObject(ObjectId)) == trigger.Pointer;
+
     public static NwTrigger? Create(string template, Location location, float size = 2.0f, string? newTag = null)
     {
       if (string.IsNullOrEmpty(template))
diff --git a/NWN.Anvil/src/main/API/Objects/NwWaypoint.cs b/NWN.Anvil/src/main/API/Objects/NwWaypoint.cs
@@ -27,6 +27,8 @@ internal NwWaypoint(CNWSWaypoint waypoint) : base(waypoint)
       this.waypoint = waypoint;
     }
 
+    public override bool IsValid => NWNXUtils.AsNWSWaypoint(NWNXUtils.GetGameObject(ObjectId)) == waypoint.Pointer;
+
     public static NwWaypoint? Create(string template, Location location, bool useAppearAnim = false, string newTag = "")
     {
       return CreateInternal<NwWaypoint>(template, location, useAppearAnim, newTag);
diff --git a/NWN.Anvil/src/main/API/Utils/VirtualMachine.cs b/NWN.Anvil/src/main/API/Utils/VirtualMachine.cs
@@ -1,6 +1,7 @@
+using System;
 using System.Collections.Generic;
 using System.Threading;
-using Anvil.Internal;
+using Anvil.Native;
 using Anvil.Services;
 using NLog;
 using NWN.Core;
@@ -194,7 +195,7 @@ private int PopScriptContext()
     private int PushScriptContext(uint oid, int scriptEventId)
     {
       CNWSVirtualMachineCommands cmd = CNWSVirtualMachineCommands.FromPointer(virtualMachine.m_pCmdImplementer.Pointer);
-      bool valid = LowLevel.ServerExoApp.GetGameObject(oid) != null;
+      bool valid = NWNXUtils.GetGameObject(oid) != IntPtr.Zero;
 
       if (virtualMachine.m_nRecursionLevel++ == -1)
       {
diff --git a/NWN.Anvil/src/main/Native/NWNXUtils.cs b/NWN.Anvil/src/main/Native/NWNXUtils.cs
@@ -0,0 +1,50 @@
+﻿using System;
+using System.Runtime.InteropServices;
+
+namespace Anvil.Native
+{
+  internal static partial class NWNXUtils
+  {
+    [LibraryImport("NWNX_Core", EntryPoint = "_ZN7NWNXLib5Utils9AsNWSAreaEP11CGameObject")]
+    public static partial IntPtr AsNWSArea(IntPtr pObj);
+
+    [LibraryImport("NWNX_Core", EntryPoint = "_ZN7NWNXLib5Utils23AsNWSAreaOfEffectObjectEP11CGameObject")]
+    public static partial IntPtr AsNWSAreaOfEffectObject(IntPtr pObj);
+
+    [LibraryImport("NWNX_Core", EntryPoint = "_ZN7NWNXLib5Utils13AsNWSCreatureEP11CGameObject")]
+    public static partial IntPtr AsNWSCreature(IntPtr pObj);
+
+    [LibraryImport("NWNX_Core", EntryPoint = "_ZN7NWNXLib5Utils9AsNWSDoorEP11CGameObject")]
+    public static partial IntPtr AsNWSDoor(IntPtr pObj);
+
+    [LibraryImport("NWNX_Core", EntryPoint = "_ZN7NWNXLib5Utils14AsNWSEncounterEP11CGameObject")]
+    public static partial IntPtr AsNWSEncounter(IntPtr pObj);
+
+    [LibraryImport("NWNX_Core", EntryPoint = "_ZN7NWNXLib5Utils9AsNWSItemEP11CGameObject")]
+    public static partial IntPtr AsNWSItem(IntPtr pObj);
+
+    [LibraryImport("NWNX_Core", EntryPoint = "_ZN7NWNXLib5Utils11AsNWSModuleEP11CGameObject")]
+    public static partial IntPtr AsNWSModule(IntPtr pObj);
+
+    [LibraryImport("NWNX_Core", EntryPoint = "_ZN7NWNXLib5Utils11AsNWSObjectEP11CGameObject")]
+    public static partial IntPtr AsNWSObject(IntPtr pObj);
+
+    [LibraryImport("NWNX_Core", EntryPoint = "_ZN7NWNXLib5Utils14AsNWSPlaceableEP11CGameObject")]
+    public static partial IntPtr AsNWSPlaceable(IntPtr pObj);
+
+    [LibraryImport("NWNX_Core", EntryPoint = "_ZN7NWNXLib5Utils16AsNWSSoundObjectEP11CGameObject")]
+    public static partial IntPtr AsNWSSoundObject(IntPtr pObj);
+
+    [LibraryImport("NWNX_Core", EntryPoint = "_ZN7NWNXLib5Utils10AsNWSStoreEP11CGameObject")]
+    public static partial IntPtr AsNWSStore(IntPtr pObj);
+
+    [LibraryImport("NWNX_Core", EntryPoint = "_ZN7NWNXLib5Utils12AsNWSTriggerEP11CGameObject")]
+    public static partial IntPtr AsNWSTrigger(IntPtr pObj);
+
+    [LibraryImport("NWNX_Core", EntryPoint = "_ZN7NWNXLib5Utils13AsNWSWaypointEP11CGameObject")]
+    public static partial IntPtr AsNWSWaypoint(IntPtr pObj);
+
+    [LibraryImport("NWNX_Core", EntryPoint = "_ZN7NWNXLib5Utils13GetGameObjectEj")]
+    public static partial IntPtr GetGameObject(uint objectId);
+  }
+}
diff --git a/NWN.Anvil/src/main/Services/ELC/EnforceLegalCharacterService.cs b/NWN.Anvil/src/main/Services/ELC/EnforceLegalCharacterService.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using Anvil.API;
-using Anvil.Internal;
 using Anvil.Native;
 using NWN.Native.API;
 using Ability = NWN.Native.API.Ability;
@@ -272,13 +271,13 @@ private int OnValidateCharacter(void* player, int* bFailedServerRestriction)
         return (int)StrRefCharacterDoesNotExist.Id;
       }
 
-      ICGameObject pGameObject = LowLevel.ServerExoApp.GetGameObject(pPlayer.m_oidNWSObject);
-      if (pGameObject == null)
+      IntPtr pGameObject = NWNXUtils.GetGameObject(pPlayer.m_oidNWSObject);
+      if (pGameObject == IntPtr.Zero)
       {
         return (int)StrRefCharacterDoesNotExist.Id;
       }
 
-      CNWSCreature pCreature = pGameObject.AsNWSCreature();
+      CNWSCreature? pCreature = CNWSCreature.FromPointer(NWNXUtils.AsNWSCreature(pGameObject));
       if (pCreature == null)
       {
         return (int)StrRefCharacterDoesNotExist.Id;

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,8 @@ internal NwCreature(CNWSCreature creature) : base(creature)`
`57`	`57`	`Inventory = new Inventory(this, Creature.m_pcItemRepository);`
`58`	`58`	`}`
`59`	`59`
	`60`	`+ public override bool IsValid => NWNXUtils.AsNWSCreature(NWNXUtils.GetGameObject(ObjectId)) == creature.Pointer;`
	`61`	`+`
`60`	`62`	`/// <summary>`
`61`	`63`	`/// Gets this creature's armour class.`
`62`	`64`	`/// </summary>`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@ internal NwDoor(CNWSDoor door) : base(door)`
`29`	`29`	`this.door = door;`
`30`	`30`	`}`
`31`	`31`
	`32`	`+ public override bool IsValid => NWNXUtils.AsNWSDoor(NWNXUtils.GetGameObject(ObjectId)) == door.Pointer;`
	`33`	`+`
`32`	`34`	`/// <summary>`
`33`	`35`	`/// Gets or sets the dialog ResRef for this door.`
`34`	`36`	`/// </summary>`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@ internal NwEncounter(CNWSEncounter encounter) : base(encounter)`
`29`	`29`	`this.encounter = encounter;`
`30`	`30`	`}`
`31`	`31`
	`32`	`+ public override bool IsValid => NWNXUtils.AsNWSEncounter(NWNXUtils.GetGameObject(ObjectId)) == encounter.Pointer;`
	`33`	`+`
`32`	`34`	`/// <summary>`
`33`	`35`	`/// Gets or sets a value indicating whether this encounter is spawned and active.`
`34`	`36`	`/// </summary>`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,8 @@ internal NwItem(CNWSItem item) : base(item)`
`38`	`38`	`Appearance = new ItemAppearance(this);`
`39`	`39`	`}`
`40`	`40`
	`41`	`+ public override bool IsValid => NWNXUtils.AsNWSItem(NWNXUtils.GetGameObject(ObjectId)) == item.Pointer;`
	`42`	`+`
`41`	`43`	`/// <summary>`
`42`	`44`	`/// Gets the armor class of this item.`
`43`	`45`	`/// <remarks>`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,8 @@ internal NwModule(CNWSModule module) : base(module)`
`32`	`32`	`this.module = module;`
`33`	`33`	`}`
`34`	`34`
	`35`	`+ public override bool IsValid => true;`
	`36`	`+`
`35`	`37`	`/// <summary>`
`36`	`38`	`/// Gets or sets the max possible ability score penalty from temporary effects/items (Default: 30).`
`37`	`39`	`/// </summary>`