Skip to content

Commit f8f53f3

Browse files
authored
refactor: remove TempGlobalObjectIdHashOverride (#1105)
1 parent bef00ff commit f8f53f3

File tree

2 files changed

+3
-18
lines changed

2 files changed

+3
-18
lines changed

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,25 +19,13 @@ public sealed class NetworkObject : MonoBehaviour
1919
internal uint GlobalObjectIdHash;
2020

2121
#if UNITY_EDITOR
22-
// HEAD: DO NOT USE! TEST ONLY TEMP IMPL, WILL BE REMOVED
23-
internal uint TempGlobalObjectIdHashOverride = 0;
24-
// TAIL: DO NOT USE! TEST ONLY TEMP IMPL, WILL BE REMOVED
25-
2622
private void OnValidate()
2723
{
2824
GenerateGlobalObjectIdHash();
2925
}
3026

3127
internal void GenerateGlobalObjectIdHash()
3228
{
33-
// HEAD: DO NOT USE! TEST ONLY TEMP IMPL, WILL BE REMOVED
34-
if (TempGlobalObjectIdHashOverride != 0)
35-
{
36-
GlobalObjectIdHash = TempGlobalObjectIdHashOverride;
37-
return;
38-
}
39-
// TAIL: DO NOT USE! TEST ONLY TEMP IMPL, WILL BE REMOVED
40-
4129
// do NOT regenerate GlobalObjectIdHash for NetworkPrefabs while Editor is in PlayMode
4230
if (UnityEditor.EditorApplication.isPlaying && !string.IsNullOrEmpty(gameObject.scene.name))
4331
{

com.unity.netcode.gameobjects/Tests/Runtime/MultiInstanceHelpers.cs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -217,16 +217,13 @@ public class CoroutineResultWrapper<T>
217217
/// <param name="globalObjectIdHash">The GlobalObjectId to force</param>
218218
public static void MakeNetworkObjectTestPrefab(NetworkObject networkObject, uint globalObjectIdHash = default)
219219
{
220-
// Set a globalObjectId for prefab
220+
// Override `GlobalObjectIdHash` if `globalObjectIdHash` param is set
221221
if (globalObjectIdHash != default)
222222
{
223-
networkObject.TempGlobalObjectIdHashOverride = globalObjectIdHash;
223+
networkObject.GlobalObjectIdHash = globalObjectIdHash;
224224
}
225225

226-
// Force generation
227-
networkObject.GenerateGlobalObjectIdHash();
228-
229-
// Fallback to auto-increment if generation fails
226+
// Fallback to auto-increment if `GlobalObjectIdHash` was never set
230227
if (networkObject.GlobalObjectIdHash == default)
231228
{
232229
networkObject.GlobalObjectIdHash = ++s_AutoIncrementGlobalObjectIdHashCounter;

0 commit comments

Comments
 (0)