(221f9f2a6) Merge branch 'dev' into capitalizationfixes

Barotrauma/BarotraumaServer/Source/GameMain.cs

@@ -296,7 +296,7 @@ namespace Barotrauma
             CloseServer();
 
             SteamManager.ShutDown();
-            if (GameSettings.SendUserStatistics) GameAnalytics.OnStop();
+            if (GameSettings.SendUserStatistics) GameAnalytics.OnQuit();
         }
 
         public static void ResetFrameTime()

Barotrauma/BarotraumaServer/Source/Items/Item.cs

@@ -193,7 +193,7 @@ namespace Barotrauma
         {
             if (GameMain.Server == null) return;
 
-            msg.Write(Prefab.Name);
+            msg.Write(Prefab.OriginalName);
             msg.Write(Prefab.Identifier);
             msg.Write(Description != prefab.Description);
             if (Description != prefab.Description)

Barotrauma/BarotraumaServer/Source/Networking/RespawnManager.cs

@@ -232,7 +232,7 @@ namespace Barotrauma.Networking
                 //add the ID card tags they should've gotten when spawning in the shuttle
                 foreach (Item item in character.Inventory.Items)
                 {
-                    if (item == null || item.Prefab.Name != "ID Card") continue;
+                    if (item == null || item.Prefab.Identifier != "idcard") continue;
                     foreach (string s in shuttleSpawnPoints[i].IdCardTags)
                     {
                         item.AddTag(s);

Barotrauma/BarotraumaServer/Source/Networking/SteamManager.cs

@@ -37,7 +37,7 @@ namespace Barotrauma.Steam
 
         public static bool RefreshServerDetails(Networking.GameServer server)
         {
-            if (instance == null || !instance.isInitialized)
+            if (instance?.server == null || !instance.isInitialized)
             {
                 return false;
             }

Barotrauma/BarotraumaServer/Source/Program.cs

@@ -35,7 +35,7 @@ namespace Barotrauma
                 inputThread.Start();
                 game.Run();
                 inputThread.Abort(); inputThread.Join();
-                if (GameSettings.SendUserStatistics) GameAnalytics.OnStop();
+                if (GameSettings.SendUserStatistics) GameAnalytics.OnQuit();
                 SteamManager.ShutDown();
 #if !DEBUG
             }