(633f44200) Emptying the "required items" field of an item in the sub editor now removes the item requirements (instead of using the default ones)

2019-04-01 22:48:03 +03:00
parent 4558d8b919
commit cbb3216466
5 changed files with 54 additions and 19 deletions
@@ -734,15 +734,13 @@ namespace Barotrauma.Items.Components
        private void OverrideRequiredItems(XElement element)
        {
            var prevRequiredItems = new Dictionary<RelatedItem.RelationType, List<RelatedItem>>(requiredItems);
-            bool overrideRequiredItems = false;
+            requiredItems.Clear();
+
            foreach (XElement subElement in element.Elements())
            {
                switch (subElement.Name.ToString().ToLowerInvariant())
                {
                    case "requireditem":
-                        if (!overrideRequiredItems) requiredItems.Clear();
-                        overrideRequiredItems = true;
-
                        RelatedItem newRequiredItem = RelatedItem.Load(subElement, item.Name);
                        if (newRequiredItem == null) continue;