Unstable 0.17.3.0

2022-03-22 14:44:12 -03:00
parent cefac171f5
commit 4206f6db42
100 changed files with 1380 additions and 655 deletions
@@ -160,17 +160,20 @@ namespace Barotrauma
        public void Delete()
        {
            Dispose();
-            if (File.Exists(ContentFile.Path))
+            try
            {
-                try
+                if (ContentPackage is { Files: { Length: 1 } }
+                    && ContentPackageManager.LocalPackages.Contains(ContentPackage))
                {
-                    File.Delete(ContentFile.Path);
-                }
-                catch (Exception e)
-                {
-                    DebugConsole.ThrowError("Deleting item assembly \"" + Name + "\" failed.", e);
+                    Directory.Delete(ContentPackage.Dir, recursive: true);
+                    ContentPackageManager.LocalPackages.Refresh();
+                    ContentPackageManager.EnabledPackages.DisableRemovedMods();
                }
            }
+            catch (Exception e)
+            {
+                DebugConsole.ThrowError("Deleting item assembly \"" + Name + "\" failed.", e);
+            }
        }

        public override void Dispose() { }