Unstable v0.1100.0.4 (November 11th 2020)

Barotrauma/BarotraumaServer/ServerSource/GameSession/GameModes/CharacterCampaignData.cs

@@ -30,9 +30,9 @@ namespace Barotrauma
             return other.SteamID == SteamID && other.ClientEndPoint == ClientEndPoint;
         }
 
-        public void SpawnInventoryItems(CharacterInfo characterInfo, Inventory inventory)
+        public void SpawnInventoryItems(Character character, Inventory inventory)
         {
-            characterInfo.SpawnInventoryItems(inventory, itemData);
+            character.SpawnInventoryItems(inventory, itemData);
         }
 
         public void ApplyHealthData(CharacterInfo characterInfo, Character character)

Barotrauma/BarotraumaServer/ServerSource/GameSession/GameModes/MissionMode.cs

@@ -1,6 +1,6 @@
 namespace Barotrauma
 {
-    partial class MissionMode : GameMode
+    abstract partial class MissionMode : GameMode
     {
         public override void ShowStartMessage()
         {

Barotrauma/BarotraumaServer/ServerSource/GameSession/GameModes/MultiPlayerCampaign.cs

@@ -216,6 +216,9 @@ namespace Barotrauma
 
                 characterData.ForEach(cd => cd.HasSpawned = false);
 
+                petsElement = new XElement("pets");
+                PetBehavior.SavePets(petsElement);
+
                 //remove all items that are in someone's inventory
                 foreach (Character c in Character.CharacterList)
                 {
@@ -237,9 +240,6 @@ namespace Barotrauma
                     c.Inventory.DeleteAllItems();
                 }
 
-                petsElement = new XElement("pets");
-                PetBehavior.SavePets(petsElement);
-
                 yield return CoroutineStatus.Running;
 
                 if (leavingSub != Submarine.MainSub && !leavingSub.DockedTo.Contains(Submarine.MainSub))