Added null checks on resolved RPC behaviours

TwoTenPvP · TwoTenPvP · commit f42ba1a9e029 · 2018-10-10T14:17:47.000+02:00
diff --git a/MLAPI/NetworkingManagerComponents/Core/InternalMessageHandler.Receive.cs b/MLAPI/NetworkingManagerComponents/Core/InternalMessageHandler.Receive.cs
@@ -346,7 +346,10 @@ internal static void HandleServerRPC(uint clientId, Stream stream, int channelId
                 if (SpawnManager.SpawnedObjects.ContainsKey(networkId)) 
                 { 
                     NetworkedBehaviour behaviour = SpawnManager.SpawnedObjects[networkId].GetBehaviourAtOrderIndex(behaviourId);
-                    behaviour.OnRemoteServerRPC(hash, clientId, stream);
+                    if (behaviour != null)
+                    {
+                        behaviour.OnRemoteServerRPC(hash, clientId, stream);
+                    }
                 }
             }
         }
@@ -362,7 +365,10 @@ internal static void HandleClientRPC(uint clientId, Stream stream, int channelId
                 if (SpawnManager.SpawnedObjects.ContainsKey(networkId)) 
                 {
                     NetworkedBehaviour behaviour = SpawnManager.SpawnedObjects[networkId].GetBehaviourAtOrderIndex(behaviourId);
-                    behaviour.OnRemoteClientRPC(hash, clientId, stream);
+                    if (behaviour != null)
+                    {
+                        behaviour.OnRemoteClientRPC(hash, clientId, stream);
+                    }
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -346,7 +346,10 @@ internal static void HandleServerRPC(uint clientId, Stream stream, int channelId`
`346`	`346`	`if (SpawnManager.SpawnedObjects.ContainsKey(networkId))`
`347`	`347`	`{`
`348`	`348`	`NetworkedBehaviour behaviour = SpawnManager.SpawnedObjects[networkId].GetBehaviourAtOrderIndex(behaviourId);`
`349`		`- behaviour.OnRemoteServerRPC(hash, clientId, stream);`
	`349`	`+ if (behaviour != null)`
	`350`	`+ {`
	`351`	`+ behaviour.OnRemoteServerRPC(hash, clientId, stream);`
	`352`	`+ }`
`350`	`353`	`}`
`351`	`354`	`}`
`352`	`355`	`}`
`@@ -362,7 +365,10 @@ internal static void HandleClientRPC(uint clientId, Stream stream, int channelId`
`362`	`365`	`if (SpawnManager.SpawnedObjects.ContainsKey(networkId))`
`363`	`366`	`{`
`364`	`367`	`NetworkedBehaviour behaviour = SpawnManager.SpawnedObjects[networkId].GetBehaviourAtOrderIndex(behaviourId);`
`365`		`- behaviour.OnRemoteClientRPC(hash, clientId, stream);`
	`368`	`+ if (behaviour != null)`
	`369`	`+ {`
	`370`	`+ behaviour.OnRemoteClientRPC(hash, clientId, stream);`
	`371`	`+ }`
`366`	`372`	`}`
`367`	`373`	`}`
`368`	`374`	`}`