Unstable 0.17.5.0

2022-03-30 01:20:59 +09:00
parent c1b8e5a341
commit 44ded0225a
88 changed files with 2033 additions and 1430 deletions
@@ -130,7 +130,7 @@ namespace Barotrauma
            }
        }

-        private Wallet wallet = new Wallet();
+        private Wallet wallet;

        public Wallet Wallet
        {
@@ -1055,8 +1055,13 @@ namespace Barotrauma
            return newCharacter;
        }

+        private Character(Submarine submarine, ushort id): base(submarine, id)
+        {
+            wallet = new Wallet(Option<Character>.Some(this));
+        }
+
        protected Character(CharacterPrefab prefab, Vector2 position, string seed, CharacterInfo characterInfo = null, ushort id = Entity.NullEntityID, bool isRemotePlayer = false, RagdollParams ragdollParams = null)
-            : base(null, id)
+            : this(null, id)
        {
            this.Seed = seed;
            this.Prefab = prefab;