chore(1377): batch map request packets from client (AscensionGameDev#2023)

* fix: fringe crash

* chore(1377): batch map request packets from client

Author: pandinocoder

Intersect (Core)/Logging/Output/FileOutput.cs

@@ -111,18 +111,30 @@ private void InternalWrite(
             params object[] args
         )
         {
-            if (LogLevel < logLevel)
+            try
             {
-                return;
-            }
-
-            var line = configuration.Formatter.Format(
-                configuration, logLevel, DateTime.UtcNow, exception, format, args
-            );
+                if (LogLevel < logLevel)
+                {
+                    return;
+                }
 
-            Writer.Write(line);
-            Writer.Write(Spacer);
-            Writer.Flush();
+                var line = configuration.Formatter.Format(
+                    configuration,
+                    logLevel,
+                    DateTime.UtcNow,
+                    exception,
+                    format,
+                    args
+                );
+
+                Writer.Write(line);
+                Writer.Write(Spacer);
+                Writer.Flush();
+            }
+            catch (Exception exceptionWhileWriting)
+            {
+                Console.WriteLine(exceptionWhileWriting);
+            }
         }
 
         ~FileOutput()

Intersect (Core)/Network/Packets/Client/NeedMapPacket.cs

@@ -11,13 +11,13 @@ public NeedMapPacket()
         {
         }
 
-        public NeedMapPacket(Guid mapId)
+        public NeedMapPacket(params Guid[] mapIds)
         {
-            MapId = mapId;
+            MapIds = new List<Guid>(mapIds);
         }
 
         [Key(0)]
-        public Guid MapId { get; set; }
+        public List<Guid> MapIds { get; set; }
 
     }
 

Intersect.Client/Entities/Player.cs

@@ -2327,10 +2327,10 @@ public void FetchNewMaps()
                 return;
             }
 
-            if (Maps.MapInstance.Get(Globals.Me.MapId) != null)
+            if (Maps.MapInstance.TryGet(Globals.Me.MapId, out var mapInstance))
             {
-                var gridX = Maps.MapInstance.Get(Globals.Me.MapId).GridX;
-                var gridY = Maps.MapInstance.Get(Globals.Me.MapId).GridY;
+                var gridX = mapInstance.GridX;
+                var gridY = mapInstance.GridY;
                 for (var x = gridX - 1; x <= gridX + 1; x++)
                 {
                     for (var y = gridY - 1; y <= gridY + 1; y++)

Intersect.Client/Maps/MapInstance.cs

@@ -1370,9 +1370,17 @@ public void Dispose(bool prep = true, bool killentities = true)
 
         public static bool MapNotRequested(Guid mapId) => !MapRequests.ContainsKey(mapId) || MapRequests[mapId] < Timing.Global.Milliseconds;
 
-        public static void UpdateMapRequestTime(Guid mapId)
+        public static void UpdateMapRequestTime(params Guid[] mapIds)
         {
-            MapRequests[mapId] = Timing.Global.Milliseconds + 2000;
+            foreach (var mapId in mapIds)
+            {
+                if (mapId == default)
+                {
+                    continue;
+                }
+
+                MapRequests[mapId] = Timing.Global.Milliseconds + 2000;
+            }
         }
     }
 

Intersect.Client/Networking/PacketSender.cs

@@ -30,14 +30,44 @@ public static void SendLogout(bool characterSelect = false)
             Network.SendPacket(new LogoutPacket(characterSelect));
         }
 
-        public static void SendNeedMap(Guid mapId)
+        public static void SendNeedMap(params Guid[] mapIds)
         {
-            if (mapId == default || MapInstance.Get(mapId) != null || !MapInstance.MapNotRequested(mapId))
+            var validMapIds = mapIds.Where(
+                    mapId => mapId != default && MapInstance.TryGet(mapId, out _) && MapInstance.MapNotRequested(mapId)
+                )
+                .ToArray();
+            if (validMapIds.Length < 1)
             {
                 return;
             }
-            Network.SendPacket(new NeedMapPacket(mapId));
-            MapInstance.UpdateMapRequestTime(mapId);
+
+            Network.SendPacket(new NeedMapPacket(validMapIds));
+            MapInstance.UpdateMapRequestTime(validMapIds);
+        }
+
+        public static void SendNeedMapForGrid(MapInstance? mapInstance)
+        {
+            if (mapInstance == default && !MapInstance.TryGet(Globals.Me.MapId, out mapInstance))
+            {
+                return;
+            }
+
+            var gridX = mapInstance.GridX;
+            var gridY = mapInstance.GridY;
+            var minX = Math.Max(0, gridX - 1);
+            var minY = Math.Max(0, gridY - 1);
+            var maxX = Math.Max(Globals.MapGridWidth, gridX + 2);
+            var maxY = Math.Max(Globals.MapGridHeight, gridY + 2);
+            for (int x = minX; x < maxX; x++)
+            {
+                for (int y = minY; y < maxY; y++)
+                {
+                    if (Globals.MapGrid[x, y] != Guid.Empty)
+                    {
+                        PacketSender.SendNeedMap(Globals.MapGrid[x, y]);
+                    }
+                }
+            }
         }
 
         public static void SendMove()

Intersect.Server.Core/Networking/PacketHandler.cs

@@ -659,13 +659,17 @@ public void HandlePacket(Client client, LogoutPacket packet)
         public void HandlePacket(Client client, NeedMapPacket packet)
         {
             var player = client?.Entity;
-            var map = MapController.Get(packet.MapId);
-            if (map != null)
+            foreach (var mapId in packet.MapIds)
             {
-                PacketSender.SendMap(client, packet.MapId);
-                if (player != null && packet.MapId == player.MapId)
+                if (!MapController.TryGet(mapId, out var mapController))
                 {
-                    PacketSender.SendMapGrid(client, map.MapGrid);
+                    continue;
+                }
+
+                PacketSender.SendMap(client, mapId);
+                if (player != null && mapId == player.MapId)
+                {
+                    PacketSender.SendMapGrid(client, mapController.MapGrid);
                 }
             }
         }