Merge branch 'development'

Author: jhett12321

.env

@@ -1,2 +1,2 @@
 NWN_VERSION=8193.34
-NWNX_VERSION=6a552d9
+NWNX_VERSION=3227d60

CHANGELOG.md

@@ -3,6 +3,16 @@ 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.34.7
+https://github.com/nwn-dotnet/Anvil/compare/v8193.34.6...v8193.34.7
+
+### Package Updates
+- NWNX 6a552d9 -> 3227d60
+
+### Fixed
+- Fixed an edge case issue that caused some servers to enter an infinite crash loop when shutting down.
+- Fixed `NWNX_CORE_SHUTDOWN_SCRIPT` throwing a NRE during shutdown.
+
 ## 8193.34.6
 https://github.com/nwn-dotnet/Anvil/compare/v8193.34.5...v8193.34.6
 

NWN.Anvil/src/main/API/Ruleset/NwRuleset.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using Anvil.Services;
 using NWN.Native.API;
@@ -51,9 +52,9 @@ public static void ReloadRules()
 
     [ServiceBinding(typeof(Factory))]
     [ServiceBindingOptions(InternalBindingPriority.API)]
-    internal sealed unsafe class Factory
+    internal sealed unsafe class Factory : IDisposable
     {
-      private readonly FunctionHook<ReloadAllHook> reloadAllHook;
+      private FunctionHook<ReloadAllHook> reloadAllHook;
 
       public Factory(HookService hookService)
       {
@@ -142,8 +143,19 @@ private static IReadOnlyList<NwSpell> LoadSpells(CNWSpellArray spellArray)
 
       private void OnReloadAll(void* pRules)
       {
-        reloadAllHook.CallOriginal(pRules);
-        LoadRules();
+        if (reloadAllHook != null)
+        {
+          reloadAllHook.CallOriginal(pRules);
+          LoadRules();
+        }
+      }
+
+      void IDisposable.Dispose()
+      {
+        // ReloadAll is called from the CNWSModule destructor
+        // If we don't dispose the hook here, the server will get stuck in an infinite segfault loop.
+        reloadAllHook?.Dispose();
+        reloadAllHook = null;
       }
     }
   }

NWN.Anvil/src/main/Services/Core/VirtualMachineFunctionHandler.cs

@@ -93,7 +93,7 @@ internal int OnRunScript(string script, uint oidSelf)
       }
       catch (Exception e)
       {
-        Log.Error(e);
+        Log.Error(e, "An exception occured while executing script {Script}", script);
       }
 
       scriptContexts.Pop();