From 2a931142a0c9008da09a90d6544014e00508cf2d Mon Sep 17 00:00:00 2001 From: MapleWheels Date: Thu, 26 Oct 2023 12:26:27 -0400 Subject: [PATCH] - Added NRE check for types list rebuilding. --- .../SharedSource/LuaCs/Plugins/AssemblyManager.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Plugins/AssemblyManager.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Plugins/AssemblyManager.cs index bb0e33a60..566276687 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Plugins/AssemblyManager.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Plugins/AssemblyManager.cs @@ -798,7 +798,7 @@ public class AssemblyManager FriendlyName = friendlyName }; } - public ImmutableDictionary AssembliesTypes => _assembliesTypes; + public ref readonly ImmutableDictionary AssembliesTypes => ref _assembliesTypes; /// /// Warning: For use by the Assembly Manager only! Do not call this method otherwise. @@ -813,6 +813,12 @@ public class AssemblyManager /// internal void RebuildTypesList() { + if (this.Acl is null) + { + ModUtils.Logging.PrintWarning($"{nameof(RebuildTypesList)}() | ACL with GUID {Id.ToString()} is null, cannot rebuild."); + return; + } + ClearTypesList(); try {