charleslemaux/Mirror
1
0
Fork 0
mirror of https://github.com/MirrorNetworking/Mirror.git synced 2024-11-18 02:50:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

moving exists check to its own function (#1948)

Browse Source 
* moving exists check to its own function

* moving order and adding whitespace
This commit is contained in:
James Frowen 2020-05-31 18:35:06 +01:00 committed by GitHub
parent 62257d8c4f
commit e736f41470
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
Assets/Mirror/Runtime/NetworkBehaviour.cs
View File

@ -362,11 +362,19 @@ public virtual bool InvokeSyncEvent(int eventHash, NetworkReader reader)
protected class Invoker protected class Invoker
{ {
public MirrorInvokeType invokeType;
public Type invokeClass; public Type invokeClass;
public MirrorInvokeType invokeType;
public CmdDelegate invokeFunction; public CmdDelegate invokeFunction;
public bool cmdIgnoreAuthority; public bool cmdIgnoreAuthority;
public bool AreEqual(Type invokeClass, MirrorInvokeType invokeType, CmdDelegate function)
{
return (this.invokeClass == invokeClass &&
this.invokeType == invokeType &&
invokeFunction == function);
}
} }
public struct CommandInfo public struct CommandInfo
{ {
public bool ignoreAuthority; public bool ignoreAuthority;
@ -381,20 +389,9 @@ protected static void RegisterDelegate(Type invokeClass, string cmdName, MirrorI
// type+func so Inventory.RpcUse != Equipment.RpcUse // type+func so Inventory.RpcUse != Equipment.RpcUse
int cmdHash = GetMethodHash(invokeClass, cmdName); int cmdHash = GetMethodHash(invokeClass, cmdName);
if (cmdHandlerDelegates.ContainsKey(cmdHash)) if (CheckIfDeligateExists(invokeClass, invokerType, func, cmdHash))
{ return;
// something already registered this hash
Invoker oldInvoker = cmdHandlerDelegates[cmdHash];
if (oldInvoker.invokeClass == invokeClass &&
oldInvoker.invokeType == invokerType &&
oldInvoker.invokeFunction == func)
{
// it's all right, it was the same function
return;
}
logger.LogError($"Function {oldInvoker.invokeClass}.{oldInvoker.invokeFunction.GetMethodName()} and {invokeClass}.{func.GetMethodName()} have the same hash. Please rename one of them");
}
Invoker invoker = new Invoker Invoker invoker = new Invoker
{ {
invokeType = invokerType, invokeType = invokerType,
@ -402,8 +399,32 @@ protected static void RegisterDelegate(Type invokeClass, string cmdName, MirrorI
invokeFunction = func, invokeFunction = func,
cmdIgnoreAuthority = cmdIgnoreAuthority, cmdIgnoreAuthority = cmdIgnoreAuthority,
}; };
cmdHandlerDelegates[cmdHash] = invoker; cmdHandlerDelegates[cmdHash] = invoker;
if (logger.LogEnabled()) logger.Log("RegisterDelegate hash:" + cmdHash + " invokerType: " + invokerType + " method:" + func.GetMethodName());
if (logger.LogEnabled())
{
string ingoreAuthorityMessage = invokerType == MirrorInvokeType.Command ? $" IgnoreAuthority:{cmdIgnoreAuthority}" : "";
logger.Log($"RegisterDelegate hash: {cmdHash} invokerType: {invokerType} method: {func.GetMethodName()}{ingoreAuthorityMessage}");
}
}
static bool CheckIfDeligateExists(Type invokeClass, MirrorInvokeType invokerType, CmdDelegate func, int cmdHash)
{
if (cmdHandlerDelegates.ContainsKey(cmdHash))
{
// something already registered this hash
Invoker oldInvoker = cmdHandlerDelegates[cmdHash];
if (oldInvoker.AreEqual(invokeClass, invokerType, func))
{
// it's all right, it was the same function
return true;
}
logger.LogError($"Function {oldInvoker.invokeClass}.{oldInvoker.invokeFunction.GetMethodName()} and {invokeClass}.{func.GetMethodName()} have the same hash. Please rename one of them");
}
return false;
} }
[EditorBrowsable(EditorBrowsableState.Never)] [EditorBrowsable(EditorBrowsableState.Never)]