Skip to content

Commit 02f132b

Browse files
committed
style and fix
1 parent ce3787b commit 02f132b

File tree

5 files changed

+15
-16
lines changed

5 files changed

+15
-16
lines changed

com.unity.netcode.gameobjects/Runtime/Messaging/Messages/NetworkVariableDeltaMessage.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,9 @@ public void Serialize(FastBufferWriter writer, int targetVersion)
144144
var startingSize = writer.Length;
145145
var networkVariable = NetworkBehaviour.NetworkVariableFields[i];
146146
var shouldWrite = networkVariable.IsDirty() &&
147-
networkVariable.CanClientRead(TargetClientId) &&
148-
(networkManager.IsServer || networkVariable.CanWrite()) &&
149-
networkVariable.CanSend();
147+
networkVariable.CanClientRead(TargetClientId)
148+
&& networkManager.IsServer ||
149+
(networkVariable.CanWrite && networkVariable.CanSend());
150150

151151
// Prevent the server from writing to the client that owns a given NetworkVariable
152152
// Allowing the write would send an old value to the client and cause jitter

com.unity.netcode.gameobjects/Runtime/NetworkVariable/AnticipatedNetworkVariable.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ public void Anticipate(T value)
189189
m_LastAnticipationCounter = m_NetworkBehaviour.NetworkManager.AnticipationSystem.AnticipationCounter;
190190
m_AnticipatedValue = value;
191191
NetworkVariableSerialization<T>.Duplicate(m_AnticipatedValue, ref m_PreviousAnticipatedValue);
192-
if (CanWrite())
192+
if (CanWrite)
193193
{
194194
AuthoritativeValue = value;
195195
}

com.unity.netcode.gameobjects/Runtime/NetworkVariable/Collections/NetworkList.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ public IEnumerator<T> GetEnumerator()
425425
public void Add(T item)
426426
{
427427
// check write permissions
428-
if (LocalClientCannotWrite())
428+
if (CannotWrite)
429429
{
430430
LogWritePermissionError();
431431
return;
@@ -452,7 +452,7 @@ public void Add(T item)
452452
public void Clear()
453453
{
454454
// check write permissions
455-
if (LocalClientCannotWrite())
455+
if (CannotWrite)
456456
{
457457
LogWritePermissionError();
458458
return;
@@ -490,7 +490,7 @@ public bool Contains(T item)
490490
public bool Remove(T item)
491491
{
492492
// check write permissions
493-
if (LocalClientCannotWrite())
493+
if (CannotWrite)
494494
{
495495
LogWritePermissionError();
496496
return false;
@@ -539,7 +539,7 @@ public int IndexOf(T item)
539539
public void Insert(int index, T item)
540540
{
541541
// check write permissions
542-
if (LocalClientCannotWrite())
542+
if (CannotWrite)
543543
{
544544
LogWritePermissionError();
545545
return;
@@ -575,7 +575,7 @@ public void Insert(int index, T item)
575575
public void RemoveAt(int index)
576576
{
577577
// check write permissions
578-
if (LocalClientCannotWrite())
578+
if (CannotWrite)
579579
{
580580
LogWritePermissionError();
581581
return;
@@ -608,7 +608,7 @@ public T this[int index]
608608
set
609609
{
610610
// check write permissions
611-
if (LocalClientCannotWrite())
611+
if (CannotWrite)
612612
{
613613
LogWritePermissionError();
614614
return;

com.unity.netcode.gameobjects/Runtime/NetworkVariable/NetworkVariable.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public virtual T Value
112112
get => m_InternalValue;
113113
set
114114
{
115-
if (CannotWrite())
115+
if (CannotWrite)
116116
{
117117
LogWritePermissionError();
118118
return;
@@ -145,7 +145,7 @@ public bool CheckDirtyState(bool forceCheck = false)
145145
var isDirty = base.IsDirty();
146146

147147
// A client without permissions invoking this method should only check to assure the current value is equal to the last known current value
148-
if (CannotWrite())
148+
if (CannotWrite)
149149
{
150150
// If modifications are detected, then revert back to the last known current value
151151
if (!NetworkVariableSerialization<T>.AreEqual(ref m_InternalValue, ref m_InternalOriginalValue))
@@ -221,7 +221,7 @@ public override bool IsDirty()
221221
{
222222
// If the client does not have write permissions but the internal value is determined to be locally modified and we are applying updates, then we should revert
223223
// to the original collection value prior to applying updates (primarily for collections).
224-
if (!NetworkUpdaterCheck && CannotWrite() && !NetworkVariableSerialization<T>.AreEqual(ref m_InternalValue, ref m_InternalOriginalValue))
224+
if (!NetworkUpdaterCheck && CannotWrite && !NetworkVariableSerialization<T>.AreEqual(ref m_InternalValue, ref m_InternalOriginalValue))
225225
{
226226
NetworkVariableSerialization<T>.Duplicate(m_InternalOriginalValue, ref m_InternalValue);
227227
return true;
@@ -297,7 +297,7 @@ public override void ReadDelta(FastBufferReader reader, bool keepDirtyDelta)
297297
{
298298
// If the client does not have write permissions but the internal value is determined to be locally modified and we are applying updates, then we should revert
299299
// to the original collection value prior to applying updates (primarily for collections).
300-
if (CannotWrite() && !NetworkVariableSerialization<T>.AreEqual(ref m_InternalOriginalValue, ref m_InternalValue))
300+
if (CannotWrite && !NetworkVariableSerialization<T>.AreEqual(ref m_InternalOriginalValue, ref m_InternalValue))
301301
{
302302
NetworkVariableSerialization<T>.Duplicate(m_InternalOriginalValue, ref m_InternalValue);
303303
}
@@ -338,7 +338,7 @@ public override void ReadField(FastBufferReader reader)
338338
{
339339
// If the client does not have write permissions but the internal value is determined to be locally modified and we are applying updates, then we should revert
340340
// to the original collection value prior to applying updates (primarily for collections).
341-
if (CannotWrite() && !NetworkVariableSerialization<T>.AreEqual(ref m_InternalOriginalValue, ref m_InternalValue))
341+
if (CannotWrite && !NetworkVariableSerialization<T>.AreEqual(ref m_InternalOriginalValue, ref m_InternalValue))
342342
{
343343
NetworkVariableSerialization<T>.Duplicate(m_InternalOriginalValue, ref m_InternalValue);
344344
}

com.unity.netcode.gameobjects/Runtime/NetworkVariable/NetworkVariableBase.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System;
2-
using System.Runtime.CompilerServices;
32
using UnityEngine;
43

54
namespace Unity.Netcode

0 commit comments

Comments
 (0)