Temporarily suppress exceptions arising from double-loading addressables

Author: jan-bures

Runtime/Core/Assets/PatchingManager.cs

@@ -142,7 +142,8 @@ public static void ImportSinglePatch(FileInfo fileInfo)
         public static void ImportAssetPatch(TextAsset asset, string modId)
         {
             Universe.LoadPatchAsset(asset, modId);
-            CurrentPatchHashes.Patches.Add(asset.name, Hash.FromString(asset.text));
+            // TODO: Actually fix the double-loading of addressables rather than just changing Add to TryAdd
+            CurrentPatchHashes.Patches.TryAdd($"{modId}/{asset.name}", Hash.FromString(asset.text));
         }
 
         public static void RegisterPatches()
@@ -292,8 +293,15 @@ public static void CreateNewAssets(Action resolve, Action<string> reject)
                     Logging.LogDebug($"Generated an asset with the label {label}, and name {name}:\n{text}");
 
                     if (!_createdAssets.ContainsKey(label))
+                    {
                         _createdAssets[label] = new List<(string name, string text)>();
-                    _createdAssets[label].Add((name, text));
+                    }
+
+                    if (!_createdAssets[label].Any(x => x.name == name))
+                    {
+                        _createdAssets[label].Add((name, text));
+                    }
+
                 }
                 catch (Exception e)
                 {

Runtime/Parts/Patchers/PartModuleLoadPatcher.cs

@@ -40,7 +40,8 @@ internal static void ApplyOnGameObject(ref GameObject gameObject, PartData partD
 
                 // Debug.Log($"ApplyOnGameObject - {partData.partName} adding {behaviourType.FullName}");
                 var instance = obj.AddComponent(behaviourType);
-                Logging.LogInfo($"Attempting to setup serialized fields on {partData.partName} of type {behaviourType}");
+                Logging.LogInfo(
+                    $"Attempting to setup serialized fields on {partData.partName} of type {behaviourType}");
                 foreach (var field in behaviourType.GetFields(BindingFlags.Instance | BindingFlags.NonPublic)
                              .Concat(behaviourType.GetFields(BindingFlags.Public | BindingFlags.Instance)))
                 {
@@ -70,7 +71,14 @@ internal static void ApplyOnGameObject(ref GameObject gameObject, PartData partD
                 if (partData.serializedPartModules.All(x => x.BehaviourType != t))
                 {
                     // Debug.Log($"ApplyOnGameObject - {partData.partName} removing {component.GetType().FullName}");
-                    Object.Destroy(component);
+                    if (Application.isEditor)
+                    {
+                        Object.DestroyImmediate(component);
+                    }
+                    else
+                    {
+                        Object.Destroy(component);
+                    }
                 }
             }