summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorworktycho <work.tycho@gmail.com>2014-10-12 13:18:52 +0200
committerworktycho <work.tycho@gmail.com>2014-10-12 13:18:52 +0200
commitdaadde2077e9640482cc7786b89d93ef66ac7360 (patch)
treea35955b3ef90db5aa18461c5a8ea926365c34556 /src
parentFix spaces (diff)
downloadcuberite-daadde2077e9640482cc7786b89d93ef66ac7360.tar
cuberite-daadde2077e9640482cc7786b89d93ef66ac7360.tar.gz
cuberite-daadde2077e9640482cc7786b89d93ef66ac7360.tar.bz2
cuberite-daadde2077e9640482cc7786b89d93ef66ac7360.tar.lz
cuberite-daadde2077e9640482cc7786b89d93ef66ac7360.tar.xz
cuberite-daadde2077e9640482cc7786b89d93ef66ac7360.tar.zst
cuberite-daadde2077e9640482cc7786b89d93ef66ac7360.zip
Diffstat (limited to 'src')
-rw-r--r--src/World.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/World.cpp b/src/World.cpp
index 8479cbf9e..0a0149e97 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -1063,7 +1063,7 @@ void cWorld::TickQueuedTasks(void)
void cWorld::TickScheduledTasks(void)
{
- // Make a copy of the tasks to avoid deadlocks on accessing m_Tasks
+ // Move the tasks to be executed to a seperate vector to avoid deadlocks on accessing m_Tasks
cScheduledTasks Tasks;
{
cCSLock Lock(m_CSScheduledTasks);
@@ -1073,7 +1073,7 @@ void cWorld::TickScheduledTasks(void)
std::find_if(
m_ScheduledTasks.begin(),
m_ScheduledTasks.end(),
- [WorldAge] (std::unique_ptr<cScheduledTask>& Task) { return Task->m_TargetTick < WorldAge;}),
+ [WorldAge] (std::unique_ptr<cScheduledTask> & Task) { return Task->m_TargetTick < WorldAge;}),
std::back_inserter(Tasks));
}