3 files changed, 12 insertions, 45 deletions

diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index e5e4cf4cb..bd1839580 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -1028,7 +1028,7 @@ void cEntity::DetectCacti(void)
 
 void cEntity::DetectPortal()
 {
-	if (!GetWorld()->AreNetherPortalsEnabled() && !GetWorld()->AreEndPortalsEnabled())
+	if (!GetWorld()->GetNetherWorldName().empty() && !GetWorld()->GetEndWorldName().empty())
 	{
 		return;
 	}
@@ -1040,7 +1040,7 @@ void cEntity::DetectPortal()
 		{
 			case E_BLOCK_NETHER_PORTAL:
 			{
-				if (!GetWorld()->AreNetherPortalsEnabled() || m_PortalCooldownData.second)
+				if (GetWorld()->GetNetherWorldName().empty() || m_PortalCooldownData.second)
 				{
 					return;
 				}
@@ -1085,7 +1085,7 @@ void cEntity::DetectPortal()
 			}
 			case E_BLOCK_END_PORTAL:
 			{
-				if (!GetWorld()->AreEndPortalsEnabled() || m_PortalCooldownData.second)
+				if (GetWorld()->GetNetherWorldName().empty() || m_PortalCooldownData.second)
 				{
 					return;
 				}
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index 1acc8a962..2a91600e7 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -1695,12 +1695,7 @@ void cPlayer::LoadPermissionsFromDisk()
 
 
 
-<<<<<<< HEAD
 bool cPlayer::LoadFromDisk(cWorldPtr & a_World)
-=======
-
-bool cPlayer::LoadFromDisk(void)
->>>>>>> master
 {
 	a_World = cRoot::Get()->GetWorld(GetLoadedWorldName());
 	if (a_World == NULL)
@@ -1711,7 +1706,7 @@ bool cPlayer::LoadFromDisk(void)
 	LoadPermissionsFromDisk();
 
 	// Load from the UUID file:
-	if (LoadFromFile(GetUUIDFileName(m_UUID)))
+	if (LoadFromFile(GetUUIDFileName(m_UUID), a_World))
 	{
 		return true;
 	}
@@ -1720,7 +1715,7 @@ bool cPlayer::LoadFromDisk(void)
 	AString OfflineUUID = cClientHandle::GenerateOfflineUUID(GetName());
 	if (cRoot::Get()->GetServer()->ShouldLoadOfflinePlayerData())
 	{
-		if (LoadFromFile(GetUUIDFileName(OfflineUUID)))
+		if (LoadFromFile(GetUUIDFileName(OfflineUUID), a_World))
 		{
 			return true;
 		}
@@ -1730,7 +1725,7 @@ bool cPlayer::LoadFromDisk(void)
 	if (cRoot::Get()->GetServer()->ShouldLoadNamedPlayerData())
 	{
 		AString OldStyleFileName = Printf("players/%s.json", GetName().c_str());
-		if (LoadFromFile(OldStyleFileName))
+		if (LoadFromFile(OldStyleFileName, a_World))
 		{
 			// Save in new format and remove the old file
 			if (SaveToDisk())
@@ -1752,7 +1747,7 @@ bool cPlayer::LoadFromDisk(void)
 
 
 
-bool cPlayer::LoadFromFile(const AString & a_FileName)
+bool cPlayer::LoadFromFile(const AString & a_FileName, cWorld * a_World)
 {
 	// Load the data from the file:
 	cFile f;
@@ -1860,28 +1855,6 @@ bool cPlayer::SaveToDisk()
 	cEnderChestEntity::SaveToJson(JSON_EnderChestInventory, m_EnderChestContents);
 
 	Json::Value root;
-<<<<<<< HEAD
-	root["position"]       = JSON_PlayerPosition;
-	root["rotation"]       = JSON_PlayerRotation;
-	root["inventory"]      = JSON_Inventory;
-	root["health"]         = m_Health;
-	root["xpTotal"]        = m_LifetimeTotalXp;
-	root["xpCurrent"]      = m_CurrentXp;
-	root["air"]            = m_AirLevel;
-	root["food"]           = m_FoodLevel;
-	root["foodSaturation"] = m_FoodSaturationLevel;
-	root["foodTickTimer"]  = m_FoodTickTimer;
-	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())
-	{
-		root["gamemode"] = (int) eGameMode_NotSet;
-=======
 	root["position"]            = JSON_PlayerPosition;
 	root["rotation"]            = JSON_PlayerRotation;
 	root["inventory"]           = JSON_Inventory;
@@ -1896,6 +1869,10 @@ bool cPlayer::SaveToDisk()
 	root["foodExhaustion"]      = m_FoodExhaustionLevel;
 	root["isflying"]            = IsFlying();
 	root["lastknownname"]       = GetName();
+	root["SpawnX"]              = GetLastBedPos().x;
+	root["SpawnY"]              = GetLastBedPos().y;
+	root["SpawnZ"]              = GetLastBedPos().z;
+
 	if (m_World != NULL)
 	{
 		root["world"] = m_World->GetName();
@@ -1907,7 +1884,6 @@ bool cPlayer::SaveToDisk()
 		{
 			root["gamemode"] = (int) m_GameMode;
 		}
->>>>>>> master
 	}
 	else
 	{
diff --git a/src/Entities/Player.h b/src/Entities/Player.h
index f84cc5f55..ad434f036 100644
--- a/src/Entities/Player.h
+++ b/src/Entities/Player.h
@@ -326,11 +326,6 @@ public:
 
 	virtual void Killed(cEntity * a_Victim) override;
 
-	void Respawn(void); // tolua_export
-
-	void SetVisible(bool a_bVisible); // tolua_export
-	bool IsVisible(void) const { return m_bVisible; } // tolua_export
-
 	void Respawn(void);  // tolua_export
 
 	void SetVisible( bool a_bVisible );  // tolua_export
@@ -352,7 +347,7 @@ Takes a (NULL) cWorld pointer which it will assign a value to based on either th
 	
 	/** Loads the player data from the specified file.
 	Returns true on success, false on failure. */
-	bool LoadFromFile(const AString & a_FileName);
+	bool LoadFromFile(const AString & a_FileName, cWorld * a_World);
 	
 	void LoadPermissionsFromDisk(void);  // tolua_export
 
@@ -544,8 +539,6 @@ protected:
 
 	cStatManager m_Stats;
 
-<<<<<<< HEAD
-=======
 	/** Flag representing whether the player is currently in a bed
 	Set by a right click on unoccupied bed, unset by a time fast forward or teleport */
 	bool m_bIsInBed;
@@ -563,8 +556,6 @@ protected:
 	If no ClientHandle is given, the UUID is initialized to empty. */
 	AString m_UUID;
 
-
->>>>>>> master
 	/** 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;