From 546fe80f40644ea01fcc5f272259d4ef5f5dca5c Mon Sep 17 00:00:00 2001 From: sorokya Date: Sat, 26 Mar 2022 21:43:27 +0100 Subject: [PATCH] re-add warp specific map requester --- EOLib/Net/FileTransfer/FileRequestActions.cs | 10 +++++++++- EOLib/PacketHandlers/BeginPlayerWarpHandler.cs | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/EOLib/Net/FileTransfer/FileRequestActions.cs b/EOLib/Net/FileTransfer/FileRequestActions.cs index c99b54092..f67a23208 100644 --- 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(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 index dfc95d62d..b05ec4562 100644 --- 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;