Unstable 0.17.4.0

2022-03-30 00:08:09 +09:00
parent 2968e23ae8
commit c1b8e5a341
177 changed files with 3388 additions and 1977 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() { }