Skip to content

feat: Add "RemoveNetworkPrefab" which is necessary for certain addressables implementations #1950

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

Merged
ShadauxCat merged 8 commits into from
May 18, 2022
Merged

feat: Add "RemoveNetworkPrefab" which is necessary for certain addressables implementations #1950

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
459bd5f
feat: Add "RemoveNetworkPrefab" which is necessary for certain addres…
ShadauxCat May 9, 2022
88f0f8e
changelog
ShadauxCat May 9, 2022
0afe25e
tests
ShadauxCat May 10, 2022
2e87041
- Added XMLDoc
ShadauxCat May 10, 2022
b3b43ba
Merge branch 'develop' into feat/remove_network_prefab
0xFA11 May 10, 2022
2afe975
Merge branch 'develop' into feat/remove_network_prefab
0xFA11 May 16, 2022
3da3f18
Merge branch 'develop' into feat/remove_network_prefab
ShadauxCat May 18, 2022
3363325
Merge develop into feat/remove_network_prefab
netcode-ci-service May 18, 2022
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
26 changes: 26 additions & 0 deletions com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,6 +541,32 @@ public void AddNetworkPrefab(GameObject prefab)
}
}

public void RemoveNetworkPrefab(GameObject prefab)
Copy link
Copy Markdown
Contributor

@0xFA11 0xFA11 May 9, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll add tests and in another commit.

why not in this PR?

Copy link
Copy Markdown
Collaborator Author

@ShadauxCat ShadauxCat May 9, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It'll be in this PR, I just haven't done it yet.

Copy link
Copy Markdown
Collaborator Author

@ShadauxCat ShadauxCat May 9, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm trying getting the PR up without tests first so people can start reviewing it while I write the tests. Thought it'd be a little more parallelizable that way.

{
var globalObjectIdHash = prefab.GetComponent<NetworkObject>().GlobalObjectIdHash;
for (var i = 0; i < NetworkConfig.NetworkPrefabs.Count; ++i)
{
if (NetworkConfig.NetworkPrefabs[i].Prefab.GetComponent<NetworkObject>().GlobalObjectIdHash == globalObjectIdHash)
{
NetworkConfig.NetworkPrefabs.RemoveAt(i);
break;
}
}
if (PrefabHandler.ContainsHandler(globalObjectIdHash))
{
PrefabHandler.RemoveHandler(globalObjectIdHash);
}
if (NetworkConfig.NetworkPrefabOverrideLinks.TryGetValue(globalObjectIdHash, out var targetPrefab))
{
NetworkConfig.NetworkPrefabOverrideLinks.Remove(globalObjectIdHash);
var targetHash = targetPrefab.Prefab.GetComponent<NetworkObject>().GlobalObjectIdHash;
if (NetworkConfig.OverrideToNetworkPrefab.ContainsKey(targetHash))
{
NetworkConfig.OverrideToNetworkPrefab.Remove(targetHash);
}
}
}

private bool ShouldAddPrefab(NetworkPrefab networkPrefab, out uint sourcePrefabGlobalObjectIdHash, out uint targetPrefabGlobalObjectIdHash, int index = -1)
{
sourcePrefabGlobalObjectIdHash = 0;
Expand Down