cleanup patch logic, look for the zdo bug that prevents initializatio…

…n on reload of game
zolantris · Jun 14, 2024 · 79e6799 · 79e6799
1 parent e127842
commit 79e6799
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/src/ValheimRAFT/ValheimRAFT.Patches/ZNetView_Patch.cs b/src/ValheimRAFT/ValheimRAFT.Patches/ZNetView_Patch.cs
@@ -22,11 +22,13 @@ private static bool ZNetView_ResetZDO(ZNetView __instance)
   [HarmonyPostfix]
   private static void ZNetView_Awake(ZNetView __instance)
   {
-    if (__instance.m_zdo != null)
+    if (__instance.m_zdo == null) return;
+    BaseVehicleController.InitPiece(__instance);
+    CultivatableComponent.InitPiece(__instance);
+
+    if (ValheimRaftPlugin.Instance.AllowOldV1RaftRecipe.Value)
     {
       MoveableBaseRootComponent.InitPiece(__instance);
-      BaseVehicleController.InitPiece(__instance);
-      CultivatableComponent.InitPiece(__instance);
     }
   }
 
@@ -38,8 +40,10 @@ private static bool ZNetView_OnDestroy(ZNetView __instance)
     if ((bool)bv)
     {
       bv.RemovePiece(__instance);
+      return true;
     }
-    else
+
+    if (ValheimRaftPlugin.Instance.AllowOldV1RaftRecipe.Value)
     {
       var mbr = __instance.GetComponentInParent<MoveableBaseRootComponent>();
       if ((bool)mbr)

diff --git a/src/ZdoWatcher/ZdoWatchManager.cs b/src/ZdoWatcher/ZdoWatchManager.cs
@@ -12,9 +12,9 @@ public class ZdoWatchManager
   public static Action<ZDO>? OnReset = null;
 
   public static ZdoWatchManager Instance = new();
-  private Dictionary<int, ZDO> m_zdoGuidLookup = new();
+  internal readonly Dictionary<int, ZDO> _mZdoGuidLookup = new();
 
-  public void Reset() => m_zdoGuidLookup.Clear();
+  public void Reset() => _mZdoGuidLookup.Clear();
 
   /// <summary>
   /// PersistentIds have migrated to a safer structure so players cannot potentially break their dictionaries with duplicate ZDOIDs
@@ -33,8 +33,6 @@ public class ZdoWatchManager
   // }
   public static bool GetPersistentID(ZDO zdo, out int id)
   {
-    id = zdo.GetInt(ZdoVarManager.PersistentUidHash, 0);
-
     id = zdo.GetInt(ZdoVarManager.PersistentUidHash, 0);
     return id != 0;
   }
@@ -51,11 +49,11 @@ public int GetOrCreatePersistentID(ZDO? zdo)
     id = ZdoIdToId(zdo.m_uid);
 
     // If the ZDO is not unique/exists in the dictionary, this number must be incremented to prevent a collision
-    while (m_zdoGuidLookup.ContainsKey(id))
+    while (_mZdoGuidLookup.ContainsKey(id))
       ++id;
     zdo.Set(ZdoVarManager.PersistentUidHash, id, false);
 
-    m_zdoGuidLookup[id] = zdo;
+    _mZdoGuidLookup[id] = zdo;
 
     return id;
   }
@@ -67,15 +65,15 @@ public void HandleRegisterPersistentId(ZDO zdo)
       return;
     }
 
-    m_zdoGuidLookup[id] = zdo;
+    _mZdoGuidLookup[id] = zdo;
   }
 
   private void HandleDeregisterPersistentId(ZDO zdo)
   {
     if (!GetPersistentID(zdo, out var id))
       return;
 
-    m_zdoGuidLookup.Remove(id);
+    _mZdoGuidLookup.Remove(id);
   }
 
   public void Deserialize(ZDO zdo)
@@ -128,7 +126,7 @@ public void Reset(ZDO zdo)
   /// <returns>ZDO|null</returns>
   public ZDO? GetZdo(int id)
   {
-    return m_zdoGuidLookup.TryGetValue(id, out var zdo) ? zdo : null;
+    return _mZdoGuidLookup.TryGetValue(id, out var zdo) ? zdo : null;
   }
 
   public GameObject? GetGameObject(int id)