v1.6.17.0 (Unto the Breach update)

2024-10-22 17:29:04 +03:00
parent e74b3cdb17
commit 6e6c17e100
417 changed files with 17166 additions and 5870 deletions
@@ -269,6 +269,13 @@ namespace Barotrauma

            IsInitialized = true;
        }
+
+        public void Remove()
+        {
+            Sprite?.Remove();
+            //don't use the Picker setter, because it causes the sprite to be re-initialized for "no character"
+            _picker = null;
+        }
    }
 }

@@ -350,7 +357,7 @@ namespace Barotrauma.Items.Components
            damageModifiers = new List<DamageModifier>();
            SkillModifiers = new Dictionary<Identifier, float>();

-            int spriteCount = element.Elements().Count(x => x.Name.ToString() == "sprite");
+            int spriteCount = element.Elements().Count(x => x.Name.ToString().ToLowerInvariant() == "sprite");
            Variants = element.GetAttributeInt("variants", 0);
            variant = Rand.Range(1, Variants + 1, Rand.RandSync.ServerAndClient);
            wearableSprites = new WearableSprite[spriteCount];
@@ -569,8 +576,7 @@ namespace Barotrauma.Items.Components

            foreach (WearableSprite wearableSprite in wearableSprites)
            {
-                wearableSprite?.Sprite?.Remove();
-                wearableSprite.Picker = null;
+                wearableSprite.Remove();
            }
        }