re-add warp specific map requester

ethanmoffat · Mar 27, 2022 · 546fe80 · 546fe80
1 parent 3c7929d
commit 546fe80
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/EOLib/Net/FileTransfer/FileRequestActions.cs b/EOLib/Net/FileTransfer/FileRequestActions.cs
@@ -58,12 +58,18 @@ public bool NeedsMapForWarp(short mapID, byte[] mapRid, int fileSize)
             return NeedMap(mapID, expectedChecksum, fileSize);
         }
 
-        public async Task GetMapFromServer(short mapID, short sessionID)
+        public async Task GetMapForWarp(short mapID, short sessionID)
         {
             var mapFile = await _fileRequestService.RequestMapFileForWarp(mapID, sessionID);
             SaveAndCacheMapFile(mapID, mapFile);
         }
 
+        public async Task GetMapFromServer(short mapID, short sessionID)
+        {
+            var mapFile = await _fileRequestService.RequestMapFile(mapID, sessionID);
+            SaveAndCacheMapFile(mapID, mapFile);
+        }
+
         public async Task GetItemFileFromServer(short sessionID)
         {
             var itemFile = await _fileRequestService.RequestFile<EIFRecord>(InitFileType.Item, sessionID);
@@ -145,6 +151,8 @@ public interface IFileRequestActions
 
         bool NeedsMapForWarp(short mapID, byte[] mapRid, int fileSize);
 
+        Task GetMapForWarp(short mapID, short sessionID);
+
         Task GetMapFromServer(short mapID, short sessionID);
 
         Task GetItemFileFromServer(short sessionID);

diff --git a/EOLib/PacketHandlers/BeginPlayerWarpHandler.cs b/EOLib/PacketHandlers/BeginPlayerWarpHandler.cs
@@ -72,7 +72,7 @@ public override bool HandlePacket(IPacket packet)
                     catch (IOException) { mapIsDownloaded = false; }
 
                     if (!mapIsDownloaded || _fileRequestActions.NeedsMapForWarp(mapID, mapRid, fileSize))
-                        _fileRequestActions.GetMapFromServer(mapID, sessionID).Wait(5000);
+                        _fileRequestActions.GetMapForWarp(mapID, sessionID).Wait(5000);
 
                     SendWarpAcceptToServer(mapID, sessionID);
                     break;