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

Remove redundant instance deletion

Browse Source
This commit is contained in:
Gent S 2020-10-25 18:14:35 -04:00
parent d840b0bbd0
commit 609d3cdb99
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ChunkManager.cpp
View File

@ -267,8 +267,9 @@ void ChunkManager::createInstance(uint64_t instanceID) {
} }
void ChunkManager::destroyInstance(uint64_t instanceID) { void ChunkManager::destroyInstance(uint64_t instanceID) {
std::cout << "Deleting instance " << instanceID << std::endl;
std::vector<std::tuple<int, int, uint64_t>> instanceChunks = ChunkManager::getChunksInMap(instanceID); std::vector<std::tuple<int, int, uint64_t>> instanceChunks = ChunkManager::getChunksInMap(instanceID);
std::cout << "Deleting instance " << instanceID << " (" << instanceChunks.size() << " chunks)" << std::endl;
for (std::tuple<int, int, uint64_t>& coords : instanceChunks) { for (std::tuple<int, int, uint64_t>& coords : instanceChunks) {
destroyChunk(coords); destroyChunk(coords);
} }

5
src/NPCManager.cpp
View File

@ -584,8 +584,6 @@ void NPCManager::handleWarp(CNSocket* sock, int32_t warpId) {
if (Warps.find(warpId) == Warps.end()) if (Warps.find(warpId) == Warps.end())
return; return;
uint64_t fromInstance = plrv.plr->instanceID; // saved for post-warp
// std::cerr << "Warped to Map Num:" << Warps[warpId].instanceID << " NPC ID " << Warps[warpId].npcID << std::endl; // std::cerr << "Warped to Map Num:" << Warps[warpId].instanceID << " NPC ID " << Warps[warpId].npcID << std::endl;
if (Warps[warpId].isInstance) { if (Warps[warpId].isInstance) {
uint64_t instanceID = Warps[warpId].instanceID; uint64_t instanceID = Warps[warpId].instanceID;
@ -625,9 +623,6 @@ void NPCManager::handleWarp(CNSocket* sock, int32_t warpId) {
plrv.plr->instanceID = INSTANCE_OVERWORLD; plrv.plr->instanceID = INSTANCE_OVERWORLD;
sock->sendPacket((void*)&resp, P_FE2CL_REP_PC_WARP_USE_NPC_SUCC, sizeof(sP_FE2CL_REP_PC_WARP_USE_NPC_SUCC)); sock->sendPacket((void*)&resp, P_FE2CL_REP_PC_WARP_USE_NPC_SUCC, sizeof(sP_FE2CL_REP_PC_WARP_USE_NPC_SUCC));
} }
// post-warp: check if the source instance has no more players in it and delete it if so
ChunkManager::destroyInstanceIfEmpty(fromInstance);
} }
/* /*

3
src/PlayerManager.cpp
View File

@ -241,7 +241,7 @@ void PlayerManager::sendPlayerTo(CNSocket* sock, int X, int Y, int Z, uint64_t I
MissionManager::failInstancedMissions(sock); // fail any instanced missions MissionManager::failInstancedMissions(sock); // fail any instanced missions
uint64_t fromInstance = plr->instanceID; uint64_t fromInstance = plrv.plr->instanceID; // pre-warp instance, saved for post-warp
plr->instanceID = I; plr->instanceID = I;
if (I != INSTANCE_OVERWORLD) { if (I != INSTANCE_OVERWORLD) {
@ -264,6 +264,7 @@ void PlayerManager::sendPlayerTo(CNSocket* sock, int X, int Y, int Z, uint64_t I
updatePlayerPosition(sock, X, Y, Z); updatePlayerPosition(sock, X, Y, Z);
} }
// post-warp: check if the source instance has no more players in it and delete it if so
ChunkManager::destroyInstanceIfEmpty(fromInstance); ChunkManager::destroyInstanceIfEmpty(fromInstance);
} }