Added NetworkedVar sync on spawn

TwoTenPvP · TwoTenPvP · commit db9b96fa5f16 · 2018-07-10T16:08:31.000+02:00
diff --git a/MLAPI/MonoBehaviours/Core/NetworkedObject.cs b/MLAPI/MonoBehaviours/Core/NetworkedObject.cs
@@ -288,17 +288,20 @@ internal static void NetworkedVarPrepareSend()
                 NetworkedBehaviours[i].NetworkedVarUpdate();
             }
         }
-
-        internal void WriteNetworkedVarData(BitWriter writer)
+        
+        internal void WriteNetworkedVarData(BitWriter writer, uint clientId)
         {
             for (int i = 0; i < childNetworkedBehaviours.Count; i++)
             {
                 childNetworkedBehaviours[i].NetworkedVarInit();
                 if (childNetworkedBehaviours[i].networkedVarFields.Count == 0)
                     continue;
-                writer.WriteUShort(GetOrderIndex(childNetworkedBehaviours[i])); //Write the behaviourId
                 for (int j = 0; j < childNetworkedBehaviours[i].networkedVarFields.Count; j++)
-                    childNetworkedBehaviours[i].networkedVarFields[j].WriteField(writer);
+                {
+                    bool canClientRead = childNetworkedBehaviours[i].networkedVarFields[j].CanClientRead(clientId);
+                    writer.WriteBool(canClientRead);
+                    if (canClientRead) childNetworkedBehaviours[i].networkedVarFields[j].WriteField(writer);
+                }
             }
         }
 
@@ -309,9 +312,10 @@ internal void SetNetworkedVarData(BitReader reader)
                 childNetworkedBehaviours[i].NetworkedVarInit();
                 if (childNetworkedBehaviours[i].networkedVarFields.Count == 0)
                     continue;
-                NetworkedBehaviour behaviour = GetBehaviourAtOrderIndex(reader.ReadUShort());
                 for (int j = 0; j < childNetworkedBehaviours[i].networkedVarFields.Count; j++)
-                    childNetworkedBehaviours[i].networkedVarFields[j].ReadField(reader);
+                {
+                    if (reader.ReadBool()) childNetworkedBehaviours[i].networkedVarFields[j].ReadField(reader);
+                }
             }
         }
 
diff --git a/MLAPI/MonoBehaviours/Core/NetworkingManager.cs b/MLAPI/MonoBehaviours/Core/NetworkingManager.cs
@@ -583,7 +583,7 @@ public void StartHost(Vector3? pos = null, Quaternion? rot = null, int prefabId
             if (NetworkConfig.HandleObjectSpawning)
             {
                 prefabId = prefabId == -1 ? NetworkConfig.NetworkPrefabIds[NetworkConfig.PlayerPrefabName] : prefabId;
-                SpawnManager.CreateSpawnedObject(prefabId, 0, hostClientId, true, pos.GetValueOrDefault(), rot.GetValueOrDefault(), null, false, false);
+                SpawnManager.CreateSpawnedObject(prefabId, 0, hostClientId, true, pos.GetValueOrDefault(), rot.GetValueOrDefault(), null, false, false, false);
             }
 
             SpawnSceneObjects();
@@ -1124,7 +1124,7 @@ internal void HandleApproval(uint clientId, int prefabId, bool approved, Vector3
                 if(NetworkConfig.HandleObjectSpawning)
                 {
                     prefabId = prefabId == -1 ? NetworkConfig.NetworkPrefabIds[NetworkConfig.PlayerPrefabName] : prefabId;
-                    netObject = SpawnManager.CreateSpawnedObject(prefabId, 0, clientId, true, position, rotation, null, false, false);
+                    netObject = SpawnManager.CreateSpawnedObject(prefabId, 0, clientId, true, position, rotation, null, false, false, false);
                     ConnectedClients[clientId].PlayerObject = netObject;
                 }
 
@@ -1186,6 +1186,7 @@ internal void HandleApproval(uint clientId, int prefabId, bool approved, Vector3
 
                             if (pair.Value.observers.Contains(clientId))
                                 pair.Value.WriteFormattedSyncedVarData(writer);
+                            pair.Value.WriteNetworkedVarData(writer, clientId);
                         }
                     }
                     InternalMessageHandler.Send(clientId, "MLAPI_CONNECTION_APPROVED", "MLAPI_INTERNAL", writer, null, null, null, true);
@@ -1224,6 +1225,7 @@ internal void HandleApproval(uint clientId, int prefabId, bool approved, Vector3
 
                             if (ConnectedClients[clientId].PlayerObject.GetComponent<NetworkedObject>().observers.Contains(clientPair.Key))
                                 ConnectedClients[clientId].PlayerObject.GetComponent<NetworkedObject>().WriteFormattedSyncedVarData(writer);
+                            ConnectedClients[clientId].PlayerObject.GetComponent<NetworkedObject>().WriteNetworkedVarData(writer, clientPair.Key);
                         }
                         else
                         {
diff --git a/MLAPI/NetworkingManagerComponents/Core/InternalMessageHandler.Receive.cs b/MLAPI/NetworkingManagerComponents/Core/InternalMessageHandler.Receive.cs
@@ -105,7 +105,7 @@ internal static void HandleConnectionApproved(uint clientId, BitReader reader, i
                     float zRot = reader.ReadFloat();
 
                     NetworkedObject netObject = SpawnManager.CreateSpawnedObject(prefabId, networkId, ownerId, isPlayerObject,
-                        new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot), reader, visible, false);
+                        new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot), reader, visible, false, true);
                     netObject.SetLocalVisibility(visible);
                     netObject.sceneObject = sceneObject;
                     netObject.gameObject.SetActive(isActive);
@@ -149,7 +149,7 @@ internal static void HandleAddObject(uint clientId, BitReader reader, int channe
                     netManager.ConnectedClientsList.Add(netManager.ConnectedClients[ownerId]);
                 }
                 NetworkedObject netObject = SpawnManager.CreateSpawnedObject(prefabId, networkId, ownerId, isPlayerObject,
-                    new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot), reader, visible, hasPayload);
+                    new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot), reader, visible, hasPayload, true);
 
                 netObject.SetLocalVisibility(visible);
                 netObject.sceneObject = sceneObject;
@@ -274,7 +274,7 @@ internal static void HandleAddObjects(uint clientId, BitReader reader, int chann
                         netManager.ConnectedClientsList.Add(netManager.ConnectedClients[ownerId]);
                     }
                     NetworkedObject netObject = SpawnManager.CreateSpawnedObject(prefabId, networkId, ownerId, isPlayerObject,
-                        new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot), reader, visible, false);
+                        new Vector3(xPos, yPos, zPos), Quaternion.Euler(xRot, yRot, zRot), reader, visible, false, true);
                     netObject.SetLocalVisibility(visible);
                     netObject.sceneObject = sceneObject;
 
diff --git a/MLAPI/NetworkingManagerComponents/Core/SpawnManager.cs b/MLAPI/NetworkingManagerComponents/Core/SpawnManager.cs
@@ -147,7 +147,7 @@ internal static void FlushSceneObjects()
         }
         */
 
-        internal static NetworkedObject CreateSpawnedObject(int networkedPrefabId, uint networkId, uint owner, bool playerObject, Vector3 position, Quaternion rotation, BitReader reader, bool readSyncedVar, bool readPayload)
+        internal static NetworkedObject CreateSpawnedObject(int networkedPrefabId, uint networkId, uint owner, bool playerObject, Vector3 position, Quaternion rotation, BitReader reader, bool readSyncedVar, bool readPayload, bool readNetworkedVar)
         {
             if (!netManager.NetworkConfig.NetworkPrefabNames.ContainsKey(networkedPrefabId))
             {
@@ -164,6 +164,7 @@ internal static NetworkedObject CreateSpawnedObject(int networkedPrefabId, uint
             }
 
             if (readSyncedVar) netObject.SetFormattedSyncedVarData(reader);
+            if (readNetworkedVar) netObject.SetNetworkedVarData(reader);
 
             netObject.NetworkedPrefabName = netManager.NetworkConfig.NetworkPrefabNames[networkedPrefabId];
             netObject.isSpawned = true;
@@ -179,7 +180,7 @@ internal static NetworkedObject CreateSpawnedObject(int networkedPrefabId, uint
             netObject.transform.rotation = rotation;
             spawnedObjects.Add(netObject.NetworkId, netObject);
             if (playerObject) NetworkingManager.singleton.ConnectedClients[owner].PlayerObject = netObject;
-            netObject.InvokeBehaviourNetworkSpawn(reader);
+            netObject.InvokeBehaviourNetworkSpawn(readPayload ? reader : null);
             return netObject;
         }
 
@@ -267,6 +268,7 @@ internal static void SpawnPlayerObject(NetworkedObject netObject, uint clientId,
 
                     if (netObject.observers.Contains(client.Key))
                         netObject.WriteFormattedSyncedVarData(writer);
+                    netObject.WriteNetworkedVarData(writer, client.Key);
 
                     if (payload != null) writer.WriteWriter(payload);
 
@@ -336,6 +338,7 @@ internal static void SpawnObject(NetworkedObject netObject, uint? clientOwnerId
 
                     if (netObject.observers.Contains(client.Key))
                         netObject.WriteFormattedSyncedVarData(writer);
+                    netObject.WriteNetworkedVarData(writer, client.Key);
 
                     if (payload != null) writer.WriteWriter(payload);
 

Original file line number	Diff line number	Diff line change
`@@ -288,17 +288,20 @@ internal static void NetworkedVarPrepareSend()`
`288`	`288`	`NetworkedBehaviours[i].NetworkedVarUpdate();`
`289`	`289`	`}`
`290`	`290`	`}`
`291`		`-`
`292`		`- internal void WriteNetworkedVarData(BitWriter writer)`
	`291`	`+`
	`292`	`+ internal void WriteNetworkedVarData(BitWriter writer, uint clientId)`
`293`	`293`	`{`
`294`	`294`	`for (int i = 0; i < childNetworkedBehaviours.Count; i++)`
`295`	`295`	`{`
`296`	`296`	`childNetworkedBehaviours[i].NetworkedVarInit();`
`297`	`297`	`if (childNetworkedBehaviours[i].networkedVarFields.Count == 0)`
`298`	`298`	`continue;`
`299`		`- writer.WriteUShort(GetOrderIndex(childNetworkedBehaviours[i])); //Write the behaviourId`
`300`	`299`	`for (int j = 0; j < childNetworkedBehaviours[i].networkedVarFields.Count; j++)`
`301`		`- childNetworkedBehaviours[i].networkedVarFields[j].WriteField(writer);`
	`300`	`+ {`
	`301`	`+ bool canClientRead = childNetworkedBehaviours[i].networkedVarFields[j].CanClientRead(clientId);`
	`302`	`+ writer.WriteBool(canClientRead);`
	`303`	`+ if (canClientRead) childNetworkedBehaviours[i].networkedVarFields[j].WriteField(writer);`
	`304`	`+ }`
`302`	`305`	`}`
`303`	`306`	`}`
`304`	`307`
`@@ -309,9 +312,10 @@ internal void SetNetworkedVarData(BitReader reader)`
`309`	`312`	`childNetworkedBehaviours[i].NetworkedVarInit();`
`310`	`313`	`if (childNetworkedBehaviours[i].networkedVarFields.Count == 0)`
`311`	`314`	`continue;`
`312`		`- NetworkedBehaviour behaviour = GetBehaviourAtOrderIndex(reader.ReadUShort());`
`313`	`315`	`for (int j = 0; j < childNetworkedBehaviours[i].networkedVarFields.Count; j++)`
`314`		`- childNetworkedBehaviours[i].networkedVarFields[j].ReadField(reader);`
	`316`	`+ {`
	`317`	`+ if (reader.ReadBool()) childNetworkedBehaviours[i].networkedVarFields[j].ReadField(reader);`
	`318`	`+ }`
`315`	`319`	`}`
`316`	`320`	`}`
`317`	`321`
Original file line number	Diff line number	Diff line change
`@@ -583,7 +583,7 @@ public void StartHost(Vector3? pos = null, Quaternion? rot = null, int prefabId`
`583`	`583`	`if (NetworkConfig.HandleObjectSpawning)`
`584`	`584`	`{`
`585`	`585`	`prefabId = prefabId == -1 ? NetworkConfig.NetworkPrefabIds[NetworkConfig.PlayerPrefabName] : prefabId;`
`586`		`- SpawnManager.CreateSpawnedObject(prefabId, 0, hostClientId, true, pos.GetValueOrDefault(), rot.GetValueOrDefault(), null, false, false);`
	`586`	`+ SpawnManager.CreateSpawnedObject(prefabId, 0, hostClientId, true, pos.GetValueOrDefault(), rot.GetValueOrDefault(), null, false, false, false);`
`587`	`587`	`}`
`588`	`588`
`589`	`589`	`SpawnSceneObjects();`
`@@ -1124,7 +1124,7 @@ internal void HandleApproval(uint clientId, int prefabId, bool approved, Vector3`
`1124`	`1124`	`if(NetworkConfig.HandleObjectSpawning)`
`1125`	`1125`	`{`
`1126`	`1126`	`prefabId = prefabId == -1 ? NetworkConfig.NetworkPrefabIds[NetworkConfig.PlayerPrefabName] : prefabId;`
`1127`		`- netObject = SpawnManager.CreateSpawnedObject(prefabId, 0, clientId, true, position, rotation, null, false, false);`
	`1127`	`+ netObject = SpawnManager.CreateSpawnedObject(prefabId, 0, clientId, true, position, rotation, null, false, false, false);`
`1128`	`1128`	`ConnectedClients[clientId].PlayerObject = netObject;`
`1129`	`1129`	`}`
`1130`	`1130`
`@@ -1186,6 +1186,7 @@ internal void HandleApproval(uint clientId, int prefabId, bool approved, Vector3`
`1186`	`1186`
`1187`	`1187`	`if (pair.Value.observers.Contains(clientId))`
`1188`	`1188`	`pair.Value.WriteFormattedSyncedVarData(writer);`
	`1189`	`+ pair.Value.WriteNetworkedVarData(writer, clientId);`
`1189`	`1190`	`}`
`1190`	`1191`	`}`
`1191`	`1192`	`InternalMessageHandler.Send(clientId, "MLAPI_CONNECTION_APPROVED", "MLAPI_INTERNAL", writer, null, null, null, true);`
`@@ -1224,6 +1225,7 @@ internal void HandleApproval(uint clientId, int prefabId, bool approved, Vector3`
`1224`	`1225`
`1225`	`1226`	`if (ConnectedClients[clientId].PlayerObject.GetComponent<NetworkedObject>().observers.Contains(clientPair.Key))`
`1226`	`1227`	`ConnectedClients[clientId].PlayerObject.GetComponent<NetworkedObject>().WriteFormattedSyncedVarData(writer);`
	`1228`	`+ ConnectedClients[clientId].PlayerObject.GetComponent<NetworkedObject>().WriteNetworkedVarData(writer, clientPair.Key);`
`1227`	`1229`	`}`
`1228`	`1230`	`else`
`1229`	`1231`	`{`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ internal static void FlushSceneObjects()`
`147`	`147`	`}`
`148`	`148`	`*/`
`149`	`149`
`150`		`- internal static NetworkedObject CreateSpawnedObject(int networkedPrefabId, uint networkId, uint owner, bool playerObject, Vector3 position, Quaternion rotation, BitReader reader, bool readSyncedVar, bool readPayload)`
	`150`	`+ internal static NetworkedObject CreateSpawnedObject(int networkedPrefabId, uint networkId, uint owner, bool playerObject, Vector3 position, Quaternion rotation, BitReader reader, bool readSyncedVar, bool readPayload, bool readNetworkedVar)`
`151`	`151`	`{`
`152`	`152`	`if (!netManager.NetworkConfig.NetworkPrefabNames.ContainsKey(networkedPrefabId))`
`153`	`153`	`{`
`@@ -164,6 +164,7 @@ internal static NetworkedObject CreateSpawnedObject(int networkedPrefabId, uint`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`if (readSyncedVar) netObject.SetFormattedSyncedVarData(reader);`
	`167`	`+ if (readNetworkedVar) netObject.SetNetworkedVarData(reader);`
`167`	`168`
`168`	`169`	`netObject.NetworkedPrefabName = netManager.NetworkConfig.NetworkPrefabNames[networkedPrefabId];`
`169`	`170`	`netObject.isSpawned = true;`
`@@ -179,7 +180,7 @@ internal static NetworkedObject CreateSpawnedObject(int networkedPrefabId, uint`
`179`	`180`	`netObject.transform.rotation = rotation;`
`180`	`181`	`spawnedObjects.Add(netObject.NetworkId, netObject);`
`181`	`182`	`if (playerObject) NetworkingManager.singleton.ConnectedClients[owner].PlayerObject = netObject;`
`182`		`- netObject.InvokeBehaviourNetworkSpawn(reader);`
	`183`	`+ netObject.InvokeBehaviourNetworkSpawn(readPayload ? reader : null);`
`183`	`184`	`return netObject;`
`184`	`185`	`}`
`185`	`186`
`@@ -267,6 +268,7 @@ internal static void SpawnPlayerObject(NetworkedObject netObject, uint clientId,`
`267`	`268`
`268`	`269`	`if (netObject.observers.Contains(client.Key))`
`269`	`270`	`netObject.WriteFormattedSyncedVarData(writer);`
	`271`	`+ netObject.WriteNetworkedVarData(writer, client.Key);`
`270`	`272`
`271`	`273`	`if (payload != null) writer.WriteWriter(payload);`
`272`	`274`
`@@ -336,6 +338,7 @@ internal static void SpawnObject(NetworkedObject netObject, uint? clientOwnerId`
`336`	`338`
`337`	`339`	`if (netObject.observers.Contains(client.Key))`
`338`	`340`	`netObject.WriteFormattedSyncedVarData(writer);`
	`341`	`+ netObject.WriteNetworkedVarData(writer, client.Key);`
`339`	`342`
`340`	`343`	`if (payload != null) writer.WriteWriter(payload);`
`341`	`344`