Build 0.18.2.0

2022-05-19 23:43:21 +09:00
parent d4f6f4cf88
commit 077917fa5d
115 changed files with 1080 additions and 1763 deletions
@@ -396,29 +396,20 @@ namespace Barotrauma
            return 1;
        }

-        private void Dispose(bool disposing)
+        public override void Dispose()
        {
            if (!disposed)
            {
-                if (disposing)
-                {
-                    Prefabs.Remove(this);
+                Prefabs.Remove(this);
 #if CLIENT
-                    Sprite?.Remove();
-                    Sprite = null;
-                    DecorativeSprites.ForEach(sprite => sprite.Remove());
-                    targetProperties.Clear();
+                Sprite?.Remove();
+                Sprite = null;
+                DecorativeSprites.ForEach(sprite => sprite.Remove());
+                targetProperties.Clear();
 #endif
-                }
            }

            disposed = true;
        }
-
-        public override void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
    }
 }