Merge develop into fix/transportId-to-clientId

netcode-ci-service · web-flow · commit 9fdd53eb9440 · 2025-06-24T07:00:34.000+01:00
diff --git a/com.unity.netcode.gameobjects/CHANGELOG.md b/com.unity.netcode.gameobjects/CHANGELOG.md
@@ -16,6 +16,7 @@ Additional documentation and release notes are available at [Multiplayer Documen
 
 ### Fixed
 
+- Fixed `NullReferenceException` on `NetworkList` when used without a NetworkManager in scene. (#3502)
 - Fixed inconsistencies in the `OnSceneEvent` callback. (#3487)
 - Fixed issue where `NetworkClient` could persist some settings if re-using the same `NetworkManager` instance. (#3494)
 - Fixed issue where a pooled `NetworkObject` was not resetting the internal latest parent property when despawned. (#3494)
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/NetworkVariableDeltaMessage.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/NetworkVariableDeltaMessage.cs
@@ -144,9 +144,9 @@ public void Serialize(FastBufferWriter writer, int targetVersion)
                 var startingSize = writer.Length;
                 var networkVariable = NetworkBehaviour.NetworkVariableFields[i];
                 var shouldWrite = networkVariable.IsDirty() &&
-                    networkVariable.CanClientRead(TargetClientId) &&
-                    (networkManager.IsServer || networkVariable.CanClientWrite(networkManager.LocalClientId)) &&
-                    networkVariable.CanSend();
+                                  networkVariable.CanClientRead(TargetClientId) &&
+                                  (networkManager.IsServer || networkVariable.CanWrite) &&
+                                  networkVariable.CanSend();
 
                 // Prevent the server from writing to the client that owns a given NetworkVariable
                 // Allowing the write would send an old value to the client and cause jitter
diff --git a/com.unity.netcode.gameobjects/Runtime/NetworkVariable/AnticipatedNetworkVariable.cs b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/AnticipatedNetworkVariable.cs
@@ -213,7 +213,7 @@ public void Anticipate(T value)
             m_LastAnticipationCounter = m_NetworkBehaviour.NetworkManager.AnticipationSystem.AnticipationCounter;
             m_AnticipatedValue = value;
             NetworkVariableSerialization<T>.Duplicate(m_AnticipatedValue, ref m_PreviousAnticipatedValue);
-            if (CanClientWrite(m_NetworkBehaviour.NetworkManager.LocalClientId))
+            if (CanWrite)
             {
                 AuthoritativeValue = value;
             }
diff --git a/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Collections/NetworkList.cs b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Collections/NetworkList.cs
@@ -428,7 +428,7 @@ public IEnumerator<T> GetEnumerator()
         public void Add(T item)
         {
             // check write permissions
-            if (!CanClientWrite(m_NetworkBehaviour.NetworkManager.LocalClientId))
+            if (CannotWrite)
             {
                 LogWritePermissionError();
                 return;
@@ -455,7 +455,7 @@ public void Add(T item)
         public void Clear()
         {
             // check write permissions
-            if (!CanClientWrite(m_NetworkBehaviour.NetworkManager.LocalClientId))
+            if (CannotWrite)
             {
                 LogWritePermissionError();
                 return;
@@ -493,7 +493,7 @@ public bool Contains(T item)
         public bool Remove(T item)
         {
             // check write permissions
-            if (!CanClientWrite(m_NetworkBehaviour.NetworkManager.LocalClientId))
+            if (CannotWrite)
             {
                 LogWritePermissionError();
                 return false;
@@ -542,7 +542,7 @@ public int IndexOf(T item)
         public void Insert(int index, T item)
         {
             // check write permissions
-            if (!CanClientWrite(m_NetworkBehaviour.NetworkManager.LocalClientId))
+            if (CannotWrite)
             {
                 LogWritePermissionError();
                 return;
@@ -578,7 +578,7 @@ public void Insert(int index, T item)
         public void RemoveAt(int index)
         {
             // check write permissions
-            if (!CanClientWrite(m_NetworkBehaviour.NetworkManager.LocalClientId))
+            if (CannotWrite)
             {
                 LogWritePermissionError();
                 return;
@@ -611,7 +611,7 @@ public T this[int index]
             set
             {
                 // check write permissions
-                if (!CanClientWrite(m_NetworkBehaviour.NetworkManager.LocalClientId))
+                if (CannotWrite)
                 {
                     LogWritePermissionError();
                     return;
diff --git a/com.unity.netcode.gameobjects/Runtime/NetworkVariable/NetworkVariable.cs b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/NetworkVariable.cs
@@ -128,7 +128,7 @@ public virtual T Value
             get => m_InternalValue;
             set
             {
-                if (m_NetworkManager && !CanClientWrite(m_NetworkManager.LocalClientId))
+                if (CannotWrite)
                 {
                     LogWritePermissionError();
                     return;
@@ -162,7 +162,7 @@ public bool CheckDirtyState(bool forceCheck = false)
             var isDirty = base.IsDirty();
 
             // A client without permissions invoking this method should only check to assure the current value is equal to the last known current value
-            if (m_NetworkManager && !CanClientWrite(m_NetworkManager.LocalClientId))
+            if (CannotWrite)
             {
                 // If modifications are detected, then revert back to the last known current value
                 if (!NetworkVariableSerialization<T>.AreEqual(ref m_InternalValue, ref m_InternalOriginalValue))
@@ -242,7 +242,7 @@ public override bool IsDirty()
         {
             // 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
             // to the original collection value prior to applying updates (primarily for collections).
-            if (!NetworkUpdaterCheck && m_NetworkManager && !CanClientWrite(m_NetworkManager.LocalClientId) && !NetworkVariableSerialization<T>.AreEqual(ref m_InternalValue, ref m_InternalOriginalValue))
+            if (!NetworkUpdaterCheck && CannotWrite && !NetworkVariableSerialization<T>.AreEqual(ref m_InternalValue, ref m_InternalOriginalValue))
             {
                 NetworkVariableSerialization<T>.Duplicate(m_InternalOriginalValue, ref m_InternalValue);
                 return true;
@@ -318,7 +318,7 @@ public override void ReadDelta(FastBufferReader reader, bool keepDirtyDelta)
         {
             // 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
             // to the original collection value prior to applying updates (primarily for collections).
-            if (m_NetworkManager && !CanClientWrite(m_NetworkManager.LocalClientId) && !NetworkVariableSerialization<T>.AreEqual(ref m_InternalOriginalValue, ref m_InternalValue))
+            if (CannotWrite && !NetworkVariableSerialization<T>.AreEqual(ref m_InternalOriginalValue, ref m_InternalValue))
             {
                 NetworkVariableSerialization<T>.Duplicate(m_InternalOriginalValue, ref m_InternalValue);
             }
@@ -359,7 +359,7 @@ public override void ReadField(FastBufferReader reader)
         {
             // 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
             // to the original collection value prior to applying updates (primarily for collections).
-            if (m_NetworkManager && !CanClientWrite(m_NetworkManager.LocalClientId) && !NetworkVariableSerialization<T>.AreEqual(ref m_InternalOriginalValue, ref m_InternalValue))
+            if (CannotWrite && !NetworkVariableSerialization<T>.AreEqual(ref m_InternalOriginalValue, ref m_InternalValue))
             {
                 NetworkVariableSerialization<T>.Duplicate(m_InternalOriginalValue, ref m_InternalValue);
             }
diff --git a/com.unity.netcode.gameobjects/Runtime/NetworkVariable/NetworkVariableBase.cs b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/NetworkVariableBase.cs
@@ -353,6 +353,16 @@ public bool CanClientWrite(ulong clientId)
             }
         }
 
+        /// <summary>
+        /// Returns true if the current <see cref="NetworkManager.LocalClientId"/> can write to this variable; otherwise false.
+        /// </summary>
+        internal bool CanWrite => m_NetworkManager && CanClientWrite(m_NetworkManager.LocalClientId);
+
+        /// <summary>
+        /// Returns false if the current <see cref="NetworkManager.LocalClientId"/> can write to this variable; otherwise true.
+        /// </summary>
+        internal bool CannotWrite => m_NetworkManager && !CanClientWrite(m_NetworkManager.LocalClientId);
+
         /// <summary>
         /// Returns the ClientId of the owning client
         /// </summary>

Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ public void Anticipate(T value)`
`213`	`213`	`m_LastAnticipationCounter = m_NetworkBehaviour.NetworkManager.AnticipationSystem.AnticipationCounter;`
`214`	`214`	`m_AnticipatedValue = value;`
`215`	`215`	`NetworkVariableSerialization<T>.Duplicate(m_AnticipatedValue, ref m_PreviousAnticipatedValue);`
`216`		`- if (CanClientWrite(m_NetworkBehaviour.NetworkManager.LocalClientId))`
	`216`	`+ if (CanWrite)`
`217`	`217`	`{`
`218`	`218`	`AuthoritativeValue = value;`
`219`	`219`	`}`
Original file line number	Diff line number	Diff line change
`@@ -428,7 +428,7 @@ public IEnumerator<T> GetEnumerator()`
`428`	`428`	`public void Add(T item)`
`429`	`429`	`{`
`430`	`430`	`// check write permissions`
`431`		`- if (!CanClientWrite(m_NetworkBehaviour.NetworkManager.LocalClientId))`
	`431`	`+ if (CannotWrite)`
`432`	`432`	`{`
`433`	`433`	`LogWritePermissionError();`
`434`	`434`	`return;`
`@@ -455,7 +455,7 @@ public void Add(T item)`
`455`	`455`	`public void Clear()`
`456`	`456`	`{`
`457`	`457`	`// check write permissions`
`458`		`- if (!CanClientWrite(m_NetworkBehaviour.NetworkManager.LocalClientId))`
	`458`	`+ if (CannotWrite)`
`459`	`459`	`{`
`460`	`460`	`LogWritePermissionError();`
`461`	`461`	`return;`
`@@ -493,7 +493,7 @@ public bool Contains(T item)`
`493`	`493`	`public bool Remove(T item)`
`494`	`494`	`{`
`495`	`495`	`// check write permissions`
`496`		`- if (!CanClientWrite(m_NetworkBehaviour.NetworkManager.LocalClientId))`
	`496`	`+ if (CannotWrite)`
`497`	`497`	`{`
`498`	`498`	`LogWritePermissionError();`
`499`	`499`	`return false;`
`@@ -542,7 +542,7 @@ public int IndexOf(T item)`
`542`	`542`	`public void Insert(int index, T item)`
`543`	`543`	`{`
`544`	`544`	`// check write permissions`
`545`		`- if (!CanClientWrite(m_NetworkBehaviour.NetworkManager.LocalClientId))`
	`545`	`+ if (CannotWrite)`
`546`	`546`	`{`
`547`	`547`	`LogWritePermissionError();`
`548`	`548`	`return;`
`@@ -578,7 +578,7 @@ public void Insert(int index, T item)`
`578`	`578`	`public void RemoveAt(int index)`
`579`	`579`	`{`
`580`	`580`	`// check write permissions`
`581`		`- if (!CanClientWrite(m_NetworkBehaviour.NetworkManager.LocalClientId))`
	`581`	`+ if (CannotWrite)`
`582`	`582`	`{`
`583`	`583`	`LogWritePermissionError();`
`584`	`584`	`return;`
`@@ -611,7 +611,7 @@ public T this[int index]`
`611`	`611`	`set`
`612`	`612`	`{`
`613`	`613`	`// check write permissions`
`614`		`- if (!CanClientWrite(m_NetworkBehaviour.NetworkManager.LocalClientId))`
	`614`	`+ if (CannotWrite)`
`615`	`615`	`{`
`616`	`616`	`LogWritePermissionError();`
`617`	`617`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ public virtual T Value`
`128`	`128`	`get => m_InternalValue;`
`129`	`129`	`set`
`130`	`130`	`{`
`131`		`- if (m_NetworkManager && !CanClientWrite(m_NetworkManager.LocalClientId))`
	`131`	`+ if (CannotWrite)`
`132`	`132`	`{`
`133`	`133`	`LogWritePermissionError();`
`134`	`134`	`return;`
`@@ -162,7 +162,7 @@ public bool CheckDirtyState(bool forceCheck = false)`
`162`	`162`	`var isDirty = base.IsDirty();`
`163`	`163`
`164`	`164`	`// A client without permissions invoking this method should only check to assure the current value is equal to the last known current value`
`165`		`- if (m_NetworkManager && !CanClientWrite(m_NetworkManager.LocalClientId))`
	`165`	`+ if (CannotWrite)`
`166`	`166`	`{`
`167`	`167`	`// If modifications are detected, then revert back to the last known current value`
`168`	`168`	`if (!NetworkVariableSerialization<T>.AreEqual(ref m_InternalValue, ref m_InternalOriginalValue))`
`@@ -242,7 +242,7 @@ public override bool IsDirty()`
`242`	`242`	`{`
`243`	`243`	`// 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`
`244`	`244`	`// to the original collection value prior to applying updates (primarily for collections).`
`245`		`- if (!NetworkUpdaterCheck && m_NetworkManager && !CanClientWrite(m_NetworkManager.LocalClientId) && !NetworkVariableSerialization<T>.AreEqual(ref m_InternalValue, ref m_InternalOriginalValue))`
	`245`	`+ if (!NetworkUpdaterCheck && CannotWrite && !NetworkVariableSerialization<T>.AreEqual(ref m_InternalValue, ref m_InternalOriginalValue))`
`246`	`246`	`{`
`247`	`247`	`NetworkVariableSerialization<T>.Duplicate(m_InternalOriginalValue, ref m_InternalValue);`
`248`	`248`	`return true;`
`@@ -318,7 +318,7 @@ public override void ReadDelta(FastBufferReader reader, bool keepDirtyDelta)`
`318`	`318`	`{`
`319`	`319`	`// 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`
`320`	`320`	`// to the original collection value prior to applying updates (primarily for collections).`
`321`		`- if (m_NetworkManager && !CanClientWrite(m_NetworkManager.LocalClientId) && !NetworkVariableSerialization<T>.AreEqual(ref m_InternalOriginalValue, ref m_InternalValue))`
	`321`	`+ if (CannotWrite && !NetworkVariableSerialization<T>.AreEqual(ref m_InternalOriginalValue, ref m_InternalValue))`
`322`	`322`	`{`
`323`	`323`	`NetworkVariableSerialization<T>.Duplicate(m_InternalOriginalValue, ref m_InternalValue);`
`324`	`324`	`}`
`@@ -359,7 +359,7 @@ public override void ReadField(FastBufferReader reader)`
`359`	`359`	`{`
`360`	`360`	`// 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`
`361`	`361`	`// to the original collection value prior to applying updates (primarily for collections).`
`362`		`- if (m_NetworkManager && !CanClientWrite(m_NetworkManager.LocalClientId) && !NetworkVariableSerialization<T>.AreEqual(ref m_InternalOriginalValue, ref m_InternalValue))`
	`362`	`+ if (CannotWrite && !NetworkVariableSerialization<T>.AreEqual(ref m_InternalOriginalValue, ref m_InternalValue))`
`363`	`363`	`{`
`364`	`364`	`NetworkVariableSerialization<T>.Duplicate(m_InternalOriginalValue, ref m_InternalValue);`
`365`	`365`	`}`