diff options
author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-06-21 23:07:38 +0200 |
---|---|---|
committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-06-21 23:07:38 +0200 |
commit | 6e681269d9dfb33b5b73f4f01a61def247b3aee7 (patch) | |
tree | d9409a8b0b00c439dcd5d2f7d4c1f2cf66592c18 /src/World.cpp | |
parent | More suggestions (diff) | |
download | cuberite-6e681269d9dfb33b5b73f4f01a61def247b3aee7.tar cuberite-6e681269d9dfb33b5b73f4f01a61def247b3aee7.tar.gz cuberite-6e681269d9dfb33b5b73f4f01a61def247b3aee7.tar.bz2 cuberite-6e681269d9dfb33b5b73f4f01a61def247b3aee7.tar.lz cuberite-6e681269d9dfb33b5b73f4f01a61def247b3aee7.tar.xz cuberite-6e681269d9dfb33b5b73f4f01a61def247b3aee7.tar.zst cuberite-6e681269d9dfb33b5b73f4f01a61def247b3aee7.zip |
Diffstat (limited to 'src/World.cpp')
-rw-r--r-- | src/World.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/World.cpp b/src/World.cpp index 3ed2f5f13..c9199b6ba 100644 --- a/src/World.cpp +++ b/src/World.cpp @@ -2417,7 +2417,10 @@ void cWorld::AddPlayer(cPlayer * a_Player) void cWorld::RemovePlayer(cPlayer * a_Player) { - m_ChunkMap->RemoveEntity(a_Player); + if (!a_Player->IsTravellingThroughPortal()) + { + m_ChunkMap->RemoveEntity(a_Player); + } { cCSLock Lock(m_CSPlayersToAdd); m_PlayersToAdd.remove(a_Player); @@ -2919,15 +2922,6 @@ bool cWorld::HasEntity(int a_UniqueID) -void cWorld::RemoveEntity(cEntity * a_Entity) -{ - m_ChunkMap->RemoveEntity(a_Entity); -} - - - - - /* unsigned int cWorld::GetNumPlayers(void) { |