Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop

2024-01-11 11:42:33 -03:00
parent 8b3d8ba027 27bceae853
commit 40beade15a
20 changed files with 263 additions and 137 deletions
@@ -436,7 +436,10 @@ namespace Barotrauma
                            break;
                        case "statvalue":
                            var newStatValue = new AppliedStatValue(subElement);
-                            afflictionStatValues.Add(newStatValue.StatType, newStatValue);
+                            if (newStatValue.StatType == StatTypes.None || !afflictionStatValues.TryAdd(newStatValue.StatType, newStatValue))
+                            {
+                                DebugConsole.ThrowError($"Invalid stat value in the affliction \"{parentDebugName}\".", contentPackage: element.ContentPackage);                                
+                            }
                            break;
                        case "abilityflag":
                            AbilityFlags flagType = subElement.GetAttributeEnum("flagtype", AbilityFlags.None);