Build 0.20.8.0

Barotrauma/BarotraumaShared/SharedSource/Networking/NetworkMember.cs

@@ -38,15 +38,15 @@ namespace Barotrauma.Networking
         READY_CHECK,
         READY_TO_SPAWN
     }
-    enum ClientNetObject
+
+    enum ClientNetSegment
     {
-        END_OF_MESSAGE, //self-explanatory
-        SYNC_IDS,       //ids of the last changes the client knows about
-        CHAT_MESSAGE,   //also self-explanatory
-        VOTE,           //you get the idea
-        CHARACTER_INPUT,
-        ENTITY_STATE,
-        SPECTATING_POS
+        SyncIds,       //ids of the last changes the client knows about
+        ChatMessage,   //also self-explanatory
+        Vote,          //you get the idea
+        CharacterInput,
+        EntityState,
+        SpectatingPos
     }
 
     enum ClientNetError
@@ -88,16 +88,15 @@ namespace Barotrauma.Networking
         MONEY,
         READY_CHECK         //start, end and update a ready check
     }
-    enum ServerNetObject
+    enum ServerNetSegment
     {
-        END_OF_MESSAGE,
-        SYNC_IDS,
-        CHAT_MESSAGE,
-        VOTE,
-        CLIENT_LIST,
-        ENTITY_POSITION,
-        ENTITY_EVENT,
-        ENTITY_EVENT_INITIAL
+        SyncIds,
+        ChatMessage,
+        Vote,
+        ClientList,
+        EntityPosition,
+        EntityEvent,
+        EntityEventInitial
     }
 
     enum TraitorMessageType

Barotrauma/BarotraumaShared/SharedSource/Networking/Primitives/NetworkPeerStructs.cs

@@ -272,6 +272,9 @@ namespace Barotrauma.Networking
         [NetworkSerialize]
         public bool IsMandatory;
 
+        [NetworkSerialize]
+        public bool IsVanilla;
+
         private Md5Hash? cachedHash;
         private DateTime? cachedDateTime;
 
@@ -305,6 +308,7 @@ namespace Barotrauma.Networking
                 ? ugcId.StringRepresentation
                 : "";
             IsMandatory = !contentPackage.Files.All(f => f is SubmarineFile);
+            IsVanilla = contentPackage == ContentPackageManager.VanillaCorePackage;
             InstallTimeDiffInSeconds =
                 contentPackage.InstallTime.TryUnwrap(out var installTime)
                     ? (uint)(installTime - referenceTime).TotalSeconds

Barotrauma/BarotraumaShared/SharedSource/Networking/RespawnManager.cs

@@ -65,7 +65,7 @@ namespace Barotrauma.Networking
 
         public State CurrentState { get; private set; }
 
-        public bool UseRespawnPrompt
+        public static bool UseRespawnPrompt
         {
             get
             {
@@ -191,6 +191,7 @@ namespace Barotrauma.Networking
         public void ForceRespawn()
         {
             ResetShuttle();
+            RespawnCountdownStarted = true;
             RespawnTime = DateTime.Now;
             CurrentState = State.Waiting;
         }