Build 0.18.9.0

Barotrauma/BarotraumaClient/ClientSource/GameSession/GameModes/MultiPlayerCampaign.cs

@@ -745,7 +745,8 @@ namespace Barotrauma
                     purchasedItemSwaps.Add(new PurchasedItemSwap(itemToRemove, itemToInstall));
                 }
 
-                if (ShouldApply(NetFlags.UpgradeManager, id, requireUpToDateSave: true))
+                if (!Submarine.Unloading && !(Submarine.MainSub is { Loading: true }) && 
+                    ShouldApply(NetFlags.UpgradeManager, id, requireUpToDateSave: true))
                 {
                     UpgradeStore.WaitForServerUpdate = false;
                     campaign.UpgradeManager.SetPendingUpgrades(pendingUpgrades);
@@ -761,7 +762,7 @@ namespace Barotrauma
                             campaign.UpgradeManager.PurchaseItemSwap(purchasedItemSwap.ItemToRemove, purchasedItemSwap.ItemToInstall, force: true);
                         }
                     }
-                    foreach (Item item in Item.ItemList)
+                    foreach (Item item in Item.ItemList.ToList())
                     {
                         if (item.PendingItemSwap != null && !purchasedItemSwaps.Any(it => it.ItemToRemove == item))
                         {

Barotrauma/BarotraumaClient/ClientSource/GameSession/GameModes/Tutorials/ScenarioTutorial.cs

@@ -1,10 +1,7 @@
 using Barotrauma.Items.Components;
 using Microsoft.Xna.Framework;
-using System;
 using System.Collections.Generic;
-using Barotrauma.IO;
 using System.Linq;
-using System.Xml.Linq;
 
 namespace Barotrauma.Tutorials
 {
@@ -228,6 +225,8 @@ namespace Barotrauma.Tutorials
                     {
                         CoroutineManager.StopCoroutines(tutorialCoroutine);
                     }
+                    GUI.PreventPauseMenuToggle = false;
+                    ContentRunning = false;
                     infoBox = null;
                 }
                 else if (Character.Controlled.IsDead)