* Leverage a better hash key (with less collisions) for the clear geo…

…metry GUID mapping
SubnauticaNitrox · Jan 13, 2019 · ceae5c6 · ceae5c6
1 parent c0cb780
commit ceae5c6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/NitroxPatcher/Patches/Base_ClearGeometry_Patch.cs b/NitroxPatcher/Patches/Base_ClearGeometry_Patch.cs
@@ -19,7 +19,7 @@ public class Base_ClearGeometry_Patch : NitroxPatch
          * them so that we can update the newly placed pieces with the proper id.  The new
          * pieces are added by Base.SpawnPiece (see that patch)
          */
-        public static Dictionary<Vector3, string> LastClearedCellsByPosition = new Dictionary<Vector3, string>();
+        public static Dictionary<string, string> GuidByObjectKey = new Dictionary<string, string>();
 
         public static void Prefix(Base __instance)
         {
@@ -48,14 +48,20 @@ public static void Prefix(Base __instance)
                             if(child.gameObject.GetComponent<UniqueIdentifier>() != null)
                             {
                                 string guid = child.gameObject.GetComponent<UniqueIdentifier>().Id;
-                                LastClearedCellsByPosition[child.position] = guid;
+                                string key = getObjectKey(child.gameObject.name, child.position);
+                                GuidByObjectKey[key] = guid;
                             }
                         }
                     }
                 }
             }
         }
 
+        public static string getObjectKey(string name, Vector3 postion)
+        {
+            return name + postion.ToString();
+        }
+
         public override void Patch(HarmonyInstance harmony)
         {
             PatchPrefix(harmony, TARGET_METHOD);

diff --git a/NitroxPatcher/Patches/Base_SpawnPiece_Patch.cs b/NitroxPatcher/Patches/Base_SpawnPiece_Patch.cs
@@ -25,8 +25,10 @@ public static void Postfix(Base __instance, Transform __result)
             }
 
             string guid;
-
-            if (Base_ClearGeometry_Patch.LastClearedCellsByPosition.TryGetValue(__result.position, out guid))
+
+            string key = Base_ClearGeometry_Patch.getObjectKey(__result.name, __result.position);
+
+            if (Base_ClearGeometry_Patch.GuidByObjectKey.TryGetValue(key, out guid))
             {
                 GuidHelper.SetNewGuid(__result.gameObject, guid);
             }