Unstable 0.1400.8.0

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

@@ -37,6 +37,14 @@ namespace Barotrauma
 
         public void SpawnInventoryItems(Character character, Inventory inventory)
         {
+            if (character == null)
+            {
+                throw new System.InvalidOperationException($"Failed to spawn inventory items. Character was null.");
+            }
+            if (itemData == null)
+            {
+                throw new System.InvalidOperationException($"Failed to spawn inventory items for the character \"{character.Name}\". No saved inventory data.");
+            }
             character.SpawnInventoryItems(inventory, itemData);
         }
 

Barotrauma/BarotraumaServer/ServerSource/Networking/RespawnManager.cs

@@ -426,7 +426,14 @@ namespace Barotrauma.Networking
                 }
                 else
                 {
-                    characterData.SpawnInventoryItems(character, character.Inventory);
+                    if (characterData.HasItemData)
+                    {
+                        characterData.SpawnInventoryItems(character, character.Inventory);
+                    }
+                    else
+                    {
+                        character.GiveJobItems(mainSubSpawnPoints[i]);
+                    }
                     characterData.ApplyHealthData(character);
                     character.GiveIdCardTags(mainSubSpawnPoints[i]);
                     characterData.HasSpawned = true;