Merge remote-tracking branch 'upstream/master' into develop

2024-12-11 10:44:53 -03:00
parent b4f264df04 38ca721cb0
commit 6da26ffa93
257 changed files with 4793 additions and 1653 deletions
@@ -180,10 +180,9 @@ namespace Barotrauma
        /// Gets a type by its name, with backwards compatibility for types that have been renamed.
        /// <see cref="TypePreviouslyKnownAs"/>
        /// </summary>
-        public static Type? GetTypeWithBackwardsCompatibility(string nameSpace, string typeName, bool throwOnError, bool ignoreCase)
+        public static Type? GetTypeWithBackwardsCompatibility(Assembly assembly, string nameSpace, string typeName, bool throwOnError, bool ignoreCase)
        {
-            if (Assembly.GetEntryAssembly() is not { } entryAssembly) { return null; }
-            var types = entryAssembly
+            var types = assembly
                .GetTypes()
                .Where(t => NameMatches(t.Namespace, nameSpace, ignoreCase));