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

Merge pull request #311 from TES3MP/0.6.1

Browse source 
Add hotfix commit for 0.6.1 from 10 Oct 2017
This commit is contained in:
David Cernat 2017-10-10 06:26:33 +03:00 committed by GitHub
commit ec2c964ae1
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -29,8 +29,17 @@ Cell::Iterator Cell::end() const
void Cell::addPlayer(Player *player)
{
auto it = find(player->cells.begin(), player->cells.end(), this);
if (it == player->cells.end())
// Ensure the player hasn't already been added
auto it = find(begin(), end(), player);
if (it != end())
{
LOG_APPEND(Log::LOG_INFO, "- Attempt to add %s to Cell %s again was ignored", player->npc.mName.c_str(), getDescription().c_str());
return;
}
auto it2 = find(player->cells.begin(), player->cells.end(), this);
if (it2 == player->cells.end())
{
LOG_APPEND(Log::LOG_INFO, "- Adding %s to Player %s", getDescription().c_str(), player->npc.mName.c_str());