From 680314645d868d49769f5a12adb8a37112af9e53 Mon Sep 17 00:00:00 2001 From: JohnCorby Date: Fri, 2 Sep 2022 21:21:40 -0700 Subject: [PATCH 1/3] fix find again by not including prefabs --- NewHorizons/Utility/SearchUtilities.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/NewHorizons/Utility/SearchUtilities.cs b/NewHorizons/Utility/SearchUtilities.cs index 6f4d1be5..7ecee7fe 100644 --- a/NewHorizons/Utility/SearchUtilities.cs +++ b/NewHorizons/Utility/SearchUtilities.cs @@ -119,9 +119,9 @@ namespace NewHorizons.Utility var name = names.Last(); if (warn) Logger.LogWarning($"Couldn't find object in path {path}, will look for potential matches for name {name}"); - // 3: find resource to include inactive objects - // also includes prefabs but hopefully thats okay - go = FindResourceOfTypeAndName(name); + // 3: find resource to include inactive objects (but skip prefabs + go = Resources.FindObjectsOfTypeAll() + .FirstOrDefault(x => x.scene.name != null && x.name == name); if (go) { CachedGameObjects.Add(path, go); From 5cf4150deb75f5c093cef7bd25b51aa5c8921ac8 Mon Sep 17 00:00:00 2001 From: Will Corby Date: Fri, 2 Sep 2022 21:27:05 -0700 Subject: [PATCH 2/3] Update SearchUtilities.cs --- NewHorizons/Utility/SearchUtilities.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NewHorizons/Utility/SearchUtilities.cs b/NewHorizons/Utility/SearchUtilities.cs index 7ecee7fe..8346077b 100644 --- a/NewHorizons/Utility/SearchUtilities.cs +++ b/NewHorizons/Utility/SearchUtilities.cs @@ -121,7 +121,7 @@ namespace NewHorizons.Utility if (warn) Logger.LogWarning($"Couldn't find object in path {path}, will look for potential matches for name {name}"); // 3: find resource to include inactive objects (but skip prefabs go = Resources.FindObjectsOfTypeAll() - .FirstOrDefault(x => x.scene.name != null && x.name == name); + .FirstOrDefault(x.name == name && x => x.scene.name != null); if (go) { CachedGameObjects.Add(path, go); From 7f801039badb7ac80b0f6ac7a66ee335196b3719 Mon Sep 17 00:00:00 2001 From: Will Corby Date: Fri, 2 Sep 2022 21:27:30 -0700 Subject: [PATCH 3/3] Update SearchUtilities.cs --- NewHorizons/Utility/SearchUtilities.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NewHorizons/Utility/SearchUtilities.cs b/NewHorizons/Utility/SearchUtilities.cs index 8346077b..97cb4a5e 100644 --- a/NewHorizons/Utility/SearchUtilities.cs +++ b/NewHorizons/Utility/SearchUtilities.cs @@ -121,7 +121,7 @@ namespace NewHorizons.Utility if (warn) Logger.LogWarning($"Couldn't find object in path {path}, will look for potential matches for name {name}"); // 3: find resource to include inactive objects (but skip prefabs go = Resources.FindObjectsOfTypeAll() - .FirstOrDefault(x.name == name && x => x.scene.name != null); + .FirstOrDefault(x => x.name == name && x.scene.name != null); if (go) { CachedGameObjects.Add(path, go);