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

[Server] Don't crash server every time a player disconnects. Again.

Browse source
This commit is contained in:
Koncord 2017-02-20 20:43:51 +08:00
parent 13a47b400d
commit ec4d016100
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -169,9 +169,8 @@ void CellController::removePlayer(Cell *cell, Player *player)
void CellController::deletePlayer(Player *player) void CellController::deletePlayer(Player *player)
{ {
std::deque<Cell *> playerCells = player->getCells();
for_each(playerCells.begin(), playerCells.end(), [&player](Cell *cell) { for_each(player->getCells()->begin(), player->getCells()->end(), [&player](Cell *cell) {
for (auto it = cell->begin(); it != cell->end(); ++it) for (auto it = cell->begin(); it != cell->end(); ++it)
{ {
if (*it == player) if (*it == player)

8
apps/openmw-mp/Player.cpp
View file

@ -138,16 +138,16 @@ std::chrono::steady_clock::time_point Player::getLastAttackerTime()
return lastAttackerTime; return lastAttackerTime;
} }
CellController::TContainer Player::getCells() CellController::TContainer *Player::getCells()
{ {
return cells; return &cells;
} }
void Player::sendToLoaded(mwmp::PlayerPacket *myPacket) void Player::sendToLoaded(mwmp::PlayerPacket *myPacket)
{ {
std::list <Player*> plList; std::list <Player*> plList;
for (auto cell : getCells()) for (auto cell : *getCells())
for (auto pl : *cell) for (auto pl : *cell)
plList.push_back(pl); plList.push_back(pl);
@ -165,7 +165,7 @@ void Player::forEachLoaded(std::function<void(Player *pl, Player *other)> func)
{ {
std::list <Player*> plList; std::list <Player*> plList;
for (auto cell : getCells()) for (auto cell : *getCells())
for (auto pl : *cell) for (auto pl : *cell)
plList.push_back(pl); plList.push_back(pl);

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

@ -70,7 +70,7 @@ public:
virtual ~Player(); virtual ~Player();
CellController::TContainer getCells(); CellController::TContainer *getCells();
void sendToLoaded(mwmp::PlayerPacket *myPacket); void sendToLoaded(mwmp::PlayerPacket *myPacket);
void forEachLoaded(std::function<void(Player *pl, Player *other)> func); void forEachLoaded(std::function<void(Player *pl, Player *other)> func);