Merge https://github.com/Regalis11/Barotrauma into develop

2023-06-15 12:13:50 -03:00
parent 6b461e1026 f95be0511c
commit 15daa64f66
210 changed files with 4491 additions and 2580 deletions
@@ -12,9 +12,12 @@ namespace Barotrauma
        private static readonly Dictionary<Assembly, ImmutableArray<Type>> cachedNonAbstractTypes
            = new Dictionary<Assembly, ImmutableArray<Type>>();

-        
+        private static readonly Dictionary<Assembly, Dictionary<Type, ImmutableArray<Type>>> cachedDerivedNonAbstract
+            = new Dictionary<Assembly, Dictionary<Type, ImmutableArray<Type>>>();
+
        public static IEnumerable<Type> GetDerivedNonAbstract<T>()
        {
+            Type t = typeof(T);
            Assembly assembly = typeof(T).Assembly;
            lock (cachedNonAbstractTypes) 
            {