Skip to content

Commit bc08e65

Browse files
fix: Issues when using UTP 2.0.0-exp.6 (#2224)
* fix: Bind to server endpoint when using Relay * Fix NativeArray conversion * Simplify creation of DataStreamReader
1 parent f98e7a2 commit bc08e65

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

com.unity.netcode.gameobjects/Runtime/Transports/UTP/BatchedSendQueue.cs

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -208,19 +208,12 @@ public int FillWriterWithMessages(ref DataStreamWriter writer)
208208

209209
unsafe
210210
{
211-
var dataPtr = (byte*)m_Data.GetUnsafePtr() + HeadIndex;
212-
213-
#if UTP_TRANSPORT_2_0_ABOVE
214-
var slice = NativeArray.ConvertExistingDataToNativeArray<byte>(dataPtr, Length, Allocator.None);
215-
var reader = new DataStreamReader(slice);
216-
#else
217-
var reader = new DataStreamReader(dataPtr, Length);
218-
#endif
211+
var reader = new DataStreamReader(m_Data.AsArray());
219212

220213
var writerAvailable = writer.Capacity;
221-
var readerOffset = 0;
214+
var readerOffset = HeadIndex;
222215

223-
while (readerOffset < Length)
216+
while (readerOffset < TailIndex)
224217
{
225218
reader.SeekSet(readerOffset);
226219
var messageLength = reader.ReadInt();

com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -482,6 +482,7 @@ private bool ClientBindAndConnect()
482482
}
483483

484484
m_NetworkSettings.WithRelayParameters(ref m_RelayServerData, m_HeartbeatTimeoutMS);
485+
serverEndpoint = m_RelayServerData.Endpoint;
485486
}
486487
else
487488
{

0 commit comments

Comments
 (0)