(b0f5305f2) Unstable v0.9.10.0

2020-05-22 08:21:34 -03:00
parent 3d2b7bcf63
commit 4f8bd39789
75 changed files with 1023 additions and 407 deletions
@@ -2111,13 +2111,19 @@ namespace Barotrauma

        public void Equip(Character character)
        {
-            foreach (ItemComponent ic in components) ic.Equip(character);
+            if (Removed)
+            {
+                DebugConsole.ThrowError($"Tried to equip a removed item ({Name}).\n{Environment.StackTrace}");
+                return;
+            }
+
+            foreach (ItemComponent ic in components) { ic.Equip(character); }
        }

        public void Unequip(Character character)
        {
            character.DeselectItem(this);
-            foreach (ItemComponent ic in components) ic.Unequip(character);
+            foreach (ItemComponent ic in components) { ic.Unequip(character); }
        }

        public List<Pair<object, SerializableProperty>> GetProperties<T>()