Allow for irregular shaped lb groups (#4166)

ACEmulator · May 12, 2024 · 95e60bf · 95e60bf
1 parent ef427aa
commit 95e60bf
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 2 deletions.
diff --git a/Source/ACE.Server/Entity/LandblockGroup.cs b/Source/ACE.Server/Entity/LandblockGroup.cs
@@ -201,7 +201,7 @@ private LandblockGroup DoTrySplit()
 
             for (int i = remainingLandblocks.Count - 1; i >= 0; i--)
             {
-                if (landblockGroupSplitHelper.BoundaryDistance(remainingLandblocks[i]) < LandblockGroupMinSpacing)
+                if (landblockGroupSplitHelper.ClosestLandblock(remainingLandblocks[i]) < LandblockGroupMinSpacing)
                 {
                     landblockGroupSplitHelper.Add(remainingLandblocks[i]);
                     remainingLandblocks.RemoveAt(i);
@@ -283,6 +283,23 @@ public List<LandblockGroup> TryThrottledSplit()
         }
 
 
+        public int ClosestLandblock(Landblock landblock)
+        {
+            int closest = int.MaxValue;
+
+            foreach (var value in landblocks)
+            {
+                var distance = Math.Max(
+                Math.Abs(value.Id.LandblockX - landblock.Id.LandblockX),
+                Math.Abs(value.Id.LandblockY - landblock.Id.LandblockY));
+
+                if (distance < closest)
+                    closest = distance;
+            }
+
+            return closest;
+        }
+
         /// <summary>
         /// This will calculate the distance from the landblock group boarder.<para />
         /// -X = Inside the bounds, where -1 is the outer perimeter<para />

diff --git a/Source/ACE.Server/Entity/LandblockGroupSplitHelper.cs b/Source/ACE.Server/Entity/LandblockGroupSplitHelper.cs
@@ -49,6 +49,23 @@ IEnumerator IEnumerable.GetEnumerator()
         }
 
 
+        public int ClosestLandblock(Landblock landblock)
+        {
+            int closest = int.MaxValue;
+
+            foreach (var value in landblocks)
+            {
+                var distance = Math.Max(
+                Math.Abs(value.Id.LandblockX - landblock.Id.LandblockX),
+                Math.Abs(value.Id.LandblockY - landblock.Id.LandblockY));
+
+                if (distance < closest)
+                    closest = distance;
+            }
+
+            return closest;
+        }
+
         /// <summary>
         /// This will calculate the distance from the landblock group boarder.<para />
         /// -X = Inside the bounds, where -1 is the outer perimeter<para />

diff --git a/Source/ACE.Server/Managers/LandblockManager.cs b/Source/ACE.Server/Managers/LandblockManager.cs
@@ -200,7 +200,7 @@ private static void ProcessPendingLandblockGroupAdditions()
                             if (landblockGroups[j].IsDungeon)
                                 continue;
 
-                            var distance = landblockGroups[j].BoundaryDistance(landblockGroupPendingAdditions[i]);
+                            var distance = landblockGroups[j].ClosestLandblock(landblockGroupPendingAdditions[i]);
 
                             if (distance < LandblockGroup.LandblockGroupMinSpacing)
                                 landblockGroupsIndexMatchesByDistance.Add(j);