Skip to content

Commit c1e6e6c

Browse files
committed
Cleaned up SyncVar system slightly
1 parent dc6afc1 commit c1e6e6c

File tree

3 files changed

+11
-13
lines changed

3 files changed

+11
-13
lines changed

MLAPI/MonoBehaviours/Core/NetworkedBehaviour.cs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ private void OnEnable()
8484
{
8585
_networkedObject = GetComponentInParent<NetworkedObject>();
8686
}
87-
NetworkedObject.networkedBehaviours.Add(this);
87+
NetworkedObject.NetworkedBehaviours.Add(this);
8888
}
8989

9090
internal bool networkedStartInvoked = false;
@@ -117,7 +117,7 @@ protected void DeregisterMessageHandler(string name, int counter)
117117

118118
private void OnDisable()
119119
{
120-
NetworkedObject.networkedBehaviours.Remove(this);
120+
NetworkedObject.NetworkedBehaviours.Remove(this);
121121
}
122122

123123
private void OnDestroy()
@@ -237,16 +237,12 @@ internal void SyncVarInit()
237237

238238
internal void OnSyncVarUpdate(object value, byte fieldIndex)
239239
{
240-
if (isServer)
241-
return;
242240
syncedFields[fieldIndex].SetValue(this, value);
243241
}
244242

245243
private float lastSyncTime = 0f;
246-
internal void SyncvarUpdate()
244+
internal void SyncVarUpdate()
247245
{
248-
if (!isServer)
249-
return;
250246
SetDirtyness();
251247
if(Time.time - lastSyncTime >= SyncVarSyncDelay)
252248
{

MLAPI/MonoBehaviours/Core/NetworkedObject.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,17 +97,18 @@ internal void InvokeBehaviourNetworkSpawn()
9797
if(netBehaviours[i].networkedObject == this && !netBehaviours[i].networkedStartInvoked)
9898
{
9999
netBehaviours[i].NetworkStart();
100-
netBehaviours[i].SyncVarInit();
100+
if (NetworkingManager.singleton.isServer)
101+
netBehaviours[i].SyncVarInit();
101102
}
102103
}
103104
}
104105

105-
internal static List<NetworkedBehaviour> networkedBehaviours = new List<NetworkedBehaviour>();
106+
internal static List<NetworkedBehaviour> NetworkedBehaviours = new List<NetworkedBehaviour>();
106107
internal static void InvokeSyncvarUpdate()
107108
{
108-
for (int i = 0; i < networkedBehaviours.Count; i++)
109+
for (int i = 0; i < NetworkedBehaviours.Count; i++)
109110
{
110-
networkedBehaviours[i].SyncvarUpdate();
111+
NetworkedBehaviours[i].SyncVarUpdate();
111112
}
112113
}
113114

MLAPI/MonoBehaviours/Core/NetworkingManager.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,9 +363,10 @@ private void Update()
363363

364364
}
365365
if (isServer)
366+
{
366367
LagCompensationManager.AddFrames();
367-
368-
NetworkedObject.InvokeSyncvarUpdate();
368+
NetworkedObject.InvokeSyncvarUpdate();
369+
}
369370
}
370371

371372
private IEnumerator ApprovalTimeout(int clientId)

0 commit comments

Comments
 (0)