Skip to content

Commit 606c9f7

Browse files
committed
Using m_CachedNetworkObject instead of NetworkObject
1 parent 0a28480 commit 606c9f7

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3625,7 +3625,7 @@ private void CleanUpOnDestroyOrDespawn()
36253625
#else
36263626
var forUpdate = true;
36273627
#endif
3628-
if (m_CachedNetworkObject != null)
3628+
if (m_CachedNetworkObject)
36293629
{
36303630
NetworkManager?.NetworkTransformRegistration(m_CachedNetworkObject, forUpdate, false);
36313631
}
@@ -3695,7 +3695,7 @@ private void ResetInterpolatedStateToCurrentAuthoritativeState()
36953695
}
36963696
private NetworkObject m_CachedNetworkObject;
36973697
/// <summary>
3698-
/// The internal initialzation method to allow for internal API adjustments
3698+
/// The internal initialization method to allow for internal API adjustments
36993699
/// </summary>
37003700
/// <param name="isOwnershipChange"></param>
37013701
private void InternalInitialization(bool isOwnershipChange = false)
@@ -3707,7 +3707,7 @@ private void InternalInitialization(bool isOwnershipChange = false)
37073707
m_CachedNetworkObject = NetworkObject;
37083708

37093709
// Determine if this is the first NetworkTransform in the associated NetworkObject's list
3710-
m_IsFirstNetworkTransform = NetworkObject.NetworkTransforms[0] == this;
3710+
m_IsFirstNetworkTransform = m_CachedNetworkObject.NetworkTransforms[0] == this;
37113711

37123712
if (m_CachedNetworkManager && m_CachedNetworkManager.DistributedAuthorityMode)
37133713
{
@@ -3719,7 +3719,7 @@ private void InternalInitialization(bool isOwnershipChange = false)
37193719
{
37203720
if (CanCommitToTransform)
37213721
{
3722-
if (NetworkObject.HasParentNetworkObject(transform))
3722+
if (m_CachedNetworkObject.HasParentNetworkObject(transform))
37233723
{
37243724
InLocalSpace = true;
37253725
}
@@ -3763,7 +3763,7 @@ private void InternalInitialization(bool isOwnershipChange = false)
37633763
if (CanCommitToTransform)
37643764
{
37653765
// Make sure authority doesn't get added to updates (no need to do this on the authority side)
3766-
m_CachedNetworkManager.NetworkTransformRegistration(NetworkObject, forUpdate, false);
3766+
m_CachedNetworkManager.NetworkTransformRegistration(m_CachedNetworkObject, forUpdate, false);
37673767
if (UseHalfFloatPrecision)
37683768
{
37693769
m_HalfPositionState = new NetworkDeltaPosition(currentPosition, m_CachedNetworkManager.ServerTime.Tick, math.bool3(SyncPositionX, SyncPositionY, SyncPositionZ));
@@ -3792,7 +3792,7 @@ private void InternalInitialization(bool isOwnershipChange = false)
37923792
m_PreviousScaleLerpSmoothing = ScaleLerpSmoothing;
37933793

37943794
// Non-authority needs to be added to updates for interpolation and applying state purposes
3795-
m_CachedNetworkManager.NetworkTransformRegistration(NetworkObject, forUpdate, true);
3795+
m_CachedNetworkManager.NetworkTransformRegistration(m_CachedNetworkObject, forUpdate, true);
37963796
// Remove this instance from the tick update
37973797
DeregisterForTickUpdate(this);
37983798
ResetInterpolatedStateToCurrentAuthoritativeState();

0 commit comments

Comments
 (0)