From 6e681269d9dfb33b5b73f4f01a61def247b3aee7 Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat, 21 Jun 2014 22:07:38 +0100
Subject: Fixed invalid iterators

---
 src/World.cpp | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'src/World.cpp')

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)
 {
-- 
cgit v1.2.3