Merge pull request #450 from mc-server/redstonefixes

Multiple fixes
2013-12-19 13:58:49 -08:00
parent 03ec64aee1 03a8dfc4a8
commit 39251bccd3
6 changed files with 94 additions and 26 deletions
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -1502,6 +1502,24 @@ bool cPlayer::LoadFromDisk()
 	//SetExperience(root.get("experience", 0).asInt());

 	m_GameMode = (eGameMode) root.get("gamemode", eGameMode_NotSet).asInt();
+
+	if (m_GameMode == eGameMode_Creative)
+	{
+		m_CanFly = true;
+	}
+	else if (m_GameMode == eGameMode_NotSet)
+	{
+		cWorld * World = cRoot::Get()->GetWorld(GetLoadedWorldName());
+		if (World == NULL)
+		{
+			World = cRoot::Get()->GetDefaultWorld();
+		}
+
+		if (World->GetGameMode() == eGameMode_Creative)
+		{
+			m_CanFly = true;
+		}
+	}
 	
 	m_Inventory.LoadFromJson(root["inventory"]);