Skip to content

Commit 2586613

Browse files
committed
Exclose use of BitWriter in using statement
1 parent 00048e1 commit 2586613

File tree

2 files changed

+16
-12
lines changed

2 files changed

+16
-12
lines changed

MLAPI/Data/NetworkedVar.cs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,13 @@ public T Value
3232
{
3333
if (!EqualityComparer<T>.Default.Equals(InternalValue, value)) // Note: value types of T should implement IEquatable to avoid boxing by default comparer
3434
{
35-
BitWriter writer = BitWriter.Get();
36-
FieldTypeHelper.WriteFieldType(writer, value, InternalValue);
37-
InternalValue = value;
38-
networkedBehaviour.SendNetworkedVar(this, writer);
39-
MonoBehaviour.print("sending networked var to remote");
35+
using (BitWriter writer = BitWriter.Get())
36+
{
37+
FieldTypeHelper.WriteFieldType(writer, value, InternalValue);
38+
InternalValue = value;
39+
networkedBehaviour.SendNetworkedVar(this, writer);
40+
MonoBehaviour.print("sending networked var to remote");
41+
}
4042
}
4143
}
4244
}

MLAPI/MonoBehaviours/Core/NetworkedBehaviour.cs

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -968,14 +968,16 @@ internal void HandleNetworkedVarChangedByRemote(BitReader reader)
968968

969969
internal void SendNetworkedVar(INetworkedVar networkedVar, BitWriter varWriter)
970970
{
971-
BitWriter writer = BitWriter.Get();
972-
writer.WriteUShort(GetNetworkedVarIndex(networkedVar));
973-
writer.WriteWriter(varWriter);
971+
using (BitWriter writer = BitWriter.Get())
972+
{
973+
writer.WriteUShort(GetNetworkedVarIndex(networkedVar));
974+
writer.WriteWriter(varWriter);
974975

975-
if (isClient)
976-
InternalMessageHandler.Send(NetworkingManager.singleton.NetworkConfig.NetworkTransport.ServerNetId, "MLAPI_NETWORKED_VAR_UPDATE", "MLAPI_INTERNAL", writer, null, networkId, networkedObject.GetOrderIndex(this));
977-
else
978-
InternalMessageHandler.Send(OwnerClientId, "MLAPI_NETWORKED_VAR_UPDATE", "MLAPI_INTERNAL", writer, null, networkId, networkedObject.GetOrderIndex(this));
976+
if (isClient)
977+
InternalMessageHandler.Send(NetworkingManager.singleton.NetworkConfig.NetworkTransport.ServerNetId, "MLAPI_NETWORKED_VAR_UPDATE", "MLAPI_INTERNAL", writer, null, networkId, networkedObject.GetOrderIndex(this));
978+
else
979+
InternalMessageHandler.Send(OwnerClientId, "MLAPI_NETWORKED_VAR_UPDATE", "MLAPI_INTERNAL", writer, null, networkId, networkedObject.GetOrderIndex(this));
980+
}
979981
}
980982

981983
internal ushort GetNetworkedVarIndex(INetworkedVar networkedVar)

0 commit comments

Comments
 (0)