- Fix issue where multiple loads of Streets would throw an NRE

- Resolve duplicate door links being added to the "dummy" AICell
- Bump version

Author: DrakiaXYZ

Patches/AICellDataGetCellPatch.cs

@@ -7,13 +7,8 @@ namespace DrakiaXYZ.Waypoints.Patches
 {
     internal class AICellDataGetCellPatch : ModulePatch
     {
-        private static AICell emptyCell;
-
         protected override MethodBase GetTargetMethod()
         {
-            emptyCell = new AICell();
-            emptyCell.Links = new NavMeshDoorLink[0];
-
             return AccessTools.Method(typeof(AICellData), "GetCell");
         }
 
@@ -31,6 +26,8 @@ public static bool PatchPrefix(int i, int j, AICellData __instance, ref AICell _
                 {
                     Array.Resize(ref __instance.List, __instance.List.Length + 1);
 
+                    AICell emptyCell = new AICell();
+                    emptyCell.Links = new NavMeshDoorLink[0];
                     __instance.List[__instance.List.Length - 1] = emptyCell;
                 }
 

Patches/DoorLinkPatch.cs

@@ -2,6 +2,7 @@
 using EFT.Interactive;
 using HarmonyLib;
 using System;
+using System.Linq;
 using System.Reflection;
 using UnityEngine;
 
@@ -17,6 +18,8 @@ protected override MethodBase GetTargetMethod()
         [PatchPrefix]
         public static void PatchPrefix(BotCellController __instance)
         {
+            int i = 0;
+
             // Prior to finding door links, add our own doorlinks for locked/breachable doors
             Door[] doors = UnityEngine.Object.FindObjectsOfType<Door>();
             foreach (Door door in doors)
@@ -34,7 +37,7 @@ public static void PatchPrefix(BotCellController __instance)
                 Vector3 shutPos = door.transform.position + (door.GetDoorRotation(door.GetAngle(EDoorState.Shut)) * WorldInteractiveObject.GetRotationAxis(door.DoorForward, door.transform));
 
                 // Create the DoorLink object and setup its properties, create the carvers
-                GameObject gameObject = new GameObject("DoorLink_Custom");
+                GameObject gameObject = new GameObject($"DoorLink_Custom_{i}");
                 NavMeshDoorLink navMeshDoorLink = gameObject.AddComponent<NavMeshDoorLink>();
                 navMeshDoorLink.Close1 = hingePos;
                 navMeshDoorLink.Open1 = hingePos;
@@ -53,6 +56,7 @@ public static void PatchPrefix(BotCellController __instance)
 
                 // Add to the AiCellData. NOTE: Will need to redo this for 3.8.0, yay
                 AddToCells(__instance, door, navMeshDoorLink);
+                i++;
             }
         }
 
@@ -69,11 +73,11 @@ private static void AddToCells(BotCellController controller, Door door, NavMeshD
                 {
                     // Make sure our bounds are valid
                     if (i < 0 || j < 0) continue;
-                    if (i > controller.Data.MaxIx || j > controller.Data.MaxIz) continue;
 
                     // Get the cell and validate it has a links list
                     AICell cell = controller.Data.GetCell(i, j);
                     if (cell.Links == null) cell.Links = new NavMeshDoorLink[0];
+                    if (cell.Links.Contains(navMeshDoorLink)) continue;
 
                     // Resizing an array is probably slow, but we're only doing this on match start, so should be fine
                     Array.Resize(ref cell.Links, cell.Links.Length + 1);

Properties/AssemblyInfo.cs

@@ -33,6 +33,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.3.0")]
-[assembly: AssemblyFileVersion("1.3.3.0")]
+[assembly: AssemblyVersion("1.3.4.0")]
+[assembly: AssemblyFileVersion("1.3.4.0")]
 [assembly: TarkovVersion(26535)]

ServerMod/package.json

@@ -1,6 +1,6 @@
 {
     "name": "DrakiaXYZ-Waypoints",
-    "version": "1.3.3",
+    "version": "1.3.4",
     "main": "src/mod.js",
     "license": "MIT",
     "author": "DrakiaXYZ",

WaypointsPlugin.cs

@@ -9,7 +9,7 @@
 
 namespace DrakiaXYZ.Waypoints
 {
-    [BepInPlugin("xyz.drakia.waypoints", "DrakiaXYZ-Waypoints", "1.3.3")]
+    [BepInPlugin("xyz.drakia.waypoints", "DrakiaXYZ-Waypoints", "1.3.4")]
     public class WaypointsPlugin : BaseUnityPlugin
     {
         public static string PluginFolder = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);