Skip to content

Fix broken hybrid spawn tests #4061

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ShadauxCat wants to merge 1 commit into
base: develop-3.x.x
Choose a base branch
from
Open

Fix broken hybrid spawn tests #4061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions com.unity.netcode.gameobjects/Runtime/Core/NetworkObject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3736,7 +3736,13 @@ private void Start()

private void InitGhost()
{
if (!NetworkManager.IsListening)
if (!HasGhost || !NetworkObjectBridge || GhostAdapter.IsPrefab())
{
// Nothing to register
return;
}

if (!NetworkManager || !NetworkManager.IsListening)
{
if (NetworkManager.LogLevel == LogLevel.Developer)
{
Expand All @@ -3745,12 +3751,6 @@ private void InitGhost()
return;
}

if (!HasGhost || !NetworkObjectBridge || GhostAdapter.IsPrefab())
{
// Nothing to register
return;
}

// All instances with Ghosts are automatically registered
if (NetworkManager.LogLevel == LogLevel.Developer)
{
Expand Down
8 changes: 8 additions & 0 deletions com.unity.netcode.gameobjects/Runtime/Spawning/NetworkSpawnManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -939,6 +939,14 @@ internal NetworkObject GetNetworkObjectToSpawn(uint globalObjectIdHash, ulong ow
/// <returns>the instance of the <see cref="NetworkObject"/></returns>
internal NetworkObject InstantiateNetworkPrefab([NotNull] GameObject networkPrefab, uint prefabGlobalObjectIdHash, Vector3? position, Quaternion? rotation)
{
#if UNIFIED_NETCODE
// TODO-FixMe: NetCode.Netcode.Instance is a singleton and might cause issues
// assigning this.
if (networkPrefab.GetComponent<NetworkObject>().HasGhost)
{
NetCode.Netcode.Instance.m_ActiveWorld = NetworkManager.NetcodeWorld;
}
#endif
var gameObject = Object.Instantiate(networkPrefab);
var networkObject = gameObject.GetComponent<NetworkObject>();
if (networkObject == null)
Expand Down
8 changes: 8 additions & 0 deletions com.unity.netcode.gameobjects/Tests/Runtime/TestHelpers/NetcodeIntegrationTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2513,6 +2513,14 @@ protected void SpawnObjectInstance(NetworkObject networkObjectToSpawn, NetworkMa
/// <returns>GameObject instance spawned</returns>
private GameObject SpawnObject(NetworkObject prefabNetworkObject, NetworkManager owner, bool destroyWithScene = false, bool isPlayerObject = false)
{
#if UNIFIED_NETCODE
// TODO-FixMe: NetCode.Netcode.Instance is a singleton and might cause issues
// assigning this.
if (prefabNetworkObject.HasGhost)
{
NetCode.Netcode.Instance.m_ActiveWorld = owner.NetcodeWorld;
}
#endif
Assert.IsTrue(prefabNetworkObject.GlobalObjectIdHash > 0, $"{nameof(GameObject)} {prefabNetworkObject.name} has a {nameof(NetworkObject.GlobalObjectIdHash)} value of 0! Make sure to make it a valid prefab before trying to spawn!");
var newInstance = Object.Instantiate(prefabNetworkObject.gameObject);
var networkObjectToSpawn = newInstance.GetComponent<NetworkObject>();
Expand Down
11 changes: 11 additions & 0 deletions testproject/Assets/Tests/Runtime/Support/NetworkObjectSpawnerForTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
using System.Collections.Generic;
using Unity.Netcode;
using UnityEngine;
#if UNIFIED_NETCODE
using Unity.NetCode;
#endif

namespace TestProject.RuntimeTests
{
Expand Down Expand Up @@ -75,6 +78,14 @@ private void SpawnRpc(RpcParams rpcParams = default)

private void Spawn(ulong ownerId)
{
#if UNIFIED_NETCODE
// TODO-FixMe: NetCode.Netcode.Instance is a singleton and might cause issues
// assigning this.
if (ObjectToSpawn.GetComponent<NetworkObject>().HasGhost)
{
Netcode.Instance.m_ActiveWorld = NetworkManager.NetcodeWorld;
}
#endif
var instance = Instantiate(ObjectToSpawn);
var networkObject = instance.GetComponent<NetworkObject>();
networkObject.SpawnWithOwnership(ownerId);
Expand Down
3 changes: 2 additions & 1 deletion testproject/Assets/Tests/Runtime/TestProject.Runtime.Tests.asmdef
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"Unity.Mathematics",
"UnityEngine.TestRunner",
"UnityEditor.TestRunner",
"Unity.Netcode.Runtime.Tests"
"Unity.Netcode.Runtime.Tests",
"Unity.NetCode"
],
"includePlatforms": [],
"excludePlatforms": [],
Expand Down
Loading