Stabilized and optimized library

TwoTenPvP · TwoTenPvP · commit 34031beee098 · 2018-03-08T19:58:15.000+01:00
diff --git a/MLAPI/MonoBehaviours/Core/NetworkedBehaviour.cs b/MLAPI/MonoBehaviours/Core/NetworkedBehaviour.cs
@@ -266,12 +266,12 @@ internal void FlushToClient(int clientId)
                 using (BinaryWriter writer = new BinaryWriter(stream))
                 {
                     //Write all indexes
-                    writer.Write(dirtyFields.Length);
+                    writer.Write((byte)dirtyFields.Length);
+                    writer.Write(networkId); //NetId
+                    writer.Write(networkedObject.GetOrderIndex(this)); //Behaviour OrderIndex
                     for (byte i = 0; i < dirtyFields.Length; i++)
                     {
-                        writer.Write(networkId);
-                        writer.Write(networkedObject.GetOrderIndex(this));
-                        writer.Write(i); //Index
+                        writer.Write(i); //FieldIndex
                         switch (syncedFieldTypes[i])
                         {
                             case FieldType.Bool:
@@ -332,8 +332,8 @@ internal void FlushToClient(int clientId)
                                 break;
                         }
                     }
-                    NetworkingManager.singleton.Send(clientId, "MLAPI_SYNC_VAR_UPDATE", "MLAPI_RELIABLE_FRAGMENTED_SEQUENCED", stream.ToArray());
                 }
+                NetworkingManager.singleton.Send(clientId, "MLAPI_SYNC_VAR_UPDATE", "MLAPI_RELIABLE_FRAGMENTED_SEQUENCED", stream.ToArray());
             }
         }
 
@@ -353,14 +353,14 @@ internal void SyncVarUpdate()
                     {
                         //Write all indexes
                         writer.Write(dirtyCount);
+                        writer.Write(networkId); //NetId
+                        writer.Write(networkedObject.GetOrderIndex(this)); //Behaviour OrderIndex
                         for (byte i = 0; i < dirtyFields.Length; i++)
                         {
                             //Writes all the indexes of the dirty syncvars.
                             if (dirtyFields[i] == true)
                             {
-                                writer.Write(networkId);
-                                writer.Write(networkedObject.GetOrderIndex(this));
-                                writer.Write(i); //Index
+                                writer.Write(i); //FieldIndex
                                 switch (syncedFieldTypes[i])
                                 {
                                     case FieldType.Bool:
@@ -425,8 +425,8 @@ internal void SyncVarUpdate()
                                 dirtyFields[i] = false;
                             }
                         }
-                        NetworkingManager.singleton.Send("MLAPI_SYNC_VAR_UPDATE", "MLAPI_RELIABLE_FRAGMENTED_SEQUENCED", stream.ToArray(), ownerClientId);
                     }
+                    NetworkingManager.singleton.Send("MLAPI_SYNC_VAR_UPDATE", "MLAPI_RELIABLE_FRAGMENTED_SEQUENCED", stream.ToArray());
                 }
                 lastSyncTime = Time.time;
             }
diff --git a/MLAPI/MonoBehaviours/Core/NetworkedObject.cs b/MLAPI/MonoBehaviours/Core/NetworkedObject.cs
@@ -86,8 +86,7 @@ internal void InvokeBehaviourNetworkSpawn()
                 if(!childNetworkedBehaviours[i].networkedStartInvoked)
                 {
                     childNetworkedBehaviours[i].NetworkStart();
-                    if (NetworkingManager.singleton.isServer)
-                        childNetworkedBehaviours[i].SyncVarInit();
+                    childNetworkedBehaviours[i].SyncVarInit();
                 }
             }
         }
diff --git a/MLAPI/MonoBehaviours/Core/NetworkingManager.cs b/MLAPI/MonoBehaviours/Core/NetworkingManager.cs
@@ -451,6 +451,16 @@ private void HandleIncomingData(int clientId, byte[] data, int channelId)
                         //Custom message, invoke all message handlers
                         if(targeted)
                         {
+                            if(!MessageManager.targetedMessages.ContainsKey(messageType))
+                            {
+                                Debug.LogWarning("MLAPI: No handlers for the given messagetype");
+                                return;
+                            }
+                            else if(!MessageManager.targetedMessages[messageType].ContainsKey(targetNetworkId))
+                            {
+                                Debug.LogWarning("MLAPI: No handlers for the given networkId");
+                                return;
+                            }
                             List<int> handlerIds = MessageManager.targetedMessages[messageType][targetNetworkId];
                             for (int i = 0; i < handlerIds.Count; i++)
                             {
@@ -688,20 +698,20 @@ private void HandleIncomingData(int clientId, byte[] data, int channelId)
                                     }
                                 }
                                 break;
-                            case 9:
+                            case 9: //Syncvar
                                 if (isClient)
                                 {
                                     using (MemoryStream messageReadStream = new MemoryStream(incommingData))
                                     {
                                         using (BinaryReader messageReader = new BinaryReader(messageReadStream))
                                         {
                                             byte dirtyCount = messageReader.ReadByte();
-                                            if(dirtyCount > 0)
+                                            uint netId = messageReader.ReadUInt32();
+                                            ushort orderIndex = messageReader.ReadUInt16();
+                                            if (dirtyCount > 0)
                                             {
                                                 for (int i = 0; i < dirtyCount; i++)
                                                 {
-                                                    uint netId = messageReader.ReadUInt32(); //NetId the syncvar is from
-                                                    ushort orderIndex = messageReader.ReadUInt16();
                                                     byte fieldIndex = messageReader.ReadByte();
                                                     if(!SpawnManager.spawnedObjects.ContainsKey(netId))
                                                     {
diff --git a/MLAPI/MonoBehaviours/Prototyping/NetworkedTransform.cs b/MLAPI/MonoBehaviours/Prototyping/NetworkedTransform.cs
@@ -81,7 +81,7 @@ private void Update()
                             writer.Write(transform.rotation.eulerAngles.z);
                         }
                         if (isServer)
-                            SendToNonLocalClientsTarget("MLAPI_OnRecieveTransformFromClient", "MLAPI_POSITION_UPDATE", writeStream.GetBuffer());
+                            SendToClientsTarget("MLAPI_OnRecieveTransformFromServer", "MLAPI_POSITION_UPDATE", writeStream.GetBuffer());
                         else
                             SendToServerTarget("MLAPI_OnRecieveTransformFromClient", "MLAPI_POSITION_UPDATE", writeStream.GetBuffer());
                     }

Original file line number	Diff line number	Diff line change
`@@ -266,12 +266,12 @@ internal void FlushToClient(int clientId)`
`266`	`266`	`using (BinaryWriter writer = new BinaryWriter(stream))`
`267`	`267`	`{`
`268`	`268`	`//Write all indexes`
`269`		`- writer.Write(dirtyFields.Length);`
	`269`	`+ writer.Write((byte)dirtyFields.Length);`
	`270`	`+ writer.Write(networkId); //NetId`
	`271`	`+ writer.Write(networkedObject.GetOrderIndex(this)); //Behaviour OrderIndex`
`270`	`272`	`for (byte i = 0; i < dirtyFields.Length; i++)`
`271`	`273`	`{`
`272`		`- writer.Write(networkId);`
`273`		`- writer.Write(networkedObject.GetOrderIndex(this));`
`274`		`- writer.Write(i); //Index`
	`274`	`+ writer.Write(i); //FieldIndex`
`275`	`275`	`switch (syncedFieldTypes[i])`
`276`	`276`	`{`
`277`	`277`	`case FieldType.Bool:`
`@@ -332,8 +332,8 @@ internal void FlushToClient(int clientId)`
`332`	`332`	`break;`
`333`	`333`	`}`
`334`	`334`	`}`
`335`		`- NetworkingManager.singleton.Send(clientId, "MLAPI_SYNC_VAR_UPDATE", "MLAPI_RELIABLE_FRAGMENTED_SEQUENCED", stream.ToArray());`
`336`	`335`	`}`
	`336`	`+ NetworkingManager.singleton.Send(clientId, "MLAPI_SYNC_VAR_UPDATE", "MLAPI_RELIABLE_FRAGMENTED_SEQUENCED", stream.ToArray());`
`337`	`337`	`}`
`338`	`338`	`}`
`339`	`339`
`@@ -353,14 +353,14 @@ internal void SyncVarUpdate()`
`353`	`353`	`{`
`354`	`354`	`//Write all indexes`
`355`	`355`	`writer.Write(dirtyCount);`
	`356`	`+ writer.Write(networkId); //NetId`
	`357`	`+ writer.Write(networkedObject.GetOrderIndex(this)); //Behaviour OrderIndex`
`356`	`358`	`for (byte i = 0; i < dirtyFields.Length; i++)`
`357`	`359`	`{`
`358`	`360`	`//Writes all the indexes of the dirty syncvars.`
`359`	`361`	`if (dirtyFields[i] == true)`
`360`	`362`	`{`
`361`		`- writer.Write(networkId);`
`362`		`- writer.Write(networkedObject.GetOrderIndex(this));`
`363`		`- writer.Write(i); //Index`
	`363`	`+ writer.Write(i); //FieldIndex`
`364`	`364`	`switch (syncedFieldTypes[i])`
`365`	`365`	`{`
`366`	`366`	`case FieldType.Bool:`
`@@ -425,8 +425,8 @@ internal void SyncVarUpdate()`
`425`	`425`	`dirtyFields[i] = false;`
`426`	`426`	`}`
`427`	`427`	`}`
`428`		`- NetworkingManager.singleton.Send("MLAPI_SYNC_VAR_UPDATE", "MLAPI_RELIABLE_FRAGMENTED_SEQUENCED", stream.ToArray(), ownerClientId);`
`429`	`428`	`}`
	`429`	`+ NetworkingManager.singleton.Send("MLAPI_SYNC_VAR_UPDATE", "MLAPI_RELIABLE_FRAGMENTED_SEQUENCED", stream.ToArray());`
`430`	`430`	`}`
`431`	`431`	`lastSyncTime = Time.time;`
`432`	`432`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,8 +86,7 @@ internal void InvokeBehaviourNetworkSpawn()`
`86`	`86`	`if(!childNetworkedBehaviours[i].networkedStartInvoked)`
`87`	`87`	`{`
`88`	`88`	`childNetworkedBehaviours[i].NetworkStart();`
`89`		`- if (NetworkingManager.singleton.isServer)`
`90`		`- childNetworkedBehaviours[i].SyncVarInit();`
	`89`	`+ childNetworkedBehaviours[i].SyncVarInit();`
`91`	`90`	`}`
`92`	`91`	`}`
`93`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -451,6 +451,16 @@ private void HandleIncomingData(int clientId, byte[] data, int channelId)`
`451`	`451`	`//Custom message, invoke all message handlers`
`452`	`452`	`if(targeted)`
`453`	`453`	`{`
	`454`	`+ if(!MessageManager.targetedMessages.ContainsKey(messageType))`
	`455`	`+ {`
	`456`	`+ Debug.LogWarning("MLAPI: No handlers for the given messagetype");`
	`457`	`+ return;`
	`458`	`+ }`
	`459`	`+ else if(!MessageManager.targetedMessages[messageType].ContainsKey(targetNetworkId))`
	`460`	`+ {`
	`461`	`+ Debug.LogWarning("MLAPI: No handlers for the given networkId");`
	`462`	`+ return;`
	`463`	`+ }`
`454`	`464`	`List<int> handlerIds = MessageManager.targetedMessages[messageType][targetNetworkId];`
`455`	`465`	`for (int i = 0; i < handlerIds.Count; i++)`
`456`	`466`	`{`
`@@ -688,20 +698,20 @@ private void HandleIncomingData(int clientId, byte[] data, int channelId)`
`688`	`698`	`}`
`689`	`699`	`}`
`690`	`700`	`break;`
`691`		`- case 9:`
	`701`	`+ case 9: //Syncvar`
`692`	`702`	`if (isClient)`
`693`	`703`	`{`
`694`	`704`	`using (MemoryStream messageReadStream = new MemoryStream(incommingData))`
`695`	`705`	`{`
`696`	`706`	`using (BinaryReader messageReader = new BinaryReader(messageReadStream))`
`697`	`707`	`{`
`698`	`708`	`byte dirtyCount = messageReader.ReadByte();`
`699`		`- if(dirtyCount > 0)`
	`709`	`+ uint netId = messageReader.ReadUInt32();`
	`710`	`+ ushort orderIndex = messageReader.ReadUInt16();`
	`711`	`+ if (dirtyCount > 0)`
`700`	`712`	`{`
`701`	`713`	`for (int i = 0; i < dirtyCount; i++)`
`702`	`714`	`{`
`703`		`- uint netId = messageReader.ReadUInt32(); //NetId the syncvar is from`
`704`		`- ushort orderIndex = messageReader.ReadUInt16();`
`705`	`715`	`byte fieldIndex = messageReader.ReadByte();`
`706`	`716`	`if(!SpawnManager.spawnedObjects.ContainsKey(netId))`
`707`	`717`	`{`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ private void Update()`
`81`	`81`	`writer.Write(transform.rotation.eulerAngles.z);`
`82`	`82`	`}`
`83`	`83`	`if (isServer)`
`84`		`- SendToNonLocalClientsTarget("MLAPI_OnRecieveTransformFromClient", "MLAPI_POSITION_UPDATE", writeStream.GetBuffer());`
	`84`	`+ SendToClientsTarget("MLAPI_OnRecieveTransformFromServer", "MLAPI_POSITION_UPDATE", writeStream.GetBuffer());`
`85`	`85`	`else`
`86`	`86`	`SendToServerTarget("MLAPI_OnRecieveTransformFromClient", "MLAPI_POSITION_UPDATE", writeStream.GetBuffer());`
`87`	`87`	`}`