Fixed AxisAlignedBB infinite expansion

Cleaned Mycelium.php and fixed its potential crash

.gitignore

@@ -20,4 +20,8 @@ Desktop.ini
 
 # Mac crap
 .DS_Store
-/nbproject/private/
+/nbproject/private/
+
+# Sphinx-doc
+/docs/build/
+!/docs/requirements.txt

.gitmodules

@@ -6,3 +6,6 @@
 	path = src/raklib
 	url = https://github.com/PocketMine/RakLib.git
 	branch = master
+[submodule "src/spl"]
+	path = src/spl
+	url = https://github.com/PocketMine/PocketMine-SPL.git

CONTRIBUTING.md

@@ -2,36 +2,37 @@
 
 # PocketMine-MP Contribution Guidelines
 
-Before contributing to PocketMine-MP, please read this. Also, take a look if your contribution fits the PocketMine-MP goals below.
+You must follow these guidelines if you wish to contribute to the PocketMine-MP code base, or participate in issue tracking.
 
-
-## I've a question
+## I have a question
 * For questions, please refer to the _#pocketmine_ or _#mcpedevs_ IRC channel on Freenode. There is a [WebIRC](http://webchat.freenode.net?channels=pocketmine,mcpedevs&uio=d4) if you want.
-* You can ask directly to _[@PocketMine](https://twitter.com/PocketMine)_ in Twitter, but don't expect an inmediate reply.
+* You can ask directly to _[@PocketMine](https://twitter.com/PocketMine)_ in Twitter, but don't expect an immediate reply.
+* You may use our [Forum](http://forums.pocketmine.net) to ask questions.
+* We do not accept questions or support requests in our issue tracker.
 
-## I want to create an issue
-* First, use the [Issue Search](https://github.com/PocketMine/PocketMine-MP/search?ref=cmdform&type=Issues) to check if anyone has reported it.
-* Is your issue related to a Plugin? If so, please contact their original author instead of reporting it here.
- * And no, we won't update a Plugin because you need it.
-* When reporting, give as much info as you can, and if the Issue is a crash, give the Crash Dump.
-* Issues should be written in English.
+## Creating an Issue
+ - First, use the [Issue Search](https://github.com/PocketMine/PocketMine-MP/search?ref=cmdform&type=Issues) to check if anyone has reported it.
+ - If your issue is related to a plugin, you must contact their original author instead of reporting it here.
+ - If your issue is related to a PocketMine official plugin, or our Android application, you must create an issue on that specific repository.
+ - **Support requests are not bugs.** Issues such as "How do I do this" are not bugs and are closed as soon as a collaborator spots it. They are referred to our Forum to seek assistance.
+ - **No generic titles** such as "Question", "Help", "Crash Report" etc. If an issue has a generic title they will either be closed on the spot, or a collaborator will edit it to describe the actual symptom.
+ - Information must be provided in the issue body, not in the title. No tags are allowed in the title, and do not change the title if the issue has been solved.
+ - Similarly, no generic issue reports. It is the issue submitter's responsibility to provide us an issue that is **trackable, debuggable, reproducible, reported professionally and is an actual bug**. If you do not provide us with a summary or instructions on how to reproduce the issue, it is a support request until the actual bug has been found and therefore the issue is closed.
 
-## I want a new feature / I want to contribute code
+## Contributing Code
 * Use the [Pull Request](https://github.com/PocketMine/PocketMine-MP/pull/new) system, your request will be checked and discussed.
 * __Create a single branch for that pull request__
-* If you want to be part of PocketMine-MP, we will ask you to.
 * Code using the syntax as in PocketMine-MP. See below for an example.
 * The code must be clear and written in English, comments included.
+* Use descriptive commit titles
+* __No merge commits are allowed, or multiple features per pull request__
 
+**Thanks for contributing to PocketMine-MP!**
 
-__Thanks for contributing to PocketMine-MP!__
-
-
-
-### Code syntax
+### Code Syntax
 
 It is mainly [PSR-2](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-1-basic-coding-standard.md) with a few exceptions.
-* Opening braces MUST go on the same line.
+* Opening braces MUST go on the same line, and MUST NOT have spaces before.
 * `else if` MUST be written as `elseif`. _(It is in PSR-2, but using a SHOULD)_
 * Control structure keywords or opening braces MUST NOT have one space after them.
 * Code MUST use tabs for indenting.
@@ -45,7 +46,7 @@ It is mainly [PSR-2](https://github.com/php-fig/fig-standards/blob/master/accept
 ```php
 <?php 
 
-namespace pocketmine\Example;
+namespace pocketmine\example;
 
 class ExampleClass{
 	const EXAMPLE_CLASS_CONSTANT = 1;
@@ -71,3 +72,55 @@ class ExampleClass{
 
 }
 ```
+## Bug Tracking for Collaborators
+
+### Labels
+To provide a concise bug tracking environment, prevent the issue tracker from over flowing and to keep support requests out of the bug tracker, PocketMine-MP uses a label scheme a bit different from the default GitHub Issues labels.
+
+PocketMine-MP uses GitHub Issues Labels. There are a total of 12 labels.
+
+Note: For future reference, labels must not be longer than 15 letters.
+
+#### Categories
+Category labels are prefixed by `C:`. Multiple category labels may be applied to a single issue(but try to keep this to a minimum and do not overuse category labels).
+ - C: Core - This label is applied when the bug results in a fatal crash, or is related to neither Gameplay nor Plugin API.
+ - C: Gameplay - This label is applied when the bug effects the gameplay.
+ - C: API - This label is applied when the bug effects the Plugin API.
+
+#### Pull Requests
+Pull Requests are prefixed by `PR:`. Only one label may be applied for a Pull Request.
+ - PR: Bug Fix - This label is applied when the Pull Request fixes a bug. 
+ - PR: Contribution - This label is applied when the Pull Request contributes code to PocketMine-MP such as a new feature or an improvement.
+
+#### Status
+Status labels show the status of the issue. Multiple status labels may be applied.
+ - Reproduced - This label is applied when the bug has been reproduced, or multiple people are reporting the same issue and symptoms in which case it is automatically assumed that the bug has been reproduced in different environments.
+ - Debugged - This label is applied when the cause of the bug has been found.
+ - Priority - This label is applied when the bug is easy to fix, or if the scale of the bug is global.
+ - Won't Fix - This label is applied if the bug has been decided not be fixed for some reason. e.g. when the bug benefits gameplay. *This label may only be applied to a closed issue.*
+
+#### Miscellaneous
+Miscellaneous labels are labels that show status not related to debugging that bug. The To-Do label and the Mojang label may not be applied to a single issue at the same time.
+ - To-Do - This label is applied when the issue is not a bug, but a feature request or a list of features to be implemented that count towards a milestone.
+ - Mojang - This label is applied when the issue is suspected of being caused by the Minecraft: Pocket Edition client, but has not been confirmed.
+ - Invalid - This label is applied when the issue is reporting a false bug that works as intended, a support request, etc. *This label may only be applied to a closed issue.*
+
+### Closing Issues
+To keep the bug tracker clear of non-related issues and to prevent it from overflowing, **issues must be closed as soon as possible** (This may sound unethical, but it is MUCH better than having the BUG TRACKER filled with SUPPORT REQUESTS and "I NEED HELP").
+
+If an issue does not conform to the "Creating an Issue" guidelines above, the issue should be closed.
+
+### Milestones
+PocketMine-MP uses GitHub Milestones to set a goal for a new release. A milestone is set on the following occasions.
+
+ - A new Beta release
+ - A new Stable release
+
+A milestone must use the following format:
+```
+Alpha_<version_number> [release_title][release_version]
+```
+For example:
+```
+Alpha_1.4 beta2
+```

README.md

@@ -21,6 +21,8 @@ __PocketMine-MP is a free, open-source software that creates Minecraft: Pocket E
 
 ### [Forums](http://forums.pocketmine.net/)
 
+### [Documentation](http://pocketmine-mp.readthedocs.org/)
+
 ### [Plugin Repository](http://plugins.pocketmine.net/)
 
 <!--## [FAQ: Frequently Asked Questions](https://github.com/PocketMine/PocketMine-MP/wiki/Frequently-Asked-Questions)-->

src/pocketmine/Achievement.php

@@ -30,78 +30,78 @@ abstract class Achievement{
 	/**
 	 * @var array[]
 	 */
-	public static $list = array(
+	public static $list = [
 		/*"openInventory" => array(
 			"name" => "Taking Inventory",
 			"requires" => [],
 		),*/
-		"mineWood" => array(
+		"mineWood" => [
 			"name" => "Getting Wood",
-			"requires" => array( //"openInventory",
-			),
-		),
-		"buildWorkBench" => array(
+			"requires" => [ //"openInventory",
+			],
+		],
+		"buildWorkBench" => [
 			"name" => "Benchmarking",
-			"requires" => array(
+			"requires" => [
 				"mineWood",
-			),
-		),
-		"buildPickaxe" => array(
+			],
+		],
+		"buildPickaxe" => [
 			"name" => "Time to Mine!",
-			"requires" => array(
+			"requires" => [
 				"buildWorkBench",
-			),
-		),
-		"buildFurnace" => array(
+			],
+		],
+		"buildFurnace" => [
 			"name" => "Hot Topic",
-			"requires" => array(
+			"requires" => [
 				"buildPickaxe",
-			),
-		),
-		"acquireIron" => array(
+			],
+		],
+		"acquireIron" => [
 			"name" => "Acquire hardware",
-			"requires" => array(
+			"requires" => [
 				"buildFurnace",
-			),
-		),
-		"buildHoe" => array(
+			],
+		],
+		"buildHoe" => [
 			"name" => "Time to Farm!",
-			"requires" => array(
+			"requires" => [
 				"buildWorkBench",
-			),
-		),
-		"makeBread" => array(
+			],
+		],
+		"makeBread" => [
 			"name" => "Bake Bread",
-			"requires" => array(
+			"requires" => [
 				"buildHoe",
-			),
-		),
-		"bakeCake" => array(
+			],
+		],
+		"bakeCake" => [
 			"name" => "The Lie",
-			"requires" => array(
+			"requires" => [
 				"buildHoe",
-			),
-		),
-		"buildBetterPickaxe" => array(
+			],
+		],
+		"buildBetterPickaxe" => [
 			"name" => "Getting an Upgrade",
-			"requires" => array(
+			"requires" => [
 				"buildPickaxe",
-			),
-		),
-		"buildSword" => array(
+			],
+		],
+		"buildSword" => [
 			"name" => "Time to Strike!",
-			"requires" => array(
+			"requires" => [
 				"buildWorkBench",
-			),
-		),
-		"diamonds" => array(
+			],
+		],
+		"diamonds" => [
 			"name" => "DIAMONDS!",
-			"requires" => array(
+			"requires" => [
 				"acquireIron",
-			),
-		),
+			],
+		],
 
-	);
+	];
 
 
 	public static function broadcast(Player $player, $achievementId){
@@ -120,10 +120,10 @@ abstract class Achievement{
 
 	public static function add($achievementId, $achievementName, array $requires = []){
 		if(!isset(Achievement::$list[$achievementId])){
-			Achievement::$list[$achievementId] = array(
+			Achievement::$list[$achievementId] = [
 				"name" => $achievementName,
 				"requires" => $requires,
-			);
+			];
 
 			return true;
 		}

src/pocketmine/CompatibleClassLoader.php

@@ -19,12 +19,14 @@
  *
 */
 
-interface LoggerAttachment{
+namespace pocketmine;
+
+class CompatibleClassLoader extends \BaseClassLoader{
 
 	/**
-	 * @param mixed  $level
-	 * @param string $message
+	 * @deprecated
 	 */
-	public function log($level, $message);
-
+	public function add($namespace, $paths){
+		$this->addPath(array_shift($paths));
+	}
 }

src/pocketmine/CrashDump.php

@@ -0,0 +1,247 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+
+ *
+ *
+*/
+
+namespace pocketmine;
+
+use pocketmine\network\protocol\Info;
+use pocketmine\plugin\PluginLoadOrder;
+use pocketmine\utils\Utils;
+use pocketmine\utils\VersionString;
+use raklib\RakLib;
+
+class CrashDump{
+
+	/** @var Server */
+	private $server;
+	private $fp;
+	private $time;
+	private $data = [];
+	private $encodedData = null;
+	private $path;
+
+	public function __construct(Server $server){
+		$this->time = time();
+		$this->server = $server;
+		$this->path = $this->server->getDataPath() . "CrashDump_" . date("D_M_j-H.i.s-T_Y", $this->time) . ".log";
+		$this->fp = fopen($this->path, "wb");
+		$this->data["time"] = $this->time;
+		$this->addLine($this->server->getName() . " Crash Dump " . date("D M j H:i:s T Y", $this->time));
+		$this->addLine();
+		$this->baseCrash();
+		$this->generalData();
+		$this->pluginsData();
+
+		$this->extraData();
+
+		$this->encodeData();
+	}
+
+	public function getPath(){
+		return $this->path;
+	}
+
+	public function getEncodedData(){
+		return $this->encodedData;
+	}
+
+	public function getData(){
+		return $this->data;
+	}
+
+	private function encodeData(){
+		$this->addLine();
+		$this->addLine("----------------------REPORT THE DATA BELOW THIS LINE-----------------------");
+		$this->addLine();
+		$this->addLine("===BEGIN CRASH DUMP===");
+		$this->encodedData = zlib_encode(json_encode($this->data, JSON_UNESCAPED_SLASHES), ZLIB_ENCODING_DEFLATE, 9);
+		foreach(str_split(base64_encode($this->encodedData), 76) as $line){
+			$this->addLine($line);
+		}
+		$this->addLine("===END CRASH DUMP===");
+	}
+
+	private function pluginsData(){
+		if(class_exists("pocketmine\\plugin\\PluginManager", false)){
+			$this->addLine();
+			$this->addLine("Loaded plugins:");
+			$this->data["plugins"] = [];
+			foreach($this->server->getPluginManager()->getPlugins() as $p){
+				$d = $p->getDescription();
+				$this->data["plugins"][$d->getName()] = [
+					"name" => $d->getName(),
+					"version" => $d->getVersion(),
+					"authors" => $d->getAuthors(),
+					"api" => $d->getCompatibleApis(),
+					"enabled" => $p->isEnabled(),
+					"depends" => $d->getDepend(),
+					"softDepends" => $d->getSoftDepend(),
+					"main" => $d->getMain(),
+					"load" => $d->getOrder() === PluginLoadOrder::POSTWORLD ? "POSTWORLD" : "STARTUP",
+					"website" => $d->getWebsite()
+				];
+				$this->addLine($d->getName() . " " . $d->getVersion() . " by " . implode(", ", $d->getAuthors()) . " for API(s) " . implode(", ", $d->getCompatibleApis()));
+			}
+		}
+	}
+
+	private function extraData(){
+		global $arguments;
+
+		if($this->server->getProperty("auto-report.send-settings", true) !== false){
+			$this->data["parameters"] = (array) $arguments;
+			$this->data["server.properties"] = @file_get_contents($this->server->getDataPath() . "server.properties");
+			$this->data["server.properties"] = preg_replace("#^rcon\\.password=(.*)$#m", "rcon.password=******", $this->data["server.properties"]);
+			$this->data["pocketmine.yml"] = @file_get_contents($this->server->getDataPath() . "pocketmine.yml");
+		}else{
+			$this->data["pocketmine.yml"] = "";
+			$this->data["server.properties"] = "";
+			$this->data["parameters"] = [];
+		}
+		$extensions = [];
+		foreach(get_loaded_extensions() as $ext){
+			$extensions[$ext] = phpversion($ext);
+		}
+		$this->data["extensions"] = $extensions;
+
+		if($this->server->getProperty("auto-report.send-phpinfo", true) !== false){
+			ob_start();
+			phpinfo();
+			$this->data["phpinfo"] = ob_get_contents();
+			ob_end_clean();
+		}
+	}
+
+	private function baseCrash(){
+		global $lastExceptionError, $lastError;
+
+		if(isset($lastExceptionError)){
+			$error = $lastExceptionError;
+		}else{
+			$error = (array) error_get_last();
+			$error["trace"] = getTrace(4);
+			$errorConversion = [
+				E_ERROR => "E_ERROR",
+				E_WARNING => "E_WARNING",
+				E_PARSE => "E_PARSE",
+				E_NOTICE => "E_NOTICE",
+				E_CORE_ERROR => "E_CORE_ERROR",
+				E_CORE_WARNING => "E_CORE_WARNING",
+				E_COMPILE_ERROR => "E_COMPILE_ERROR",
+				E_COMPILE_WARNING => "E_COMPILE_WARNING",
+				E_USER_ERROR => "E_USER_ERROR",
+				E_USER_WARNING => "E_USER_WARNING",
+				E_USER_NOTICE => "E_USER_NOTICE",
+				E_STRICT => "E_STRICT",
+				E_RECOVERABLE_ERROR => "E_RECOVERABLE_ERROR",
+				E_DEPRECATED => "E_DEPRECATED",
+				E_USER_DEPRECATED => "E_USER_DEPRECATED",
+			];
+			$error["fullFile"] = $error["file"];
+			$error["file"] = cleanPath($error["file"]);
+			$error["type"] = isset($errorConversion[$error["type"]]) ? $errorConversion[$error["type"]] : $error["type"];
+			if(($pos = strpos($error["message"], "\n")) !== false){
+				$error["message"] = substr($error["message"], 0, $pos);
+			}
+		}
+
+		if(isset($lastError)){
+			$this->data["lastError"] = $lastError;
+		}
+
+		$this->data["error"] = $error;
+		unset($this->data["error"]["fullFile"]);
+		unset($this->data["error"]["trace"]);
+		$this->addLine("Error: " . $error["message"]);
+		$this->addLine("File: " . $error["file"]);
+		$this->addLine("Line: " . $error["line"]);
+		$this->addLine("Type: " . $error["type"]);
+
+		if(strpos($error["file"], "src/pocketmine/") === false and strpos($error["file"], "src/raklib/") === false and file_exists($error["fullFile"])){
+			$this->addLine();
+			$this->addLine("THIS CRASH WAS CAUSED BY A PLUGIN");
+			$this->data["plugin"] = true;
+
+			$reflection = new \ReflectionClass("pocketmine\\plugin\\PluginBase");
+			$file = $reflection->getProperty("file");
+			$file->setAccessible(true);
+			foreach($this->server->getPluginManager()->getPlugins() as $plugin){
+				$filePath = \pocketmine\cleanPath($file->getValue($plugin));
+				if(strpos($error["file"], $filePath) === 0){
+					$this->data["plugin"] = $plugin->getName();
+					$this->addLine("BAD PLUGIN: " . $plugin->getDescription()->getFullName());
+					break;
+				}
+			}
+		}else{
+			$this->data["plugin"] = false;
+		}
+
+		$this->addLine();
+		$this->addLine("Code:");
+		$this->data["code"] = [];
+
+		if($this->server->getProperty("auto-report.send-code", true) !== false){
+			$file = @file($error["fullFile"], FILE_IGNORE_NEW_LINES);
+			for($l = max(0, $error["line"] - 10); $l < $error["line"] + 10; ++$l){
+				$this->addLine("[" . ($l + 1) . "] " . @$file[$l]);
+				$this->data["code"][$l + 1] = @$file[$l];
+			}
+		}
+
+		$this->addLine();
+		$this->addLine("Backtrace:");
+		foreach(($this->data["trace"] = $error["trace"]) as $line){
+			$this->addLine($line);
+		}
+		$this->addLine();
+	}
+
+	private function generalData(){
+		$version = new VersionString();
+		$this->data["general"] = [];
+		$this->data["general"]["version"] = $version->get(false);
+		$this->data["general"]["build"] = $version->getBuild();
+		$this->data["general"]["protocol"] = Info::CURRENT_PROTOCOL;
+		$this->data["general"]["api"] = \pocketmine\API_VERSION;
+		$this->data["general"]["git"] = \pocketmine\GIT_COMMIT;
+		$this->data["general"]["raklib"] = RakLib::VERSION;
+		$this->data["general"]["uname"] = php_uname("a");
+		$this->data["general"]["php"] = phpversion();
+		$this->data["general"]["zend"] = zend_version();
+		$this->data["general"]["php_os"] = PHP_OS;
+		$this->data["general"]["os"] = Utils::getOS();
+		$this->addLine("PocketMine-MP version: " . $version->get(false) . " #" . $version->getNumber() . " [Protocol " . Info::CURRENT_PROTOCOL . "; API " . API_VERSION . "]");
+		$this->addLine("Git commit: " . GIT_COMMIT);
+		$this->addLine("uname -a: " . php_uname("a"));
+		$this->addLine("PHP Version: " . phpversion());
+		$this->addLine("Zend version: " . zend_version());
+		$this->addLine("OS : " . PHP_OS . ", " . Utils::getOS());
+	}
+
+	public function addLine($line = ""){
+		fwrite($this->fp, $line . PHP_EOL);
+	}
+
+	public function add($str){
+		fwrite($this->fp, $str);
+	}
+
+}

src/pocketmine/PocketMine.php

@@ -68,16 +68,14 @@ namespace pocketmine {
 	use LogLevel;
 	use pocketmine\utils\Binary;
 	use pocketmine\utils\MainLogger;
-	use pocketmine\utils\TextFormat;
 	use pocketmine\utils\Utils;
 	use pocketmine\wizard\Installer;
 	use raklib\RakLib;
 
 	const VERSION = "Alpha_1.4dev";
-	const API_VERSION = "1.0.0";
+	const API_VERSION = "1.3.1";
 	const CODENAME = "絶好(Zekkou)ケーキ(Cake)";
-	const MINECRAFT_VERSION = "v0.9.0 alpha";
-	const PHP_VERSION = "5.5";
+	const MINECRAFT_VERSION = "v0.9.5 alpha";
 
 	if(\Phar::running(true) !== ""){
 		@define("pocketmine\\PATH", \Phar::running(true) . "/");
@@ -85,16 +83,21 @@ namespace pocketmine {
 		@define("pocketmine\\PATH", \getcwd() . DIRECTORY_SEPARATOR);
 	}
 
-	if(!class_exists("SplClassLoader", false)){
-		require_once(\pocketmine\PATH . "src/spl/SplClassLoader.php");
+	if(!extension_loaded("pthreads")){
+		echo "[CRITICAL] Unable to find the pthreads extension." . PHP_EOL;
+		echo "[CRITICAL] Please use the installer provided on the homepage." . PHP_EOL;
+		exit(1);
 	}
 
-	$autoloader = new \SplClassLoader();
-	$autoloader->setMode(\SplAutoloader::MODE_DEBUG);
-	$autoloader->add("pocketmine", [
-		\pocketmine\PATH . "src"
-	]);
+	if(!class_exists("ClassLoader", false)){
+		require_once(\pocketmine\PATH . "src/spl/ClassLoader.php");
+		require_once(\pocketmine\PATH . "src/spl/BaseClassLoader.php");
+		require_once(\pocketmine\PATH . "src/pocketmine/CompatibleClassLoader.php");
+	}
 
+	$autoloader = new CompatibleClassLoader();
+	$autoloader->addPath(\pocketmine\PATH . "src");
+	$autoloader->addPath(\pocketmine\PATH . "src" . DIRECTORY_SEPARATOR . "spl");
 	$autoloader->register(true);
 	if(!class_exists("raklib\\RakLib", false)){
 		require(\pocketmine\PATH . "src/raklib/raklib/RakLib.php");
@@ -112,14 +115,14 @@ namespace pocketmine {
 			$time -= $time % 60;
 			//TODO: Parse different time & date formats by region. ¬¬ world
 			//Example: USA
-			exec("time.exe /T", $hour);
+			@exec("time.exe /T", $hour);
 			$i = array_map("intval", explode(":", trim($hour[0])));
-			exec("date.exe /T", $date);
+			@exec("date.exe /T", $date);
 			$j = array_map("intval", explode(substr($date[0], 2, 1), trim($date[0])));
-			$offset = round((mktime($i[0], $i[1], 0, $j[1], $j[0], $j[2]) - $time) / 60) * 60;
+			$offset = @round((mktime($i[0], $i[1], 0, $j[1], $j[0], $j[2]) - $time) / 60) * 60;
 		}else{
-			exec("date +%s", $t);
-			$offset = round((intval(trim($t[0])) - time()) / 60) * 60;
+			@exec("date +%s", $t);
+			$offset = @round((intval(trim($t[0])) - time()) / 60) * 60;
 		}
 
 		$daylight = (int) date("I");
@@ -136,16 +139,16 @@ namespace pocketmine {
 	}
 
 	gc_enable();
-	error_reporting(E_ALL | E_STRICT);
+	error_reporting(-1);
 	ini_set("allow_url_fopen", 1);
 	ini_set("display_errors", 1);
 	ini_set("display_startup_errors", 1);
 	ini_set("default_charset", "utf-8");
 
-	ini_set("memory_limit", "128M"); //Default
+	ini_set("memory_limit", "256M"); //Default
 	define("pocketmine\\START_TIME", microtime(true));
 
-	$opts = getopt("", array("enable-ansi", "disable-ansi", "data:", "plugins:", "no-wizard"));
+	$opts = getopt("", ["enable-ansi", "disable-ansi", "data:", "plugins:", "no-wizard", "enable-profiler"]);
 
 	define("pocketmine\\DATA", isset($opts["data"]) ? realpath($opts["data"]) . DIRECTORY_SEPARATOR : \getcwd() . DIRECTORY_SEPARATOR);
 	define("pocketmine\\PLUGIN_PATH", isset($opts["plugins"]) ? realpath($opts["plugins"]) . DIRECTORY_SEPARATOR : \getcwd() . DIRECTORY_SEPARATOR . "plugins" . DIRECTORY_SEPARATOR);
@@ -154,6 +157,15 @@ namespace pocketmine {
 
 	$logger = new MainLogger(\pocketmine\DATA . "server.log", \pocketmine\ANSI);
 
+	if(isset($opts["enable-profiler"])){
+		if(function_exists("profiler_enable")){
+			\profiler_enable();
+			$logger->notice("Execution is being profiled");
+		}else{
+			$logger->notice("No profiler found. Please install https://github.com/krakjoe/profiler");
+		}
+	}
+
 	function kill($pid){
 		switch(Utils::getOS()){
 			case "win":
@@ -166,29 +178,46 @@ namespace pocketmine {
 		}
 	}
 
-	function getTrace($start = 1){
-		$e = new \Exception();
-		$trace = $e->getTrace();
+	function getTrace($start = 1, $trace = null){
+		if($trace === null){
+			if(function_exists("xdebug_get_function_stack")){
+				$trace = array_reverse(xdebug_get_function_stack());
+			}else{
+				$e = new \Exception();
+				$trace = $e->getTrace();
+			}
+		}
+
 		$messages = [];
 		$j = 0;
 		for($i = (int) $start; isset($trace[$i]); ++$i, ++$j){
 			$params = "";
-			if(isset($trace[$i]["args"])){
-				foreach($trace[$i]["args"] as $name => $value){
+			if(isset($trace[$i]["args"]) or isset($trace[$i]["params"])){
+				if(isset($trace[$i]["args"])){
+					$args = $trace[$i]["args"];
+				}else{
+					$args = $trace[$i]["params"];
+				}
+				foreach($args as $name => $value){
 					$params .= (is_object($value) ? get_class($value) . " " . (method_exists($value, "__toString") ? $value->__toString() : "object") : gettype($value) . " " . @strval($value)) . ", ";
 				}
 			}
-			$messages[] = "#$j " . (isset($trace[$i]["file"]) ? $trace[$i]["file"] : "") . "(" . (isset($trace[$i]["line"]) ? $trace[$i]["line"] : "") . "): " . (isset($trace[$i]["class"]) ? $trace[$i]["class"] . $trace[$i]["type"] : "") . $trace[$i]["function"] . "(" . substr($params, 0, -2) . ")";
+			$messages[] = "#$j " . (isset($trace[$i]["file"]) ? cleanPath($trace[$i]["file"]) : "") . "(" . (isset($trace[$i]["line"]) ? $trace[$i]["line"] : "") . "): " . (isset($trace[$i]["class"]) ? $trace[$i]["class"] . (($trace[$i]["type"] === "dynamic" or $trace[$i]["type"] === "->") ? "->" : "::") : "") . $trace[$i]["function"] . "(" . substr($params, 0, -2) . ")";
 		}
 
 		return $messages;
 	}
 
-	function error_handler($errno, $errstr, $errfile, $errline){
+	function cleanPath($path){
+		return rtrim(str_replace(["\\", ".php", "phar://", rtrim(str_replace(["\\", "phar://"], ["/", ""], \pocketmine\PATH), "/"), rtrim(str_replace(["\\", "phar://"], ["/", ""], \pocketmine\PLUGIN_PATH), "/")], ["/", "", "", "", ""], $path), "/");
+	}
+
+	function error_handler($errno, $errstr, $errfile, $errline, $trace = null){
+		global $lastError;
 		if(error_reporting() === 0){ //@ error-control
 			return false;
 		}
-		$errorConversion = array(
+		$errorConversion = [
 			E_ERROR => "E_ERROR",
 			E_WARNING => "E_WARNING",
 			E_PARSE => "E_PARSE",
@@ -204,14 +233,28 @@ namespace pocketmine {
 			E_RECOVERABLE_ERROR => "E_RECOVERABLE_ERROR",
 			E_DEPRECATED => "E_DEPRECATED",
 			E_USER_DEPRECATED => "E_USER_DEPRECATED",
-		);
+		];
 		$type = ($errno === E_ERROR or $errno === E_WARNING or $errno === E_USER_ERROR or $errno === E_USER_WARNING) ? LogLevel::ERROR : LogLevel::NOTICE;
 		$errno = isset($errorConversion[$errno]) ? $errorConversion[$errno] : $errno;
+		if(($pos = strpos($errstr, "\n")) !== false){
+			$errstr = substr($errstr, 0, $pos);
+		}
 		$logger = MainLogger::getLogger();
-		$logger->log($type, "A $errno error happened: \"$errstr\" in \"$errfile\" at line $errline");
-		foreach(getTrace() as $i => $line){
+		$oldFile = $errfile;
+		$errfile = cleanPath($errfile);
+		$logger->log($type, "An $errno error happened: \"$errstr\" in \"$errfile\" at line $errline");
+
+		foreach(($trace = getTrace($trace === null ? 3 : 0, $trace)) as $i => $line){
 			$logger->debug($line);
 		}
+		$lastError = [
+			"type" => $type,
+			"message" => $errstr,
+			"fullFile" => $oldFile,
+			"file" => $errfile,
+			"line" => $errline,
+			"trace" => $trace
+		];
 
 		return true;
 	}
@@ -220,8 +263,8 @@ namespace pocketmine {
 
 	$errors = 0;
 
-	if(version_compare("5.4.0", PHP_VERSION) > 0){
-		$logger->critical("Use PHP >= 5.4.0");
+	if(version_compare("5.6.0", PHP_VERSION) > 0){
+		$logger->critical("You must use PHP >= 5.6");
 		++$errors;
 	}
 
@@ -235,18 +278,13 @@ namespace pocketmine {
 		++$errors;
 	}
 
-	if(!extension_loaded("pthreads")){
-		$logger->critical("Unable to find the pthreads extension.");
+	$pthreads_version = phpversion("pthreads");
+	if(substr_count($pthreads_version, ".") < 2){
+		$pthreads_version = "0.$pthreads_version";
+	}
+	if(version_compare($pthreads_version, "2.0.4") < 0){
+		$logger->critical("pthreads >= 2.0.4 is required, while you have $pthreads_version.");
 		++$errors;
-	}else{
-		$pthreads_version = phpversion("pthreads");
-		if(substr_count($pthreads_version, ".") < 2){
-			$pthreads_version = "0.$pthreads_version";
-		}
-		if(version_compare($pthreads_version, "2.0.4") < 0){
-			$logger->critical("pthreads >= 2.0.4 is required, while you have $pthreads_version.");
-			++$errors;
-		}
 	}
 
 	if(!extension_loaded("uopz")){
@@ -313,12 +351,36 @@ namespace pocketmine {
 		$logger->warning("Non-packaged PocketMine-MP installation detected, do not use on production.");
 	}
 
+	ThreadManager::init();
 	$server = new Server($autoloader, $logger, \pocketmine\PATH, \pocketmine\DATA, \pocketmine\PLUGIN_PATH);
-	$server->start();
+
+	$logger->info("Stopping other threads");
+
+	foreach(ThreadManager::getInstance()->getAll() as $id => $thread){
+		if($thread->isRunning()){
+			$logger->debug("Stopping " . (new \ReflectionClass($thread))->getShortName() . " thread");
+			if($thread instanceof Thread){
+				$thread->kill();
+
+				if($thread->isRunning() or !$thread->join()){
+					$thread->detach();
+				}
+			}elseif($thread instanceof Worker){
+				$thread->kill();
+				sleep(1);
+				if($thread->isRunning() or !$thread->join()){
+					$thread->detach();
+				}
+			}
+		}elseif(!$thread->isJoined()){
+			$logger->debug("Joining " . (new \ReflectionClass($thread))->getShortName() . " thread");
+			$thread->join();
+		}
+	}
+
 	$logger->shutdown();
 	$logger->join();
 
-	kill(getmypid());
 	exit(0);
 
 }

src/pocketmine/Server.php

@@ -36,6 +36,8 @@ use pocketmine\event\HandlerList;
 use pocketmine\event\level\LevelInitEvent;
 use pocketmine\event\level\LevelLoadEvent;
 use pocketmine\event\server\ServerCommandEvent;
+use pocketmine\event\Timings;
+use pocketmine\event\TimingsHandler;
 use pocketmine\inventory\CraftingManager;
 use pocketmine\inventory\InventoryType;
 use pocketmine\inventory\Recipe;
@@ -58,7 +60,6 @@ use pocketmine\nbt\tag\Long;
 use pocketmine\nbt\tag\Short;
 use pocketmine\nbt\tag\String;
 use pocketmine\network\protocol\DataPacket;
-use pocketmine\network\protocol\Info;
 use pocketmine\network\query\QueryHandler;
 use pocketmine\network\query\QueryPacket;
 use pocketmine\network\RakLibInterface;
@@ -67,6 +68,7 @@ use pocketmine\network\SourceInterface;
 use pocketmine\network\upnp\UPnP;
 use pocketmine\permission\BanList;
 use pocketmine\permission\DefaultPermissions;
+use pocketmine\plugin\PharPluginLoader;
 use pocketmine\plugin\Plugin;
 use pocketmine\plugin\PluginLoadOrder;
 use pocketmine\plugin\PluginManager;
@@ -273,7 +275,7 @@ class Server{
 	 * @return int
 	 */
 	public function getViewDistance(){
-		return min(11, max($this->getConfigInt("view-distance", 7), 4));
+		return max(56, $this->getProperty("chunk-sending.max-chunks"));
 	}
 
 	/**
@@ -453,7 +455,7 @@ class Server{
 	}
 
 	/**
-	 * @return \SplClassLoader
+	 * @return \ClassLoader
 	 */
 	public function getLoader(){
 		return $this->autoloader;
@@ -624,39 +626,39 @@ class Server{
 		$path = $this->getDataPath() . "players/";
 		if(!file_exists($path . "$name.dat")){
 			$spawn = $this->getDefaultLevel()->getSafeSpawn();
-			$nbt = new Compound(false, array(
+			$nbt = new Compound(false, [
 				new Long("firstPlayed", floor(microtime(true) * 1000)),
 				new Long("lastPlayed", floor(microtime(true) * 1000)),
-				new Enum("Pos", array(
+				new Enum("Pos", [
 					new Double(0, $spawn->x),
 					new Double(1, $spawn->y),
 					new Double(2, $spawn->z)
-				)),
+				]),
 				new String("Level", $this->getDefaultLevel()->getName()),
-				new String("SpawnLevel", $this->getDefaultLevel()->getName()),
-				new Int("SpawnX", (int) $spawn->x),
-				new Int("SpawnY", (int) $spawn->y),
-				new Int("SpawnZ", (int) $spawn->z),
-				new Byte("SpawnForced", 1), //TODO
+				//new String("SpawnLevel", $this->getDefaultLevel()->getName()),
+				//new Int("SpawnX", (int) $spawn->x),
+				//new Int("SpawnY", (int) $spawn->y),
+				//new Int("SpawnZ", (int) $spawn->z),
+				//new Byte("SpawnForced", 1), //TODO
 				new Enum("Inventory", []),
 				new Compound("Achievements", []),
 				new Int("playerGameType", $this->getGamemode()),
-				new Enum("Motion", array(
+				new Enum("Motion", [
 					new Double(0, 0.0),
 					new Double(1, 0.0),
 					new Double(2, 0.0)
-				)),
-				new Enum("Rotation", array(
+				]),
+				new Enum("Rotation", [
 					new Float(0, 0.0),
 					new Float(1, 0.0)
-				)),
+				]),
 				new Float("FallDistance", 0.0),
 				new Short("Fire", 0),
 				new Short("Air", 0),
 				new Byte("OnGround", 1),
 				new Byte("Invulnerable", 0),
 				new String("NameTag", $name),
-			));
+			]);
 			$nbt->Pos->setTagType(NBT::TAG_Double);
 			$nbt->Inventory->setTagType(NBT::TAG_Compound);
 			$nbt->Motion->setTagType(NBT::TAG_Double);
@@ -676,35 +678,35 @@ class Server{
 				$this->logger->notice("Old Player data found for \"" . $name . "\", upgrading profile");
 				foreach($data->get("inventory") as $slot => $item){
 					if(count($item) === 3){
-						$nbt->Inventory[$slot + 9] = new Compound(false, array(
+						$nbt->Inventory[$slot + 9] = new Compound(false, [
 							new Short("id", $item[0]),
 							new Short("Damage", $item[1]),
 							new Byte("Count", $item[2]),
 							new Byte("Slot", $slot + 9),
 							new Byte("TrueSlot", $slot + 9)
-						));
+						]);
 					}
 				}
 				foreach($data->get("hotbar") as $slot => $itemSlot){
 					if(isset($nbt->Inventory[$itemSlot + 9])){
 						$item = $nbt->Inventory[$itemSlot + 9];
-						$nbt->Inventory[$slot] = new Compound(false, array(
-							new Short("id", $item->id),
-							new Short("Damage", $item->Damage),
-							new Byte("Count", $item->Count),
+						$nbt->Inventory[$slot] = new Compound(false, [
+							new Short("id", $item["id"]),
+							new Short("Damage", $item["Damage"]),
+							new Byte("Count", $item["Count"]),
 							new Byte("Slot", $slot),
-							new Byte("TrueSlot", $item->TrueSlot)
-						));
+							new Byte("TrueSlot", $item["TrueSlot"])
+						]);
 					}
 				}
 				foreach($data->get("armor") as $slot => $item){
 					if(count($item) === 2){
-						$nbt->Inventory[$slot + 100] = new Compound(false, array(
+						$nbt->Inventory[$slot + 100] = new Compound(false, [
 							new Short("id", $item[0]),
 							new Short("Damage", $item[1]),
 							new Byte("Count", 1),
 							new Byte("Slot", $slot + 100)
-						));
+						]);
 					}
 				}
 				foreach($data->get("achievements") as $achievement => $status){
@@ -786,7 +788,7 @@ class Server{
 		$matchedPlayers = [];
 		foreach($this->getOnlinePlayers() as $player){
 			if(strtolower($player->getName()) === $partialName){
-				$matchedPlayers = array($player);
+				$matchedPlayers = [$player];
 				break;
 			}elseif(stripos($player->getName(), $partialName) !== false){
 				$matchedPlayers[] = $player;
@@ -800,9 +802,7 @@ class Server{
 	 * @param Player $player
 	 */
 	public function removePlayer(Player $player){
-		if($player->isOnline() === false){
-			unset($this->players[$player->getAddress() . ":" . $player->getPort()]);
-		}
+		unset($this->players[$player->getAddress() . ":" . $player->getPort()]);
 	}
 
 	/**
@@ -878,6 +878,7 @@ class Server{
 	public function unloadLevel(Level $level, $forceUnload = false){
 		if($level->unload($forceUnload) === true and $this->isLevelLoaded($level->getFolderName())){
 			unset($this->levels[$level->getID()]);
+
 			return true;
 		}
 
@@ -910,7 +911,7 @@ class Server{
 		$provider = LevelProviderManager::getProvider($path);
 
 		if($provider === null){
-			$this->logger->error("Could not load level \"" . $name . "\"");
+			$this->logger->error("Could not load level \"" . $name . "\": Unknown provider");
 
 			return false;
 		}
@@ -919,7 +920,14 @@ class Server{
 		//	@rename($path . "tileEntities.yml", $path . "tiles.yml");
 		//}
 
-		$level = new Level($this, $name, $path, $provider);
+		try{
+			$level = new Level($this, $name, $path, $provider);
+		}catch(\Exception $e){
+			$this->logger->error("Could not load level \"" . $name . "\": " . $e->getMessage());
+
+			return false;
+		}
+
 		$this->levels[$level->getID()] = $level;
 
 		$this->getPluginManager()->callEvent(new LevelLoadEvent($level));
@@ -1030,7 +1038,7 @@ class Server{
 	 *
 	 * @return bool
 	 */
-	public function generateLevel($name, $seed = null, $generator = null, array $options = []){
+	public function generateLevel($name, $seed = null, $generator = null, $options = []){
 		if(trim($name) === "" or $this->isLevelGenerated($name)){
 			return false;
 		}
@@ -1048,7 +1056,9 @@ class Server{
 			}
 		}
 
-		$provider = "pocketmine\\level\\format\\anvil\\Anvil";
+		if(($provider = LevelProviderManager::getProviderByName($providerName = $this->getProperty("level-settings.default-format", "mcregion"))) === null){
+			$provider = LevelProviderManager::getProviderByName($providerName = "mcregion");
+		}
 
 		$path = $this->getDataPath() . "worlds/" . $name . "/";
 		/** @var \pocketmine\level\format\LevelProvider $provider */
@@ -1061,12 +1071,39 @@ class Server{
 
 		$this->getPluginManager()->callEvent(new LevelLoadEvent($level));
 
-		for($Z = 5; $Z <= 11; ++$Z){
-			for($X = 5; $X <= 11; ++$X){
-				$level->generateChunk($X, $Z);
+		$this->getLogger()->notice("Spawn terrain for level \"$name\" is being generated in the background");
+
+
+		$radiusSquared = ($this->getViewDistance() + 1) / M_PI;
+		$radius = ceil(sqrt($radiusSquared));
+
+		$centerX = $level->getSpawn()->getX() >> 4;
+		$centerZ = $level->getSpawn()->getZ() >> 4;
+
+		$order = [];
+
+		for($X = -$radius; $X <= $radius; ++$X){
+			for($Z = -$radius; $Z <= $radius; ++$Z){
+				$distance = ($X * $X) + ($Z * $Z);
+				if($distance > $radiusSquared){
+					continue;
+				}
+				$chunkX = $X + $centerX;
+				$chunkZ = $Z + $centerZ;
+				$index = Level::chunkHash($chunkX, $chunkZ);
+				$order[$index] = $distance;
 			}
 		}
 
+		asort($order);
+
+		$chunkX = $chunkZ = null;
+
+		foreach($order as $index => $distance){
+			Level::getXZ($index, $chunkX, $chunkZ);
+			$level->generateChunk($chunkX, $chunkZ);
+		}
+
 		return true;
 	}
 
@@ -1105,7 +1142,7 @@ class Server{
 	 * @return string
 	 */
 	public function getConfigString($variable, $defaultValue = ""){
-		$v = getopt("", array("$variable::"));
+		$v = getopt("", ["$variable::"]);
 		if(isset($v[$variable])){
 			return (string) $v[$variable];
 		}
@@ -1155,7 +1192,7 @@ class Server{
 	 * @return int
 	 */
 	public function getConfigInt($variable, $defaultValue = 0){
-		$v = getopt("", array("$variable::"));
+		$v = getopt("", ["$variable::"]);
 		if(isset($v[$variable])){
 			return (int) $v[$variable];
 		}
@@ -1178,7 +1215,7 @@ class Server{
 	 * @return boolean
 	 */
 	public function getConfigBoolean($variable, $defaultValue = false){
-		$v = getopt("", array("$variable::"));
+		$v = getopt("", ["$variable::"]);
 		if(isset($v[$variable])){
 			$value = $v[$variable];
 		}else{
@@ -1340,13 +1377,13 @@ class Server{
 	}
 
 	/**
-	 * @param \SplClassLoader $autoloader
+	 * @param \ClassLoader $autoloader
 	 * @param \ThreadedLogger $logger
 	 * @param string          $filePath
 	 * @param string          $dataPath
 	 * @param string          $pluginPath
 	 */
-	public function __construct(\SplClassLoader $autoloader, \ThreadedLogger $logger, $filePath, $dataPath, $pluginPath){
+	public function __construct(\ClassLoader $autoloader, \ThreadedLogger $logger, $filePath, $dataPath, $pluginPath){
 		self::$instance = $this;
 
 		$this->autoloader = $autoloader;
@@ -1354,7 +1391,7 @@ class Server{
 		$this->filePath = $filePath;
 		$this->dataPath = $dataPath;
 		$this->pluginPath = $pluginPath;
-		@mkdir($this->dataPath . "worlds/", 0777);
+		@mkdir($this->dataPath . "worlds/", 0777, true);
 		@mkdir($this->dataPath . "players/", 0777);
 		@mkdir($this->pluginPath, 0777);
 
@@ -1390,14 +1427,13 @@ class Server{
 		$this->config = new Config($this->dataPath . "pocketmine.yml", Config::YAML, []);
 
 		$this->logger->info("Loading server properties...");
-		$this->properties = new Config($this->dataPath . "server.properties", Config::PROPERTIES, array(
+		$this->properties = new Config($this->dataPath . "server.properties", Config::PROPERTIES, [
 			"motd" => "Minecraft: PE Server",
 			"server-port" => 19132,
 			"memory-limit" => "256M",
 			"white-list" => false,
 			"announce-player-achievements" => true,
 			"spawn-protection" => 16,
-			"view-distance" => 8,
 			"max-players" => 20,
 			"allow-flight" => false,
 			"spawn-animals" => true,
@@ -1415,34 +1451,34 @@ class Server{
 			"enable-rcon" => false,
 			"rcon.password" => substr(base64_encode(Utils::getRandomBytes(20, false)), 3, 10),
 			"auto-save" => true,
-		));
+		]);
 
 		ServerScheduler::$WORKERS = $this->getProperty("settings.async-workers", ServerScheduler::$WORKERS);
 
 		$this->scheduler = new ServerScheduler();
 
 		if($this->getConfigBoolean("enable-rcon", false) === true){
-			$this->rcon = new RCON($this->getConfigString("rcon.password", ""), $this->getConfigInt("rcon.port", $this->getPort()), ($ip = $this->getIp()) != "" ? $ip : "0.0.0.0", $this->getConfigInt("rcon.threads", 1), $this->getConfigInt("rcon.clients-per-thread", 50));
+			$this->rcon = new RCON($this, $this->getConfigString("rcon.password", ""), $this->getConfigInt("rcon.port", $this->getPort()), ($ip = $this->getIp()) != "" ? $ip : "0.0.0.0", $this->getConfigInt("rcon.threads", 1), $this->getConfigInt("rcon.clients-per-thread", 50));
 		}
 
 		$this->maxPlayers = $this->getConfigInt("max-players", 20);
 
-		if(($memory = str_replace("B", "", strtoupper($this->getConfigString("memory-limit", "128M")))) !== false){
-			$value = array("M" => 1, "G" => 1024);
+		if(($memory = str_replace("B", "", strtoupper($this->getConfigString("memory-limit", "256M")))) !== false){
+			$value = ["M" => 1, "G" => 1024];
 			$real = ((int) substr($memory, 0, -1)) * $value[substr($memory, -1)];
 			if($real < 128){
-				$this->logger->warning("PocketMine-MP may not work right with less than 128MB of RAM", true, true, 0);
+				$this->logger->warning($this->getName() . " may not work right with less than 128MB of RAM", true, true, 0);
 			}
 			@ini_set("memory_limit", $memory);
 		}else{
-			$this->setConfigString("memory-limit", "128M");
+			$this->setConfigString("memory-limit", "256M");
 		}
 
 		if($this->getConfigBoolean("hardcore", false) === true and $this->getDifficulty() < 3){
 			$this->setConfigInt("difficulty", 3);
 		}
 
-		define("pocketmine\\DEBUG", $this->getProperty("debug.level", 1));
+		define("pocketmine\\DEBUG", (int) $this->getProperty("debug.level", 1));
 		if($this->logger instanceof MainLogger){
 			$this->logger->setLogDebug(\pocketmine\DEBUG > 1);
 		}
@@ -1453,8 +1489,8 @@ class Server{
 
 		Level::$COMPRESSION_LEVEL = $this->getProperty("chunk-sending.compression-level", 7);
 
-		if(defined("pocketmine\\DEBUG") and \pocketmine\DEBUG >= 0 and function_exists("cli_set_process_title")){
-			@cli_set_process_title("PocketMine-MP " . $this->getPocketMineVersion());
+		if(defined("pocketmine\\DEBUG") and \pocketmine\DEBUG >= 0){
+			@cli_set_process_title($this->getName() . " " . $this->getPocketMineVersion());
 		}
 
 		$this->logger->info("Starting Minecraft PE server on " . ($this->getIp() === "" ? "*" : $this->getIp()) . ":" . $this->getPort());
@@ -1463,8 +1499,8 @@ class Server{
 
 		$this->addInterface($this->mainInterface = new RakLibInterface($this));
 
-		$this->logger->info("This server is running PocketMine-MP version " . ($version->isDev() ? TextFormat::YELLOW : "") . $version->get(false) . TextFormat::RESET . " \"" . $this->getCodename() . "\" (API " . $this->getApiVersion() . ")", true, true, 0);
-		$this->logger->info("PocketMine-MP is distributed under the LGPL License", true, true, 0);
+		$this->logger->info("This server is running " . $this->getName() . " version " . ($version->isDev() ? TextFormat::YELLOW : "") . $version->get(false) . TextFormat::RESET . " \"" . $this->getCodename() . "\" (API " . $this->getApiVersion() . ")", true, true, 0);
+		$this->logger->info($this->getName() . " is distributed under the LGPL License", true, true, 0);
 
 		$this->consoleSender = new ConsoleCommandSender();
 		$this->commandMap = new SimpleCommandMap($this);
@@ -1474,9 +1510,18 @@ class Server{
 		Item::init();
 		$this->craftingManager = new CraftingManager();
 
+		PluginManager::$pluginParentTimer = new TimingsHandler("** Plugins");
+		Timings::init();
+
 		$this->pluginManager = new PluginManager($this, $this->commandMap);
 		$this->pluginManager->subscribeToPermission(Server::BROADCAST_CHANNEL_ADMINISTRATIVE, $this->consoleSender);
+		$this->pluginManager->setUseTimings($this->getProperty("settings.enable-profiling", false));
 		$this->pluginManager->registerInterface("pocketmine\\plugin\\PharPluginLoader");
+
+		set_exception_handler([$this, "exceptionHandler"]);
+		register_shutdown_function([$this, "crashDump"]);
+		register_shutdown_function([$this, "forceShutdown"]);
+
 		$this->pluginManager->loadPlugins($this->pluginPath);
 
 		$this->updater = new AutoUpdater($this, $this->getProperty("auto-updater.host", "www.pocketmine.net"));
@@ -1486,12 +1531,30 @@ class Server{
 		$this->generationManager = new GenerationRequestManager($this);
 
 		LevelProviderManager::addProvider($this, "pocketmine\\level\\format\\anvil\\Anvil");
+		LevelProviderManager::addProvider($this, "pocketmine\\level\\format\\mcregion\\McRegion");
 
 
 		Generator::addGenerator("pocketmine\\level\\generator\\Flat", "flat");
 		Generator::addGenerator("pocketmine\\level\\generator\\Normal", "normal");
 		Generator::addGenerator("pocketmine\\level\\generator\\Normal", "default");
 
+		foreach($this->getProperty("worlds", []) as $name => $worldSetting){
+			if($this->loadLevel($name) === false){
+				$seed = $this->getProperty("worlds.$name.seed", time());
+				$options = explode(":", $this->getProperty("worlds.$name.generator", Generator::getGenerator("default")));
+				$generator = Generator::getGenerator(array_shift($options));
+				if(count($options) > 0){
+					$options = [
+						"preset" => implode(":", $options),
+					];
+				}else{
+					$options = [];
+				}
+
+				$this->generateLevel($name, $seed, $generator, $options);
+			}
+		}
+
 		if($this->getDefaultLevel() === null){
 			$default = $this->getConfigString("level-name", "world");
 			if(trim($default) == ""){
@@ -1510,17 +1573,25 @@ class Server{
 
 		$this->properties->save();
 
+		if(!($this->getDefaultLevel() instanceof Level)){
+			$this->getLogger()->emergency("No default level has been loaded");
+			$this->forceShutdown();
+
+			return;
+		}
+
 		$this->scheduler->scheduleDelayedRepeatingTask(new CallbackTask("pocketmine\\utils\\Cache::cleanup"), $this->getProperty("ticks-per.cache-cleanup", 900), $this->getProperty("ticks-per.cache-cleanup", 900));
 		if($this->getConfigBoolean("auto-save", true) === true and $this->getProperty("ticks-per.autosave", 6000) > 0){
-			$this->scheduler->scheduleDelayedRepeatingTask(new CallbackTask(array($this, "doAutoSave")), $this->getProperty("ticks-per.autosave", 6000), $this->getProperty("ticks-per.autosave", 6000));
+			$this->scheduler->scheduleDelayedRepeatingTask(new CallbackTask([$this, "doAutoSave"]), $this->getProperty("ticks-per.autosave", 6000), $this->getProperty("ticks-per.autosave", 6000));
 		}
 
 		if($this->getProperty("chunk-gc.period-in-ticks", 600) > 0){
-			$this->scheduler->scheduleDelayedRepeatingTask(new CallbackTask(array($this, "doLevelGC")), $this->getProperty("chunk-gc.period-in-ticks", 600), $this->getProperty("chunk-gc.period-in-ticks", 600));
+			$this->scheduler->scheduleDelayedRepeatingTask(new CallbackTask([$this, "doLevelGC"]), $this->getProperty("chunk-gc.period-in-ticks", 600), $this->getProperty("chunk-gc.period-in-ticks", 600));
 		}
 
 		$this->enablePlugins(PluginLoadOrder::POSTWORLD);
 
+		$this->start();
 	}
 
 	/**
@@ -1552,8 +1623,9 @@ class Server{
 		foreach($recipients as $recipient){
 			$recipient->sendMessage($message);
 		}
+
 		return count($recipients);
-  	}
+	}
 
 	/**
 	 * Broadcasts a Minecraft packet to a list of players
@@ -1574,7 +1646,7 @@ class Server{
 	public function enablePlugins($type){
 		foreach($this->pluginManager->getPlugins() as $plugin){
 			if(!$plugin->isEnabled() and $plugin->getDescription()->getOrder() === $type){
-				$this->loadPlugin($plugin);
+				$this->enablePlugin($plugin);
 			}
 		}
 
@@ -1587,19 +1659,32 @@ class Server{
 	/**
 	 * @param Plugin $plugin
 	 */
-	public function loadPlugin(Plugin $plugin){
+	public function enablePlugin(Plugin $plugin){
 		$this->pluginManager->enablePlugin($plugin);
 	}
 
+	/**
+	 * @param Plugin $plugin
+	 *
+	 * @deprecated
+	 */
+	public function loadPlugin(Plugin $plugin){
+		$this->enablePlugin($plugin);
+	}
+
 	public function disablePlugins(){
 		$this->pluginManager->disablePlugins();
 	}
 
 	public function checkConsole(){
+		Timings::$serverCommandTimer->startTiming();
 		if(($line = $this->console->getLine()) !== null){
 			$this->pluginManager->callEvent($ev = new ServerCommandEvent($this->consoleSender, $line));
-			$this->dispatchCommand($this->consoleSender, $ev->getCommand());
+			if(!$ev->isCancelled()){
+				$this->dispatchCommand($ev->getSender(), $ev->getCommand());
+			}
 		}
+		Timings::$serverCommandTimer->stopTiming();
 	}
 
 	/**
@@ -1640,14 +1725,14 @@ class Server{
 		$this->maxPlayers = $this->getConfigInt("max-players", 20);
 
 		if(($memory = str_replace("B", "", strtoupper($this->getConfigString("memory-limit", "256M")))) !== false){
-			$value = array("M" => 1, "G" => 1024);
+			$value = ["M" => 1, "G" => 1024];
 			$real = ((int) substr($memory, 0, -1)) * $value[substr($memory, -1)];
 			if($real < 256){
-				$this->logger->warning("PocketMine-MP may not work right with less than 256MB of RAM", true, true, 0);
+				$this->logger->warning($this->getName() . " may not work right with less than 256MB of RAM", true, true, 0);
 			}
 			@ini_set("memory_limit", $memory);
 		}else{
-			$this->setConfigString("memory-limit", "128M");
+			$this->setConfigString("memory-limit", "256M");
 		}
 
 		if($this->getConfigBoolean("hardcore", false) === true and $this->getDifficulty() < 3){
@@ -1664,6 +1749,7 @@ class Server{
 		$this->pluginManager->loadPlugins($this->pluginPath);
 		$this->enablePlugins(PluginLoadOrder::STARTUP);
 		$this->enablePlugins(PluginLoadOrder::POSTWORLD);
+		TimingsHandler::reload();
 	}
 
 	/**
@@ -1671,6 +1757,7 @@ class Server{
 	 */
 	public function shutdown(){
 		$this->isRunning = false;
+		gc_collect_cycles();
 	}
 
 	public function forceShutdown(){
@@ -1693,7 +1780,10 @@ class Server{
 		foreach($this->getLevels() as $level){
 			$this->unloadLevel($level, true);
 		}
-		$this->generationManager->shutdown();
+
+		if($this->generationManager instanceof GenerationRequestManager){
+			$this->generationManager->shutdown();
+		}
 
 		HandlerList::unregisterAll();
 		$this->scheduler->cancelAllTasks();
@@ -1719,7 +1809,7 @@ class Server{
 
 
 		if($this->getProperty("settings.send-usage", true) !== false){
-			$this->scheduler->scheduleDelayedRepeatingTask(new CallbackTask(array($this, "sendUsage")), 6000, 6000);
+			$this->scheduler->scheduleDelayedRepeatingTask(new CallbackTask([$this, "sendUsage"]), 6000, 6000);
 			$this->sendUsage();
 		}
 
@@ -1731,44 +1821,26 @@ class Server{
 
 		$this->tickCounter = 0;
 
-		//register_shutdown_function(array($this, "dumpError"));
-		register_shutdown_function(array($this, "forceShutdown"));
 		if(function_exists("pcntl_signal")){
-			pcntl_signal(SIGTERM, array($this, "shutdown"));
-			pcntl_signal(SIGINT, array($this, "shutdown"));
-			pcntl_signal(SIGHUP, array($this, "shutdown"));
+			pcntl_signal(SIGTERM, [$this, "handleSignal"]);
+			pcntl_signal(SIGINT, [$this, "handleSignal"]);
+			pcntl_signal(SIGHUP, [$this, "handleSignal"]);
+			$this->getScheduler()->scheduleRepeatingTask(new CallbackTask("pcntl_signal_dispatch"), 5);
 		}
 
 		$this->logger->info("Default game type: " . self::getGamemodeString($this->getGamemode())); //TODO: string name
 
 		$this->logger->info("Done (" . round(microtime(true) - \pocketmine\START_TIME, 3) . 's)! For help, type "help" or "?"');
 
-		if(Utils::getOS() === "win"){ //Workaround less usleep() waste
-			$this->tickProcessorWindows();
-		}else{
-			$this->tickProcessor();
-		}
+		$this->tickProcessor();
 		$this->forceShutdown();
+
+		gc_collect_cycles();
 	}
 
-	private function tickProcessorWindows(){
-		$lastLoop = 0;
-		while($this->isRunning){
-			foreach($this->interfaces as $interface){
-				if($interface->process()){
-					$lastLoop = 0;
-				}
-			}
-			$this->generationManager->handlePackets();
-
-			if(($ticks = $this->tick()) !== true){
-				++$lastLoop;
-				if($lastLoop > 128){
-					usleep(1000);
-				}
-			}else{
-				$lastLoop = 0;
-			}
+	public function handleSignal($signo){
+		if($signo === SIGTERM or $signo === SIGINT or $signo === SIGHUP){
+			$this->shutdown();
 		}
 	}
 
@@ -1788,113 +1860,87 @@ class Server{
 		}
 	}
 
-	public function dumpError(){
-		//TODO
-		if($this->stop === true){
+	public function exceptionHandler(\Exception $e){
+		if($e === null){
+			return;
+		}
+
+		error_handler(E_ERROR, $e->getMessage(), $e->getFile(), $e->getLine(), $e->getTrace());
+		global $lastExceptionError, $lastError;
+		$lastExceptionError = $lastError;
+		$this->crashDump();
+		$this->forceShutdown();
+		kill(getmypid());
+		exit(1);
+	}
+
+	public function crashDump(){
+		if($this->isRunning === false){
 			return;
 		}
 		ini_set("memory_limit", "-1"); //Fix error dump not dumped on memory problems
-		$this->logger->emergency("An unrecoverable has occurred and the server has crashed. Creating an error dump");
-		$dump = "```\r\n# PocketMine-MP Error Dump " . date("D M j H:i:s T Y") . "\r\n";
-		$er = error_get_last();
-		$errorConversion = array(
-			E_ERROR => "E_ERROR",
-			E_WARNING => "E_WARNING",
-			E_PARSE => "E_PARSE",
-			E_NOTICE => "E_NOTICE",
-			E_CORE_ERROR => "E_CORE_ERROR",
-			E_CORE_WARNING => "E_CORE_WARNING",
-			E_COMPILE_ERROR => "E_COMPILE_ERROR",
-			E_COMPILE_WARNING => "E_COMPILE_WARNING",
-			E_USER_ERROR => "E_USER_ERROR",
-			E_USER_WARNING => "E_USER_WARNING",
-			E_USER_NOTICE => "E_USER_NOTICE",
-			E_STRICT => "E_STRICT",
-			E_RECOVERABLE_ERROR => "E_RECOVERABLE_ERROR",
-			E_DEPRECATED => "E_DEPRECATED",
-			E_USER_DEPRECATED => "E_USER_DEPRECATED",
-		);
-		$er["type"] = isset($errorConversion[$er["type"]]) ? $errorConversion[$er["type"]] : $er["type"];
-		$dump .= "Error: " . var_export($er, true) . "\r\n\r\n";
-		if(stripos($er["file"], "plugin") !== false){
-			$dump .= "THIS ERROR WAS CAUSED BY A PLUGIN. REPORT IT TO THE PLUGIN DEVELOPER.\r\n";
-		}
+		$this->logger->emergency("An unrecoverable error has occurred and the server has crashed. Creating a crash dump");
+		$dump = new CrashDump($this);
 
-		$dump .= "Code: \r\n";
-		$file = @file($er["file"], FILE_IGNORE_NEW_LINES);
-		for($l = max(0, $er["line"] - 10); $l < $er["line"] + 10; ++$l){
-			$dump .= "[" . ($l + 1) . "] " . @$file[$l] . "\r\n";
-		}
-		$dump .= "\r\n\r\n";
-		$dump .= "Backtrace: \r\n";
-		foreach(getTrace() as $line){
-			$dump .= "$line\r\n";
-		}
-		$dump .= "\r\n\r\n";
-		$version = new VersionString();
-		$dump .= "PocketMine-MP version: " . $version->get(false). " #" . $version->getNumber() . " [Protocol " . Info::CURRENT_PROTOCOL . "; API " . API_VERSION . "]\r\n";
-		$dump .= "Git commit: " . GIT_COMMIT . "\r\n";
-		$dump .= "uname -a: " . php_uname("a") . "\r\n";
-		$dump .= "PHP Version: " . phpversion() . "\r\n";
-		$dump .= "Zend version: " . zend_version() . "\r\n";
-		$dump .= "OS : " . PHP_OS . ", " . Utils::getOS() . "\r\n";
-		$dump .= "Debug Info: " . var_export($this->debugInfo(false), true) . "\r\n\r\n\r\n";
-		global $arguments;
-		$dump .= "Parameters: " . var_export($arguments, true) . "\r\n\r\n\r\n";
-		$p = $this->api->getProperties();
-		if($p["rcon.password"] != ""){
-			$p["rcon.password"] = "******";
-		}
-		$dump .= "server.properties: " . var_export($p, true) . "\r\n\r\n\r\n";
-		if(class_exists("pocketmine\\plugin\\PluginManager", false)){
-			$dump .= "Loaded plugins:\r\n";
-			foreach($this->getPluginManager()->getPlugins() as $p){
-				$d = $p->getDescription();
-				$dump .= $d->getName() . " " . $d->getVersion() . " by " . implode(", ", $d->getAuthors()) . "\r\n";
+		$this->logger->emergency("Please submit the \"" . $dump->getPath() . "\" file to the Bug Reporting page. Give as much info as you can.");
+
+
+		if($this->getProperty("auto-report.enabled", true) !== false){
+			$plugin = $dump->getData()["plugin"];
+			if(is_string($plugin)){
+				$p = $this->pluginManager->getPlugin($plugin);
+				if($p instanceof Plugin and !($p->getPluginLoader() instanceof PharPluginLoader)){
+					return;
+				}
+			}elseif(\Phar::running(true) == ""){
+				return;
+			}elseif($dump->getData()["type"] === "E_PARSE" or $dump->getData()["type"] === "E_COMPILE_ERROR"){
+				return;
+			}
+
+			$reply = Utils::postURL("http://" . $this->getProperty("auto-report.host", "crash.pocketmine.net") . "/submit/api", [
+				"report" => "yes",
+				"name" => $this->getName() . " " . $this->getPocketMineVersion(),
+				"email" => "crash@pocketmine.net",
+				"reportPaste" => base64_encode($dump->getEncodedData())
+			]);
+
+			if(($data = json_decode($reply)) !== false and isset($data->crashId)){
+				$reportId = $data->crashId;
+				$reportUrl = $data->crashUrl;
+				$this->logger->emergency("The crash dump has been automatically submitted to the Crash Archive. You can view it on $reportUrl or use the ID #$reportId.");
 			}
-			$dump .= "\r\n\r\n";
 		}
 
-		$extensions = [];
-		foreach(get_loaded_extensions() as $ext){
-			$extensions[$ext] = phpversion($ext);
-		}
+		//$this->checkMemory();
+		//$dump .= "Memory Usage Tracking: \r\n" . chunk_split(base64_encode(gzdeflate(implode(";", $this->memoryStats), 9))) . "\r\n";
 
-		$dump .= "Loaded Modules: " . var_export($extensions, true) . "\r\n";
-		$this->checkMemory();
-		$dump .= "Memory Usage Tracking: \r\n" . chunk_split(base64_encode(gzdeflate(implode(";", $this->memoryStats), 9))) . "\r\n";
-		ob_start();
-		phpinfo();
-		$dump .= "\r\nphpinfo(): \r\n" . chunk_split(base64_encode(gzdeflate(ob_get_contents(), 9))) . "\r\n";
-		ob_end_clean();
-		$dump .= "\r\n```";
-		$name = "Error_Dump_" . date("D_M_j-H.i.s-T_Y");
-		//log($dump, $name, true, 0, true);
-		$this->logger->emergency("Please submit the \"{$name}.log\" file to the Bug Reporting page. Give as much info as you can.", true, true, 0);
 	}
 
 	private function tickProcessor(){
 		$lastLoop = 0;
+		$connectionTimer = Timings::$connectionTimer;
 		while($this->isRunning){
-
+			$connectionTimer->startTiming();
 			foreach($this->interfaces as $interface){
 				if($interface->process()){
 					$lastLoop = 0;
 				}
 			}
+			$connectionTimer->stopTiming();
+
 			$this->generationManager->handlePackets();
 
+			++$lastLoop;
+
 			if(($ticks = $this->tick()) !== true){
-				++$lastLoop;
-				if($lastLoop > 16 and $lastLoop < 128){
-					usleep(200);
-				}elseif($lastLoop < 512){
-					usleep(400);
-				}else{
+				if($lastLoop > 2 and $lastLoop < 16){
 					usleep(1000);
+				}elseif($lastLoop < 128){
+					usleep(2000);
+				}else{
+					usleep(10000);
 				}
-			}else{
-				$lastLoop = 0;
 			}
 		}
 	}
@@ -1904,22 +1950,29 @@ class Server{
 	}
 
 	private function checkTickUpdates($currentTick){
+
+		//TODO: move this to each Level
+
 		//Update entities that need update
 		if(count(Entity::$needUpdate) > 0){
+			Timings::$tickEntityTimer->startTiming();
 			foreach(Entity::$needUpdate as $id => $entity){
 				if($entity->onUpdate() === false){
 					unset(Entity::$needUpdate[$id]);
 				}
 			}
+			Timings::$tickEntityTimer->stopTiming();
 		}
 
 		//Update tiles that need update
 		if(count(Tile::$needUpdate) > 0){
+			Timings::$tickTileEntityTimer->startTiming();
 			foreach(Tile::$needUpdate as $id => $tile){
 				if($tile->onUpdate() === false){
 					unset(Tile::$needUpdate[$id]);
 				}
 			}
+			Timings::$tickTileEntityTimer->stopTiming();
 		}
 
 		//TODO: Add level blocks
@@ -1931,14 +1984,19 @@ class Server{
 	}
 
 	public function doAutoSave(){
-
-		/*foreach($this->getOnlinePlayers() as $player){
-			$player->save();
-		}*/
+		Timings::$worldSaveTimer->startTiming();
+		foreach($this->getOnlinePlayers() as $index => $player){
+			if($player->isOnline()){
+				$player->save();
+			}elseif(!$player->isConnected()){
+				unset($this->players[$index]);
+			}
+		}
 
 		foreach($this->getLevels() as $level){
-			$level->save();
+			$level->save(false);
 		}
+		Timings::$worldSaveTimer->stopTiming();
 	}
 
 	public function doLevelGC(){
@@ -1953,20 +2011,21 @@ class Server{
 				return;
 			}
 		}
+		echo "Sending usage\n";
 		$plist = "";
 		foreach($this->getPluginManager()->getPlugins() as $p){
 			$d = $p->getDescription();
-			$plist .= str_replace(array(";", ":"), "", $d->getName()) . ":" . str_replace(array(";", ":"), "", $d->getVersion()) . ";";
+			$plist .= str_replace([";", ":"], "", $d->getName()) . ":" . str_replace([";", ":"], "", $d->getVersion()) . ";";
 		}
 
 		$version = new VersionString();
-		$this->lastSendUsage = new SendUsageTask("http://stats.pocketmine.net/usage.php", array(
+		$this->lastSendUsage = new SendUsageTask("http://stats.pocketmine.net/usage.php", [
 			"serverid" => Binary::readLong(substr(Utils::getUniqueID(true, $this->getIp() . ":" . $this->getPort()), 0, 8)),
 			"port" => $this->getPort(),
 			"os" => Utils::getOS(),
 			"memory_total" => $this->getConfigString("memory-limit"),
 			"memory_usage" => memory_get_usage(),
-			"php_version" => \pocketmine\PHP_VERSION,
+			"php_version" => PHP_VERSION,
 			"version" => $version->get(false),
 			"build" => $version->getBuild(),
 			"mc_version" => \pocketmine\MINECRAFT_VERSION,
@@ -1974,14 +2033,14 @@ class Server{
 			"online" => count($this->players),
 			"max" => $this->getMaxPlayers(),
 			"plugins" => $plist,
-		));
+		]);
 
 		$this->scheduler->scheduleAsyncTask($this->lastSendUsage);
 	}
 
-	public function titleTick(){
+	private function titleTick(){
 		if(defined("pocketmine\\DEBUG") and \pocketmine\DEBUG >= 0 and \pocketmine\ANSI === true){
-			echo "\x1b]0;PocketMine-MP " . $this->getPocketMineVersion() . " | Online " . count($this->players) . "/" . $this->getMaxPlayers() . " | RAM " . round((memory_get_usage() / 1024) / 1024, 2) . "/" . round((memory_get_usage(true) / 1024) / 1024, 2) . " MB | U -1 D -1 kB/s | TPS " . $this->getTicksPerSecond() . "\x07";
+			echo "\x1b]0;". $this->getName() . " " . $this->getPocketMineVersion() . " | Online " . count($this->players) . "/" . $this->getMaxPlayers() . " | RAM " . round((memory_get_usage() / 1024) / 1024, 2) . "/" . round((memory_get_usage(true) / 1024) / 1024, 2) . " MB | U " . round($this->mainInterface->getUploadUsage() / 1024, 2) . " D " . round($this->mainInterface->getDownloadUsage() / 1024, 2) . " kB/s | TPS " . $this->getTicksPerSecond() . "\x07";
 		}
 	}
 
@@ -1996,11 +2055,15 @@ class Server{
 				return false;
 			}
 
+			Timings::$serverTickTimer->startTiming();
+
 			$this->inTick = true; //Fix race conditions
 			++$this->tickCounter;
 
 			$this->checkConsole();
+			Timings::$schedulerTimer->startTiming();
 			$this->scheduler->mainThreadHeartbeat($this->tickCounter);
+			Timings::$schedulerTimer->stopTiming();
 			$this->checkTickUpdates($this->tickCounter);
 
 			if(($this->tickCounter & 0b1111) === 0){
@@ -2010,11 +2073,15 @@ class Server{
 				}
 			}
 
+			TimingsHandler::tick();
+
 			$this->tickMeasure = (($time = microtime(true)) - $this->tickTime);
 			$this->tickTime = $time;
 			$this->nextTick = 0.05 * (0.05 / max(0.05, $this->tickMeasure)) + $time;
 			$this->inTick = false;
 
+			Timings::$serverTickTimer->stopTiming();
+
 			return true;
 		}
 

src/pocketmine/Thread.php

@@ -0,0 +1,34 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+namespace pocketmine;
+
+/**
+ * This class must be extended by all custom threading classes
+ */
+abstract class Thread extends \Thread{
+
+	public final function start($options = PTHREADS_INHERIT_ALL){
+		ThreadManager::getInstance()->add($this);
+
+		return parent::start($options & ~PTHREADS_INHERIT_CLASSES);
+	}
+}

src/pocketmine/ThreadManager.php

@@ -0,0 +1,69 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+namespace pocketmine;
+
+class ThreadManager extends \Threaded{
+
+	/** @var ThreadManager */
+	private static $instance = null;
+
+	public static function init(){
+		self::$instance = new ThreadManager();
+	}
+
+	/**
+	 * @return ThreadManager
+	 */
+	public static function getInstance(){
+		return self::$instance;
+	}
+
+	/**
+	 * @param Worker|Thread $thread
+	 */
+	public function add($thread){
+		if($thread instanceof Thread or $thread instanceof Worker){
+			$this->{spl_object_hash($thread)} = $thread;
+		}
+	}
+
+	/**
+	 * @param Worker|Thread $thread
+	 */
+	public function remove($thread){
+		if($thread instanceof Thread or $thread instanceof Worker){
+			unset($this->{spl_object_hash($thread)});
+		}
+	}
+
+	/**
+	 * @return Worker[]|Thread[]
+	 */
+	public function getAll(){
+		$array = [];
+		foreach($this as $key => $thread){
+			$array[$key] = $thread;
+		}
+
+		return $array;
+	}
+}

src/pocketmine/Worker.php

@@ -0,0 +1,34 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+namespace pocketmine;
+
+/**
+ * This class must be extended by all custom threading classes
+ */
+abstract class Worker extends \Worker{
+
+	public final function start($options = PTHREADS_INHERIT_ALL){
+		ThreadManager::getInstance()->add($this);
+
+		return parent::start($options & ~PTHREADS_INHERIT_CLASSES);
+	}
+}

src/pocketmine/block/AcaciaWoodStairs.php

@@ -29,8 +29,8 @@ class AcaciaWoodStairs extends Stair{
 	}
 
 	public function getDrops(Item $item){
-		return array(
-			array($this->id, 0, 1),
-		);
+		return [
+			[$this->id, 0, 1],
+		];
 	}
 }

src/pocketmine/block/Air.php

@@ -21,30 +21,31 @@
 
 namespace pocketmine\block;
 
-use pocketmine\math\AxisAlignedBB;
-
 
 /**
  * Air block
  */
 class Air extends Transparent{
+	public $isActivable = false;
+	public $breakable = false;
+	public $isFlowable = true;
+	public $isTransparent = true;
+	public $isReplaceable = true;
+	public $isPlaceable = false;
+	public $hasPhysics = false;
+	public $isSolid = false;
+	public $isFullBlock = true;
+	protected $id = self::AIR;
+	protected $meta = 0;
+	protected $name = "Air";
+	protected $hardness = 0;
+
 	public function __construct(){
-		parent::__construct(self::AIR, 0, "Air");
-		$this->isActivable = false;
-		$this->breakable = false;
-		$this->isFlowable = true;
-		$this->isTransparent = true;
-		$this->isReplaceable = true;
-		$this->isPlaceable = false;
-		$this->hasPhysics = false;
-		$this->isSolid = false;
-		$this->isFullBlock = true;
-		$this->hardness = 0;
 
 	}
 
 	public function getBoundingBox(){
-		return new AxisAlignedBB(0, 0, 0, 0, 0, 0);
+		return null;
 	}
 
 }

src/pocketmine/block/Bed.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\level\Level;
 use pocketmine\network\protocol\ChatPacket;
 use pocketmine\Player;
 
@@ -34,13 +35,18 @@ class Bed extends Transparent{
 	}
 
 	public function onActivate(Item $item, Player $player = null){
-		/*if($player instanceof Player and Server::getInstance()->api->time->getPhase($this->getLevel()) !== "night"){
+
+		$time = $this->getLevel()->getTime() % Level::TIME_FULL;
+
+		$isNight = ($time >= Level::TIME_NIGHT and $time < Level::TIME_SUNRISE);
+
+		if($player instanceof Player and !$isNight){
 			$pk = new ChatPacket;
 			$pk->message = "You can only sleep at night";
 			$player->dataPacket($pk);
 
 			return true;
-		}*/
+		}
 
 		$blockNorth = $this->getSide(2); //Gets the blocks around them
 		$blockSouth = $this->getSide(3);
@@ -57,10 +63,12 @@ class Bed extends Transparent{
 				$b = $blockEast;
 			}elseif($blockWest->getID() === $this->id and ($blockWest->meta & 0x08) === 0x08){
 				$b = $blockWest;
-			}elseif($player instanceof Player){
-				$pk = new ChatPacket;
-				$pk->message = "This bed is incomplete";
-				$player->dataPacket($pk);
+			}else{
+				if($player instanceof Player){
+					$pk = new ChatPacket;
+					$pk->message = "This bed is incomplete";
+					$player->dataPacket($pk);
+				}
 
 				return true;
 			}
@@ -78,12 +86,12 @@ class Bed extends Transparent{
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		$down = $this->getSide(0);
 		if($down->isTransparent === false){
-			$faces = array(
+			$faces = [
 				0 => 3,
 				1 => 4,
 				2 => 2,
 				3 => 5,
-			);
+			];
 			$d = $player instanceof Player ? $player->getDirection() : 0;
 			$next = $this->getSide($faces[(($d + 3) % 4)]);
 			$downNext = $this->getSide(0);
@@ -132,9 +140,9 @@ class Bed extends Transparent{
 	}
 
 	public function getDrops(Item $item){
-		return array(
-			array(Item::BED, 0, 1),
-		);
+		return [
+			[Item::BED, 0, 1],
+		];
 	}
 
 }

src/pocketmine/block/Beetroot.php

@@ -32,6 +32,10 @@ class Beetroot extends Flowable{
 		$this->hardness = 0;
 	}
 
+	public function getBoundingBox(){
+		return null;
+	}
+
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		$down = $this->getSide(0);
 		if($down->getID() === self::FARMLAND){
@@ -82,10 +86,10 @@ class Beetroot extends Flowable{
 	public function getDrops(Item $item){
 		$drops = [];
 		if($this->meta >= 0x07){
-			$drops[] = array(Item::BEETROOT, 0, 1);
-			$drops[] = array(Item::BEETROOT_SEEDS, 0, mt_rand(0, 3));
+			$drops[] = [Item::BEETROOT, 0, 1];
+			$drops[] = [Item::BEETROOT_SEEDS, 0, mt_rand(0, 3)];
 		}else{
-			$drops[] = array(Item::BEETROOT_SEEDS, 0, 1);
+			$drops[] = [Item::BEETROOT_SEEDS, 0, 1];
 		}
 
 		return $drops;

src/pocketmine/block/BirchWoodStairs.php

@@ -29,8 +29,8 @@ class BirchWoodStairs extends Stair{
 	}
 
 	public function getDrops(Item $item){
-		return array(
-			array($this->id, 0, 1),
-		);
+		return [
+			[$this->id, 0, 1],
+		];
 	}
 }

src/pocketmine/block/Block.php

@@ -24,6 +24,8 @@
  */
 namespace pocketmine\block;
 
+use pocketmine\entity\Villager;
+use pocketmine\entity\Zombie;
 use pocketmine\item\Item;
 use pocketmine\level\Level;
 use pocketmine\level\Position;
@@ -97,7 +99,7 @@ abstract class Block extends Position implements Metadatable{
 	const OBSIDIAN = 49;
 	const TORCH = 50;
 	const FIRE = 51;
-
+	const MONSTER_SPAWNER = 52;
 	const WOOD_STAIRS = 53;
 	const WOODEN_STAIRS = 53;
 	const OAK_WOOD_STAIRS = 53;
@@ -166,12 +168,16 @@ abstract class Block extends Position implements Metadatable{
 	const FENCE_GATE = 107;
 	const BRICK_STAIRS = 108;
 	const STONE_BRICK_STAIRS = 109;
+	const MYCELIUM = 110;
 
 	const NETHER_BRICKS = 112;
 	const NETHER_BRICK_BLOCK = 112;
 
 	const NETHER_BRICKS_STAIRS = 114;
 
+	const END_PORTAL = 120;
+	const END_STONE = 121;
+
 	const SANDSTONE_STAIRS = 128;
 	const EMERALD_ORE = 129;
 
@@ -218,17 +224,19 @@ abstract class Block extends Position implements Metadatable{
 	const HARDENED_CLAY = 172;
 	const COAL_BLOCK = 173;
 
+	const PODZOL = 243;
 	const BEETROOT_BLOCK = 244;
 	const STONECUTTER = 245;
 	const GLOWING_OBSIDIAN = 246;
 	const NETHER_REACTOR = 247;
 
-	public static $creative = array(
+	public static $creative = [
 		//Building
 		[Item::COBBLESTONE, 0],
 		[Item::STONE_BRICKS, 0],
 		[Item::STONE_BRICKS, 1],
 		[Item::STONE_BRICKS, 2],
+		[Item::STONE_BRICKS, 3],
 		[Item::MOSS_STONE, 0],
 		[Item::WOODEN_PLANKS, 0],
 		[Item::WOODEN_PLANKS, 1],
@@ -246,9 +254,9 @@ abstract class Block extends Position implements Metadatable{
 		[Item::STONE, 5],
 		[Item::STONE, 6],
 		[Item::DIRT, 0],
-		//TODO: PODZOL
+		[Item::PODZOL, 0],
 		[Item::GRASS, 0],
-		//TODO: MYCELIUM
+		[Item::MYCELIUM, 0],
 		[Item::CLAY_BLOCK, 0],
 		[Item::HARDENED_CLAY, 0],
 		[Item::STAINED_CLAY, 0],
@@ -271,6 +279,7 @@ abstract class Block extends Position implements Metadatable{
 		[Item::SANDSTONE, 1],
 		[Item::SANDSTONE, 2],
 		[Item::SAND, 0],
+		[Item::SAND, 1],
 		[Item::GRAVEL, 0],
 		[Item::TRUNK, 0],
 		[Item::TRUNK, 1],
@@ -318,7 +327,7 @@ abstract class Block extends Position implements Metadatable{
 		[Item::OBSIDIAN, 0],
 		[Item::ICE, 0],
 		[Item::SNOW_BLOCK, 0],
-		//TODO: ENDSTONE
+		[Item::END_STONE, 0],
 
 		//Decoration
 		[Item::COBBLESTONE_WALL, 0],
@@ -351,6 +360,7 @@ abstract class Block extends Position implements Metadatable{
 		[Item::CHEST, 0],
 		[Item::FURNACE, 0],
 		//TODO: End Portal
+		[Item::END_PORTAL, 0],
 		[Item::DANDELION, 0],
 		[Item::POPPY, 0],
 		//TODO: blue orchid
@@ -396,7 +406,7 @@ abstract class Block extends Position implements Metadatable{
 		[Item::LEAVES2, 1],
 		[Item::CAKE, 0],
 		[Item::SIGN, 0],
-		//TODO: Monster Spawner
+		[Item::MONSTER_SPAWNER, 0],
 		[Item::WOOL, 0],
 		[Item::WOOL, 7],
 		[Item::WOOL, 6],
@@ -446,11 +456,11 @@ abstract class Block extends Position implements Metadatable{
 		[Item::CLOCK, 0],
 		[Item::COMPASS, 0],
 		[Item::MINECART, 0],
-		//TODO: Villager
-		[Item::SPAWN_EGG, 10], //Chicken
-		[Item::SPAWN_EGG, 11], //Cow
-		[Item::SPAWN_EGG, 12], //Pig
-		[Item::SPAWN_EGG, 13], //Sheep
+		[Item::SPAWN_EGG, Villager::NETWORK_ID],
+		//[Item::SPAWN_EGG, 10], //Chicken
+		//[Item::SPAWN_EGG, 11], //Cow
+		//[Item::SPAWN_EGG, 12], //Pig
+		//[Item::SPAWN_EGG, 13], //Sheep
 		//TODO: Wolf
 		//TODO: Mooshroom
 		//TODO: Creeper
@@ -458,7 +468,7 @@ abstract class Block extends Position implements Metadatable{
 		//TODO: Silverfish
 		//TODO: Skeleton
 		//TODO: Slime
-		//TODO: Zombie
+		[Item::SPAWN_EGG, Zombie::NETWORK_ID],
 		//TODO: PigZombie
 		//TODO: Replace with Entity constants
 
@@ -490,15 +500,15 @@ abstract class Block extends Position implements Metadatable{
 		[Item::DYE, 9],
 		[Item::DYE, 8],
 
-	);
+	];
 
 	/** @var Block[] */
 	public static $list = [];
 	protected $id;
 	protected $meta;
-	protected $name;
-	protected $breakTime;
-	protected $hardness;
+	protected $name = "Unknown";
+	protected $breakTime = 0.20;
+	protected $hardness = 10;
 	public $isActivable = false;
 	public $breakable = true;
 	public $isFlowable = false;
@@ -516,140 +526,144 @@ abstract class Block extends Position implements Metadatable{
 
 	public static function init(){
 		if(count(self::$list) === 0){
-			self::$list = array(
-				self::AIR => new Air(),
-				self::STONE => new Stone(),
-				self::GRASS => new Grass(),
-				self::DIRT => new Dirt(),
-				self::COBBLESTONE => new Cobblestone(),
-				self::PLANKS => new Planks(),
-				self::SAPLING => new Sapling(),
-				self::BEDROCK => new Bedrock(),
-				self::WATER => new Water(),
-				self::STILL_WATER => new StillWater(),
-				self::LAVA => new Lava(),
-				self::STILL_LAVA => new StillLava(),
-				self::SAND => new Sand(),
-				self::GRAVEL => new Gravel(),
-				self::GOLD_ORE => new GoldOre(),
-				self::IRON_ORE => new IronOre(),
-				self::COAL_ORE => new CoalOre(),
-				self::WOOD => new Wood(),
-				self::LEAVES => new Leaves(),
-				self::SPONGE => new Sponge(),
-				self::GLASS => new Glass(),
-				self::LAPIS_ORE => new LapisOre(),
-				self::LAPIS_BLOCK => new Lapis(),
-				self::SANDSTONE => new Sandstone(),
-				self::BED_BLOCK => new Bed(),
-				self::COBWEB => new Cobweb(),
-				self::TALL_GRASS => new TallGrass(),
-				self::DEAD_BUSH => new DeadBush(),
-				self::WOOL => new Wool(),
-				self::DANDELION => new Dandelion(),
-				self::POPPY => new CyanFlower(),
-				self::BROWN_MUSHROOM => new BrownMushroom(),
-				self::RED_MUSHROOM => new RedMushroom(),
-				self::GOLD_BLOCK => new Gold(),
-				self::IRON_BLOCK => new Iron(),
-				self::DOUBLE_SLAB => new DoubleSlab(),
-				self::SLAB => new Slab(),
-				self::BRICKS_BLOCK => new Bricks(),
-				self::TNT => new TNT(),
-				self::BOOKSHELF => new Bookshelf(),
-				self::MOSS_STONE => new MossStone(),
-				self::OBSIDIAN => new Obsidian(),
-				self::TORCH => new Torch(),
-				self::FIRE => new Fire(),
+			self::$list = [
+				self::AIR => Air::class,
+				self::STONE => Stone::class,
+				self::GRASS => Grass::class,
+				self::DIRT => Dirt::class,
+				self::COBBLESTONE => Cobblestone::class,
+				self::PLANKS => Planks::class,
+				self::SAPLING => Sapling::class,
+				self::BEDROCK => Bedrock::class,
+				self::WATER => Water::class,
+				self::STILL_WATER => StillWater::class,
+				self::LAVA => Lava::class,
+				self::STILL_LAVA => StillLava::class,
+				self::SAND => Sand::class,
+				self::GRAVEL => Gravel::class,
+				self::GOLD_ORE => GoldOre::class,
+				self::IRON_ORE => IronOre::class,
+				self::COAL_ORE => CoalOre::class,
+				self::WOOD => Wood::class,
+				self::LEAVES => Leaves::class,
+				self::SPONGE => Sponge::class,
+				self::GLASS => Glass::class,
+				self::LAPIS_ORE => LapisOre::class,
+				self::LAPIS_BLOCK => Lapis::class,
+				self::SANDSTONE => Sandstone::class,
+				self::BED_BLOCK => Bed::class,
+				self::COBWEB => Cobweb::class,
+				self::TALL_GRASS => TallGrass::class,
+				self::DEAD_BUSH => DeadBush::class,
+				self::WOOL => Wool::class,
+				self::DANDELION => Dandelion::class,
+				self::POPPY => CyanFlower::class,
+				self::BROWN_MUSHROOM => BrownMushroom::class,
+				self::RED_MUSHROOM => RedMushroom::class,
+				self::GOLD_BLOCK => Gold::class,
+				self::IRON_BLOCK => Iron::class,
+				self::DOUBLE_SLAB => DoubleSlab::class,
+				self::SLAB => Slab::class,
+				self::BRICKS_BLOCK => Bricks::class,
+				self::TNT => TNT::class,
+				self::BOOKSHELF => Bookshelf::class,
+				self::MOSS_STONE => MossStone::class,
+				self::OBSIDIAN => Obsidian::class,
+				self::TORCH => Torch::class,
+				self::FIRE => Fire::class,
+				self::MONSTER_SPAWNER => MonsterSpawner::class,
+				self::WOOD_STAIRS => WoodStairs::class,
+				self::CHEST => Chest::class,
 
-				self::WOOD_STAIRS => new WoodStairs(),
-				self::CHEST => new Chest(),
+				self::DIAMOND_ORE => DiamondOre::class,
+				self::DIAMOND_BLOCK => Diamond::class,
+				self::WORKBENCH => Workbench::class,
+				self::WHEAT_BLOCK => Wheat::class,
+				self::FARMLAND => Farmland::class,
+				self::FURNACE => Furnace::class,
+				self::BURNING_FURNACE => BurningFurnace::class,
+				self::SIGN_POST => SignPost::class,
+				self::WOOD_DOOR_BLOCK => WoodDoor::class,
+				self::LADDER => Ladder::class,
 
-				self::DIAMOND_ORE => new DiamondOre(),
-				self::DIAMOND_BLOCK => new Diamond(),
-				self::WORKBENCH => new Workbench(),
-				self::WHEAT_BLOCK => new Wheat(),
-				self::FARMLAND => new Farmland(),
-				self::FURNACE => new Furnace(),
-				self::BURNING_FURNACE => new BurningFurnace(),
-				self::SIGN_POST => new SignPost(),
-				self::WOOD_DOOR_BLOCK => new WoodDoor(),
-				self::LADDER => new Ladder(),
+				self::COBBLESTONE_STAIRS => CobblestoneStairs::class,
+				self::WALL_SIGN => WallSign::class,
 
-				self::COBBLESTONE_STAIRS => new CobblestoneStairs(),
-				self::WALL_SIGN => new WallSign(),
+				self::IRON_DOOR_BLOCK => IronDoor::class,
+				self::REDSTONE_ORE => RedstoneOre::class,
+				self::GLOWING_REDSTONE_ORE => GlowingRedstoneOre::class,
 
-				self::IRON_DOOR_BLOCK => new IronDoor(),
-				self::REDSTONE_ORE => new RedstoneOre(),
-				self::GLOWING_REDSTONE_ORE => new GlowingRedstoneOre(),
+				self::SNOW_LAYER => SnowLayer::class,
+				self::ICE => Ice::class,
+				self::SNOW_BLOCK => Snow::class,
+				self::CACTUS => Cactus::class,
+				self::CLAY_BLOCK => Clay::class,
+				self::SUGARCANE_BLOCK => Sugarcane::class,
 
-				self::SNOW_LAYER => new SnowLayer(),
-				self::ICE => new Ice(),
-				self::SNOW_BLOCK => new Snow(),
-				self::CACTUS => new Cactus(),
-				self::CLAY_BLOCK => new Clay(),
-				self::SUGARCANE_BLOCK => new Sugarcane(),
+				self::FENCE => Fence::class,
+				self::PUMPKIN => Pumpkin::class,
+				self::NETHERRACK => Netherrack::class,
+				self::SOUL_SAND => SoulSand::class,
+				self::GLOWSTONE_BLOCK => Glowstone::class,
 
-				self::FENCE => new Fence(),
-				self::PUMPKIN => new Pumpkin(),
-				self::NETHERRACK => new Netherrack(),
-				self::SOUL_SAND => new SoulSand(),
-				self::GLOWSTONE_BLOCK => new Glowstone(),
+				self::LIT_PUMPKIN => LitPumpkin::class,
+				self::CAKE_BLOCK => Cake::class,
 
-				self::LIT_PUMPKIN => new LitPumpkin(),
-				self::CAKE_BLOCK => new Cake(),
+				self::TRAPDOOR => Trapdoor::class,
 
-				self::TRAPDOOR => new Trapdoor(),
+				self::STONE_BRICKS => StoneBricks::class,
 
-				self::STONE_BRICKS => new StoneBricks(),
+				self::IRON_BARS => IronBars::class,
+				self::GLASS_PANE => GlassPane::class,
+				self::MELON_BLOCK => Melon::class,
+				self::PUMPKIN_STEM => PumpkinStem::class,
+				self::MELON_STEM => MelonStem::class,
 
-				self::IRON_BARS => new IronBars(),
-				self::GLASS_PANE => new GlassPane(),
-				self::MELON_BLOCK => new Melon(),
-				self::PUMPKIN_STEM => new PumpkinStem(),
-				self::MELON_STEM => new MelonStem(),
+				self::FENCE_GATE => FenceGate::class,
+				self::BRICK_STAIRS => BrickStairs::class,
+				self::STONE_BRICK_STAIRS => StoneBrickStairs::class,
 
-				self::FENCE_GATE => new FenceGate(),
-				self::BRICK_STAIRS => new BrickStairs(),
-				self::STONE_BRICK_STAIRS => new StoneBrickStairs(),
+				self::MYCELIUM => Mycelium::class,
+				self::NETHER_BRICKS => NetherBrick::class,
 
-				self::NETHER_BRICKS => new NetherBrick(),
+				self::NETHER_BRICKS_STAIRS => NetherBrickStairs::class,
 
-				self::NETHER_BRICKS_STAIRS => new NetherBrickStairs(),
+				self::END_PORTAL => EndPortal::class,
+				self::END_STONE => EndStone::class,
+				self::SANDSTONE_STAIRS => SandstoneStairs::class,
+				self::EMERALD_ORE => EmeraldOre::class,
 
-				self::SANDSTONE_STAIRS => new SandstoneStairs(),
-				self::EMERALD_ORE => new EmeraldOre(),
+				self::EMERALD_BLOCK => Emerald::class,
+				self::SPRUCE_WOOD_STAIRS => SpruceWoodStairs::class,
+				self::BIRCH_WOOD_STAIRS => BirchWoodStairs::class,
+				self::JUNGLE_WOOD_STAIRS => JungleWoodStairs::class,
+				self::STONE_WALL => StoneWall::class,
 
-				self::EMERALD_BLOCK => new Emerald(),
-				self::SPRUCE_WOOD_STAIRS => new SpruceWoodStairs(),
-				self::BIRCH_WOOD_STAIRS => new BirchWoodStairs(),
-				self::JUNGLE_WOOD_STAIRS => new JungleWoodStairs(),
-				self::STONE_WALL => new StoneWall(),
+				self::CARROT_BLOCK => Carrot::class,
+				self::POTATO_BLOCK => Potato::class,
 
-				self::CARROT_BLOCK => new Carrot(),
-				self::POTATO_BLOCK => new Potato(),
+				self::QUARTZ_BLOCK => Quartz::class,
+				self::QUARTZ_STAIRS => QuartzStairs::class,
+				self::DOUBLE_WOOD_SLAB => DoubleWoodSlab::class,
+				self::WOOD_SLAB => WoodSlab::class,
+				self::STAINED_CLAY => StainedClay::class,
 
-				self::QUARTZ_BLOCK => new Quartz(),
-				self::QUARTZ_STAIRS => new QuartzStairs(),
-				self::DOUBLE_WOOD_SLAB => new DoubleWoodSlab(),
-				self::WOOD_SLAB => new WoodSlab(),
-				self::STAINED_CLAY => new StainedClay(),
+				self::LEAVES2 => Leaves2::class,
+				self::WOOD2 => Wood2::class,
+				self::ACACIA_WOOD_STAIRS => AcaciaWoodStairs::class,
+				self::DARK_OAK_WOOD_STAIRS => DarkOakWoodStairs::class,
 
-				self::LEAVES2 => new Leaves2(),
-				self::WOOD2 => new Wood2(),
-				self::ACACIA_WOOD_STAIRS => new AcaciaWoodStairs(),
-				self::DARK_OAK_WOOD_STAIRS => new DarkOakWoodStairs(),
+				self::HAY_BALE => HayBale::class,
+				self::CARPET => Carpet::class,
+				self::HARDENED_CLAY => HardenedClay::class,
+				self::COAL_BLOCK => Coal::class,
 
-				self::HAY_BALE => new HayBale(),
-				self::CARPET => new Carpet(),
-				self::HARDENED_CLAY => new HardenedClay(),
-				self::COAL_BLOCK => new Coal(),
-
-				self::BEETROOT_BLOCK => new Beetroot(),
-				self::STONECUTTER => new Stonecutter(),
-				self::GLOWING_OBSIDIAN => new GlowingObsidian(),
-				self::NETHER_REACTOR => new NetherReactor(),
-			);
+				self::PODZOL => Podzol::class,
+				self::BEETROOT_BLOCK => Beetroot::class,
+				self::STONECUTTER => Stonecutter::class,
+				self::GLOWING_OBSIDIAN => GlowingObsidian::class,
+				self::NETHER_REACTOR => NetherReactor::class,
+			];
 		}
 	}
 
@@ -662,11 +676,12 @@ abstract class Block extends Position implements Metadatable{
 	 */
 	public static function get($id, $meta = 0, Position $pos = null){
 		if(isset(self::$list[$id])){
-			$block = clone self::$list[$id];
-			$block->setDamage($meta);
+			$block = self::$list[$id];
+			$block = new $block($meta);
 		}else{
 			$block = new Generic($id, $meta);
 		}
+
 		if($pos instanceof Position){
 			$block->position($pos);
 		}
@@ -683,8 +698,6 @@ abstract class Block extends Position implements Metadatable{
 		$this->id = (int) $id;
 		$this->meta = (int) $meta;
 		$this->name = $name;
-		$this->breakTime = 0.20;
-		$this->hardness = 10;
 	}
 
 	/**
@@ -726,17 +739,12 @@ abstract class Block extends Position implements Metadatable{
 	 * Sets the block position to a new Position object
 	 *
 	 * @param Position $v
-	 *
-	 * @throws \RuntimeException
 	 */
 	final public function position(Position $v){
-		if(!$v->isValid()){
-			throw new \RuntimeException("Undefined Level reference");
-		}
 		$this->x = (int) $v->x;
 		$this->y = (int) $v->y;
 		$this->z = (int) $v->z;
-		$this->setLevel($v->getLevel(), false);
+		$this->level = $v->level;
 	}
 
 	/**
@@ -751,7 +759,7 @@ abstract class Block extends Position implements Metadatable{
 			return [];
 		}else{
 			return [
-				array($this->id, $this->meta, 1),
+				[$this->id, $this->meta, 1],
 			];
 		}
 	}
@@ -815,9 +823,9 @@ abstract class Block extends Position implements Metadatable{
 	 * @param AxisAlignedBB $bb
 	 * @param Block[]       $list
 	 */
-	public function collidesWithBB(AxisAlignedBB $bb, &$list = array()){
+	public function collidesWithBB(AxisAlignedBB $bb, &$list = []){
 		$bb2 = $this->getBoundingBox();
-		if($bb2->intersectsWith($bb)){
+		if($bb2 !== null and $bb2->intersectsWith($bb)){
 			$list[] = $bb2;
 		}
 	}
@@ -894,4 +902,4 @@ abstract class Block extends Position implements Metadatable{
 			$this->getLevel()->getBlockMetadata()->removeMetadata($this, $metadataKey, $plugin);
 		}
 	}
-}
+}

src/pocketmine/block/Bricks.php

@@ -48,9 +48,9 @@ class Bricks extends Solid{
 
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 1){
-			return array(
-				array(Item::BRICKS_BLOCK, 0, 1),
-			);
+			return [
+				[Item::BRICKS_BLOCK, 0, 1],
+			];
 		}else{
 			return [];
 		}

src/pocketmine/block/BrownMushroom.php

@@ -54,4 +54,9 @@ class BrownMushroom extends Flowable{
 
 		return false;
 	}
+
+	public function getBoundingBox(){
+		return null;
+	}
+
 }

src/pocketmine/block/BurningFurnace.php

@@ -39,21 +39,21 @@ class BurningFurnace extends Solid{
 	}
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
-		$faces = array(
+		$faces = [
 			0 => 4,
 			1 => 2,
 			2 => 5,
 			3 => 3,
-		);
+		];
 		$this->meta = $faces[$player instanceof Player ? $player->getDirection() : 0];
 		$this->getLevel()->setBlock($block, $this, true, false, true);
-		$nbt = new Compound(false, array(
+		$nbt = new Compound(false, [
 			new Enum("Items", []),
 			new String("id", Tile::FURNACE),
 			new Int("x", $this->x),
 			new Int("y", $this->y),
 			new Int("z", $this->z)
-		));
+		]);
 		$nbt->Items->setTagType(NBT::TAG_Compound);
 		new Furnace($this->getLevel()->getChunkAt($this->x >> 4, $this->z >> 4), $nbt);
 
@@ -73,13 +73,13 @@ class BurningFurnace extends Solid{
 			if($t instanceof Furnace){
 				$furnace = $t;
 			}else{
-				$nbt = new Compound(false, array(
+				$nbt = new Compound(false, [
 					new Enum("Items", []),
 					new String("id", Tile::FURNACE),
 					new Int("x", $this->x),
 					new Int("y", $this->y),
 					new Int("z", $this->z)
-				));
+				]);
 				$nbt->Items->setTagType(NBT::TAG_Compound);
 				$furnace = new Furnace($this->getLevel()->getChunkAt($this->x >> 4, $this->z >> 4), $nbt);
 			}
@@ -114,14 +114,14 @@ class BurningFurnace extends Solid{
 	public function getDrops(Item $item){
 		$drops = [];
 		if($item->isPickaxe() >= 1){
-			$drops[] = array(Item::FURNACE, 0, 1);
+			$drops[] = [Item::FURNACE, 0, 1];
 		}
 		$t = $this->getLevel()->getTile($this);
 		if($t instanceof Furnace){
 			for($s = 0; $s < $t->getInventory()->getSize(); ++$s){
 				$slot = $t->getInventory()->getItem($s);
 				if($slot->getID() > Item::AIR and $slot->getCount() > 0){
-					$drops[] = array($slot->getID(), $slot->getDamage(), $slot->getCount());
+					$drops[] = [$slot->getID(), $slot->getDamage(), $slot->getCount()];
 				}
 			}
 		}

src/pocketmine/block/Cactus.php

@@ -25,7 +25,6 @@ use pocketmine\item\Item;
 use pocketmine\level\Level;
 use pocketmine\math\Vector3 as Vector3;
 use pocketmine\Player;
-use pocketmine\Server;
 
 class Cactus extends Transparent{
 	public function __construct($meta = 0){
@@ -39,7 +38,7 @@ class Cactus extends Transparent{
 			$down = $this->getSide(0);
 			if($down->getID() !== self::SAND and $down->getID() !== self::CACTUS){ //Replace with common break method
 				$this->getLevel()->setBlock($this, new Air(), false);
-				Server::getInstance()->api->entity->drop($this, Item::get($this->id));
+				$this->getLevel()->dropItem($this, Item::get($this->id));
 
 				return Level::BLOCK_UPDATE_NORMAL;
 			}
@@ -85,8 +84,8 @@ class Cactus extends Transparent{
 	}
 
 	public function getDrops(Item $item){
-		return array(
-			array($this->id, 0, 1),
-		);
+		return [
+			[$this->id, 0, 1],
+		];
 	}
 }

src/pocketmine/block/Carpet.php

@@ -28,7 +28,7 @@ use pocketmine\Player;
 class Carpet extends Flowable{
 	public function __construct($meta = 0){
 		parent::__construct(self::CARPET, $meta, "Carpet");
-		$names = array(
+		$names = [
 			0 => "White Carpet",
 			1 => "Orange Carpet",
 			2 => "Magenta Carpet",
@@ -45,7 +45,7 @@ class Carpet extends Flowable{
 			13 => "Green Carpet",
 			14 => "Red Carpet",
 			15 => "Black Carpet",
-		);
+		];
 		$this->name = $names[$this->meta];
 		$this->hardness = 0;
 		$this->isFullBlock = false;

src/pocketmine/block/Carrot.php

@@ -32,6 +32,11 @@ class Carrot extends Flowable{
 		$this->hardness = 0;
 	}
 
+	public function getBoundingBox(){
+		return null;
+	}
+
+
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		$down = $this->getSide(0);
 		if($down->getID() === self::FARMLAND){
@@ -83,9 +88,9 @@ class Carrot extends Flowable{
 	public function getDrops(Item $item){
 		$drops = [];
 		if($this->meta >= 0x07){
-			$drops[] = array(Item::CARROT, 0, mt_rand(1, 4));
+			$drops[] = [Item::CARROT, 0, mt_rand(1, 4)];
 		}else{
-			$drops[] = array(Item::CARROT, 0, 1);
+			$drops[] = [Item::CARROT, 0, 1];
 		}
 
 		return $drops;

src/pocketmine/block/Chest.php

@@ -42,12 +42,12 @@ class Chest extends Transparent{
 	}
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
-		$faces = array(
+		$faces = [
 			0 => 4,
 			1 => 2,
 			2 => 5,
 			3 => 3,
-		);
+		];
 
 		$chest = false;
 		$this->meta = $faces[$player instanceof Player ? $player->getDirection() : 0];
@@ -69,13 +69,13 @@ class Chest extends Transparent{
 		}
 
 		$this->getLevel()->setBlock($block, $this, true, false, true);
-		$nbt = new Compound(false, array(
+		$nbt = new Compound(false, [
 			new Enum("Items", []),
 			new String("id", Tile::CHEST),
 			new Int("x", $this->x),
 			new Int("y", $this->y),
 			new Int("z", $this->z)
-		));
+		]);
 		$nbt->Items->setTagType(NBT::TAG_Compound);
 		$tile = new TileChest($this->getLevel()->getChunkAt($this->x >> 4, $this->z >> 4), $nbt);
 
@@ -109,13 +109,13 @@ class Chest extends Transparent{
 			if($t instanceof TileChest){
 				$chest = $t;
 			}else{
-				$nbt = new Compound(false, array(
+				$nbt = new Compound(false, [
 					new Enum("Items", []),
 					new String("id", Tile::CHEST),
 					new Int("x", $this->x),
 					new Int("y", $this->y),
 					new Int("z", $this->z)
-				));
+				]);
 				$nbt->Items->setTagType(NBT::TAG_Compound);
 				$chest = new TileChest($this->getLevel()->getChunkAt($this->x >> 4, $this->z >> 4), $nbt);
 			}
@@ -131,15 +131,15 @@ class Chest extends Transparent{
 	}
 
 	public function getDrops(Item $item){
-		$drops = array(
-			array($this->id, 0, 1),
-		);
+		$drops = [
+			[$this->id, 0, 1],
+		];
 		$t = $this->getLevel()->getTile($this);
 		if($t instanceof TileChest){
 			for($s = 0; $s < $t->getRealInventory()->getSize(); ++$s){
 				$slot = $t->getRealInventory()->getItem($s);
 				if($slot->getID() > Item::AIR and $slot->getCount() > 0){
-					$drops[] = array($slot->getID(), $slot->getDamage(), $slot->getCount());
+					$drops[] = [$slot->getID(), $slot->getDamage(), $slot->getCount()];
 				}
 			}
 		}

src/pocketmine/block/Clay.php

@@ -30,8 +30,8 @@ class Clay extends Solid{
 	}
 
 	public function getDrops(Item $item){
-		return array(
-			array(Item::CLAY, 0, 4),
-		);
+		return [
+			[Item::CLAY, 0, 4],
+		];
 	}
 }

src/pocketmine/block/Coal.php

@@ -48,9 +48,9 @@ class Coal extends Solid{
 
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 1){
-			return array(
-				array(Item::COAL_BLOCK, 0, 1),
-			);
+			return [
+				[Item::COAL_BLOCK, 0, 1],
+			];
 		}else{
 			return [];
 		}

src/pocketmine/block/CoalOre.php

@@ -48,9 +48,9 @@ class CoalOre extends Solid{
 
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 1){
-			return array(
-				array(Item::COAL, 0, 1),
-			);
+			return [
+				[Item::COAL, 0, 1],
+			];
 		}else{
 			return [];
 		}

src/pocketmine/block/Cobblestone.php

@@ -48,9 +48,9 @@ class Cobblestone extends Solid{
 
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 1){
-			return array(
-				array(Item::COBBLESTONE, 0, 1),
-			);
+			return [
+				[Item::COBBLESTONE, 0, 1],
+			];
 		}else{
 			return [];
 		}

src/pocketmine/block/CyanFlower.php

@@ -31,6 +31,11 @@ class CyanFlower extends Flowable{
 		$this->hardness = 0;
 	}
 
+	public function getBoundingBox(){
+		return null;
+	}
+
+
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		$down = $this->getSide(0);
 		if($down->getID() === 2 or $down->getID() === 3 or $down->getID() === 60){

src/pocketmine/block/Dandelion.php

@@ -31,6 +31,11 @@ class Dandelion extends Flowable{
 		$this->hardness = 0;
 	}
 
+	public function getBoundingBox(){
+		return null;
+	}
+
+
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		$down = $this->getSide(0);
 		if($down->getID() === 2 or $down->getID() === 3 or $down->getID() === 60){

src/pocketmine/block/DarkOakWoodStairs.php

@@ -29,8 +29,8 @@ class DarkOakWoodStairs extends Stair{
 	}
 
 	public function getDrops(Item $item){
-		return array(
-			array($this->id, 0, 1),
-		);
+		return [
+			[$this->id, 0, 1],
+		];
 	}
 }

src/pocketmine/block/DeadBush.php

@@ -30,6 +30,11 @@ class DeadBush extends Flowable{
 		$this->hardness = 0;
 	}
 
+	public function getBoundingBox(){
+		return null;
+	}
+
+
 	public function onUpdate($type){
 		if($type === Level::BLOCK_UPDATE_NORMAL){
 			if($this->getSide(0)->isTransparent === true){ //Replace with common break method

src/pocketmine/block/Diamond.php

@@ -42,9 +42,9 @@ class Diamond extends Solid{
 
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 4){
-			return array(
-				array(Item::DIAMOND_BLOCK, 0, 1),
-			);
+			return [
+				[Item::DIAMOND_BLOCK, 0, 1],
+			];
 		}else{
 			return [];
 		}

src/pocketmine/block/DiamondOre.php

@@ -42,9 +42,9 @@ class DiamondOre extends Solid{
 
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 4){
-			return array(
-				array(Item::DIAMOND, 0, 1),
-			);
+			return [
+				[Item::DIAMOND, 0, 1],
+			];
 		}else{
 			return [];
 		}

src/pocketmine/block/Dirt.php

@@ -25,10 +25,15 @@ use pocketmine\item\Item;
 use pocketmine\Player;
 
 class Dirt extends Solid{
+
+	public $isActivable = true;
+	protected $hardness = 2.5;
+	protected $id = self::DIRT;
+	protected $meta = 0;
+	protected $name = "Dirt";
+
 	public function __construct(){
-		parent::__construct(self::DIRT, 0, "Dirt");
-		$this->isActivable = true;
-		$this->hardness = 2.5;
+
 	}
 
 	public function onActivate(Item $item, Player $player = null){

src/pocketmine/block/Door.php

@@ -57,12 +57,12 @@ abstract class Door extends Transparent{
 				return false;
 			}
 			$direction = $player instanceof Player ? $player->getDirection() : 0;
-			$face = array(
+			$face = [
 				0 => 3,
 				1 => 4,
 				2 => 2,
 				3 => 5,
-			);
+			];
 			$next = $this->getSide($face[(($direction + 2) % 4)]);
 			$next2 = $this->getSide($face[$direction]);
 			$metaUp = 0x08;

src/pocketmine/block/DoubleSlab.php

@@ -26,7 +26,7 @@ use pocketmine\item\Item;
 class DoubleSlab extends Solid{
 	public function __construct($meta = 0){
 		parent::__construct(self::DOUBLE_SLAB, $meta, "Double Slab");
-		$names = array(
+		$names = [
 			0 => "Stone",
 			1 => "Sandstone",
 			2 => "Wooden",
@@ -34,7 +34,7 @@ class DoubleSlab extends Solid{
 			4 => "Brick",
 			5 => "Stone Brick",
 			6 => "Quartz",
-		);
+		];
 		$this->name = "Double " . $names[$this->meta & 0x07] . " Slab";
 		$this->hardness = 30;
 	}
@@ -58,9 +58,9 @@ class DoubleSlab extends Solid{
 
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 1){
-			return array(
-				array(Item::SLAB, $this->meta & 0x07, 2),
-			);
+			return [
+				[Item::SLAB, $this->meta & 0x07, 2],
+			];
 		}else{
 			return [];
 		}

src/pocketmine/block/DoubleWoodSlab.php

@@ -26,14 +26,14 @@ use pocketmine\item\Item;
 class DoubleWoodSlab extends Solid{
 	public function __construct($meta = 0){
 		parent::__construct(self::DOUBLE_WOOD_SLAB, $meta, "Double Wooden Slab");
-		$names = array(
+		$names = [
 			0 => "Oak",
 			1 => "Spruce",
 			2 => "Birch",
 			3 => "Jungle",
 			4 => "Acacia",
 			5 => "Dark Oak",
-		);
+		];
 		$this->name = "Double " . $names[$this->meta & 0x07] . " Wooden Slab";
 		$this->hardness = 15;
 	}
@@ -56,9 +56,9 @@ class DoubleWoodSlab extends Solid{
 	}
 
 	public function getDrops(Item $item){
-		return array(
-			array(Item::WOOD_SLAB, $this->meta & 0x07, 2),
-		);
+		return [
+			[Item::WOOD_SLAB, $this->meta & 0x07, 2],
+		];
 	}
 
 }

src/pocketmine/block/Emerald.php

@@ -42,9 +42,9 @@ class Emerald extends Solid{
 
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 4){
-			return array(
-				array(Item::EMERALD_BLOCK, 0, 1),
-			);
+			return [
+				[Item::EMERALD_BLOCK, 0, 1],
+			];
 		}else{
 			return [];
 		}

src/pocketmine/block/EmeraldOre.php

@@ -42,9 +42,9 @@ class EmeraldOre extends Solid{
 
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 4){
-			return array(
-				array(Item::EMERALD, 0, 1),
-			);
+			return [
+				[Item::EMERALD, 0, 1],
+			];
 		}else{
 			return [];
 		}

src/pocketmine/block/EndPortal.php

@@ -0,0 +1,29 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+namespace pocketmine\block;
+
+class EndPortal extends Solid{
+	public function __construct($meta = 0){
+		parent::__construct(self::END_PORTAL, $meta, "End Portal");
+		$this->hardness = 18000000;
+	}
+}

src/pocketmine/block/EndStone.php

@@ -0,0 +1,48 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+namespace pocketmine\block;
+
+use pocketmine\item\Item;
+
+class EndStone extends Solid{
+	public function __construct(){
+		parent::__construct(self::END_STONE, 0, "End Stone");	
+		$this->hardness = 45;
+	}
+
+	public function getBreakTime(Item $item){
+		switch($item->isPickaxe()){
+			case 5:
+				return 0.6;
+			case 4:
+				return 0.75;
+			case 3:
+				return 1.15;
+			case 2:
+				return 0.4;
+			case 1:
+				return 2.25;
+			default:
+				return 15;
+		}
+	}
+}

src/pocketmine/block/Fallable.php

@@ -26,10 +26,7 @@ use pocketmine\Player;
 
 class Fallable extends Solid{
 
-	public function __construct($id, $meta = 0, $name = "Unknown"){
-		parent::__construct($id, $meta, $name);
-		$this->hasPhysics = true;
-	}
+	public $hasPhysics = true;
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		$ret = $this->getLevel()->setBlock($this, $this, true, false, true);

src/pocketmine/block/Farmland.php

@@ -30,8 +30,8 @@ class Farmland extends Solid{
 	}
 
 	public function getDrops(Item $item){
-		return array(
-			array(Item::DIRT, 0, 1),
-		);
+		return [
+			[Item::DIRT, 0, 1],
+		];
 	}
 }

src/pocketmine/block/FenceGate.php

@@ -37,12 +37,12 @@ class FenceGate extends Transparent{
 	}
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
-		$faces = array(
+		$faces = [
 			0 => 3,
 			1 => 0,
 			2 => 1,
 			3 => 2,
-		);
+		];
 		$this->meta = $faces[$player instanceof Player ? $player->getDirection() : 0] & 0x03;
 		$this->getLevel()->setBlock($block, $this, true, false, true);
 
@@ -50,18 +50,18 @@ class FenceGate extends Transparent{
 	}
 
 	public function getDrops(Item $item){
-		return array(
-			array($this->id, 0, 1),
-		);
+		return [
+			[$this->id, 0, 1],
+		];
 	}
 
 	public function onActivate(Item $item, Player $player = null){
-		$faces = array(
+		$faces = [
 			0 => 3,
 			1 => 0,
 			2 => 1,
 			3 => 2,
-		);
+		];
 		$this->meta = ($faces[$player instanceof Player ? $player->getDirection() : 0] & 0x03) | ((~$this->meta) & 0x04);
 		if(($this->meta & 0x04) === 0x04){
 			$this->isFullBlock = true;

src/pocketmine/block/Fire.php

@@ -33,6 +33,11 @@ class Fire extends Flowable{
 		$this->hardness = 0;
 	}
 
+	public function getBoundingBox(){
+		return null;
+	}
+
+
 	public function getDrops(Item $item){
 		return [];
 	}

src/pocketmine/block/Flowable.php

@@ -23,10 +23,9 @@ namespace pocketmine\block;
 
 
 class Flowable extends Transparent{
-	public function __construct($id, $meta = 0, $name = "Unknown"){
-		parent::__construct($id, $meta, $name);
-		$this->isFlowable = true;
-		$this->isFullBlock = false;
-		$this->isSolid = false;
-	}
+
+	public $isFlowable = true;
+	public $isFullBlock = false;
+	public $isSolid = false;
+
 }

src/pocketmine/block/Generic.php

@@ -24,19 +24,9 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 use pocketmine\level\Level;
 use pocketmine\Player;
-use pocketmine\Server;
 
 class Generic extends Block{
 
-	/**
-	 * @param int    $id
-	 * @param int    $meta
-	 * @param string $name
-	 */
-	public function __construct($id, $meta = 0, $name = "Unknown"){
-		parent::__construct($id, $meta, $name);
-	}
-
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		return $this->getLevel()->setBlock($this, $this, true, false, true);
 	}
@@ -53,13 +43,12 @@ class Generic extends Block{
 		if($this->hasPhysics === true and $type === Level::BLOCK_UPDATE_NORMAL){
 			$down = $this->getSide(0);
 			if($down->getID() === self::AIR or ($down instanceof Liquid)){
-				$data = array(
+				$data = [
 					"x" => $this->x + 0.5,
 					"y" => $this->y + 0.5,
 					"z" => $this->z + 0.5,
 					"Tile" => $this->id,
-				);
-				$server = Server::getInstance();
+				];
 				/*$this->getLevel()->setBlock($this, new Air(), false, false, true);
 				//TODO
 				//$e = $server->api->entity->add($this->getLevel(), ENTITY_FALLING, FALLING_SAND, $data);

src/pocketmine/block/GlowingRedstoneOre.php

@@ -54,9 +54,9 @@ class GlowingRedstoneOre extends Solid{
 
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 4){
-			return array(
-				array(Item::REDSTONE_DUST, 0, mt_rand(4, 5)),
-			);
+			return [
+				[Item::REDSTONE_DUST, 0, mt_rand(4, 5)],
+			];
 		}else{
 			return [];
 		}

src/pocketmine/block/Glowstone.php

@@ -30,8 +30,8 @@ class Glowstone extends Transparent{
 	}
 
 	public function getDrops(Item $item){
-		return array(
-			array(Item::GLOWSTONE_DUST, 0, mt_rand(2, 4)),
-		);
+		return [
+			[Item::GLOWSTONE_DUST, 0, mt_rand(2, 4)],
+		];
 	}
 }

src/pocketmine/block/Gold.php

@@ -42,9 +42,9 @@ class Gold extends Solid{
 
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 4){
-			return array(
-				array(Item::GOLD_BLOCK, 0, 1),
-			);
+			return [
+				[Item::GOLD_BLOCK, 0, 1],
+			];
 		}else{
 			return [];
 		}

src/pocketmine/block/GoldOre.php

@@ -42,9 +42,9 @@ class GoldOre extends Solid{
 
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 4){
-			return array(
-				array(Item::GOLD_ORE, 0, 1),
-			);
+			return [
+				[Item::GOLD_ORE, 0, 1],
+			];
 		}else{
 			return [];
 		}

src/pocketmine/block/Grass.php

@@ -24,15 +24,20 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 use pocketmine\level\generator\object\TallGrass;
 use pocketmine\level\Level;
-use pocketmine\math\Vector3;
+use pocketmine\level\Position;
 use pocketmine\Player;
 use pocketmine\utils\Random;
 
 class Grass extends Solid{
+
+	public $isActivable = true;
+	protected $hardness = 3;
+	protected $id = self::GRASS;
+	protected $meta = 0;
+	protected $name = "Grass";
+
 	public function __construct(){
-		parent::__construct(self::GRASS, 0, "Grass");
-		$this->isActivable = true;
-		$this->hardness = 3;
+
 	}
 
 	public function getDrops(Item $item){
@@ -49,7 +54,7 @@ class Grass extends Solid{
 			$z = mt_rand($this->z - 1, $this->z + 1);
 			$block = $this->getLevel()->getBlockIdAt($x, $y, $z);
 			if($block === Block::DIRT){
-				$block = $this->getLevel()->getBlock(new Vector3($x, $y, $z));
+				$block = Block::get($block, $this->getLevel()->getBlockDataAt($x, $y, $z), new Position($x, $y, $z, $this->getLevel()));
 				if($block->getSide(1) instanceof Transparent){
 					$this->getLevel()->setBlock($block, new Grass());
 				}

src/pocketmine/block/Gravel.php

@@ -31,14 +31,14 @@ class Gravel extends Fallable{
 
 	public function getDrops(Item $item){
 		if(mt_rand(1, 10) === 1){
-			return array(
-				array(Item::FLINT, 0, 1),
-			);
+			return [
+				[Item::FLINT, 0, 1],
+			];
 		}
 
-		return array(
-			array(Item::GRAVEL, 0, 1),
-		);
+		return [
+			[Item::GRAVEL, 0, 1],
+		];
 	}
 
 }

src/pocketmine/block/HayBale.php

@@ -31,14 +31,14 @@ class HayBale extends Solid{
 	}
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
-		$faces = array(
+		$faces = [
 			0 => 0,
 			1 => 0,
 			2 => 0b1000,
 			3 => 0b1000,
 			4 => 0b0100,
 			5 => 0b0100,
-		);
+		];
 
 		$this->meta = ($this->meta & 0x03) | $faces[$face];
 		$this->getLevel()->setBlock($block, $this, true, false, true);
@@ -47,9 +47,9 @@ class HayBale extends Solid{
 	}
 
 	public function getDrops(Item $item){
-		return array(
-			array($this->id, 0, 1),
-		);
+		return [
+			[$this->id, 0, 1],
+		];
 	}
 
 }

src/pocketmine/block/Iron.php

@@ -44,9 +44,9 @@ class Iron extends Solid{
 
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 3){
-			return array(
-				array(Item::IRON_BLOCK, 0, 1),
-			);
+			return [
+				[Item::IRON_BLOCK, 0, 1],
+			];
 		}else{
 			return [];
 		}

src/pocketmine/block/IronDoor.php

@@ -49,9 +49,9 @@ class IronDoor extends Door{
 
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 1){
-			return array(
-				array(Item::IRON_DOOR, 0, 1),
-			);
+			return [
+				[Item::IRON_DOOR, 0, 1],
+			];
 		}else{
 			return [];
 		}

src/pocketmine/block/IronOre.php

@@ -44,9 +44,9 @@ class IronOre extends Solid{
 
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 3){
-			return array(
-				array(Item::IRON_ORE, 0, 1),
-			);
+			return [
+				[Item::IRON_ORE, 0, 1],
+			];
 		}else{
 			return [];
 		}

src/pocketmine/block/JungleWoodStairs.php

@@ -29,8 +29,8 @@ class JungleWoodStairs extends Stair{
 	}
 
 	public function getDrops(Item $item){
-		return array(
-			array($this->id, 0, 1),
-		);
+		return [
+			[$this->id, 0, 1],
+		];
 	}
 }

src/pocketmine/block/Ladder.php

@@ -33,14 +33,19 @@ class Ladder extends Transparent{
 		$this->hardness = 2;
 	}
 
+	public function getBoundingBox(){
+		return null;
+	}
+
+
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		if($target->isTransparent === false){
-			$faces = array(
+			$faces = [
 				2 => 2,
 				3 => 3,
 				4 => 4,
 				5 => 5,
-			);
+			];
 			if(isset($faces[$face])){
 				$this->meta = $faces[$face];
 				$this->getLevel()->setBlock($block, $this, true, false, true);
@@ -65,8 +70,8 @@ class Ladder extends Transparent{
 	}
 
 	public function getDrops(Item $item){
-		return array(
-			array($this->id, 0, 1),
-		);
+		return [
+			[$this->id, 0, 1],
+		];
 	}
 }

src/pocketmine/block/Lapis.php

@@ -44,9 +44,9 @@ class Lapis extends Solid{
 
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 3){
-			return array(
-				array(Item::LAPIS_BLOCK, 0, 1),
-			);
+			return [
+				[Item::LAPIS_BLOCK, 0, 1],
+			];
 		}else{
 			return [];
 		}

src/pocketmine/block/LapisOre.php

@@ -45,9 +45,9 @@ class LapisOre extends Solid{
 
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 3){
-			return array(
-				array(Item::DYE, 4, mt_rand(4, 8)),
-			);
+			return [
+				[Item::DYE, 4, mt_rand(4, 8)],
+			];
 		}else{
 			return [];
 		}

src/pocketmine/block/Lava.php

@@ -33,9 +33,14 @@ class Lava extends Liquid{
 		$this->hardness = 0;
 	}
 
+	public function getBoundingBox(){
+		return null;
+	}
+
+
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		$ret = $this->getLevel()->setBlock($this, $this, true, false, true);
-		Server::getInstance()->api->block->scheduleBlockUpdate(clone $this, 40, Level::BLOCK_UPDATE_NORMAL);
+		$this->getLevel()->scheduleUpdate(clone $this, 40);
 
 		return $ret;
 	}
@@ -85,7 +90,7 @@ class Lava extends Liquid{
 	}
 
 	public function onUpdate($type){
-		//return false;
+		return false;
 		$newId = $this->id;
 		$level = $this->meta & 0x07;
 		if($type !== Level::BLOCK_UPDATE_NORMAL){

src/pocketmine/block/Leaves.php

@@ -35,12 +35,12 @@ class Leaves extends Transparent{
 
 	public function __construct($meta = 0){
 		parent::__construct(self::LEAVES, $meta, "Leaves");
-		$names = array(
+		$names = [
 			self::OAK => "Oak Leaves",
 			self::SPRUCE => "Spruce Leaves",
 			self::BIRCH => "Birch Leaves",
 			self::JUNGLE => "Jungle Leaves",
-		);
+		];
 		$this->name = $names[$this->meta & 0x03];
 		$this->hardness = 1;
 	}
@@ -148,13 +148,13 @@ class Leaves extends Transparent{
 	public function getDrops(Item $item){
 		$drops = [];
 		if($item->isShears()){
-			$drops[] = array(Item::LEAVES, $this->meta & 0x03, 1);
+			$drops[] = [Item::LEAVES, $this->meta & 0x03, 1];
 		}else{
 			if(mt_rand(1, 20) === 1){ //Saplings
-				$drops[] = array(Item::SAPLING, $this->meta & 0x03, 1);
+				$drops[] = [Item::SAPLING, $this->meta & 0x03, 1];
 			}
 			if(($this->meta & 0x03) === self::OAK and mt_rand(1, 200) === 1){ //Apples
-				$drops[] = array(Item::APPLE, 0, 1);
+				$drops[] = [Item::APPLE, 0, 1];
 			}
 		}
 

src/pocketmine/block/Leaves2.php

@@ -29,10 +29,10 @@ class Leaves2 extends Leaves{
 
 	public function __construct($meta = 0){
 		Transparent::__construct(self::LEAVES, $meta, "Leaves");
-		$names = array(
+		$names = [
 			self::ACACIA => "Acacia Leaves",
 			self::DARK_OAK => "Dark Oak Leaves",
-		);
+		];
 		$this->name = $names[$this->meta & 0x03];
 		$this->hardness = 1;
 	}
@@ -137,10 +137,10 @@ class Leaves2 extends Leaves{
 	public function getDrops(Item $item){
 		$drops = [];
 		if($item->isShears()){
-			$drops[] = array(Item::LEAVES2, $this->meta & 0x03, 1);
+			$drops[] = [Item::LEAVES2, $this->meta & 0x03, 1];
 		}else{
 			if(mt_rand(1, 20) === 1){ //Saplings
-				$drops[] = array(Item::SAPLING, $this->meta & 0x03, 1);
+				$drops[] = [Item::SAPLING, $this->meta & 0x03, 1];
 			}
 		}
 

src/pocketmine/block/Liquid.php

@@ -23,12 +23,9 @@ namespace pocketmine\block;
 
 
 class Liquid extends Transparent{
-	public function __construct($id, $meta = 0, $name = "Unknown"){
-		parent::__construct($id, $meta, $name);
-		$this->isLiquid = true;
-		$this->breakable = false;
-		$this->isReplaceable = true;
-		$this->isSolid = false;
-		$this->isFullBlock = true;
-	}
+	public $isLiquid = true;
+	public $breakable = false;
+	public $isReplaceable = true;
+	public $isSolid = false;
+	public $isFullBlock = true;
 }

src/pocketmine/block/LitPumpkin.php

@@ -31,13 +31,9 @@ class LitPumpkin extends Solid{
 	}
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
-		$faces = array(
-			0 => 4,
-			1 => 2,
-			2 => 5,
-			3 => 3,
-		);
-		$this->meta = $faces[$player->getDirection()];
+		if($player instanceof Player){
+			$this->meta = (int) $player->getDirection();
+		}
 		$this->getLevel()->setBlock($block, $this, true, false, true);
 
 		return true;

src/pocketmine/block/Melon.php

@@ -30,8 +30,8 @@ class Melon extends Transparent{
 	}
 
 	public function getDrops(Item $item){
-		return array(
-			array(Item::MELON_SLICE, 0, mt_rand(3, 7)),
-		);
+		return [
+			[Item::MELON_SLICE, 0, mt_rand(3, 7)],
+		];
 	}
 }

src/pocketmine/block/MelonStem.php

@@ -32,6 +32,11 @@ class MelonStem extends Flowable{
 		$this->hardness = 0;
 	}
 
+	public function getBoundingBox(){
+		return null;
+	}
+
+
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		$down = $this->getSide(0);
 		if($down->getID() === self::FARMLAND){
@@ -94,8 +99,8 @@ class MelonStem extends Flowable{
 	}
 
 	public function getDrops(Item $item){
-		return array(
-			array(Item::MELON_SEEDS, 0, mt_rand(0, 2)),
-		);
+		return [
+			[Item::MELON_SEEDS, 0, mt_rand(0, 2)],
+		];
 	}
 }

src/pocketmine/block/MonsterSpawner.php

@@ -0,0 +1,52 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____ 
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+*/
+
+namespace pocketmine\block;
+
+use pocketmine\item\Item;
+
+class MonsterSpawner extends Solid{
+	public function __construct(){
+		parent::__construct(self::MONSTER_SPAWNER, 0, "Monster Spawner");
+		$this->hardness = 25;
+	}
+
+    public function getBreakTime(Item $item){
+        switch($item->isPickaxe()){
+            case 5:
+                return 0.95;
+            case 4:
+                return 1.25;
+            case 3:
+                return 1.9;
+            case 2:
+                return 0.65;
+            case 1:
+                return 3.75;
+            default:
+                return 25;
+        }
+    }
+
+    public function getDrops(Item $item){
+        return [];
+    }
+}

src/pocketmine/block/MossStone.php

@@ -49,9 +49,9 @@ class MossStone extends Solid{
 
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 1){
-			return array(
-				array(Item::MOSS_STONE, $this->meta, 1),
-			);
+			return [
+				[Item::MOSS_STONE, $this->meta, 1],
+			];
 		}else{
 			return [];
 		}

src/pocketmine/block/Mycelium.php

@@ -0,0 +1,55 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+namespace pocketmine\block;
+
+use pocketmine\item\Item;
+use pocketmine\level\Level;
+use pocketmine\level\Position;
+
+class Mycelium extends Solid{
+	public function __construct(){
+		parent::__construct(self::MYCELIUM, 0, "Mycelium");
+		$this->hardness = 2.5;
+	}
+
+	public function getDrops(Item $item){
+		return [
+			[Item::DIRT, 0, 1],
+		];
+	}
+
+	public function onUpdate($type){
+		if($type === Level::BLOCK_UPDATE_RANDOM){
+			//TODO: light levels
+			$x = mt_rand($this->x - 1, $this->x + 1);
+			$y = mt_rand($this->y - 2, $this->y + 2);
+			$z = mt_rand($this->z - 1, $this->z + 1);
+			$block = $this->getLevel()->getBlockIdAt($x, $y, $z);
+			if($block === Block::DIRT){
+				$block = Block::get($block, $this->getLevel()->getBlockDataAt($x, $y, $z), new Position($x, $y, $z, $this->getLevel()));
+				if($block->getSide(1) instanceof Transparent){
+					$this->getLevel()->setBlock($block, new Mycelium());
+				}
+			}
+		}
+	}
+}

src/pocketmine/block/NetherBrick.php

@@ -49,9 +49,9 @@ class NetherBrick extends Solid{
 
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 1){
-			return array(
-				array(Item::NETHER_BRICKS, 0, 1),
-			);
+			return [
+				[Item::NETHER_BRICKS, 0, 1],
+			];
 		}else{
 			return [];
 		}

src/pocketmine/block/Netherrack.php

@@ -49,9 +49,9 @@ class Netherrack extends Solid{
 
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 1){
-			return array(
-				array(Item::NETHERRACK, 0, 1),
-			);
+			return [
+				[Item::NETHERRACK, 0, 1],
+			];
 		}else{
 			return [];
 		}

src/pocketmine/block/Obsidian.php

@@ -40,9 +40,9 @@ class Obsidian extends Solid{
 
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 5){
-			return array(
-				array(Item::OBSIDIAN, 0, 1),
-			);
+			return [
+				[Item::OBSIDIAN, 0, 1],
+			];
 		}else{
 			return [];
 		}

src/pocketmine/block/Planks.php

@@ -32,14 +32,14 @@ class Planks extends Solid{
 
 	public function __construct($meta = 0){
 		parent::__construct(self::PLANKS, $meta, "Wood Planks");
-		$names = array(
+		$names = [
 			self::OAK => "Oak Wood Planks",
 			self::SPRUCE => "Spruce Wood Planks",
 			self::BIRCH => "Birch Wood Planks",
 			self::JUNGLE => "Jungle Wood Planks",
 			self::ACACIA => "Acacia Wood Planks",
 			self::DARK_OAK => "Jungle Wood Planks",
-		);
+		];
 		$this->name = $names[$this->meta & 0x07];
 		$this->hardness = 15;
 	}

src/pocketmine/block/Podzol.php

@@ -19,9 +19,11 @@
  *
 */
 
-namespace pocketmine\entity;
-
-
-class FallingBlock extends Entity{
+namespace pocketmine\block;
 
+class Podzol extends Solid{
+	public function __construct(){
+		parent::__construct(self::PODZOL, 0, "Podzol");	
+		$this->hardness = 2.5;
+	}
 }

src/pocketmine/block/Potato.php

@@ -32,6 +32,11 @@ class Potato extends Flowable{
 		$this->hardness = 0;
 	}
 
+	public function getBoundingBox(){
+		return null;
+	}
+
+
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		$down = $this->getSide(0);
 		if($down->getID() === self::FARMLAND){
@@ -84,9 +89,9 @@ class Potato extends Flowable{
 	public function getDrops(Item $item){
 		$drops = [];
 		if($this->meta >= 0x07){
-			$drops[] = array(Item::POTATO, 0, mt_rand(1, 4));
+			$drops[] = [Item::POTATO, 0, mt_rand(1, 4)];
 		}else{
-			$drops[] = array(Item::POTATO, 0, 1);
+			$drops[] = [Item::POTATO, 0, 1];
 		}
 
 		return $drops;

src/pocketmine/block/PumpkinStem.php

@@ -32,6 +32,11 @@ class PumpkinStem extends Flowable{
 		$this->hardness = 0;
 	}
 
+	public function getBoundingBox(){
+		return null;
+	}
+
+
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		$down = $this->getSide(0);
 		if($down->getID() === self::FARMLAND){
@@ -95,8 +100,8 @@ class PumpkinStem extends Flowable{
 	}
 
 	public function getDrops(Item $item){
-		return array(
-			array(Item::PUMPKIN_SEEDS, 0, mt_rand(0, 2)),
-		);
+		return [
+			[Item::PUMPKIN_SEEDS, 0, mt_rand(0, 2)],
+		];
 	}
 }

src/pocketmine/block/Quartz.php

@@ -26,12 +26,12 @@ use pocketmine\item\Item;
 class Quartz extends Solid{
 	public function __construct($meta = 0){
 		parent::__construct(self::QUARTZ_BLOCK, $meta, "Quartz Block");
-		$names = array(
+		$names = [
 			0 => "Quartz Block",
 			1 => "Chiseled Quartz Block",
 			2 => "Quartz Pillar",
 			3 => "Quartz Pillar",
-		);
+		];
 		$this->name = $names[$this->meta & 0x03];
 	}
 
@@ -55,9 +55,9 @@ class Quartz extends Solid{
 
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 1){
-			return array(
-				array(Item::QUARTZ_BLOCK, $this->meta & 0x03, 1),
-			);
+			return [
+				[Item::QUARTZ_BLOCK, $this->meta & 0x03, 1],
+			];
 		}else{
 			return [];
 		}

src/pocketmine/block/RedMushroom.php

@@ -31,6 +31,11 @@ class RedMushroom extends Flowable{
 		$this->hardness = 0;
 	}
 
+	public function getBoundingBox(){
+		return null;
+	}
+
+
 	public function onUpdate($type){
 		if($type === Level::BLOCK_UPDATE_NORMAL){
 			if($this->getSide(0)->isTransparent === true){ //Replace with common break method

src/pocketmine/block/RedstoneOre.php

@@ -42,9 +42,9 @@ class RedstoneOre extends Solid{
 
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 2){
-			return array(
-				array(Item::REDSTONE_DUST, 0, mt_rand(4, 5)),
-			);
+			return [
+				[Item::REDSTONE_DUST, 0, mt_rand(4, 5)],
+			];
 		}else{
 			return [];
 		}

src/pocketmine/block/Sandstone.php

@@ -26,11 +26,11 @@ use pocketmine\item\Item;
 class Sandstone extends Solid{
 	public function __construct($meta = 0){
 		parent::__construct(self::SANDSTONE, $meta, "Sandstone");
-		$names = array(
+		$names = [
 			0 => "Sandstone",
 			1 => "Chiseled Sandstone",
 			2 => "Smooth Sandstone",
-		);
+		];
 		$this->name = $names[$this->meta & 0x03];
 		$this->hardness = 4;
 	}
@@ -55,9 +55,9 @@ class Sandstone extends Solid{
 
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 1){
-			return array(
-				array(Item::SANDSTONE, $this->meta & 0x03, 1),
-			);
+			return [
+				[Item::SANDSTONE, $this->meta & 0x03, 1],
+			];
 		}else{
 			return [];
 		}

src/pocketmine/block/Sapling.php

@@ -37,18 +37,23 @@ class Sapling extends Flowable{
 	public function __construct($meta = Sapling::OAK){
 		parent::__construct(self::SAPLING, $meta, "Sapling");
 		$this->isActivable = true;
-		$names = array(
+		$names = [
 			0 => "Oak Sapling",
 			1 => "Spruce Sapling",
 			2 => "Birch Sapling",
 			3 => "Jungle Sapling",
 			4 => "Acacia Sapling",
 			5 => "Dark Oak Sapling",
-		);
+		];
 		$this->name = $names[$this->meta & 0x07];
 		$this->hardness = 0;
 	}
 
+	public function getBoundingBox(){
+		return null;
+	}
+
+
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		$down = $this->getSide(0);
 		if($down->getID() === self::GRASS or $down->getID() === self::DIRT or $down->getID() === self::FARMLAND){
@@ -102,8 +107,8 @@ class Sapling extends Flowable{
 	}
 
 	public function getDrops(Item $item){
-		return array(
-			array($this->id, $this->meta & 0x07, 1),
-		);
+		return [
+			[$this->id, $this->meta & 0x07, 1],
+		];
 	}
 }

src/pocketmine/block/SignPost.php

@@ -33,14 +33,19 @@ class SignPost extends Transparent{
 		$this->hardness = 5;
 	}
 
+	public function getBoundingBox(){
+		return null;
+	}
+
+
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		if($face !== 0){
-			$faces = array(
+			$faces = [
 				2 => 2,
 				3 => 3,
 				4 => 4,
 				5 => 5,
-			);
+			];
 			if(!isset($faces[$face])){
 				$this->meta = floor((($player->yaw + 180) * 16 / 360) + 0.5) & 0x0F;
 				$this->getLevel()->setBlock($block, Block::get(Item::SIGN_POST, $this->meta), true, false, true);
@@ -78,8 +83,8 @@ class SignPost extends Transparent{
 	}
 
 	public function getDrops(Item $item){
-		return array(
-			array(Item::SIGN, 0, 1),
-		);
+		return [
+			[Item::SIGN, 0, 1],
+		];
 	}
 }

src/pocketmine/block/Slab.php

@@ -27,7 +27,7 @@ use pocketmine\Player;
 class Slab extends Transparent{
 	public function __construct($meta = 0){
 		parent::__construct(self::SLAB, $meta, "Slab");
-		$names = array(
+		$names = [
 			0 => "Stone",
 			1 => "Sandstone",
 			2 => "Wooden",
@@ -36,7 +36,7 @@ class Slab extends Transparent{
 			5 => "Stone Brick",
 			6 => "Quartz",
 			7 => "",
-		);
+		];
 		$this->name = (($this->meta & 0x08) === 0x08 ? "Upper " : "") . $names[$this->meta & 0x07] . " Slab";
 		if(($this->meta & 0x08) === 0x08){
 			$this->isFullBlock = true;
@@ -116,9 +116,9 @@ class Slab extends Transparent{
 
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 1){
-			return array(
-				array($this->id, $this->meta & 0x07, 1),
-			);
+			return [
+				[$this->id, $this->meta & 0x07, 1],
+			];
 		}else{
 			return [];
 		}

src/pocketmine/block/SnowLayer.php

@@ -34,6 +34,11 @@ class SnowLayer extends Flowable{
 		$this->hardness = 0.5;
 	}
 
+	public function getBoundingBox(){
+		return null;
+	}
+
+
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		$down = $this->getSide(0);
 		if($down instanceof Solid){
@@ -59,9 +64,9 @@ class SnowLayer extends Flowable{
 
 	public function getDrops(Item $item){
 		if($item->isShovel() !== false){
-			return array(
-				array(Item::SNOWBALL, 0, 1),
-			);
+			return [
+				[Item::SNOWBALL, 0, 1],
+			];
 		}
 
 		return [];

src/pocketmine/block/SpruceWoodStairs.php

@@ -29,8 +29,8 @@ class SpruceWoodStairs extends Stair{
 	}
 
 	public function getDrops(Item $item){
-		return array(
-			array($this->id, 0, 1),
-		);
+		return [
+			[$this->id, 0, 1],
+		];
 	}
 }

src/pocketmine/block/StainedClay.php

@@ -26,7 +26,7 @@ use pocketmine\item\Item;
 class StainedClay extends Solid{
 	public function __construct($meta = 0){
 		parent::__construct(self::STAINED_CLAY, $meta, "Stained Clay");
-		$names = array(
+		$names = [
 			0 => "White Stained Clay",
 			1 => "Orange Stained Clay",
 			2 => "Magenta Stained Clay",
@@ -43,7 +43,7 @@ class StainedClay extends Solid{
 			13 => "Green Stained Clay",
 			14 => "Red Stained Clay",
 			15 => "Black Stained Clay",
-		);
+		];
 		$this->name = $names[$this->meta];
 		$this->hardness = 30;
 	}

src/pocketmine/block/Stair.php

@@ -37,12 +37,12 @@ class Stair extends Transparent{
 	}
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
-		$faces = array(
+		$faces = [
 			0 => 0,
 			1 => 2,
 			2 => 1,
 			3 => 3,
-		);
+		];
 		$this->meta = $faces[$player->getDirection()] & 0x03;
 		if(($fy > 0.5 and $face !== 1) or $face === 0){
 			$this->meta |= 0x04; //Upside-down stairs
@@ -54,9 +54,9 @@ class Stair extends Transparent{
 
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 1){
-			return array(
-				array($this->id, 0, 1),
-			);
+			return [
+				[$this->id, 0, 1],
+			];
 		}else{
 			return [];
 		}

src/pocketmine/block/Stone.php

@@ -24,7 +24,7 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 
 class Stone extends Solid{
-	const STONE = 0;
+	const NORMAL = 0;
 	const GRANITE = 1;
 	const POLISHED_GRANITE = 2;
 	const DIORITE = 3;
@@ -32,10 +32,13 @@ class Stone extends Solid{
 	const ANDESITE = 5;
 	const POLISHED_ANDESITE = 6;
 
+	protected $hardness = 30;
+	protected $id = self::STONE;
+
 	public function __construct($meta = 0){
-		parent::__construct(self::STONE, $meta, "Stone");
+		$this->meta = $meta;
 		$names = [
-			self::STONE => "Stone",
+			self::NORMAL => "Stone",
 			self::GRANITE => "Granite",
 			self::POLISHED_GRANITE => "Polished Granite",
 			self::DIORITE => "Diorite",
@@ -44,11 +47,9 @@ class Stone extends Solid{
 			self::POLISHED_ANDESITE => "Polished Andesite",
 		];
 		$this->name = $names[$this->meta & 0x07];
-		$this->hardness = 30;
 	}
 
 	public function getBreakTime(Item $item){
-
 		switch($item->isPickaxe()){
 			case 5:
 				return 0.4;
@@ -67,9 +68,9 @@ class Stone extends Solid{
 
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 1){
-			return array(
-				array(Item::COBBLESTONE, 0, 1),
-			);
+			return [
+				[Item::COBBLESTONE, 0, 1],
+			];
 		}else{
 			return [];
 		}

src/pocketmine/block/StoneBricks.php

@@ -26,12 +26,12 @@ use pocketmine\item\Item;
 class StoneBricks extends Solid{
 	public function __construct($meta = 0){
 		parent::__construct(self::STONE_BRICKS, $meta, "Stone Bricks");
-		$names = array(
+		$names = [
 			0 => "Stone Bricks",
 			1 => "Mossy Stone Bricks",
 			2 => "Cracked Stone Bricks",
 			3 => "Chiseled Stone Bricks",
-		);
+		];
 		$this->name = $names[$this->meta & 0x03];
 		$this->hardness = 30;
 	}
@@ -56,9 +56,9 @@ class StoneBricks extends Solid{
 
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 1){
-			return array(
-				array(Item::STONE_BRICKS, $this->meta & 0x03, 1),
-			);
+			return [
+				[Item::STONE_BRICKS, $this->meta & 0x03, 1],
+			];
 		}else{
 			return [];
 		}

src/pocketmine/block/Stonecutter.php

@@ -40,8 +40,8 @@ class Stonecutter extends Solid{
 	}
 
 	public function getDrops(Item $item){
-		return array(
-			array($this->id, 0, 1),
-		);
+		return [
+			[$this->id, 0, 1],
+		];
 	}
 }

src/pocketmine/block/Sugarcane.php

@@ -32,10 +32,15 @@ class Sugarcane extends Flowable{
 		$this->hardness = 0;
 	}
 
+	public function getBoundingBox(){
+		return null;
+	}
+
+
 	public function getDrops(Item $item){
-		return array(
-			array(Item::SUGARCANE, 0, 1),
-		);
+		return [
+			[Item::SUGARCANE, 0, 1],
+		];
 	}
 
 	public function onActivate(Item $item, Player $player = null){

src/pocketmine/block/TNT.php

@@ -36,13 +36,13 @@ class TNT extends Solid{
 			if(($player->gamemode & 0x01) === 0){
 				$item->useOn($this);
 			}
-			$data = array(
+			$data = [
 				"x" => $this->x + 0.5,
 				"y" => $this->y + 0.5,
 				"z" => $this->z + 0.5,
 				"power" => 4,
 				"fuse" => 20 * 4, //4 seconds
-			);
+			];
 			$this->getLevel()->setBlock($this, new Air(), false, false, true);
 			//TODO
 			//$e = Server::getInstance()->api->entity->add($this->level, ENTITY_OBJECT, OBJECT_PRIMEDTNT, $data);

src/pocketmine/block/TallGrass.php

@@ -28,15 +28,20 @@ class TallGrass extends Flowable{
 	public function __construct($meta = 1){
 		parent::__construct(self::TALL_GRASS, $meta, "Tall Grass");
 		$this->isReplaceable = true;
-		$names = array(
+		$names = [
 			0 => "Dead Shrub",
 			1 => "Tall Grass",
 			2 => "Fern",
-		);
+		];
 		$this->name = $names[$this->meta & 0x03];
 		$this->hardness = 0;
 	}
 
+	public function getBoundingBox(){
+		return null;
+	}
+
+
 	public function onUpdate($type){
 		if($type === Level::BLOCK_UPDATE_NORMAL){
 			if($this->getSide(0)->isTransparent === true){ //Replace with common break method
@@ -50,28 +55,11 @@ class TallGrass extends Flowable{
 	}
 
 	public function getDrops(Item $item){
-		$drops = [];
-		$possibleDrops = array(
-			array(Item::WHEAT_SEEDS, 0, 1),
-			array(Item::CARROT, 0, 1),
-			array(Item::POTATO, 0, 1),
-			array(Item::BEETROOT_SEEDS, 0, 1),
-			array(Item::MELON_SEEDS, 0, 1),
-			array(Item::PUMPKIN_SEEDS, 0, 1),
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-			0,
-		);
-		if(($item = $possibleDrops[mt_rand(0, count($possibleDrops) - 1)]) !== 0){
-			$drops[] = $item;
+		if(mt_rand(0, 15) === 0){
+			return [Item::WHEAT_SEEDS, 0, 1];
 		}
 
-		return $drops;
+		return [];
 	}
 
 }

src/pocketmine/block/Torch.php

@@ -31,10 +31,15 @@ class Torch extends Flowable{
 		$this->hardness = 0;
 	}
 
+	public function getBoundingBox(){
+		return null;
+	}
+
+
 	public function onUpdate($type){
 		if($type === Level::BLOCK_UPDATE_NORMAL){
 			$side = $this->getDamage();
-			$faces = array(
+			$faces = [
 				1 => 4,
 				2 => 5,
 				3 => 2,
@@ -42,7 +47,7 @@ class Torch extends Flowable{
 				5 => 0,
 				6 => 0,
 				0 => 0,
-			);
+			];
 
 			if($this->getSide($faces[$side])->isTransparent === true and !($side === 0 and $this->getSide(0)->getID() === self::FENCE)){ //Replace with common break method
 				//TODO
@@ -58,13 +63,13 @@ class Torch extends Flowable{
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		if($target->isTransparent === false and $face !== 0){
-			$faces = array(
+			$faces = [
 				1 => 5,
 				2 => 4,
 				3 => 3,
 				4 => 2,
 				5 => 1,
-			);
+			];
 			$this->meta = $faces[$face];
 			$this->getLevel()->setBlock($block, $this, true, false, true);
 
@@ -80,8 +85,8 @@ class Torch extends Flowable{
 	}
 
 	public function getDrops(Item $item){
-		return array(
-			array($this->id, 0, 1),
-		);
+		return [
+			[$this->id, 0, 1],
+		];
 	}
 }

src/pocketmine/block/Transparent.php

@@ -22,16 +22,13 @@
 namespace pocketmine\block;
 
 
-class Transparent extends Generic{
 
-	public function __construct($id, $meta = 0, $name = "Unknown"){
-		parent::__construct($id, $meta, $name);
-		$this->isActivable = false;
-		$this->breakable = true;
-		$this->isFlowable = false;
-		$this->isTransparent = true;
-		$this->isReplaceable = false;
-		$this->isPlaceable = true;
-		$this->isSolid = true;
-	}
+class Transparent extends Generic{
+	public $isActivable = false;
+	public $breakable = true;
+	public $isFlowable = false;
+	public $isTransparent = true;
+	public $isReplaceable = false;
+	public $isPlaceable = true;
+	public $isSolid = true;
 }