1 files changed, 40 insertions, 33 deletions

diff --git a/src/World.cpp b/src/World.cpp
index a3c804b44..1f9361386 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -256,14 +256,14 @@ cWorld::cWorld(const AString & a_WorldName, eDimension a_Dimension, const AStrin
 	m_IsDeepSnowEnabled(false),
 	m_ShouldLavaSpawnFire(true),
 	m_VillagersShouldHarvestCrops(true),
-	m_SimulatorManager(NULL),
-	m_SandSimulator(NULL),
+	m_SimulatorManager(),
+	m_SandSimulator(),
 	m_WaterSimulator(NULL),
-	m_LavaSimulator(NULL),
-	m_FireSimulator(NULL),
+	m_LavaSimulator(nullptr),
+	m_FireSimulator(),
 	m_RedstoneSimulator(NULL),
 	m_MaxPlayers(10),
-	m_ChunkMap(NULL),
+	m_ChunkMap(),
 	m_bAnimals(true),
 	m_Weather(eWeather_Sunny),
 	m_WeatherInterval(24000),  // Guaranteed 1 day of sunshine at server start :)
@@ -303,11 +303,8 @@ cWorld::cWorld(const AString & a_WorldName, eDimension a_Dimension, const AStrin
 
 cWorld::~cWorld()
 {
-	delete m_SimulatorManager;   m_SimulatorManager  = NULL;
-	delete m_SandSimulator;      m_SandSimulator     = NULL;
 	delete m_WaterSimulator;     m_WaterSimulator    = NULL;
 	delete m_LavaSimulator;      m_LavaSimulator     = NULL;
-	delete m_FireSimulator;      m_FireSimulator     = NULL;
 	delete m_RedstoneSimulator;  m_RedstoneSimulator = NULL;
 
 	UnloadUnusedChunks();
@@ -319,8 +316,6 @@ cWorld::~cWorld()
 	Serializer.Save();
 
 	m_MapManager.SaveMapData();
-
-	delete m_ChunkMap;
 }
 
 
@@ -631,7 +626,7 @@ void cWorld::Start(void)
 	InitialiseAndLoadMobSpawningValues(IniFile);
 	SetTimeOfDay(IniFile.GetValueSetI("General", "TimeInTicks", m_TimeOfDay));
 
-	m_ChunkMap = new cChunkMap(this);
+	m_ChunkMap = make_unique<cChunkMap>(this);
 	
 	m_LastSave = 0;
 	m_LastUnload = 0;
@@ -641,16 +636,16 @@ void cWorld::Start(void)
 	m_BlockTickQueueCopy.reserve(1000);
 
 	// Simulators:
-	m_SimulatorManager  = new cSimulatorManager(*this);
+	m_SimulatorManager  = make_unique<cSimulatorManager>(*this);
 	m_WaterSimulator    = InitializeFluidSimulator(IniFile, "Water", E_BLOCK_WATER, E_BLOCK_STATIONARY_WATER);
 	m_LavaSimulator     = InitializeFluidSimulator(IniFile, "Lava",  E_BLOCK_LAVA,  E_BLOCK_STATIONARY_LAVA);
-	m_SandSimulator     = new cSandSimulator(*this, IniFile);
-	m_FireSimulator     = new cFireSimulator(*this, IniFile);
+	m_SandSimulator     = make_unique<cSandSimulator>(*this, IniFile);
+	m_FireSimulator     = make_unique<cFireSimulator>(*this, IniFile);
 	m_RedstoneSimulator = InitializeRedstoneSimulator(IniFile);
 
 	// Water, Lava and Redstone simulators get registered in their initialize function.
-	m_SimulatorManager->RegisterSimulator(m_SandSimulator, 1);
-	m_SimulatorManager->RegisterSimulator(m_FireSimulator, 1);
+	m_SimulatorManager->RegisterSimulator(m_SandSimulator.get(), 1);
+	m_SimulatorManager->RegisterSimulator(m_FireSimulator.get(), 1);
 
 	m_Lighting.Start(this);
 	m_Storage.Start(this, m_StorageSchema, m_StorageCompressionFactor);
@@ -1059,7 +1054,6 @@ void cWorld::TickQueuedTasks(void)
 	for (cTasks::iterator itr = Tasks.begin(), end = Tasks.end(); itr != end; ++itr)
 	{
 		(*itr)->Run(*this);
-		delete *itr;
 	}  // for itr - m_Tasks[]
 }
 
@@ -1069,14 +1063,28 @@ 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);
-		while (!m_ScheduledTasks.empty() && (m_ScheduledTasks.front()->m_TargetTick < m_WorldAge))
+		auto WorldAge = m_WorldAge;
+
+		// Move all the due tasks from m_ScheduledTasks into Tasks:
+		for (auto itr = m_ScheduledTasks.begin(); itr != m_ScheduledTasks.end();)  // Cannot use range-basd for, we're modifying the container
 		{
-			Tasks.push_back(m_ScheduledTasks.front());
-			m_ScheduledTasks.pop_front();
+			if ((*itr)->m_TargetTick < WorldAge)
+			{
+				auto next = itr;
+				++next;
+				Tasks.push_back(std::move(*itr));
+				m_ScheduledTasks.erase(itr);
+				itr = next;
+			}
+			else
+			{
+				// All the eligible tasks have been moved, bail out now
+				break;
+			}
 		}
 	}
 
@@ -1084,7 +1092,6 @@ void cWorld::TickScheduledTasks(void)
 	for (cScheduledTasks::iterator itr = Tasks.begin(), end = Tasks.end(); itr != end; ++itr)
 	{
 		(*itr)->m_Task->Run(*this);
-		delete *itr;
 	}  // for itr - m_Tasks[]
 }
 
@@ -2593,14 +2600,14 @@ void cWorld::UnloadUnusedChunks(void)
 
 void cWorld::QueueUnloadUnusedChunks(void)
 {
-	QueueTask(new cWorld::cTaskUnloadUnusedChunks);
+	QueueTask(make_unique<cWorld::cTaskUnloadUnusedChunks>());
 }
 
 
 
 
 
-void cWorld::CollectPickupsByPlayer(cPlayer * a_Player)
+void cWorld::CollectPickupsByPlayer(cPlayer & a_Player)
 {
 	m_ChunkMap->CollectPickupsByPlayer(a_Player);
 }
@@ -2902,13 +2909,13 @@ bool cWorld::SetSignLines(int a_BlockX, int a_BlockY, int a_BlockZ, const AStrin
 	AString Line2(a_Line2);
 	AString Line3(a_Line3);
 	AString Line4(a_Line4);
-	if (cRoot::Get()->GetPluginManager()->CallHookUpdatingSign(this, a_BlockX, a_BlockY, a_BlockZ, Line1, Line2, Line3, Line4, a_Player))
+	if (cRoot::Get()->GetPluginManager()->CallHookUpdatingSign(*this, a_BlockX, a_BlockY, a_BlockZ, Line1, Line2, Line3, Line4, a_Player))
 	{
 		return false;
 	}
 	if (m_ChunkMap->SetSignLines(a_BlockX, a_BlockY, a_BlockZ, Line1, Line2, Line3, Line4))
 	{
-		cRoot::Get()->GetPluginManager()->CallHookUpdatedSign(this, a_BlockX, a_BlockY, a_BlockZ, Line1, Line2, Line3, Line4, a_Player);
+		cRoot::Get()->GetPluginManager()->CallHookUpdatedSign(*this, a_BlockX, a_BlockY, a_BlockZ, Line1, Line2, Line3, Line4, a_Player);
 		return true;
 	}
 	return false;
@@ -3049,17 +3056,17 @@ void cWorld::SaveAllChunks(void)
 
 void cWorld::QueueSaveAllChunks(void)
 {
-	QueueTask(new cWorld::cTaskSaveAllChunks);
+	QueueTask(make_unique<cWorld::cTaskSaveAllChunks>());
 }
 
 
 
 
 
-void cWorld::QueueTask(cTask * a_Task)
+void cWorld::QueueTask(std::unique_ptr<cTask> a_Task)
 {
 	cCSLock Lock(m_CSTasks);
-	m_Tasks.push_back(a_Task);
+	m_Tasks.push_back(std::move(a_Task));
 }
 
 
@@ -3076,11 +3083,11 @@ void cWorld::ScheduleTask(int a_DelayTicks, cTask * a_Task)
 	{
 		if ((*itr)->m_TargetTick >= TargetTick)
 		{
-			m_ScheduledTasks.insert(itr, new cScheduledTask(TargetTick, a_Task));
+			m_ScheduledTasks.insert(itr, make_unique<cScheduledTask>(TargetTick, a_Task));
 			return;
 		}
 	}
-	m_ScheduledTasks.push_back(new cScheduledTask(TargetTick, a_Task));
+	m_ScheduledTasks.push_back(make_unique<cScheduledTask>(TargetTick, a_Task));
 }
 
 
@@ -3633,7 +3640,7 @@ bool cWorld::cChunkGeneratorCallbacks::HasChunkAnyClients(int a_ChunkX, int a_Ch
 void cWorld::cChunkGeneratorCallbacks::CallHookChunkGenerating(cChunkDesc & a_ChunkDesc)
 {
 	cPluginManager::Get()->CallHookChunkGenerating(
-		m_World, a_ChunkDesc.GetChunkX(), a_ChunkDesc.GetChunkZ(), &a_ChunkDesc
+		*m_World, a_ChunkDesc.GetChunkX(), a_ChunkDesc.GetChunkZ(), &a_ChunkDesc
 	);
 }
 
@@ -3644,7 +3651,7 @@ void cWorld::cChunkGeneratorCallbacks::CallHookChunkGenerating(cChunkDesc & a_Ch
 void cWorld::cChunkGeneratorCallbacks::CallHookChunkGenerated (cChunkDesc & a_ChunkDesc)
 {
 	cPluginManager::Get()->CallHookChunkGenerated(
-		m_World, a_ChunkDesc.GetChunkX(), a_ChunkDesc.GetChunkZ(), &a_ChunkDesc
+		*m_World, a_ChunkDesc.GetChunkX(), a_ChunkDesc.GetChunkZ(), &a_ChunkDesc
 	);
 }