Merge branch 'master' of https://github.com/Regalis11/Barotrauma.git

2022-06-15 13:26:49 -03:00
parent efd1243754 08cc2faec8
commit 7a09711296
410 changed files with 11140 additions and 5815 deletions
@@ -20,10 +20,11 @@ namespace Barotrauma
        private ServerContentPackage? currentDownload;

        private readonly List<ContentPackage> downloadedPackages = new List<ContentPackage>();
+        public IEnumerable<ContentPackage> DownloadedPackages => downloadedPackages;
        
        private bool confirmDownload;

-        private void Reset()
+        public void Reset()
        {
            pendingDownloads.Clear();
            downloadedPackages.Clear();
@@ -256,12 +257,6 @@ namespace Barotrauma
            }
        }

-        public override void Deselect()
-        {
-            Reset();
-            base.Deselect();
-        }
-
        public override void Update(double deltaTime)
        {
            base.Update(deltaTime);