1 files changed, 27 insertions, 27 deletions

diff --git a/src/World.h b/src/World.h
index 3cac71a36..ffc10a9e4 100644
--- a/src/World.h
+++ b/src/World.h
@@ -106,7 +106,8 @@ public:
 		virtual void Run(cWorld & a_World) = 0;
 	} ;
 	
-	typedef std::vector<std::unique_ptr<cTask>> cTasks;
+	typedef SharedPtr<cTask> cTaskPtr;
+	typedef std::vector<cTaskPtr> cTasks;
 
 	
 	class cTaskSaveAllChunks :
@@ -673,14 +674,14 @@ public:
 	bool ShouldBroadcastAchievementMessages(void) const { return m_BroadcastAchievementMessages; }
 
 
-	AString GetNetherWorldName(void) const { return m_NetherWorldName; }
-	void SetNetherWorldName(const AString & a_Name) { m_NetherWorldName = a_Name; }
+	AString GetLinkedNetherWorldName(void) const { return m_LinkedNetherWorldName; }
+	void SetLinkedNetherWorldName(const AString & a_Name) { m_LinkedNetherWorldName = a_Name; }
 
-	AString GetEndWorldName(void) const { return m_EndWorldName; }
-	void SetEndWorldName(const AString & a_Name) { m_EndWorldName = a_Name; }
+	AString GetLinkedEndWorldName(void) const { return m_LinkedEndWorldName; }
+	void SetLinkedEndWorldName(const AString & a_Name) { m_LinkedEndWorldName = a_Name; }
 
-	AString GetLinkedOverworldName(void) const { return m_OverworldName; }
-	void SetLinkedOverworldName(const AString & a_Name) { m_OverworldName = a_Name; }
+	AString GetLinkedOverworldName(void) const { return m_LinkedOverworldName; }
+	void SetLinkedOverworldName(const AString & a_Name) { m_LinkedOverworldName = a_Name; }
 	
 	// tolua_end
 	
@@ -691,11 +692,10 @@ public:
 	void QueueSaveAllChunks(void);  // tolua_export
 	
 	/** Queues a task onto the tick thread. The task object will be deleted once the task is finished */
-	void QueueTask(std::unique_ptr<cTask> a_Task);  // Exported in ManualBindings.cpp
+	void QueueTask(cTaskPtr a_Task);  // Exported in ManualBindings.cpp
 	
-	/** Queues a task onto the tick thread, with the specified delay.
-	The task object will be deleted once the task is finished */
-	void ScheduleTask(int a_DelayTicks, cTask * a_Task);
+	/** Queues a task onto the tick thread, with the specified delay. */
+	void ScheduleTask(int a_DelayTicks, cTaskPtr a_Task);
 
 	/** Returns the number of chunks loaded	 */
 	int GetNumChunks() const;  // tolua_export
@@ -867,20 +867,16 @@ private:
 	{
 	public:
 		Int64 m_TargetTick;
-		cTask * m_Task;
+		cTaskPtr m_Task;
 		
 		/** Creates a new scheduled task; takes ownership of the task object passed to it. */
-		cScheduledTask(Int64 a_TargetTick, cTask * a_Task) :
+		cScheduledTask(Int64 a_TargetTick, cTaskPtr a_Task) :
 			m_TargetTick(a_TargetTick),
 			m_Task(a_Task)
 		{
 		}
 		
-		virtual ~cScheduledTask()
-		{
-			delete m_Task;
-			m_Task = nullptr;
-		}
+		virtual ~cScheduledTask() {}
 	};
 
 	typedef std::unique_ptr<cScheduledTask> cScheduledTaskPtr;
@@ -889,10 +885,9 @@ private:
 
 	AString m_WorldName;
 
-	/** The name of the world that a portal in this world should link to
-	Only has effect if this world is a nether or end world, as it is used by entities to see which world to teleport to when in a portal
-	*/
-	AString m_OverworldName;
+	/** The name of the overworld that portals in this world should link to.
+	Only has effect if this world is a Nether or End world. */
+	AString m_LinkedOverworldName;
 
 	AString m_IniFileName;
 	
@@ -985,11 +980,13 @@ private:
 	/** The maximum view distance that a player can have in this world. */
 	int m_MaxViewDistance;
 
-	/** Name of the nether world */
-	AString m_NetherWorldName;
+	/** Name of the nether world - where Nether portals should teleport.
+	Only used when this world is an Overworld. */
+	AString m_LinkedNetherWorldName;
 
-	/** Name of the end world */
-	AString m_EndWorldName;
+	/** Name of the End world - where End portals should teleport.
+	Only used when this world is an Overworld. */
+	AString m_LinkedEndWorldName;
 	
 
 	cChunkGenerator  m_Generator;
@@ -1049,7 +1046,7 @@ private:
 	cSetChunkDataPtrs m_SetChunkDataQueue;
 
 
-	cWorld(const AString & a_WorldName, eDimension a_Dimension = dimOverworld, const AString & a_OverworldName = "");
+	cWorld(const AString & a_WorldName, eDimension a_Dimension = dimOverworld, const AString & a_LinkedOverworldName = "");
 	virtual ~cWorld();
 
 	void Tick(std::chrono::milliseconds a_Dt, std::chrono::milliseconds a_LastTickDurationMSec);
@@ -1077,6 +1074,9 @@ private:
 	/** <summary>Generates a random spawnpoint on solid land by walking chunks and finding their biomes</summary> */
 	void GenerateRandomSpawn(void);
 
+	/** Check if player starting point is acceptable **/
+	bool CheckPlayerSpawnPoint(int a_PosX, int a_PosY, int a_PosZ);
+
 	/** Chooses a reasonable transition from the current weather to a new weather **/
 	eWeather ChooseNewWeather(void);