From 8bff3e5af220070ecc789ef551c0b8428b8953ef Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat, 31 May 2014 22:28:51 +0100
Subject: Implemented end and nether portals

---
 src/Root.cpp | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'src/Root.cpp')

diff --git a/src/Root.cpp b/src/Root.cpp
index c82b05a66..2a80baeb3 100644
--- a/src/Root.cpp
+++ b/src/Root.cpp
@@ -320,7 +320,7 @@ cWorld * cRoot::CreateAndInitializeWorld(const AString & a_WorldName)
 	{
 		return NULL;
 	}
-	cWorld* NewWorld = new cWorld(a_WorldName.c_str());
+	cWorld * NewWorld = new cWorld(a_WorldName.c_str());
 	m_WorldsByName[a_WorldName] = NewWorld;
 	NewWorld->Start();
 	NewWorld->InitializeSpawn();
@@ -372,7 +372,7 @@ void cRoot::UnloadWorlds(void)
 
 
 
-cWorld* cRoot::GetDefaultWorld()
+cWorld * cRoot::GetDefaultWorld()
 {
 	return m_pDefaultWorld;
 }
@@ -381,12 +381,14 @@ cWorld* cRoot::GetDefaultWorld()
 
 
 
-cWorld* cRoot::GetWorld( const AString & a_WorldName )
+cWorld * cRoot::GetWorld(const AString & a_WorldName)
 {
-	WorldMap::iterator itr = m_WorldsByName.find( a_WorldName );
-	if( itr != m_WorldsByName.end() )
+	WorldMap::iterator itr = m_WorldsByName.find(a_WorldName);
+	if (itr != m_WorldsByName.end())
+	{
 		return itr->second;
-	return 0;
+	}
+	return NULL;
 }
 
 
@@ -398,9 +400,12 @@ bool cRoot::ForEachWorld(cWorldListCallback & a_Callback)
 	for (WorldMap::iterator itr = m_WorldsByName.begin(), itr2 = itr; itr != m_WorldsByName.end(); itr = itr2)
 	{
 		++itr2;
-		if (a_Callback.Item(itr->second))
+		if (itr->second != NULL)
 		{
-			return false;
+			if (a_Callback.Item(itr->second))
+			{
+				return false;
+			}
 		}
 	}
 	return true;
-- 
cgit v1.2.3