4 files changed, 252 insertions, 40 deletions

diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index ee7ce06ac..d4edc9144 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -37,6 +37,7 @@ cEntity::cEntity(eEntityType a_EntityType, double a_X, double a_Y, double a_Z, d
 	, m_Gravity(-9.81f)
 	, m_LastPos(a_X, a_Y, a_Z)
 	, m_IsInitialized(false)
+	, m_IsTravellingThroughPortal(false)
 	, m_EntityType(a_EntityType)
 	, m_World(NULL)
 	, m_IsFireproof(false)
@@ -624,6 +625,7 @@ void cEntity::Tick(float a_Dt, cChunk & a_Chunk)
 			// Handle drowning
 			HandleAir();
 		}
+		DetectPortal();
 
 		// None of the above functions change position, we remain in the chunk of NextChunk
 		HandlePhysics(a_Dt, *NextChunk);
@@ -863,7 +865,7 @@ void cEntity::TickBurning(cChunk & a_Chunk)
 	// Remember the current burning state:
 	bool HasBeenBurning = (m_TicksLeftBurning > 0);
 
-	if (m_World->IsWeatherWet())
+	if (GetWorld()->IsWeatherWetAt(POSX_TOINT, POSZ_TOINT))
 	{
 		if (POSY_TOINT > m_World->GetHeight(POSX_TOINT, POSZ_TOINT))
 		{
@@ -1034,6 +1036,162 @@ void cEntity::DetectCacti(void)
 
 
 
+void cEntity::DetectPortal()
+{
+	if (!GetWorld()->AreNetherPortalsEnabled() && !GetWorld()->AreEndPortalsEnabled())
+	{
+		return;
+	}
+
+	int X = POSX_TOINT, Y = POSY_TOINT, Z = POSZ_TOINT;
+	if ((Y > 0) && (Y < cChunkDef::Height))
+	{
+		switch (GetWorld()->GetBlock(X, Y, Z))
+		{
+			case E_BLOCK_NETHER_PORTAL:
+			{
+				if (!GetWorld()->AreNetherPortalsEnabled() || m_PortalCooldownData.second)
+				{
+					return;
+				}
+
+				if (m_PortalCooldownData.first != 80)
+				{
+					m_PortalCooldownData.first++;
+					return;
+				}
+				m_PortalCooldownData.first = 0;
+
+				switch (GetWorld()->GetDimension())
+				{
+					case dimNether: 
+					{
+						m_PortalCooldownData.second = true; // Stop portals from working on respawn
+
+						if (IsPlayer())
+						{
+							((cPlayer *)this)->GetClientHandle()->SendRespawn(dimOverworld);
+						}
+						MoveToWorld(GetWorld()->GetLinkedOverworldName(), cRoot::Get()->CreateAndInitializeWorld(GetWorld()->GetLinkedOverworldName()), false);
+
+						return;
+					}
+					case dimOverworld:
+					{
+						m_PortalCooldownData.second = true; // Stop portals from working on respawn
+
+						if (IsPlayer())
+						{
+							((cPlayer *)this)->AwardAchievement(achEnterPortal);
+							((cPlayer *)this)->GetClientHandle()->SendRespawn(dimNether);
+						}
+						MoveToWorld(GetWorld()->GetNetherWorldName(), cRoot::Get()->CreateAndInitializeWorld(GetWorld()->GetNetherWorldName(), dimNether, GetWorld()->GetName()), false);
+
+						return;
+					}
+					default: break;
+				}
+				return;
+			}
+			case E_BLOCK_END_PORTAL:
+			{
+				if (!GetWorld()->AreEndPortalsEnabled() || m_PortalCooldownData.second)
+				{
+					return;
+				}
+
+				if (m_PortalCooldownData.first != 80)
+				{
+					m_PortalCooldownData.first++;
+					return;
+				}
+				m_PortalCooldownData.first = 0;
+
+				switch (GetWorld()->GetDimension())
+				{
+					case dimEnd:
+					{
+						m_PortalCooldownData.second = true; // Stop portals from working on respawn
+
+						if (IsPlayer())
+						{
+							cPlayer * Player = (cPlayer *)this;
+							Player->TeleportToCoords(Player->GetLastBedPos().x, Player->GetLastBedPos().y, Player->GetLastBedPos().z);
+							Player->GetClientHandle()->SendRespawn(dimOverworld);
+						}
+						MoveToWorld(GetWorld()->GetLinkedOverworldName(), cRoot::Get()->CreateAndInitializeWorld(GetWorld()->GetLinkedOverworldName()), false);
+
+						return;
+					}
+					case dimOverworld:
+					{
+						m_PortalCooldownData.second = true; // Stop portals from working on respawn
+
+						if (IsPlayer())
+						{
+							((cPlayer *)this)->AwardAchievement(achEnterTheEnd);
+							((cPlayer *)this)->GetClientHandle()->SendRespawn(dimEnd);
+						}
+						MoveToWorld(GetWorld()->GetEndWorldName(), cRoot::Get()->CreateAndInitializeWorld(GetWorld()->GetEndWorldName(), dimEnd, GetWorld()->GetName()), false);
+
+						return;
+					}
+					default: break;
+				}
+				return;
+			}
+			default: break;
+		}
+	}
+
+	// Allow portals to work again
+	m_PortalCooldownData.second = false;
+	m_PortalCooldownData.first = 0;
+}
+
+
+
+
+
+bool cEntity::MoveToWorld(const AString & a_WorldName, cWorld * a_World, bool a_ShouldSendRespawn)
+{
+	UNUSED(a_ShouldSendRespawn);
+
+	cWorld * World;
+	if (a_World == NULL)
+	{
+		World = cRoot::Get()->GetWorld(a_WorldName);
+		if (World == NULL)
+		{
+			LOG("%s: Couldn't find world \"%s\".", __FUNCTION__, a_WorldName.c_str());
+			return false;
+		}
+	}
+	else
+	{
+		World = a_World;
+	}
+
+	if (GetWorld() == World)
+	{
+		// Don't move to same world
+		return false;
+	}
+
+	// Remove all links to the old world
+	SetIsTravellingThroughPortal(true); // cChunk handles entity removal
+	GetWorld()->BroadcastDestroyEntity(*this);
+
+	// Queue add to new world
+	World->AddEntity(this);
+
+	return true;
+}
+
+
+
+
+
 void cEntity::SetSwimState(cChunk & a_Chunk)
 {
 	int RelY = (int)floor(GetPosY() + 0.1);
diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h
index 2df66e353..f06666569 100644
--- a/src/Entities/Entity.h
+++ b/src/Entities/Entity.h
@@ -335,6 +335,9 @@ public:
 
 	/** Detects the time for application of cacti damage */
 	virtual void DetectCacti(void);
+
+	/** Detects whether we are in a portal block and begins teleportation procedures if so */
+	virtual void DetectPortal(void);
 	
 	/// Handles when the entity is in the void
 	virtual void TickInVoid(cChunk & a_Chunk);
@@ -377,8 +380,17 @@ public:
 	
 	/// Teleports to the coordinates specified
 	virtual void TeleportToCoords(double a_PosX, double a_PosY, double a_PosZ);
+
+	/** Moves entity to specified world */
+	virtual bool MoveToWorld(const AString & a_WorldName, cWorld * a_World = NULL, bool a_ShouldSendRespawn = true);
 	
 	// tolua_end
+
+	/** Returns if the entity is travelling through a portal. Set to true by MoveToWorld and to false when the entity is removed by the old chunk */
+	bool IsTravellingThroughPortal(void) const { return m_IsTravellingThroughPortal; }
+
+	/** Sets if the entity has begun travelling through a portal or not */
+	void SetIsTravellingThroughPortal(bool a_Flag) { m_IsTravellingThroughPortal = a_Flag; }
 	
 	/// Updates clients of changes in the entity.
 	virtual void BroadcastMovementUpdate(const cClientHandle * a_Exclude = NULL);
@@ -478,6 +490,9 @@ protected:
 	/** True when entity is initialised (Initialize()) and false when destroyed pending deletion (Destroy()) */
 	bool m_IsInitialized;
 
+	/** True when entity is being moved across worlds, false anytime else */
+	bool m_IsTravellingThroughPortal;
+
 	eEntityType m_EntityType;
 	
 	cWorld * m_World;
@@ -499,7 +514,6 @@ protected:
 	
 	/// Time, in ticks, since the last damage dealt by the void. Reset to zero when moving out of the void.
 	int m_TicksSinceLastVoidDamage;
-
 	
 	/** Does the actual speed-setting. The default implementation just sets the member variable value;
 	overrides can provide further processing, such as forcing players to move at the given speed. */
@@ -519,6 +533,12 @@ protected:
 	/** Air level of a mobile */
 	int m_AirLevel;
 	int m_AirTickTimer;
+
+	/** Portal delay timer and cooldown boolean
+	First value is to delay sending the respawn packet (which triggers the Entering the {Dimension} screen).
+	Second value is to prevent a teleportation loop by ensuring we do not reenter a portal that we came out of.
+	*/
+	std::pair<unsigned short, bool> m_PortalCooldownData;
 	
 private:
 	/** Measured in degrees, [-180, +180) */
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index e1e03fded..5a156bd3b 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -89,13 +89,14 @@ cPlayer::cPlayer(cClientHandle* a_Client, const AString & a_PlayerName)
 	
 	m_PlayerName = a_PlayerName;
 
-	if (!LoadFromDisk())
+	cWorld * World;
+	if (!LoadFromDisk(World))
 	{
 		m_Inventory.Clear();
-		cWorld * DefaultWorld = cRoot::Get()->GetDefaultWorld();
-		SetPosX(DefaultWorld->GetSpawnX());
-		SetPosY(DefaultWorld->GetSpawnY());
-		SetPosZ(DefaultWorld->GetSpawnZ());
+		SetPosX(World->GetSpawnX());
+		SetPosY(World->GetSpawnY());
+		SetPosZ(World->GetSpawnZ());
+		SetBedPos(Vector3i(World->GetSpawnX(), World->GetSpawnY(), World->GetSpawnZ()));
 		
 		LOGD("Player \"%s\" is connecting for the first time, spawning at default world spawn {%.2f, %.2f, %.2f}",
 			a_PlayerName.c_str(), GetPosX(), GetPosY(), GetPosZ()
@@ -108,11 +109,6 @@ cPlayer::cPlayer(cClientHandle* a_Client, const AString & a_PlayerName)
 
 	if (m_GameMode == gmNotSet)
 	{
-		cWorld * World = cRoot::Get()->GetWorld(GetLoadedWorldName());
-		if (World == NULL)
-		{
-			World = cRoot::Get()->GetDefaultWorld();
-		}
 		if (World->IsGameModeCreative())
 		{
 			m_CanFly = true;
@@ -141,7 +137,7 @@ cPlayer::~cPlayer(void)
 
 	SaveToDisk();
 
-	m_World->RemovePlayer( this );
+	m_World->RemovePlayer(this);
 
 	m_ClientHandle = NULL;
 	
@@ -158,8 +154,6 @@ cPlayer::~cPlayer(void)
 void cPlayer::Destroyed()
 {
 	CloseWindow(false);
-	
-	m_ClientHandle = NULL;
 }
 
 
@@ -972,12 +966,12 @@ void cPlayer::Respawn(void)
 	m_LifetimeTotalXp = 0;
 	// ToDo: send score to client? How?
 
-	m_ClientHandle->SendRespawn(*m_World);
+	m_ClientHandle->SendRespawn(GetWorld()->GetDimension());
 	
 	// Extinguish the fire:
 	StopBurning();
 
-	TeleportToCoords(GetWorld()->GetSpawnX(), GetWorld()->GetSpawnY(), GetWorld()->GetSpawnZ());
+	TeleportToCoords(GetLastBedPos().x, GetLastBedPos().y, GetLastBedPos().z);
 
 	SetVisible(true);
 }
@@ -1605,27 +1599,39 @@ void cPlayer::TossItems(const cItems & a_Items)
 
 
 
-bool cPlayer::MoveToWorld(const char * a_WorldName)
+bool cPlayer::MoveToWorld(const AString & a_WorldName, cWorld * a_World, bool a_ShouldSendRespawn)
 {
-	cWorld * World = cRoot::Get()->GetWorld(a_WorldName);
-	if (World == NULL)
+	cWorld * World;	
+	if (a_World == NULL)
 	{
-		LOG("%s: Couldn't find world \"%s\".", __FUNCTION__, a_WorldName);
+		World = cRoot::Get()->GetWorld(a_WorldName);
+		if (World == NULL)
+		{
+			LOG("%s: Couldn't find world \"%s\".", __FUNCTION__, a_WorldName.c_str());
+			return false;
+		}
+	}
+	else
+	{
+		World = a_World;
+	}
+
+	if (GetWorld() == World)
+	{
+		// Don't move to same world
 		return false;
 	}
 	
 	// Send the respawn packet:
-	if (m_ClientHandle != NULL)
+	if (a_ShouldSendRespawn && (m_ClientHandle != NULL))
 	{
-		m_ClientHandle->SendRespawn(*World);
+		m_ClientHandle->SendRespawn(World->GetDimension());
 	}
 
-	// Remove all links to the old world
+	// Remove player from the old world
+	SetIsTravellingThroughPortal(true); // cChunk handles entity removal
 	m_World->RemovePlayer(this);
 
-	// If the dimension is different, we can send the respawn packet
-	// http://wiki.vg/Protocol#0x09 says "don't send if dimension is the same" as of 2013_07_02
-
 	// Queue adding player to the new world, including all the necessary adjustments to the object
 	World->AddPlayer(this);
 
@@ -1675,8 +1681,14 @@ void cPlayer::LoadPermissionsFromDisk()
 
 
 
-bool cPlayer::LoadFromDisk()
+bool cPlayer::LoadFromDisk(cWorldPtr & a_World)
 {
+	a_World = cRoot::Get()->GetWorld(GetLoadedWorldName());
+	if (a_World == NULL)
+	{
+		a_World = cRoot::Get()->GetDefaultWorld();
+	}
+
 	LoadPermissionsFromDisk();
 
 	AString SourceFile;
@@ -1730,6 +1742,9 @@ bool cPlayer::LoadFromDisk()
 	m_LifetimeTotalXp     = (short) root.get("xpTotal", 0).asInt();
 	m_CurrentXp           = (short) root.get("xpCurrent", 0).asInt();
 	m_IsFlying            = root.get("isflying", 0).asBool();
+	m_LastBedPos.x        = root.get("SpawnX", a_World->GetSpawnX()).asInt();
+	m_LastBedPos.y        = root.get("SpawnY", a_World->GetSpawnY()).asInt();
+	m_LastBedPos.z        = root.get("SpawnZ", a_World->GetSpawnZ()).asInt();
 
 	m_GameMode = (eGameMode) root.get("gamemode", eGameMode_NotSet).asInt();
 
@@ -1748,7 +1763,7 @@ bool cPlayer::LoadFromDisk()
 	StatSerializer.Load();
 	
 	LOGD("Player \"%s\" was read from file, spawning at {%.2f, %.2f, %.2f} in world \"%s\"",
-		GetName().c_str(), GetPosX(), GetPosY(), GetPosZ(), m_LoadedWorldName.c_str()
+		GetName().c_str(), GetPosX(), GetPosY(), GetPosZ(), GetLoadedWorldName().c_str()
 	);
 	
 	return true;
@@ -1790,6 +1805,9 @@ bool cPlayer::SaveToDisk()
 	root["foodExhaustion"] = m_FoodExhaustionLevel;
 	root["world"]          = GetWorld()->GetName();
 	root["isflying"]       = IsFlying();
+	root["SpawnX"]         = GetLastBedPos().x;
+	root["SpawnY"]         = GetLastBedPos().y;
+	root["SpawnZ"]         = GetLastBedPos().z;
 
 	if (m_GameMode == GetWorld()->GetGameMode())
 	{
diff --git a/src/Entities/Player.h b/src/Entities/Player.h
index b2142a18b..eff5d0663 100644
--- a/src/Entities/Player.h
+++ b/src/Entities/Player.h
@@ -127,7 +127,7 @@ public:
 	
 	inline const cItem & GetEquippedItem(void) const { return GetInventory().GetEquippedItem(); }  // tolua_export
 
-	/** Returns whether the player is climbing (ladders, vines e.t.c). */
+	/** Returns whether the player is climbing (ladders, vines etc.) */
 	bool IsClimbing(void) const;
 
 	virtual void TeleportToCoords(double a_PosX, double a_PosY, double a_PosZ) override;
@@ -324,18 +324,24 @@ public:
 
 	virtual void Killed(cEntity * a_Victim) override;
 	
-	void Respawn(void);															// tolua_export
+	void Respawn(void); // tolua_export
 
-	void SetVisible( bool a_bVisible );										// tolua_export
-	bool IsVisible(void) const { return m_bVisible; }									// tolua_export
+	void SetVisible(bool a_bVisible); // tolua_export
+	bool IsVisible(void) const { return m_bVisible; } // tolua_export
 
 	/** Moves the player to the specified world.
 	Returns true if successful, false on failure (world not found). */
-	bool MoveToWorld(const char * a_WorldName);  // tolua_export
+	virtual bool MoveToWorld(const AString & a_WorldName, cWorld * a_World = NULL, bool a_ShouldSendRespawn = true) override; // tolua_export
 
+	/** Saves all player data, such as inventory, to JSON */
 	bool SaveToDisk(void);
-	bool LoadFromDisk(void);
-	void LoadPermissionsFromDisk(void);											// tolua_export
+
+	typedef cWorld * cWorldPtr;
+	/** Loads player data from JSON to the object
+	Takes a (NULL) cWorld pointer which it will assign a value to based on either the loaded world or default world
+	*/
+	bool LoadFromDisk(cWorldPtr & a_World);
+	void LoadPermissionsFromDisk(void); // tolua_export
 
 	const AString & GetLoadedWorldName() { return m_LoadedWorldName; }
 
@@ -345,8 +351,7 @@ public:
 
 	void SendExperience(void);
 	
-	// In UI windows, the item that the player is dragging:
-	bool IsDraggingItem(void) const { return !m_DraggingItem.IsEmpty(); }
+	/** In UI windows, get the item that the player is dragging */
 	cItem & GetDraggingItem(void) {return m_DraggingItem; }
 	
 	// In UI windows, when inventory-painting:
@@ -394,11 +399,21 @@ public:
 	/** If true the player can fly even when he's not in creative. */
 	void SetCanFly(bool a_CanFly);
 
+	/** Gets the last position that the player slept in
+	This is initialised to the world spawn point if the player has not slept in a bed as of yet
+	*/
+	Vector3i GetLastBedPos(void) const { return m_LastBedPos; }
+
+	/** Sets the player's bed (home) position */
+	void SetBedPos(const Vector3i & a_Pos) { m_LastBedPos = a_Pos; }
+
 	/** Update movement-related statistics. */
 	void UpdateMovementStats(const Vector3d & a_DeltaPos);
 
 	/** Returns wheter the player can fly or not. */
 	virtual bool CanFly(void) const { return m_CanFly; }
+
+
 	// tolua_end
 
 	// cEntity overrides:
@@ -453,6 +468,9 @@ protected:
 	cWindow * m_CurrentWindow;
 	cWindow * m_InventoryWindow;
 
+	/** The player's last saved bed position */
+	Vector3i m_LastBedPos;
+
 	char m_Color;
 
 	eGameMode m_GameMode;
@@ -510,8 +528,6 @@ protected:
 
 	cStatManager m_Stats;
 
-
-
 	/** Sets the speed and sends it to the client, so that they are forced to move so. */
 	virtual void DoSetSpeed(double a_SpeedX, double a_SpeedY, double a_SpeedZ) override;