Build 0.20.12.0

2022-12-09 20:08:36 +02:00
parent a10cc13566
commit 6f788fb8b4
24 changed files with 203 additions and 456 deletions
@@ -1020,12 +1020,15 @@ namespace Barotrauma
                }

                if (ic.statusEffectLists == null) { continue; }
-
-                if (statusEffectLists == null)
+                if (ic.InheritStatusEffects)
                {
-                    statusEffectLists = new Dictionary<ActionType, List<StatusEffect>>();
+                    // Inherited status effects are added when the ItemComponent is initialized at ItemComponent.cs:332.
+                    // Don't create duplicate effects here.
+                    continue;
                }

+                statusEffectLists ??= new Dictionary<ActionType, List<StatusEffect>>();
+
                //go through all the status effects of the component 
                //and add them to the corresponding statuseffect list
                foreach (List<StatusEffect> componentEffectList in ic.statusEffectLists.Values)