Merge branch 'develop-2.0.0' into pvp-fixes-develop-2.0.0-round2

Author: michalChrobot

com.unity.netcode.gameobjects/Runtime/Configuration/SessionConfig.cs

@@ -8,9 +8,10 @@ internal class SessionConfig
         public const uint NoFeatureCompatibility = 0;
         public const uint BypassFeatureCompatible = 1;
         public const uint ServerDistributionCompatible = 2;
+        public const uint SessionStateToken = 3;
 
         // The most current session version (!!!!set this when you increment!!!!!)
-        public static uint PackageSessionVersion => ServerDistributionCompatible;
+        public static uint PackageSessionVersion => SessionStateToken;
 
         internal uint SessionVersion;
 

com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ConnectionApprovedMessage.cs

@@ -9,6 +9,7 @@ internal struct ServiceConfig : INetworkSerializable
         public bool IsRestoredSession;
         public ulong CurrentSessionOwner;
         public bool ServerRedistribution;
+        public ulong SessionStateToken;
 
         public void NetworkSerialize<T>(BufferSerializer<T> serializer) where T : IReaderWriter
         {
@@ -22,6 +23,11 @@ public void NetworkSerialize<T>(BufferSerializer<T> serializer) where T : IReade
                 {
                     serializer.SerializeValue(ref ServerRedistribution);
                 }
+
+                if (SessionVersion >= SessionConfig.SessionStateToken)
+                {
+                    serializer.SerializeValue(ref SessionStateToken);
+                }
             }
             else
             {
@@ -37,6 +43,15 @@ public void NetworkSerialize<T>(BufferSerializer<T> serializer) where T : IReade
                 {
                     ServerRedistribution = false;
                 }
+
+                if (SessionVersion >= SessionConfig.SessionStateToken)
+                {
+                    serializer.SerializeValue(ref SessionStateToken);
+                }
+                else
+                {
+                    SessionStateToken = 0;
+                }
             }
         }
     }