OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2024-11-26 06:50:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix S.C.A.M.P.E.R. chunk desync... again

Browse Source
This commit is contained in:
Gent S 2020-11-26 22:58:56 -05:00
parent 8073c68bd5
commit 75d33aff3e
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/TransportManager.cpp
View File

@ -138,12 +138,10 @@ void TransportManager::transportWarpHandler(CNSocket* sock, CNPacketData* data)
TransportRoute route = Routes[req->iTransporationID]; TransportRoute route = Routes[req->iTransporationID];
plr->money -= route.cost; plr->money -= route.cost;
TransportLocation target; TransportLocation* target = nullptr;
switch (route.type) { switch (route.type) {
case 1: // S.C.A.M.P.E.R. case 1: // S.C.A.M.P.E.R.
target = Locations[route.end]; target = &Locations[route.end];
ChunkManager::updatePlayerChunk(sock, plr->chunkPos, std::make_tuple(0, 0, 0)); // force player to reload chunks
PlayerManager::updatePlayerPosition(sock, target.x, target.y, target.z, INSTANCE_OVERWORLD, plr->angle);
break; break;
case 2: // Monkey Skyway case 2: // Monkey Skyway
// set last safe coords // set last safe coords
@ -182,10 +180,16 @@ void TransportManager::transportWarpHandler(CNSocket* sock, CNPacketData* data)
// response parameters // response parameters
resp.eTT = route.type; resp.eTT = route.type;
resp.iCandy = plr->money; resp.iCandy = plr->money;
resp.iX = plr->x; resp.iX = (target == nullptr) ? plr->x : target->x;
resp.iY = plr->y; resp.iY = (target == nullptr) ? plr->y : target->y;
resp.iZ = plr->z; resp.iZ = (target == nullptr) ? plr->z : target->z;
sock->sendPacket((void*)&resp, P_FE2CL_REP_PC_WARP_USE_TRANSPORTATION_SUCC, sizeof(sP_FE2CL_REP_PC_WARP_USE_TRANSPORTATION_SUCC)); sock->sendPacket((void*)&resp, P_FE2CL_REP_PC_WARP_USE_TRANSPORTATION_SUCC, sizeof(sP_FE2CL_REP_PC_WARP_USE_TRANSPORTATION_SUCC));
if (target == nullptr)
return;
// we warped; update position and chunks
ChunkManager::updatePlayerChunk(sock, plr->chunkPos, std::make_tuple(0, 0, 0)); // force player to reload chunks
PlayerManager::updatePlayerPosition(sock, target->x, target->y, target->z, INSTANCE_OVERWORLD, plr->angle);
} }
void TransportManager::testMssRoute(CNSocket *sock, std::vector<WarpLocation>* route) { void TransportManager::testMssRoute(CNSocket *sock, std::vector<WarpLocation>* route) {