summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLogicParrot <LogicParrot@users.noreply.github.com>2016-03-31 20:33:49 +0200
committerLogicParrot <LogicParrot@users.noreply.github.com>2016-03-31 20:33:49 +0200
commit6b1856f22698ea498ed543a1074647a50204f42b (patch)
tree23add67e6d0c8359182a04fb1cfa40eefcfbf878
parentMerge pull request #3116 from LogicParrot/bedFix (diff)
parentFix adding players to world (diff)
downloadcuberite-6b1856f22698ea498ed543a1074647a50204f42b.tar
cuberite-6b1856f22698ea498ed543a1074647a50204f42b.tar.gz
cuberite-6b1856f22698ea498ed543a1074647a50204f42b.tar.bz2
cuberite-6b1856f22698ea498ed543a1074647a50204f42b.tar.lz
cuberite-6b1856f22698ea498ed543a1074647a50204f42b.tar.xz
cuberite-6b1856f22698ea498ed543a1074647a50204f42b.tar.zst
cuberite-6b1856f22698ea498ed543a1074647a50204f42b.zip
-rw-r--r--src/World.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/World.cpp b/src/World.cpp
index 79098487f..d8b77647a 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -3817,7 +3817,7 @@ void cWorld::AddQueuedPlayers(void)
// Add all the players in the grabbed list:
{
cCSLock Lock(m_CSPlayers);
- for (auto Player : m_Players)
+ for (auto Player : PlayersToAdd)
{
ASSERT(std::find(m_Players.begin(), m_Players.end(), Player) == m_Players.end()); // Is it already in the list? HOW?
LOGD("Adding player %s to world \"%s\".", Player->GetName().c_str(), m_WorldName.c_str());