Skip to content

Commit 7326a83

Browse files
committed
Removed the BufferSerializer From the GetInstantiationDataReader method
1 parent 36ec35f commit 7326a83

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

com.unity.netcode.gameobjects/Runtime/Core/NetworkObject.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3239,7 +3239,7 @@ internal static NetworkObject AddSceneObject(in SceneObject sceneObject, FastBuf
32393239
var bufferSerializer = new BufferSerializer<BufferSerializerReader>(new BufferSerializerReader(reader));
32403240

32413241
//Synchronize the instantiation data if needed
3242-
FastBufferReader instantiationDataReader = sceneObject.HasInstantiationData ? networkManager.PrefabHandler.GetInstantiationDataReader(sceneObject.Hash, ref bufferSerializer) : default;
3242+
FastBufferReader instantiationDataReader = sceneObject.HasInstantiationData ? networkManager.PrefabHandler.GetInstantiationDataReader(sceneObject.Hash, reader) : default;
32433243

32443244
//Attempt to create a local NetworkObject
32453245
var networkObject = networkManager.SpawnManager.CreateLocalNetworkObject(sceneObject, instantiationDataReader);

com.unity.netcode.gameobjects/Runtime/Spawning/NetworkPrefabHandler.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -283,15 +283,17 @@ internal bool TryGetHandlerWithData(uint objectHash, out INetworkPrefabInstanceH
283283
/// <typeparam name="T"></typeparam>
284284
/// <param name="objectHash"></param>
285285
/// <param name="serializer"></param>
286-
internal FastBufferReader GetInstantiationDataReader<T>(uint objectHash, ref BufferSerializer<T> serializer) where T : IReaderWriter
286+
internal FastBufferReader GetInstantiationDataReader(uint objectHash, FastBufferReader fastBufferReader)
287287
{
288-
if (!serializer.IsReader || !TryGetHandlerWithData(objectHash, out INetworkPrefabInstanceHandlerWithData synchronizableHandler))
288+
if (!TryGetHandlerWithData(objectHash, out var _))
289289
{
290+
if (NetworkManager.Singleton.LogLevel <= LogLevel.Developer)
291+
{
292+
Debug.LogWarning($"No handler with data found for object hash {objectHash}.");
293+
}
290294
return default;
291295
}
292296

293-
FastBufferReader fastBufferReader = serializer.GetFastBufferReader();
294-
// Reads the expected size of the instantiation data
295297
fastBufferReader.ReadValueSafe(out int dataSize);
296298
int dataStartPos = fastBufferReader.Position;
297299
var result = new FastBufferReader(fastBufferReader, Collections.Allocator.Temp, dataSize, dataStartPos);

0 commit comments

Comments
 (0)