Skip to content

fix: Prevent duplicate prefab entries when reimporting #2430

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 6 commits into from
Mar 3, 2023
Merged

fix: Prevent duplicate prefab entries when reimporting #2430

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
101e179
fix
NoelStephensUnity Mar 1, 2023
6f9d67d
update
NoelStephensUnity Mar 1, 2023
1fab15d
update
NoelStephensUnity Mar 1, 2023
769b124
Revert "update"
NoelStephensUnity Mar 1, 2023
b34ad18
Revert "update"
NoelStephensUnity Mar 1, 2023
b6cdcb8
style
NoelStephensUnity Mar 1, 2023
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
28 changes: 28 additions & 0 deletions com.unity.netcode.gameobjects/Editor/Configuration/NetworkPrefabProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ internal set
}
}
private static NetworkPrefabsList s_PrefabsList;
private static Dictionary<string, NetworkPrefab> s_PrefabsListPath = new Dictionary<string, NetworkPrefab>();

private static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAssets, string[] movedAssets, string[] movedFromAssetPaths)
{
Expand All @@ -48,6 +49,21 @@ bool ProcessImportedAssets(string[] importedAssets1)
var go = AssetDatabase.LoadAssetAtPath<GameObject>(assetPath);
if (go.TryGetComponent<NetworkObject>(out _))
{
// Make sure we are not duplicating an already existing entry
if (s_PrefabsListPath.ContainsKey(assetPath))
{
// Is the imported asset different from the one we already have in the list?
if (s_PrefabsListPath[assetPath].Prefab.GetHashCode() != go.GetHashCode())
{
// If so remove the one in the list and continue on to add the imported one
s_PrefabsList.List.Remove(s_PrefabsListPath[assetPath]);
}
else // If they are identical, then just ignore the import
{
continue;
}
}

s_PrefabsList.List.Add(new NetworkPrefab { Prefab = go });
dirty = true;
}
Expand Down Expand Up @@ -103,7 +119,19 @@ bool ProcessDeletedAssets(string[] strings)
return;
}
}
// Clear our asset path to prefab table each time
s_PrefabsListPath.Clear();

// Create our asst path to prefab table
foreach (var prefabEntry in s_PrefabsList.List)
{
if (!s_PrefabsListPath.ContainsKey(AssetDatabase.GetAssetPath(prefabEntry.Prefab)))
{
s_PrefabsListPath.Add(AssetDatabase.GetAssetPath(prefabEntry.Prefab), prefabEntry);
}
}

// Process the imported and deleted assets
var markDirty = ProcessImportedAssets(importedAssets);
markDirty &= ProcessDeletedAssets(deletedAssets);

Expand Down