fix: partially undo the change I made 4 hours ago, GameBorderStyle 2 should be no camera holds (all false), instead of all true

Author: pandinocoder

Intersect (Core)/Network/Packets/Server/MapPacket.cs

@@ -31,7 +31,7 @@ public MapPacket(
         int revision = -1,
         int gridX = -1,
         int gridY = -1,
-        bool[] borders = null
+        bool[]? borders = null
     )
     {
         MapId = mapId;
@@ -70,7 +70,7 @@ public MapPacket(
     public int GridY { get; set; }
 
     [Key(8)]
-    public bool[] CameraHolds { get; set; }
+    public bool[]? CameraHolds { get; set; }
 
     [IgnoreMember]
     public string? CacheChecksum
@@ -102,13 +102,13 @@ public string? CacheVersion
         }
     }
 
-    public static string ComputeCacheVersion(Guid id, int revision, int gridX, int gridY, bool[] cameraHolds)
+    public static string ComputeCacheVersion(Guid id, int revision, int gridX, int gridY, bool[]? cameraHolds)
     {
         var hashInputData = id.ToByteArray()
             .Concat(BitConverter.GetBytes(revision))
             .Concat(BitConverter.GetBytes(gridX))
             .Concat(BitConverter.GetBytes(gridY))
-            .Concat(cameraHolds.SelectMany(BitConverter.GetBytes))
+            .Concat(cameraHolds?.SelectMany(BitConverter.GetBytes) ?? [])
             .ToArray();
         var versionData = SHA256.HashData(hashInputData);
         var version = Convert.ToBase64String(versionData);

Intersect.Client.Core/Networking/PacketHandler.cs

@@ -245,7 +245,7 @@ private void HandleMap(IPacketSender packetSender, MapPacket packet, bool skipSa
                 packet.GridY,
                 packet.Revision,
                 packet.CacheVersion,
-                $"[{string.Join(", ", packet.CameraHolds)}]"
+                $"[{string.Join(", ", packet.CameraHolds ?? [])}]"
             );
 
             ObjectCacheData<MapBase> cacheData = new()
@@ -305,7 +305,7 @@ private void HandleMap(IPacketSender packetSender, MapPacket packet, bool skipSa
 
             mapInstance.GridX = gridPosition.X;
             mapInstance.GridY = gridPosition.Y;
-            mapInstance.CameraHolds = packet.CameraHolds;
+            mapInstance.CameraHolds = packet.CameraHolds ?? [false, false, false, false];
 
             ApplicationContext.CurrentContext.Logger.LogDebug(
                 "Loading map {Id} ({Name}) @ ({GridX}, {GridY}) revision {Revision} version {Version} holds {CameraHolds}",

Intersect.Server.Core/Maps/MapController.cs

@@ -90,15 +90,13 @@ public int MapGridY
         }
     }
 
-    public bool[] GetCameraHolds()
+    public bool[]? GetCameraHolds()
     {
         switch (Options.Instance.Map.GameBorderStyle)
         {
             case 1:
                 return [true, true, true, true];
 
-                break;
-
             case 0:
                 var grid = DbInterface.GetGrid(MapGrid);
                 if (grid != null)
@@ -115,7 +113,7 @@ public bool[] GetCameraHolds()
                 break;
         }
 
-        return [true, true, true, true];
+        return null;
     }
 
     //Temporary Values