Skip to content

Commit 9d6adb2

Browse files
committed
Fix ulong to int conversions
1 parent a01e9be commit 9d6adb2

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

com.unity.netcode.gameobjects/Runtime/SceneManagement/NetworkSceneManager.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3168,9 +3168,9 @@ public List<SceneMap> GetSceneMapping(MapTypes mapType)
31683168
{
31693169
MapType = mapType,
31703170
#if SCENE_MANAGEMENT_SCENE_HANDLE_NO_INT_CONVERSION
3171-
ServerHandle = entry.Key.GetRawData(),
3172-
MappedLocalHandle = entry.Value.GetRawData(),
3173-
LocalHandle = scene.handle.GetRawData(),
3171+
ServerHandle = (int)entry.Key.GetRawData(),
3172+
MappedLocalHandle = (int)entry.Value.GetRawData(),
3173+
LocalHandle = (int)scene.handle.GetRawData(),
31743174
#else
31753175
ServerHandle = entry.Key,
31763176
MappedLocalHandle = entry.Value,
@@ -3193,9 +3193,9 @@ public List<SceneMap> GetSceneMapping(MapTypes mapType)
31933193
{
31943194
MapType = mapType,
31953195
#if SCENE_MANAGEMENT_SCENE_HANDLE_NO_INT_CONVERSION
3196-
ServerHandle = entry.Key,
3197-
MappedLocalHandle = entry.Value,
3198-
LocalHandle = scene.handle,
3196+
ServerHandle = (int)entry.Key.GetRawData(),
3197+
MappedLocalHandle = (int)entry.Value.GetRawData(),
3198+
LocalHandle = (int)scene.handle.GetRawData(),
31993199
#else
32003200
ServerHandle = entry.Key,
32013201
MappedLocalHandle = entry.Value,

com.unity.netcode.gameobjects/Runtime/Serialization/BytePacker.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ internal static void WriteValuePacked(FastBufferWriter writer, SceneHandle handl
289289
#if SCENE_MANAGEMENT_SCENE_HANDLE_NO_INT_CONVERSION
290290
WriteValuePacked(writer, handle.GetRawData());
291291
#else
292-
WriteValuePacked(writer, handle);
292+
WriteValuePacked(writer, (int)handle);
293293
#endif
294294
}
295295

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1109,7 +1109,7 @@ internal void SpawnNetworkObjectLocallyCommon(NetworkObject networkObject, ulong
11091109

11101110
// Always check to make sure our scene of origin is properly set for in-scene placed NetworkObjects
11111111
// Note: Always check SceneOriginHandle directly at this specific location.
1112-
if (networkObject.IsSceneObject != false && networkObject.SceneOriginHandle == 0)
1112+
if (networkObject.IsSceneObject != false && networkObject.SceneOriginHandle == SceneHandle.None)
11131113
{
11141114
networkObject.SceneOrigin = networkObject.gameObject.scene;
11151115
}

0 commit comments

Comments
 (0)