teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

[Server] Fix invalidation of iterators

Browse source
This commit is contained in:
Koncord 2018-12-29 11:09:13 +08:00
parent 343dd8b5ea
commit b3456a8841
3 changed files with 41 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/openmw-mp/Cell.cpp
View file

@ -53,18 +53,21 @@ void Cell::addPlayer(Player *player)
players.push_back(player); players.push_back(player);
} }
void Cell::removePlayer(Player *player) void Cell::removePlayer(Player *player, bool cleanPlayer)
{ {
for (Iterator it = begin(); it != end(); it++) for (Iterator it = begin(); it != end(); it++)
{ {
if (*it == player) if (*it == player)
{ {
auto it2 = find(player->cells.begin(), player->cells.end(), this); if (cleanPlayer)
if (it2 != player->cells.end())
{ {
LOG_APPEND(Log::LOG_INFO, "- Removing %s from Player %s", getDescription().c_str(), player->npc.mName.c_str()); auto it2 = find(player->cells.begin(), player->cells.end(), this);
if (it2 != player->cells.end())
{
LOG_APPEND(Log::LOG_INFO, "- Removing %s from Player %s", getDescription().c_str(), player->npc.mName.c_str());
player->cells.erase(it2); player->cells.erase(it2);
}
} }
LOG_APPEND(Log::LOG_INFO, "- Removing %s from Cell %s", player->npc.mName.c_str(), getDescription().c_str()); LOG_APPEND(Log::LOG_INFO, "- Removing %s from Cell %s", player->npc.mName.c_str(), getDescription().c_str());

2
apps/openmw-mp/Cell.hpp
View file

@ -28,7 +28,7 @@ public:
Iterator end() const; Iterator end() const;
void addPlayer(Player *player); void addPlayer(Player *player);
void removePlayer(Player *player); void removePlayer(Player *player, bool cleanPlayer = true);
void readActorList(unsigned char packetID, const mwmp::BaseActorList *newActorList); void readActorList(unsigned char packetID, const mwmp::BaseActorList *newActorList);
bool containsActor(int refNum, int mpNum); bool containsActor(int refNum, int mpNum);

43
apps/openmw-mp/CellController.cpp
View file

@ -136,26 +136,38 @@ void CellController::removeCell(Cell *cell)
void CellController::removePlayer(Cell *cell, Player *player) void CellController::removePlayer(Cell *cell, Player *player)
{ {
cell->removePlayer(player); //cell->removePlayer(player);
if (cell->players.empty())
{
LOG_APPEND(Log::LOG_INFO, "- Cell %s has no players left", cell->getDescription().c_str());
removeCell(cell);
}
} }
void CellController::deletePlayer(Player *player) void CellController::deletePlayer(Player *player)
{ {
LOG_APPEND(Log::LOG_INFO, "- Iterating through Cells from Player %s", player->npc.mName.c_str()); LOG_APPEND(Log::LOG_INFO, "- Iterating through Cells from Player %s", player->npc.mName.c_str());
for (auto it = player->getCells()->begin(); player->getCells()->size() != 0; ++it) std::vector<Cell*> toDelete;
removePlayer(*it, player);
auto it = player->getCells()->begin();
const auto endIter = player->getCells()->end();
for (; it != endIter; ++it)
{
Cell *c = *it;
c->removePlayer(player, false);
if (c->players.empty())
toDelete.push_back(c);
}
for (auto &&cell : toDelete)
{
LOG_APPEND(Log::LOG_INFO, "- Cell %s has no players left", cell->getDescription().c_str());
removeCell(cell);
}
} }
void CellController::update(Player *player) void CellController::update(Player *player)
{ {
for (auto cell : player->cellStateChanges.cellStates) std::vector<Cell*> toDelete;
for (auto &&cell : player->cellStateChanges.cellStates)
{ {
if (cell.type == mwmp::CellState::LOAD) if (cell.type == mwmp::CellState::LOAD)
{ {
@ -171,7 +183,16 @@ void CellController::update(Player *player)
c = getCellByXY(cell.cell.getGridX(), cell.cell.getGridY()); c = getCellByXY(cell.cell.getGridX(), cell.cell.getGridY());
if (c != nullptr) if (c != nullptr)
removePlayer(c, player); {
c->removePlayer(player);
if (c->players.empty())
toDelete.push_back(c);
}
} }
} }
for (auto &&cell : toDelete)
{
LOG_APPEND(Log::LOG_INFO, "- Cell %s has no players left", cell->getDescription().c_str());
removeCell(cell);
}
} }