Merge branch 'master' into certificate-hail

Author: TwoTenPvP

MLAPI/MonoBehaviours/Core/NetworkedBehaviour.cs

@@ -413,7 +413,29 @@ private ulong HashMethodName(string name)
 
             return 0;
         }
-        
+
+        private MethodInfo[] GetNetworkedBehaviorChildClassesMethods(Type type, List<MethodInfo> list = null) 
+        {
+            if (list == null) 
+            {
+                list = new List<MethodInfo>();
+                list.AddRange(type.GetMethods(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance));
+            }
+            else
+            {
+                list.AddRange(type.GetMethods(BindingFlags.NonPublic | BindingFlags.Instance));
+            }
+
+            if (type.BaseType != null && type.BaseType != typeof(NetworkedBehaviour))
+            {
+                return GetNetworkedBehaviorChildClassesMethods(type.BaseType, list);
+            }
+            else
+            {
+                return list.ToArray();
+            }
+        }
+
         private void CacheAttributes()
         {
             Type type = GetType();
@@ -425,7 +447,7 @@ private void CacheAttributes()
             if (Methods.ContainsKey(type)) methods = Methods[type];
             else
             {
-                methods = type.GetMethods(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+                methods = GetNetworkedBehaviorChildClassesMethods(type);
                 Methods.Add(type, methods);
             }
 

MLAPI/NetworkingManagerComponents/Binary/BitReader.cs

@@ -6,7 +6,9 @@
 using System;
 using System.IO;
 using System.Text;
+using MLAPI.Components;
 using MLAPI.Internal;
+using MLAPI.Logging;
 using UnityEngine;
 
 namespace MLAPI.Serialization
@@ -108,7 +110,7 @@ public object ReadObjectPacked(Type type)
             if (type == typeof(double))
                 return ReadDoublePacked();
             if (type == typeof(string))
-                return ReadStringPacked();
+                return ReadStringPacked().ToString();
             if (type == typeof(bool))
                 return ReadBool();
             if (type == typeof(Vector2))
@@ -127,14 +129,57 @@ public object ReadObjectPacked(Type type)
                 return ReadRotation(3);
             if (type == typeof(char))
                 return ReadCharPacked();
-            if (type == typeof(IBitWritable))
+            if (type.IsEnum)
+                return ReadInt32Packed();
+            if (type == typeof(GameObject))
+            {
+                uint networkId = ReadUInt32Packed();
+                if (SpawnManager.SpawnedObjects.ContainsKey(networkId)) 
+                {
+                    return SpawnManager.SpawnedObjects[networkId].gameObject;
+                }
+                else 
+                {
+                    if (LogHelper.CurrentLogLevel <= LogLevel.Normal)
+                        LogHelper.LogWarning("BitReader canot find the GameObject sent in the SpawnedObjects list, it may have been destroyed. NetworkId: " + networkId.ToString());
+                    return null;
+                }
+            }
+            if (type == typeof(NetworkedObject))
+            {
+                uint networkId = ReadUInt32Packed();
+                if (SpawnManager.SpawnedObjects.ContainsKey(networkId)) 
+                {
+                    return SpawnManager.SpawnedObjects[networkId];
+                }
+                else 
+                {
+                    if (LogHelper.CurrentLogLevel <= LogLevel.Normal)
+                        LogHelper.LogWarning("BitReader canot find the NetworkedObject sent in the SpawnedObjects list, it may have been destroyed. NetworkId: " + networkId.ToString());
+                    return null;
+                }
+            }
+            if (type == typeof(NetworkedBehaviour))
+            {
+                uint networkId = ReadUInt32Packed();
+                ushort behaviourId = ReadUInt16Packed();
+                if (SpawnManager.SpawnedObjects.ContainsKey(networkId)) 
+                {
+                    return SpawnManager.SpawnedObjects[networkId].GetBehaviourAtOrderIndex(behaviourId);
+                }
+                else 
+                {
+                    if (LogHelper.CurrentLogLevel <= LogLevel.Normal)
+                        LogHelper.LogWarning("BitReader canot find the NetworkedBehaviour sent in the SpawnedObjects list, it may have been destroyed. NetworkId: " + networkId.ToString());
+                    return null;
+                }
+            }
+            if (typeof(IBitWritable).IsAssignableFrom(type))
             {
                 object instance = Activator.CreateInstance(type);
                 ((IBitWritable)instance).Read(this.source);
                 return instance;
             }
-            if (type.IsEnum)
-                return ReadInt32Packed();
 
             throw new ArgumentException("BitReader cannot read type " + type.Name);
         }

MLAPI/NetworkingManagerComponents/Binary/BitWriter.cs

@@ -145,16 +145,53 @@ public void WriteObjectPacked(object value)
                 WriteCharPacked((char)value);
                 return;
             }
-            else if(value is IBitWritable)
-            {
-                ((IBitWritable)value).Write(this.sink);
-                return;
-            } 
             else if (value.GetType().IsEnum) 
             {
                 WriteInt32Packed((int)value);
                 return;
             }
+            else if (value is GameObject) 
+            {
+                if(value == null) 
+                {
+                    throw new ArgumentException("BitWriter cannot write GameObject types with a null value");
+                }
+                NetworkedObject networkedObject = ((GameObject)value).GetComponent<NetworkedObject>();
+                if(networkedObject == null) 
+                {
+                    throw new ArgumentException("BitWriter cannot write GameObject types that does not has a NetworkedObject component attached. GameObject: " + ((GameObject)value).name);
+                } 
+                else 
+                {
+                    WriteUInt32Packed(networkedObject.NetworkId);
+                }
+                return;
+            }
+            else if (value is NetworkedObject)
+            {
+                if (value == null) 
+                {
+                    throw new ArgumentException("BitWriter cannot write NetworkedObject types with a null value");
+                }
+                WriteUInt32Packed(((NetworkedObject)value).NetworkId);
+                return;
+            } 
+            else if (value is NetworkedBehaviour)
+            {
+                if(value == null) 
+                {
+                    throw new ArgumentException("BitWriter cannot write NetworkedBehaviour types with a null value");
+                }
+                WriteUInt32Packed(((NetworkedBehaviour)value).networkId);
+                WriteUInt16Packed(((NetworkedBehaviour)value).GetBehaviourId());
+                return;
+            } 
+            else if(value is IBitWritable)
+            {
+                ((IBitWritable)value).Write(this.sink);
+                return;
+            } 
+            
 
             throw new ArgumentException("BitWriter cannot write type " + value.GetType().Name);
         }

MLAPI/NetworkingManagerComponents/Core/InternalMessageHandler.Receive.cs

@@ -487,8 +487,11 @@ internal static void HandleServerRPC(uint clientId, Stream stream, int channelId
                 ushort behaviourId = reader.ReadUInt16Packed();
                 ulong hash = reader.ReadUInt64Packed();
 
-                NetworkedBehaviour behaviour = SpawnManager.SpawnedObjects[networkId].GetBehaviourAtOrderIndex(behaviourId);
-                behaviour.OnRemoteServerRPC(hash, clientId, stream);
+                if (SpawnManager.SpawnedObjects.ContainsKey(networkId)) 
+                { 
+                    NetworkedBehaviour behaviour = SpawnManager.SpawnedObjects[networkId].GetBehaviourAtOrderIndex(behaviourId);
+                    behaviour.OnRemoteServerRPC(hash, clientId, stream);
+                }
             }
         }
 
@@ -500,8 +503,11 @@ internal static void HandleClientRPC(uint clientId, Stream stream, int channelId
                 ushort behaviourId = reader.ReadUInt16Packed();
                 ulong hash = reader.ReadUInt64Packed();
 
-                NetworkedBehaviour behaviour = SpawnManager.SpawnedObjects[networkId].GetBehaviourAtOrderIndex(behaviourId);
-                behaviour.OnRemoteClientRPC(hash, clientId, stream);
+                if (SpawnManager.SpawnedObjects.ContainsKey(networkId)) 
+                {
+                    NetworkedBehaviour behaviour = SpawnManager.SpawnedObjects[networkId].GetBehaviourAtOrderIndex(behaviourId);
+                    behaviour.OnRemoteClientRPC(hash, clientId, stream);
+                }
             }
         }