Skip to content

Commit cb11580

Browse files
fix: fixedstring byte writing and comparing (#2992)
* yupdate Updating version of package and changelog version * fix removing the [GenerateSerializationForType(typeof(byte))] attributes. * fix fixing the issue of a missing byte serializer for fixedstrings. * style removing whitespace * Update CHANGELOG.md
1 parent 3863794 commit cb11580

File tree

3 files changed

+2
-12
lines changed

3 files changed

+2
-12
lines changed

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

-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ public enum StaleDataHandling
5151
#pragma warning restore IDE0001
5252
[Serializable]
5353
[GenerateSerializationForGenericParameter(0)]
54-
[GenerateSerializationForType(typeof(byte))]
5554
public class AnticipatedNetworkVariable<T> : NetworkVariableBase
5655
{
5756
[SerializeField]

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

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ namespace Unity.Netcode
99
/// <typeparam name="T">the unmanaged type for <see cref="NetworkVariable{T}"/> </typeparam>
1010
[Serializable]
1111
[GenerateSerializationForGenericParameter(0)]
12-
[GenerateSerializationForType(typeof(byte))]
1312
public class NetworkVariable<T> : NetworkVariableBase
1413
{
1514
/// <summary>

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

+2-10
Original file line numberDiff line numberDiff line change
@@ -698,7 +698,7 @@ public unsafe void WriteDelta(FastBufferWriter writer, ref T value, ref T previo
698698
{
699699
var val = value[i];
700700
var prevVal = previousValue[i];
701-
if (!NetworkVariableSerialization<byte>.AreEqual(ref val, ref prevVal))
701+
if (val != prevVal)
702702
{
703703
++numChanges;
704704
changes.Set(i);
@@ -723,19 +723,11 @@ public unsafe void WriteDelta(FastBufferWriter writer, ref T value, ref T previo
723723
unsafe
724724
{
725725
byte* ptr = value.GetUnsafePtr();
726-
byte* prevPtr = previousValue.GetUnsafePtr();
727726
for (int i = 0; i < value.Length; ++i)
728727
{
729728
if (changes.IsSet(i))
730729
{
731-
if (i < previousValue.Length)
732-
{
733-
NetworkVariableSerialization<byte>.WriteDelta(writer, ref ptr[i], ref prevPtr[i]);
734-
}
735-
else
736-
{
737-
NetworkVariableSerialization<byte>.Write(writer, ref ptr[i]);
738-
}
730+
writer.WriteByteSafe(ptr[i]);
739731
}
740732
}
741733
}

0 commit comments

Comments
 (0)