OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2025-09-30 19:50:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed private instance memory leaks.

Browse Source
This commit is contained in:
dongresource
2020-10-19 04:30:12 +02:00
parent 55be58cc24
commit e97b58ccaf
4 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/PlayerManager.cpp
View File

@@ -64,6 +64,7 @@ void PlayerManager::addPlayer(CNSocket* key, Player plr) {
void PlayerManager::removePlayer(CNSocket* key) {
PlayerView& view = players[key];
uint64_t fromInstance = view.plr->instanceID;
//MissionManager::failInstancedMissions(key); moved to enter
GroupManager::groupKickPlayer(view.plr);
@@ -71,9 +72,6 @@ void PlayerManager::removePlayer(CNSocket* key) {
// save player to DB
Database::updatePlayer(view.plr);
INITSTRUCT(sP_FE2CL_PC_EXIT, exitPacket);
exitPacket.iID = players[key].plr->iID;
// remove players from all chunks
removePlayerFromChunks(view.currentChunks, key);
@@ -87,6 +85,9 @@ void PlayerManager::removePlayer(CNSocket* key) {
delete view.plr;
players.erase(key);
// if the player was in a lair, clean it up
ChunkManager::destroyInstanceIfEmpty(fromInstance);
std::cout << players.size() << " players" << std::endl;
}
@@ -230,6 +231,9 @@ void PlayerManager::updatePlayerChunk(CNSocket* sock, int X, int Y, uint64_t ins
void PlayerManager::sendPlayerTo(CNSocket* sock, int X, int Y, int Z, uint64_t I) {
PlayerView& plrv = PlayerManager::players[sock];
Player* plr = plrv.plr;
uint64_t fromInstance = plr->instanceID;
plr->instanceID = I;
if (I != INSTANCE_OVERWORLD) {
INITSTRUCT(sP_FE2CL_INSTANCE_MAP_INFO, pkt);
@@ -250,7 +254,8 @@ void PlayerManager::sendPlayerTo(CNSocket* sock, int X, int Y, int Z, uint64_t I
plrv.currentChunks.clear();
sock->sendPacket((void*)&resp, P_FE2CL_REP_PC_WARP_USE_NPC_SUCC, sizeof(sP_FE2CL_REP_PC_WARP_USE_NPC_SUCC));
}
ChunkManager::destroyInstanceIfEmpty(fromInstance);
}
void PlayerManager::sendPlayerTo(CNSocket* sock, int X, int Y, int Z) {