OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2026-01-10 10:40:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up warp code.

Browse Source
This commit is contained in:
Gent
2020-10-22 13:14:24 -04:00
parent 512647974d
commit 2b650b0bed
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/NPCManager.cpp
View File

@@ -584,18 +584,8 @@ void NPCManager::handleWarp(CNSocket* sock, int32_t warpId) {
if (Warps.find(warpId) == Warps.end())
return;
MissionManager::failInstancedMissions(sock); // fail any missions that require the player's current instance
uint64_t fromInstance = plrv.plr->instanceID; // saved for post-warp
if (plrv.plr->instanceID == 0) {
// save last uninstanced coords
plrv.plr->lastX = plrv.plr->x;
plrv.plr->lastY = plrv.plr->y;
plrv.plr->lastZ = plrv.plr->z;
plrv.plr->lastAngle = plrv.plr->angle;
}
// std::cerr << "Warped to Map Num:" << Warps[warpId].instanceID << " NPC ID " << Warps[warpId].npcID << std::endl;
if (Warps[warpId].isInstance) {
uint64_t instanceID = Warps[warpId].instanceID;