From 7e0310957629bbd53a0203e81edd982ed5561cd0 Mon Sep 17 00:00:00 2001
From: Shoghi Cervantes <shoghicp@gmail.com>
Date: Fri, 28 Mar 2014 13:07:36 +0100
Subject: [PATCH] Moved default level registration

---
 src/PocketMine/Server.php                    | 5 +++++
 src/PocketMine/level/generator/Flat.php      | 4 +---
 src/PocketMine/level/generator/Generator.php | 4 ++--
 src/PocketMine/level/generator/Normal.php    | 5 +----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/PocketMine/Server.php b/src/PocketMine/Server.php
index 63f26d1d9..9c05f56bb 100644
--- a/src/PocketMine/Server.php
+++ b/src/PocketMine/Server.php
@@ -36,6 +36,7 @@ use PocketMine\Event\HandlerList;
 use PocketMine\Event\Server\PacketReceiveEvent;
 use PocketMine\Event\Server\PacketSendEvent;
 use PocketMine\Item\Item;
+use PocketMine\Level\Generator\Generator;
 use PocketMine\Level\Level;
 use PocketMine\Network\Packet;
 use PocketMine\Network\Query\QueryHandler;
@@ -552,6 +553,10 @@ class Server{
 		Block::init();
 		Item::init();
 		Crafting::init();
+
+		Generator::addGenerator("PocketMine\\Level\\Generator\\Flat", "flat");
+		Generator::addGenerator("PocketMine\\Level\\Generator\\Normal", "normal");
+		Generator::addGenerator("PocketMine\\Level\\Generator\\Normal", "default");
 		Level::init();
 
 		$this->properties->save();
diff --git a/src/PocketMine/level/generator/Flat.php b/src/PocketMine/level/generator/Flat.php
index 675efc02e..f486bd036 100644
--- a/src/PocketMine/level/generator/Flat.php
+++ b/src/PocketMine/level/generator/Flat.php
@@ -156,6 +156,4 @@ class Flat extends Generator{
 	public function getSpawn(){
 		return new Vector3(128, $this->floorLevel, 128);
 	}
-}
-
-Generator::addGenerator(__NAMESPACE__ . "\\Flat", "flat");
+}
\ No newline at end of file
diff --git a/src/PocketMine/level/generator/Generator.php b/src/PocketMine/level/generator/Generator.php
index 2a390709d..b29fae700 100644
--- a/src/PocketMine/level/generator/Generator.php
+++ b/src/PocketMine/level/generator/Generator.php
@@ -31,7 +31,7 @@ abstract class Generator{
 	private static $list = array();
 
 	public static function addGenerator($object, $name){
-		if(is_subclass_of($object, "\PocketMine\Level\Generator\Generator") and !isset(Generator::$list[$name])){
+		if(is_subclass_of($object, "\\PocketMine\\Level\\Generator\\Generator") and !isset(Generator::$list[$name])){
 			Generator::$list[$name] = $object;
 
 			return true;
@@ -45,7 +45,7 @@ abstract class Generator{
 			return Generator::$list[$name];
 		}
 
-		return "\PocketMine\Level\Generator\Normal";
+		return "\\PocketMine\\Level\\Generator\\Normal";
 	}
 
 	public abstract function __construct(array $settings = array());
diff --git a/src/PocketMine/level/generator/Normal.php b/src/PocketMine/level/generator/Normal.php
index f5b10ee94..b366345bd 100644
--- a/src/PocketMine/level/generator/Normal.php
+++ b/src/PocketMine/level/generator/Normal.php
@@ -186,7 +186,4 @@ class Normal extends Generator{
 		return $this->level->getSafeSpawn(new Vector3(127.5, 128, 127.5));
 	}
 
-}
-
-Generator::addGenerator(__NAMESPACE__ . "\\Normal", "normal");
-Generator::addGenerator(__NAMESPACE__ . "\\Normal", "default");
\ No newline at end of file
+}
\ No newline at end of file