From f7b8a301f8a705cec6df17c7051164169cf619a6 Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Wed, 3 Jul 2013 07:47:35 +0000 Subject: Fixed player moving between worlds. Fixes FS #407. Also fixes a few possible deadlocks between SocketThreads and TickThread git-svn-id: http://mc-server.googlecode.com/svn/trunk@1641 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/World.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source/World.cpp') diff --git a/source/World.cpp b/source/World.cpp index 4333aa7a4..ac7ba42aa 100644 --- a/source/World.cpp +++ b/source/World.cpp @@ -1843,6 +1843,8 @@ void cWorld::AddPlayer(cPlayer * a_Player) m_Players.remove(a_Player); // Make sure the player is registered only once m_Players.push_back(a_Player); + + // The player has already been added to the chunkmap as the entity, do NOT add again! } -- cgit v1.2.3