Skip to content

Commit ecb2758

Browse files
committed
remove static from method
1 parent 784530f commit ecb2758

File tree

1 file changed

+16
-19
lines changed

1 file changed

+16
-19
lines changed

com.unity.netcode.gameobjects/Runtime/Components/NetworkTransform.cs

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2606,7 +2606,7 @@ private void OnNetworkTick(bool isCalledFromParent = false)
26062606
}
26072607
else // If we are no longer authority, unsubscribe to the tick event
26082608
{
2609-
DeregisterForTickUpdate(this);
2609+
DeregisterForTickUpdate();
26102610
}
26112611
}
26122612
#endregion
@@ -3654,7 +3654,7 @@ private void CleanUpOnDestroyOrDespawn()
36543654
m_CachedNetworkManager.NetworkTransformRegistration(m_CachedNetworkObject, forUpdate, false);
36553655
}
36563656

3657-
DeregisterForTickUpdate(this);
3657+
DeregisterForTickUpdate();
36583658
CanCommitToTransform = false;
36593659
}
36603660

@@ -3793,7 +3793,7 @@ private void InternalInitialization(bool isOwnershipChange = false)
37933793
m_InternalCurrentPosition = currentPosition;
37943794
m_LastStateTargetPosition = currentPosition;
37953795

3796-
RegisterForTickUpdate(this);
3796+
RegisterForTickUpdate();
37973797

37983798
if (UseHalfFloatPrecision && isOwnershipChange && !IsServerAuthoritative() && Interpolate)
37993799
{
@@ -3813,7 +3813,7 @@ private void InternalInitialization(bool isOwnershipChange = false)
38133813
// Non-authority needs to be added to updates for interpolation and applying state purposes
38143814
m_CachedNetworkManager.NetworkTransformRegistration(NetworkObject, forUpdate, true);
38153815
// Remove this instance from the tick update
3816-
DeregisterForTickUpdate(this);
3816+
DeregisterForTickUpdate();
38173817
ResetInterpolatedStateToCurrentAuthoritativeState();
38183818
m_InternalCurrentPosition = currentPosition;
38193819
m_LastStateTargetPosition = currentPosition;
@@ -4818,37 +4818,34 @@ private static void RegisterNetworkManagerForTickUpdate(NetworkManager networkMa
48184818
/// If a NetworkTransformTickRegistration has not yet been registered for the NetworkManager
48194819
/// instance, then create an entry.
48204820
/// </summary>
4821-
/// <param name="networkTransform"></param>
4822-
private static void RegisterForTickUpdate(NetworkTransform networkTransform)
4821+
private void RegisterForTickUpdate()
48234822
{
4824-
var networkManager = networkTransform.NetworkManager;
4825-
if (!networkManager.DistributedAuthorityMode && !s_NetworkTickRegistration.ContainsKey(networkManager))
4823+
4824+
if (!m_CachedNetworkManager.DistributedAuthorityMode && !s_NetworkTickRegistration.ContainsKey(m_CachedNetworkManager))
48264825
{
4827-
s_NetworkTickRegistration.Add(networkManager, new NetworkTransformTickRegistration(networkManager));
4826+
s_NetworkTickRegistration.Add(m_CachedNetworkManager, new NetworkTransformTickRegistration(m_CachedNetworkManager));
48284827
}
48294828

4830-
networkTransform.RegisterForTickSynchronization();
4831-
s_NetworkTickRegistration[networkManager].NetworkTransforms.Add(networkTransform);
4829+
RegisterForTickSynchronization();
4830+
s_NetworkTickRegistration[m_CachedNetworkManager].NetworkTransforms.Add(this);
48324831
}
48334832

48344833
/// <summary>
48354834
/// If a NetworkTransformTickRegistration exists for the NetworkManager instance, then this will
48364835
/// remove the NetworkTransform instance from the single tick update entry point.
48374836
/// </summary>
4838-
/// <param name="networkTransform"></param>
4839-
private static void DeregisterForTickUpdate(NetworkTransform networkTransform)
4837+
private void DeregisterForTickUpdate()
48404838
{
4841-
var networkManager = networkTransform.NetworkManager;
4842-
if (!networkManager)
4839+
if (m_CachedNetworkManager == null)
48434840
{
48444841
return;
48454842
}
4846-
if (s_NetworkTickRegistration.ContainsKey(networkManager))
4843+
if (s_NetworkTickRegistration.ContainsKey(m_CachedNetworkManager))
48474844
{
4848-
s_NetworkTickRegistration[networkManager].NetworkTransforms.Remove(networkTransform);
4849-
if (!networkManager.DistributedAuthorityMode && s_NetworkTickRegistration[networkManager].NetworkTransforms.Count == 0)
4845+
s_NetworkTickRegistration[m_CachedNetworkManager].NetworkTransforms.Remove(this);
4846+
if (!m_CachedNetworkManager.DistributedAuthorityMode && s_NetworkTickRegistration[m_CachedNetworkManager].NetworkTransforms.Count == 0)
48504847
{
4851-
var registrationEntry = s_NetworkTickRegistration[networkManager];
4848+
var registrationEntry = s_NetworkTickRegistration[m_CachedNetworkManager];
48524849
registrationEntry.Remove();
48534850
}
48544851
}

0 commit comments

Comments
 (0)