From 27c8a3ca2ed4b62c421e9754adab265398893386 Mon Sep 17 00:00:00 2001 From: MapleWheels Date: Fri, 22 Sep 2023 12:21:05 -0400 Subject: [PATCH] Added CLR Type-search to GetTypesByName. Fixed error caused by generic type searching from Lua. --- .../SharedSource/LuaCs/Plugins/AssemblyManager.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Plugins/AssemblyManager.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Plugins/AssemblyManager.cs index b68a8e6b7..45468968f 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Plugins/AssemblyManager.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/Plugins/AssemblyManager.cs @@ -240,9 +240,16 @@ public partial class AssemblyManager try { // fallback to Type.GetType + Type t = Type.GetType(typeName, false, false); + if (t is not null) + { + types.Add(byRef ? t.MakeByRefType() : t); + return types; + } + foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies()) { - Type t = assembly.GetType(typeName, false, false); + t = assembly.GetType(typeName, false, false); if (t is not null) types.Add(byRef ? t.MakeByRefType() : t); }