Skip to content

Made SyncedVar hooks fire on host aswell as on clients. #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 28, 2018
Merged

Made SyncedVar hooks fire on host aswell as on clients. #64

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
387f84b
Made SyncedVar hooks fire on host aswell as on clients.
jaglitegrann May 28, 2018
40f4164
Made SyncedVars invoke on Server and not only Host
TwoTenPvP May 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions MLAPI/MonoBehaviours/Core/NetworkedBehaviour.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,6 +593,7 @@ internal void SyncVarUpdate()
FieldTypeHelper.WriteFieldType(writer, syncedVarFields[i].FieldInfo.GetValue(this), syncedVarFields[i].FieldValue);
syncedVarFields[i].FieldValue = FieldTypeHelper.GetReferenceArrayValue(syncedVarFields[i].FieldInfo.GetValue(this), syncedVarFields[i].FieldValue);
syncedVarFields[i].Dirty = false;
InvokeSyncvarMethodOnServer(syncedVarFields[i].HookMethod);
}
}
List<uint> stillDirtyIds = InternalMessageHandler.Send("MLAPI_SYNC_VAR_UPDATE", "MLAPI_INTERNAL", writer, networkId);
Expand Down Expand Up @@ -628,6 +629,7 @@ internal void SyncVarUpdate()
//Only targeted SyncedVars were changed. Thus we need to set them as non dirty here since it wont be done by the next loop.
syncedVarFields[i].FieldValue = FieldTypeHelper.GetReferenceArrayValue(syncedVarFields[i].FieldInfo.GetValue(this), syncedVarFields[i].FieldValue);
syncedVarFields[i].Dirty = false;
InvokeSyncvarMethodOnServer(syncedVarFields[i].HookMethod);
}
}
}
Expand Down Expand Up @@ -658,6 +660,7 @@ internal void SyncVarUpdate()
FieldTypeHelper.WriteFieldType(writer, syncedVarFields[i].FieldInfo.GetValue(this), syncedVarFields[i].FieldValue);
syncedVarFields[i].FieldValue = FieldTypeHelper.GetReferenceArrayValue(syncedVarFields[i].FieldInfo.GetValue(this), syncedVarFields[i].FieldValue);
syncedVarFields[i].Dirty = false;
InvokeSyncvarMethodOnServer(syncedVarFields[i].HookMethod);
}
}
List<uint> stillDirtyIds = InternalMessageHandler.Send("MLAPI_SYNC_VAR_UPDATE", "MLAPI_INTERNAL", writer, ownerClientId, networkId, null, null); // Send to everyone except target.
Expand All @@ -670,6 +673,12 @@ internal void SyncVarUpdate()
}
}

private void InvokeSyncvarMethodOnServer(MethodInfo hookMethod)
{
if (isServer && hookMethod != null)
hookMethod.Invoke(this, null);
}

private bool SetDirtyness()
{
if (!isServer)
Expand Down