GabrielTofvesson/MLAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed SyncedVarHook issue

Browse Source
This commit is contained in:
Albin Corén 2018-04-19 09:26:48 +02:00
parent f45ac572ea
commit 9df6316c59
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MLAPI/Attributes/SyncedVar.cs
View File

@ -11,7 +11,7 @@ namespace MLAPI.Attributes
/// <summary> /// <summary>
/// The method name to invoke when the SyncVar get's updated. /// The method name to invoke when the SyncVar get's updated.
/// </summary> /// </summary>
public string hook; public string hookMethodName;
/// <summary> /// <summary>
/// If true, the syncedVar will only be synced to the owner. /// If true, the syncedVar will only be synced to the owner.
/// </summary> /// </summary>

18
MLAPI/MonoBehaviours/Core/NetworkedBehaviour.cs
View File

@ -213,24 +213,24 @@ namespace MLAPI.MonoBehaviours.Core
{ {
if(sortedFields[i].IsDefined(typeof(SyncedVar), true)) if(sortedFields[i].IsDefined(typeof(SyncedVar), true))
{ {
object[] syncedVarAttributes = sortedFields[i].GetCustomAttributes(typeof(SyncedVar), true); SyncedVar attribute = ((SyncedVar)sortedFields[i].GetCustomAttributes(typeof(SyncedVar), true)[0]);
MethodInfo method = null;
if (!string.IsNullOrEmpty(((SyncedVar)syncedVarAttributes[0]).hook)) MethodInfo hookMethod = null;
{
method = GetType().GetMethod(((SyncedVar)syncedVarAttributes[0]).hook, BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance); if (!string.IsNullOrEmpty(attribute.hookMethodName))
break; hookMethod = GetType().GetMethod(attribute.hookMethodName, BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance);
}
FieldType fieldType = FieldTypeHelper.GetFieldType(sortedFields[i].FieldType); FieldType fieldType = FieldTypeHelper.GetFieldType(sortedFields[i].FieldType);
if (fieldType != FieldType.Invalid) if (fieldType != FieldType.Invalid)
{ {
syncedVarFields.Add(new SyncedVarField() syncedVarFields.Add(new SyncedVarField()
{ {
Dirty = false, Dirty = false,
Target = ((SyncedVar)sortedFields[i].GetCustomAttributes(typeof(SyncedVar), true)[0]).target, Target = attribute.target,
FieldInfo = sortedFields[i], FieldInfo = sortedFields[i],
FieldType = fieldType, FieldType = fieldType,
FieldValue = sortedFields[i].GetValue(this), FieldValue = sortedFields[i].GetValue(this),
HookMethod = method HookMethod = hookMethod
}); });
} }
else else