Updated RakLib protocol

Fix wrong size increasing code.

.gitmodules

@@ -12,3 +12,6 @@
 [submodule "tests/TesterPlugin"]
 	path = tests/TesterPlugin
 	url = https://github.com/PocketMine/TesterPlugin.git
+[submodule "src/pocketmine/lang/locale"]
+	path = src/pocketmine/lang/locale
+	url = https://github.com/PocketMine/PocketMine-Language.git

CONTRIBUTING.md

@@ -34,14 +34,13 @@ You must follow these guidelines if you wish to contribute to the PocketMine-MP
 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, 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.
+* Control structure keywords or opening braces MUST NOT have one space before or after them.
 * Code MUST use tabs for indenting.
 * Long arrays MAY be split across multiple lines, where each subsequent line is indented once. 
 * Files MUST use only the `<?php` tag.
 * Files MUST NOT have an ending `?>` tag.
 * Code MUST use namespaces.
 * Strings SHOULD use the double quote `"` except when the single quote is required.
-* Argument lists MAY NOT be split across multiple lines, except long arrays.
 
 ```php
 <?php 

src/pocketmine/Achievement.php

@@ -2,11 +2,11 @@
 
 /*
  *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
  * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
  *
  * 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
@@ -14,13 +14,14 @@
  * (at your option) any later version.
  *
  * @author PocketMine Team
-
- * 
+ * @link http://www.pocketmine.net/
+ *
  *
 */
 
 namespace pocketmine;
 
+use pocketmine\event\TranslationContainer;
 use pocketmine\utils\TextFormat;
 
 /**
@@ -106,10 +107,11 @@ abstract class Achievement{
 
 	public static function broadcast(Player $player, $achievementId){
 		if(isset(Achievement::$list[$achievementId])){
+			$translation = new TranslationContainer("chat.type.achievement", [$player->getDisplayName(), TextFormat::GREEN . Achievement::$list[$achievementId]["name"]]);
 			if(Server::getInstance()->getConfigString("announce-player-achievements", true) === true){
-				Server::getInstance()->broadcastMessage($player->getDisplayName() . " has just earned the achievement " . TextFormat::GREEN . Achievement::$list[$achievementId]["name"]);
+				Server::getInstance()->broadcastMessage($translation);
 			}else{
-				$player->sendMessage("You have just earned the achievement " . TextFormat::GREEN . Achievement::$list[$achievementId]["name"]);
+				$player->sendMessage($translation);
 			}
 
 			return true;

src/pocketmine/CrashDump.php

@@ -14,7 +14,7 @@
  * (at your option) any later version.
  *
  * @author PocketMine Team
-
+ * @link http://www.pocketmine.net/
  *
  *
 */

src/pocketmine/MemoryManager.php

@@ -0,0 +1,422 @@
+<?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;
+
+use pocketmine\event\server\LowMemoryEvent;
+use pocketmine\event\Timings;
+use pocketmine\scheduler\GarbageCollectionTask;
+use pocketmine\utils\Utils;
+use pocketmine\utils\UUID;
+
+class MemoryManager{
+
+	/** @var Server */
+	private $server;
+
+	private $memoryLimit;
+	private $globalMemoryLimit;
+	private $checkRate;
+	private $checkTicker = 0;
+	private $lowMemory = false;
+
+	private $continuousTrigger = true;
+	private $continuousTriggerRate;
+	private $continuousTriggerCount = 0;
+	private $continuousTriggerTicker = 0;
+
+	private $garbageCollectionPeriod;
+	private $garbageCollectionTicker = 0;
+	private $garbageCollectionTrigger;
+	private $garbageCollectionAsync;
+
+	private $chunkLimit;
+	private $chunkCollect;
+	private $chunkTrigger;
+
+	private $chunkCache;
+	private $cacheTrigger;
+
+	/** @var \WeakRef[] */
+	private $leakWatch = [];
+
+	private $leakInfo = [];
+
+	private $leakSeed = 0;
+
+	public function __construct(Server $server){
+		$this->server = $server;
+
+		$this->init();
+	}
+
+	private function init(){
+		$this->memoryLimit = ((int) $this->server->getProperty("memory.main-limit", 0)) * 1024 * 1024;
+
+		$defaultMemory = 1024;
+
+		if(preg_match("/([0-9]+)([KMGkmg])/", $this->server->getConfigString("memory-limit", ""), $matches) > 0){
+			$m = (int) $matches[1];
+			if($m <= 0){
+				$defaultMemory = 0;
+			}else{
+				switch(strtoupper($matches[2])){
+					case "K":
+						$defaultMemory = $m / 1024;
+						break;
+					case "M":
+						$defaultMemory = $m;
+						break;
+					case "G":
+						$defaultMemory = $m * 1024;
+						break;
+					default:
+						$defaultMemory = $m;
+						break;
+				}
+			}
+		}
+
+		$hardLimit = ((int) $this->server->getProperty("memory.main-hard-limit", $defaultMemory));
+
+		if($hardLimit <= 0){
+			ini_set("memory_limit", -1);
+		}else{
+			ini_set("memory_limit", $hardLimit . "M");
+		}
+
+		$this->globalMemoryLimit = ((int) $this->server->getProperty("memory.global-limit", 0)) * 1024 * 1024;
+		$this->checkRate = (int) $this->server->getProperty("memory.check-rate", 20);
+		$this->continuousTrigger = (bool) $this->server->getProperty("memory.continuous-trigger", true);
+		$this->continuousTriggerRate = (int) $this->server->getProperty("memory.continuous-trigger-rate", 30);
+
+		$this->garbageCollectionPeriod = (int) $this->server->getProperty("memory.garbage-collection.period", 36000);
+		$this->garbageCollectionTrigger = (bool) $this->server->getProperty("memory.garbage-collection.low-memory-trigger", true);
+		$this->garbageCollectionAsync = (bool) $this->server->getProperty("memory.garbage-collection.collect-async-worker", true);
+
+		$this->chunkLimit = (int) $this->server->getProperty("memory.max-chunks.trigger-limit", 96);
+		$this->chunkCollect = (bool) $this->server->getProperty("memory.max-chunks.trigger-chunk-collect", true);
+		$this->chunkTrigger = (bool) $this->server->getProperty("memory.max-chunks.low-memory-trigger", true);
+
+		$this->chunkCache = (bool) $this->server->getProperty("memory.world-caches.disable-chunk-cache", true);
+		$this->cacheTrigger = (bool) $this->server->getProperty("memory.world-caches.low-memory-trigger", true);
+
+		gc_enable();
+	}
+
+	public function isLowMemory(){
+		return $this->lowMemory;
+	}
+
+	public function canUseChunkCache(){
+		return !($this->lowMemory and $this->chunkTrigger);
+	}
+
+	public function getViewDistance($distance){
+		return $this->lowMemory ? min($this->chunkLimit, $distance) : $distance;
+	}
+
+	public function trigger($memory, $limit, $global = false, $triggerCount = 0){
+		$this->server->getLogger()->debug("[Memory Manager] ".($global ? "Global " : "") ."Low memory triggered, limit ". round(($limit / 1024) / 1024, 2)."MB, using ". round(($memory / 1024) / 1024, 2)."MB");
+
+		if($this->cacheTrigger){
+			foreach($this->server->getLevels() as $level){
+				$level->clearCache(true);
+			}
+		}
+
+		if($this->chunkTrigger and $this->chunkCollect){
+			foreach($this->server->getLevels() as $level){
+				$level->doChunkGarbageCollection();
+			}
+		}
+
+		$ev = new LowMemoryEvent($memory, $limit, $global, $triggerCount);
+		$this->server->getPluginManager()->callEvent($ev);
+
+		$cycles = 0;
+		if($this->garbageCollectionTrigger){
+			$cycles = $this->triggerGarbageCollector();
+		}
+
+		$this->server->getLogger()->debug("[Memory Manager] Freed " . round(($ev->getMemoryFreed() / 1024) / 1024, 2)."MB, $cycles cycles");
+	}
+
+	public function check(){
+		Timings::$memoryManagerTimer->startTiming();
+
+		if(($this->memoryLimit > 0 or $this->globalMemoryLimit > 0) and ++$this->checkTicker >= $this->checkRate){
+			$this->checkTicker = 0;
+			$memory = Utils::getMemoryUsage(true);
+			$trigger = false;
+			if($this->memoryLimit > 0 and $memory[0] > $this->memoryLimit){
+				$trigger = 0;
+			}elseif($this->globalMemoryLimit > 0 and $memory[1] > $this->globalMemoryLimit){
+				$trigger = 1;
+			}
+
+			if($trigger !== false){
+				if($this->lowMemory and $this->continuousTrigger){
+					if(++$this->continuousTriggerTicker >= $this->continuousTriggerRate){
+						$this->continuousTriggerTicker = 0;
+						$this->trigger($memory[$trigger], $this->memoryLimit, $trigger > 0, ++$this->continuousTriggerCount);
+					}
+				}else{
+					$this->lowMemory = true;
+					$this->continuousTriggerCount = 0;
+					$this->trigger($memory[$trigger], $this->memoryLimit, $trigger > 0);
+				}
+			}else{
+				$this->lowMemory = false;
+			}
+		}
+
+		if($this->garbageCollectionPeriod > 0 and ++$this->garbageCollectionTicker >= $this->garbageCollectionPeriod){
+			$this->garbageCollectionTicker = 0;
+			$this->triggerGarbageCollector();
+		}
+
+		Timings::$memoryManagerTimer->stopTiming();
+	}
+
+	public function triggerGarbageCollector(){
+		Timings::$garbageCollectorTimer->startTiming();
+
+		if($this->garbageCollectionAsync){
+			$size = $this->server->getScheduler()->getAsyncTaskPoolSize();
+			for($i = 0; $i < $size; ++$i){
+				$this->server->getScheduler()->scheduleAsyncTaskToWorker(new GarbageCollectionTask(), $i);
+			}
+		}
+
+		$cycles = gc_collect_cycles();
+
+		Timings::$garbageCollectorTimer->stopTiming();
+
+		return $cycles;
+	}
+
+	/**
+	 * @param object $object
+	 *
+	 * @return string Object identifier for future checks
+	 */
+	public function addObjectWatcher($object){
+		if(!is_object($object)){
+			throw new \InvalidArgumentException("Not an object!");
+		}
+
+
+		$identifier = spl_object_hash($object) . ":" . get_class($object);
+
+		if(isset($this->leakInfo[$identifier])){
+			return $this->leakInfo["id"];
+		}
+
+		$this->leakInfo[$identifier] = [
+			"id" => $id = md5($identifier . ":" . $this->leakSeed++),
+			"class" => get_class($object),
+			"hash" => $identifier
+		];
+		$this->leakInfo[$id] = $this->leakInfo[$identifier];
+
+		$this->leakWatch[$id] = new \WeakRef($object);
+
+		return $id;
+	}
+
+	public function isObjectAlive($id){
+		if(isset($this->leakWatch[$id])){
+			return $this->leakWatch[$id]->valid();
+		}
+
+		return false;
+	}
+
+	public function removeObjectWatch($id){
+		if(!isset($this->leakWatch[$id])){
+			return;
+		}
+		unset($this->leakInfo[$this->leakInfo[$id]["hash"]]);
+		unset($this->leakInfo[$id]);
+		unset($this->leakWatch[$id]);
+	}
+
+	public function doObjectCleanup(){
+		foreach($this->leakWatch as $id => $w){
+			if(!$w->valid()){
+				$this->removeObjectWatch($id);
+			}
+		}
+	}
+
+	public function getObjectInformation($id, $includeObject = false){
+		if(!isset($this->leakWatch[$id])){
+			return null;
+		}
+
+		$valid = false;
+		$references = 0;
+		$object = null;
+
+		if($this->leakWatch[$id]->acquire()){
+			$object = $this->leakWatch[$id]->get();
+			$this->leakWatch[$id]->release();
+
+			$valid = true;
+			$references = getReferenceCount($object, false);
+		}
+
+		return [
+			"id" => $id,
+			"class" => $this->leakInfo[$id]["class"],
+			"hash" => $this->leakInfo[$id]["hash"],
+			"valid" => $valid,
+			"references" => $references,
+			"object" => $includeObject ? $object : null
+		];
+	}
+
+	public function dumpServerMemory($outputFolder, $maxNesting, $maxStringSize){
+		gc_disable();
+
+		if(!file_exists($outputFolder)){
+			mkdir($outputFolder, 0777, true);
+		}
+
+		$this->server->getLogger()->notice("[Dump] After the memory dump is done, the server might crash");
+
+		$obData = fopen($outputFolder . "/objects.js", "wb+");
+
+		$staticProperties = [];
+
+		$data = [];
+
+		$objects = [];
+
+		$refCounts = [];
+
+		$this->continueDump($this->server, $data, $objects, $refCounts, 0, $maxNesting, $maxStringSize);
+
+		do{
+			$continue = false;
+			foreach($objects as $hash => $object){
+				if(!is_object($object)){
+					continue;
+				}
+				$continue = true;
+
+				$className = get_class($object);
+
+				$objects[$hash] = true;
+
+				$reflection = new \ReflectionObject($object);
+
+				$info = [
+					"information" => "$hash@$className",
+					"properties" => []
+				];
+
+				if($reflection->getParentClass()){
+					$info["parent"] = $reflection->getParentClass()->getName();
+				}
+
+				if(count($reflection->getInterfaceNames()) > 0){
+					$info["implements"] = implode(", ", $reflection->getInterfaceNames());
+				}
+
+				foreach($reflection->getProperties() as $property){
+					if($property->isStatic()){
+						continue;
+					}
+
+					if(!$property->isPublic()){
+						$property->setAccessible(true);
+					}
+					$this->continueDump($property->getValue($object), $info["properties"][$property->getName()], $objects, $refCounts, 0, $maxNesting, $maxStringSize);
+				}
+
+				fwrite($obData, "$hash@$className: ". json_encode($info, JSON_UNESCAPED_SLASHES) . "\n");
+
+				if(!isset($objects["staticProperties"][$className])){
+					$staticProperties[$className] = [];
+					foreach($reflection->getProperties() as $property){
+						if(!$property->isStatic() or $property->getDeclaringClass()->getName() !== $className){
+							continue;
+						}
+
+						if(!$property->isPublic()){
+							$property->setAccessible(true);
+						}
+						$this->continueDump($property->getValue($object), $staticProperties[$className][$property->getName()], $objects, $refCounts, 0, $maxNesting, $maxStringSize);
+					}
+				}
+			}
+
+			echo "[Dump] Wrote " . count($objects) . " objects\n";
+		}while($continue);
+
+		file_put_contents($outputFolder . "/staticProperties.js", json_encode($staticProperties, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
+		file_put_contents($outputFolder . "/serverEntry.js", json_encode($data, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
+		file_put_contents($outputFolder . "/referenceCounts.js", json_encode($refCounts, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
+
+		echo "[Dump] Finished!\n";
+
+		gc_enable();
+
+		$this->server->forceShutdown();
+	}
+
+	private function continueDump($from, &$data, &$objects, &$refCounts, $recursion, $maxNesting, $maxStringSize){
+		if($maxNesting <= 0){
+			$data = "(error) NESTING LIMIT REACHED";
+			return;
+		}
+
+		--$maxNesting;
+
+		if(is_object($from)){
+			if(!isset($objects[$hash = spl_object_hash($from)])){
+				$objects[$hash] = $from;
+				$refCounts[$hash] = 0;
+			}
+
+			++$refCounts[$hash];
+
+			$data = "(object) $hash@" . get_class($from);
+		}elseif(is_array($from)){
+			if($recursion >= 5){
+				$data = "(error) ARRAY RECURSION LIMIT REACHED";
+				return;
+			}
+			$data = [];
+			foreach($from as $key => $value){
+				$this->continueDump($value, $data[$key], $objects, $refCounts, $recursion + 1, $maxNesting, $maxStringSize);
+			}
+		}elseif(is_string($from)){
+			$data = "(string) len(".strlen($from).") " . substr(Utils::printable($from), 0, $maxStringSize);
+		}elseif(is_resource($from)){
+			$data = "(resource) " . print_r($from, true);
+		}else{
+			$data = $from;
+		}
+	}
+}

src/pocketmine/PocketMine.php

@@ -34,7 +34,7 @@ namespace {
 					}
 					echo str_repeat("  ", $cnt) . "}" . PHP_EOL;
 					break;
-				case is_integer($var):
+				case is_int($var):
 					echo str_repeat("  ", $cnt) . "int(" . $var . ")" . PHP_EOL;
 					break;
 				case is_float($var):
@@ -67,13 +67,16 @@ namespace {
 namespace pocketmine {
 	use pocketmine\utils\Binary;
 	use pocketmine\utils\MainLogger;
+	use pocketmine\utils\ServerKiller;
+	use pocketmine\utils\Terminal;
 	use pocketmine\utils\Utils;
 	use pocketmine\wizard\Installer;
 
-	const VERSION = "1.4.1dev";
-	const API_VERSION = "1.11.0";
-	const CODENAME = "絶好(Zekkou)ケーキ(Cake)";
-	const MINECRAFT_VERSION = "v0.10.4 alpha";
+	const VERSION = "1.5dev";
+	const API_VERSION = "1.12.0";
+	const CODENAME = "活発(Kappatsu)フグ(Fugu)";
+	const MINECRAFT_VERSION = "v0.11.0 alpha";
+	const MINECRAFT_VERSION_NETWORK = "0.11.0";
 
 	/*
 	 * Startup code. Do not look at it, it may harm you.
@@ -95,6 +98,7 @@ namespace pocketmine {
 	}
 
 	if(!class_exists("ClassLoader", false)){
+		require_once(\pocketmine\PATH . "src/spl/ThreadedFactory.php");
 		require_once(\pocketmine\PATH . "src/spl/ClassLoader.php");
 		require_once(\pocketmine\PATH . "src/spl/BaseClassLoader.php");
 		require_once(\pocketmine\PATH . "src/pocketmine/CompatibleClassLoader.php");
@@ -103,7 +107,6 @@ namespace pocketmine {
 	$autoloader = new CompatibleClassLoader();
 	$autoloader->addPath(\pocketmine\PATH . "src");
 	$autoloader->addPath(\pocketmine\PATH . "src" . DIRECTORY_SEPARATOR . "spl");
-	$autoloader->addPath(\pocketmine\PATH . "src" . DIRECTORY_SEPARATOR . "raklib");
 	$autoloader->register(true);
 
 
@@ -116,16 +119,17 @@ namespace pocketmine {
 	ini_set("display_startup_errors", 1);
 	ini_set("default_charset", "utf-8");
 
-	ini_set("memory_limit", "256M"); //Default
+	ini_set("memory_limit", -1);
 	define("pocketmine\\START_TIME", microtime(true));
 
-	$opts = getopt("", ["enable-ansi", "disable-ansi", "data:", "plugins:", "no-wizard", "enable-profiler"]);
+	$opts = getopt("", ["data:", "plugins:", "no-wizard", "enable-profiler"]);
 
 	define("pocketmine\\DATA", isset($opts["data"]) ? $opts["data"] . DIRECTORY_SEPARATOR : \getcwd() . DIRECTORY_SEPARATOR);
 	define("pocketmine\\PLUGIN_PATH", isset($opts["plugins"]) ? $opts["plugins"] . DIRECTORY_SEPARATOR : \getcwd() . DIRECTORY_SEPARATOR . "plugins" . DIRECTORY_SEPARATOR);
 
-	define("pocketmine\\ANSI", (Utils::getOS() !== "win" or isset($opts["enable-ansi"])) and !isset($opts["disable-ansi"]));
+	Terminal::init();
 
+	define("pocketmine\\ANSI", Terminal::hasFormattingCodes());
 
 	if(!file_exists(\pocketmine\DATA)){
 		mkdir(\pocketmine\DATA, 0777, true);
@@ -312,6 +316,24 @@ namespace pocketmine {
 		}
 	}
 
+	/**
+	 * @param object $value
+	 * @param bool   $includeCurrent
+	 *
+	 * @return int
+	 */
+	function getReferenceCount($value, $includeCurrent = true){
+		ob_start();
+		debug_zval_dump($value);
+		$ret = explode("\n", ob_get_contents());
+		ob_end_clean();
+
+		if(count($ret) >= 1 and preg_match('/^.* refcount\\(([0-9]+)\\)\\{$/', trim($ret[0]), $m) > 0){
+			return ((int) $m[1]) - ($includeCurrent ? 3 : 4); //$value + zval call + extra call
+		}
+		return -1;
+	}
+
 	function getTrace($start = 1, $trace = null){
 		if($trace === null){
 			if(function_exists("xdebug_get_function_stack")){
@@ -333,10 +355,10 @@ namespace pocketmine {
 					$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) . " " . (is_array($value) ? "Array()" : @strval($value))) . ", ";
+					$params .= (is_object($value) ? get_class($value) . " " . (method_exists($value, "__toString") ? $value->__toString() : "object") : gettype($value) . " " . (is_array($value) ? "Array()" : Utils::printable(@strval($value)))) . ", ";
 				}
 			}
-			$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) . ")";
+			$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"] . "(" . Utils::printable(substr($params, 0, -2)) . ")";
 		}
 
 		return $messages;
@@ -444,30 +466,19 @@ namespace pocketmine {
 	$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();
-				sleep(1);
-				if($thread->isRunning()){
-					$thread->detach();
-				}
-			}elseif($thread instanceof Worker){
-				$thread->kill();
-				sleep(1);
-				if($thread->isRunning()){
-					$thread->detach();
-				}
-			}
-		}elseif(!$thread->isJoined()){
-			$logger->debug("Joining " . (new \ReflectionClass($thread))->getShortName() . " thread");
-			$thread->join();
-		}
+		$logger->debug("Stopping " . (new \ReflectionClass($thread))->getShortName() . " thread");
+		$thread->quit();
 	}
 
+	$killer = new ServerKiller(8);
+	$killer->start();
+	$killer->detach();
+
 	$logger->shutdown();
 	$logger->join();
 
+	echo Terminal::$FORMAT_RESET . "\n";
+
 	exit(0);
 
 }

src/pocketmine/Thread.php

@@ -26,13 +26,66 @@ namespace pocketmine;
  */
 abstract class Thread extends \Thread{
 
+	/** @var \ClassLoader */
+	protected $classLoader;
+
+	public function getClassLoader(){
+		return $this->classLoader;
+	}
+
+	public function setClassLoader(\ClassLoader $loader = null){
+		if($loader === null){
+			$loader = Server::getInstance()->getLoader();
+		}
+		$this->classLoader = $loader;
+	}
+
+	public function registerClassLoader(){
+		if(!interface_exists("ClassLoader", false)){
+			require(\pocketmine\PATH . "src/spl/ClassLoader.php");
+			require(\pocketmine\PATH . "src/spl/BaseClassLoader.php");
+			require(\pocketmine\PATH . "src/pocketmine/CompatibleClassLoader.php");
+		}
+		if($this->classLoader !== null){
+			$this->classLoader->register(true);
+		}
+	}
+
 	public function start($options = PTHREADS_INHERIT_ALL){
 		ThreadManager::getInstance()->add($this);
 
 		if(!$this->isRunning() and !$this->isJoined() and !$this->isTerminated()){
+			if($this->getClassLoader() === null){
+				$this->setClassLoader();
+			}
 			return parent::start($options);
 		}
 
 		return false;
 	}
+
+	/**
+	 * Stops the thread using the best way possible. Try to stop it yourself before calling this.
+	 */
+	public function quit(){
+		if($this->isRunning()){
+			$this->kill();
+			$this->detach();
+		}elseif(!$this->isJoined()){
+			if(!$this->isTerminated()){
+				$this->join();
+			}else{
+				$this->kill();
+				$this->detach();
+			}
+		}else{
+			$this->detach();
+		}
+
+		ThreadManager::getInstance()->remove($this);
+	}
+
+	public function getThreadName(){
+		return (new \ReflectionClass($this))->getShortName();
+	}
 }

src/pocketmine/Worker.php

@@ -26,13 +26,67 @@ namespace pocketmine;
  */
 abstract class Worker extends \Worker{
 
+	/** @var \ClassLoader */
+	protected $classLoader;
+
+	public function getClassLoader(){
+		return $this->classLoader;
+	}
+
+	public function setClassLoader(\ClassLoader $loader = null){
+		if($loader === null){
+			$loader = Server::getInstance()->getLoader();
+		}
+		$this->classLoader = $loader;
+	}
+
+	public function registerClassLoader(){
+		if(!interface_exists("ClassLoader", false)){
+			require(\pocketmine\PATH . "src/spl/ClassLoader.php");
+			require(\pocketmine\PATH . "src/spl/BaseClassLoader.php");
+			require(\pocketmine\PATH . "src/pocketmine/CompatibleClassLoader.php");
+		}
+		if($this->classLoader !== null){
+			$this->classLoader->register(true);
+		}
+	}
+
 	public function start($options = PTHREADS_INHERIT_ALL){
 		ThreadManager::getInstance()->add($this);
 
-		if(!$this->isRunning() and !$this->isJoined() and !$this->isTerminated() and !$this->isShutdown()){
+		if(!$this->isRunning() and !$this->isJoined() and !$this->isTerminated()){
+			if($this->getClassLoader() === null){
+				$this->setClassLoader();
+			}
 			return parent::start($options);
 		}
 
 		return false;
 	}
+
+	/**
+	 * Stops the thread using the best way possible. Try to stop it yourself before calling this.
+	 */
+	public function quit(){
+		if($this->isRunning()){
+			$this->unstack();
+			$this->kill();
+			$this->detach();
+		}elseif(!$this->isJoined()){
+			if(!$this->isTerminated()){
+				$this->join();
+			}else{
+				$this->kill();
+				$this->detach();
+			}
+		}else{
+			$this->detach();
+		}
+
+		ThreadManager::getInstance()->remove($this);
+	}
+
+	public function getThreadName(){
+		return (new \ReflectionClass($this))->getShortName();
+	}
 }

src/pocketmine/block/AcaciaWoodStairs.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class AcaciaWoodStairs extends Stair{
 
@@ -40,4 +41,16 @@ class AcaciaWoodStairs extends Stair{
 			[$this->id, 0, 1],
 		];
 	}
+
+	public function getHardness(){
+		return 2;
+	}
+
+	public function getResistance(){
+		return 15;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_AXE;
+	}
 }

src/pocketmine/block/Air.php

@@ -40,6 +40,10 @@ class Air extends Transparent{
 		return "Air";
 	}
 
+	public function canPassThrough(){
+		return true;
+	}
+
 	public function isBreakable(Item $item){
 		return false;
 	}
@@ -64,4 +68,12 @@ class Air extends Transparent{
 		return null;
 	}
 
+	public function getHardness(){
+		return -1;
+	}
+
+	public function getResistance(){
+		return 0;
+	}
+
 }

src/pocketmine/block/Bed.php

@@ -24,8 +24,8 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 use pocketmine\level\Level;
 use pocketmine\math\AxisAlignedBB;
-use pocketmine\network\protocol\ChatPacket;
 use pocketmine\Player;
+use pocketmine\utils\TextFormat;
 
 class Bed extends Transparent{
 
@@ -40,7 +40,7 @@ class Bed extends Transparent{
 	}
 
 	public function getHardness(){
-		return 1;
+		return 0.2;
 	}
 
 	public function getName(){
@@ -65,10 +65,7 @@ class Bed extends Transparent{
 		$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);
-
+			$player->sendMessage(TextFormat::GRAY . "You can only sleep at night");
 			return true;
 		}
 
@@ -89,9 +86,7 @@ class Bed extends Transparent{
 				$b = $blockWest;
 			}else{
 				if($player instanceof Player){
-					$pk = new ChatPacket();
-					$pk->message = "This bed is incomplete";
-					$player->dataPacket($pk);
+					$player->sendMessage(TextFormat::GRAY . "This bed is incomplete");
 				}
 
 				return true;
@@ -99,9 +94,7 @@ class Bed extends Transparent{
 		}
 
 		if($player instanceof Player and $player->sleepOn($b) === false){
-			$pk = new ChatPacket();
-			$pk->message = "This bed is occupied";
-			$player->dataPacket($pk);
+			$player->sendMessage(TextFormat::GRAY . "This bed is occupied");
 		}
 
 		return true;

src/pocketmine/block/Bedrock.php

@@ -36,6 +36,10 @@ class Bedrock extends Solid{
 	}
 
 	public function getHardness(){
+		return -1;
+	}
+
+	public function getResistance(){
 		return 18000000;
 	}
 

src/pocketmine/block/BirchWoodStairs.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class BirchWoodStairs extends Stair{
 
@@ -40,4 +41,16 @@ class BirchWoodStairs extends Stair{
 			[$this->id, 0, 1],
 		];
 	}
+
+	public function getHardness(){
+		return 2;
+	}
+
+	public function getResistance(){
+		return 15;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_AXE;
+	}
 }

src/pocketmine/block/Block.php

@@ -25,9 +25,11 @@
 namespace pocketmine\block;
 
 use pocketmine\entity\Entity;
+use pocketmine\entity\Squid;
 use pocketmine\entity\Villager;
 use pocketmine\entity\Zombie;
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 use pocketmine\level\Level;
 use pocketmine\level\MovingObjectPosition;
 use pocketmine\level\Position;
@@ -85,6 +87,7 @@ class Block extends Position implements Metadatable{
 	const DANDELION = 37;
 	const ROSE = 38;
 	const POPPY = 38;
+	const RED_FLOWER = 38;
 	const BROWN_MUSHROOM = 39;
 	const RED_MUSHROOM = 40;
 	const GOLD_BLOCK = 41;
@@ -144,7 +147,6 @@ class Block extends Position implements Metadatable{
 	const SUGARCANE_BLOCK = 83;
 
 	const FENCE = 85;
-	const FENCE_OAK = 85;
 	const PUMPKIN = 86;
 	const NETHERRACK = 87;
 	const SOUL_SAND = 88;
@@ -157,6 +159,8 @@ class Block extends Position implements Metadatable{
 	const CAKE_BLOCK = 92;
 
 	const TRAPDOOR = 96;
+	const WOODEN_TRAPDOOR = 96;
+	const WOOD_TRAPDOOR = 96;
 
 	const STONE_BRICKS = 98;
 	const STONE_BRICK = 98;
@@ -174,7 +178,8 @@ class Block extends Position implements Metadatable{
 	const BRICK_STAIRS = 108;
 	const STONE_BRICK_STAIRS = 109;
 	const MYCELIUM = 110;
-
+	const WATER_LILY = 111;
+	const LILY_PAD = 111;
 	const NETHER_BRICKS = 112;
 	const NETHER_BRICK_BLOCK = 112;
 
@@ -201,6 +206,8 @@ class Block extends Position implements Metadatable{
 	const CARROT_BLOCK = 141;
 	const POTATO_BLOCK = 142;
 
+	const REDSTONE_BLOCK = 152;
+
 	const QUARTZ_BLOCK = 155;
 	const QUARTZ_STAIRS = 156;
 	const DOUBLE_WOOD_SLAB = 157;
@@ -236,11 +243,8 @@ class Block extends Position implements Metadatable{
 	const FENCE_GATE_JUNGLE = 185;
 	const FENCE_GATE_DARK_OAK = 186;
 	const FENCE_GATE_ACACIA = 187;
-	const FENCE_SPRUCE = 188;
-	const FENCE_BIRCH = 189;
-	const FENCE_JUNGLE = 190;
-	const FENCE_DARK_OAK = 191;
-	const FENCE_ACACIA = 192;
+
+	const GRASS_PATH = 198;
 
 	const PODZOL = 243;
 	const BEETROOT_BLOCK = 244;
@@ -248,286 +252,6 @@ class Block extends Position implements Metadatable{
 	const GLOWING_OBSIDIAN = 246;
 	const NETHER_REACTOR = 247;
 
-	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],
-		[Item::WOODEN_PLANKS, 2],
-		[Item::WOODEN_PLANKS, 3],
-		[Item::WOODEN_PLANKS, 4],
-		[Item::WOODEN_PLANKS, 5],
-		[Item::BRICKS, 0],
-
-		[Item::STONE, 0],
-		[Item::STONE, 1],
-		[Item::STONE, 2],
-		[Item::STONE, 3],
-		[Item::STONE, 4],
-		[Item::STONE, 5],
-		[Item::STONE, 6],
-		[Item::DIRT, 0],
-		[Item::PODZOL, 0],
-		[Item::GRASS, 0],
-		[Item::MYCELIUM, 0],
-		[Item::CLAY_BLOCK, 0],
-		[Item::HARDENED_CLAY, 0],
-		[Item::STAINED_CLAY, 0],
-		[Item::STAINED_CLAY, 7],
-		[Item::STAINED_CLAY, 6],
-		[Item::STAINED_CLAY, 5],
-		[Item::STAINED_CLAY, 4],
-		[Item::STAINED_CLAY, 3],
-		[Item::STAINED_CLAY, 2],
-		[Item::STAINED_CLAY, 1],
-		[Item::STAINED_CLAY, 15],
-		[Item::STAINED_CLAY, 14],
-		[Item::STAINED_CLAY, 13],
-		[Item::STAINED_CLAY, 12],
-		[Item::STAINED_CLAY, 11],
-		[Item::STAINED_CLAY, 10],
-		[Item::STAINED_CLAY, 9],
-		[Item::STAINED_CLAY, 8],
-		[Item::SANDSTONE, 0],
-		[Item::SANDSTONE, 1],
-		[Item::SANDSTONE, 2],
-		[Item::SAND, 0],
-		[Item::SAND, 1],
-		[Item::GRAVEL, 0],
-		[Item::TRUNK, 0],
-		[Item::TRUNK, 1],
-		[Item::TRUNK, 2],
-		[Item::TRUNK, 3],
-		[Item::TRUNK2, 0],
-		[Item::TRUNK2, 1],
-		[Item::NETHER_BRICKS, 0],
-		[Item::NETHERRACK, 0],
-		[Item::BEDROCK, 0],
-		[Item::COBBLESTONE_STAIRS, 0],
-		[Item::OAK_WOODEN_STAIRS, 0],
-		[Item::SPRUCE_WOODEN_STAIRS, 0],
-		[Item::BIRCH_WOODEN_STAIRS, 0],
-		[Item::JUNGLE_WOODEN_STAIRS, 0],
-		[Item::ACACIA_WOODEN_STAIRS, 0],
-		[Item::DARK_OAK_WOODEN_STAIRS, 0],
-		[Item::BRICK_STAIRS, 0],
-		[Item::SANDSTONE_STAIRS, 0],
-		[Item::STONE_BRICK_STAIRS, 0],
-		[Item::NETHER_BRICKS_STAIRS, 0],
-		[Item::QUARTZ_STAIRS, 0],
-		[Item::SLAB, 0],
-		[Item::SLAB, 1],
-		[Item::WOODEN_SLAB, 0],
-		[Item::WOODEN_SLAB, 1],
-		[Item::WOODEN_SLAB, 2],
-		[Item::WOODEN_SLAB, 3],
-		[Item::WOODEN_SLAB, 4],
-		[Item::WOODEN_SLAB, 5],
-		[Item::SLAB, 3],
-		[Item::SLAB, 4],
-		[Item::SLAB, 5],
-		[Item::SLAB, 6],
-		[Item::QUARTZ_BLOCK, 0],
-		[Item::QUARTZ_BLOCK, 1],
-		[Item::QUARTZ_BLOCK, 2],
-		[Item::COAL_ORE, 0],
-		[Item::IRON_ORE, 0],
-		[Item::GOLD_ORE, 0],
-		[Item::DIAMOND_ORE, 0],
-		[Item::LAPIS_ORE, 0],
-		[Item::REDSTONE_ORE, 0],
-		[Item::EMERALD_ORE, 0],
-		[Item::OBSIDIAN, 0],
-		[Item::ICE, 0],
-		[Item::SNOW_BLOCK, 0],
-		[Item::END_STONE, 0],
-
-		//Decoration
-		[Item::COBBLESTONE_WALL, 0],
-		[Item::COBBLESTONE_WALL, 1],
-		//TODO: Lilly Pad
-		[Item::GOLD_BLOCK, 0],
-		[Item::IRON_BLOCK, 0],
-		[Item::DIAMOND_BLOCK, 0],
-		[Item::LAPIS_BLOCK, 0],
-		[Item::COAL_BLOCK, 0],
-		[Item::EMERALD_BLOCK, 0],
-		[Item::SNOW_LAYER, 0],
-		[Item::GLASS, 0],
-		[Item::GLOWSTONE_BLOCK, 0],
-		[Item::VINES, 0],
-		[Item::NETHER_REACTOR, 0],
-		[Item::LADDER, 0],
-		[Item::SPONGE, 0],
-		[Item::GLASS_PANE, 0],
-		[Item::WOODEN_DOOR, 0],
-		[Item::TRAPDOOR, 0],
-		[Item::FENCE, 0],
-		[Item::FENCE_SPRUCE, 0],
-		[Item::FENCE_BIRCH, 0],
-		[Item::FENCE_DARK_OAK, 0],
-		[Item::FENCE_JUNGLE, 0],
-		[Item::FENCE_GATE, 0],
-		[Item::FENCE_GATE_BIRCH, 0],
-		[Item::FENCE_GATE_SPRUCE, 0],
-		[Item::FENCE_GATE_DARK_OAK, 0],
-		[Item::FENCE_GATE_JUNGLE, 0],
-		[Item::FENCE_GATE_ACACIA, 0],
-		[Item::IRON_BARS, 0],
-		[Item::BED, 0],
-		[Item::BOOKSHELF, 0],
-		[Item::PAINTING, 0],
-		[Item::WORKBENCH, 0],
-		[Item::STONECUTTER, 0],
-		[Item::CHEST, 0],
-		[Item::FURNACE, 0],
-		[Item::END_PORTAL, 0],
-		[Item::DANDELION, 0],
-		[Item::POPPY, 0],
-		//TODO: blue orchid
-		//TODO: Allium
-		//TODO: Azure Bluet
-		//TODO: Red Tulip
-		//TODO: Orange Tulip
-		//TODO: White Tulip
-		//TODO: Pink Tulip
-		//TODO: Oxeye Daisy
-		//TODO: Lilac
-		//TODO: Double Tallgrass
-		//TODO: Large Fern
-		//TODO: Rose Bush
-		//TODO: Peony
-		[Item::BROWN_MUSHROOM, 0],
-		[Item::RED_MUSHROOM, 0],
-		//TODO: Mushroom block (brown, cover)
-		//TODO: Mushroom block (red, cover)
-		//TODO: Mushroom block (brown, stem)
-		//TODO: Mushroom block (red, stem)
-		[Item::CACTUS, 0],
-		[Item::MELON_BLOCK, 0],
-		[Item::PUMPKIN, 0],
-		[Item::LIT_PUMPKIN, 0],
-		[Item::COBWEB, 0],
-		[Item::HAY_BALE, 0],
-		[Item::TALL_GRASS, 1],
-		[Item::TALL_GRASS, 2],
-		[Item::DEAD_BUSH, 0],
-		[Item::SAPLING, 0],
-		[Item::SAPLING, 1],
-		[Item::SAPLING, 2],
-		[Item::SAPLING, 3],
-		[Item::SAPLING, 4],
-		[Item::SAPLING, 5],
-		[Item::LEAVES, 0],
-		[Item::LEAVES, 1],
-		[Item::LEAVES, 2],
-		[Item::LEAVES, 3],
-		[Item::LEAVES, 3],
-		[Item::LEAVES2, 0],
-		[Item::LEAVES2, 1],
-		[Item::CAKE, 0],
-		[Item::SIGN, 0],
-		[Item::MONSTER_SPAWNER, 0],
-		[Item::WOOL, 0],
-		[Item::WOOL, 7],
-		[Item::WOOL, 6],
-		[Item::WOOL, 5],
-		[Item::WOOL, 4],
-		[Item::WOOL, 3],
-		[Item::WOOL, 2],
-		[Item::WOOL, 1],
-		[Item::WOOL, 15],
-		[Item::WOOL, 14],
-		[Item::WOOL, 13],
-		[Item::WOOL, 12],
-		[Item::WOOL, 11],
-		[Item::WOOL, 10],
-		[Item::WOOL, 9],
-		[Item::WOOL, 8],
-		[Item::CARPET, 0],
-		[Item::CARPET, 7],
-		[Item::CARPET, 6],
-		[Item::CARPET, 5],
-		[Item::CARPET, 4],
-		[Item::CARPET, 3],
-		[Item::CARPET, 2],
-		[Item::CARPET, 1],
-		[Item::CARPET, 15],
-		[Item::CARPET, 14],
-		[Item::CARPET, 13],
-		[Item::CARPET, 12],
-		[Item::CARPET, 11],
-		[Item::CARPET, 10],
-		[Item::CARPET, 9],
-		[Item::CARPET, 8],
-
-		//Tools
-		//TODO [Item::RAILS, 0],
-		//TODO [Item::POWERED_RAILS, 0],
-		[Item::TORCH, 0],
-		[Item::BUCKET, 0],
-		[Item::BUCKET, 8],
-		[Item::BUCKET, 10],
-		[Item::TNT, 0],
-		[Item::IRON_HOE, 0],
-		[Item::IRON_SWORD, 0],
-		[Item::BOW, 0],
-		[Item::SHEARS, 0],
-		[Item::FLINT_AND_STEEL, 0],
-		[Item::CLOCK, 0],
-		[Item::COMPASS, 0],
-		[Item::MINECART, 0],
-		[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
-		//TODO: Enderman
-		//TODO: Silverfish
-		//TODO: Skeleton
-		//TODO: Slime
-		[Item::SPAWN_EGG, Zombie::NETWORK_ID],
-		//TODO: PigZombie
-		//TODO: Replace with Entity constants
-
-
-		//Seeds
-		[Item::SUGARCANE, 0],
-		[Item::WHEAT, 0],
-		[Item::SEEDS, 0],
-		[Item::MELON_SEEDS, 0],
-		[Item::PUMPKIN_SEEDS, 0],
-		[Item::CARROT, 0],
-		[Item::POTATO, 0],
-		[Item::BEETROOT_SEEDS, 0],
-		[Item::EGG, 0],
-		[Item::DYE, 0],
-		[Item::DYE, 7],
-		[Item::DYE, 6],
-		[Item::DYE, 5],
-		[Item::DYE, 4],
-		[Item::DYE, 3],
-		[Item::DYE, 2],
-		[Item::DYE, 1],
-		[Item::DYE, 15],
-		[Item::DYE, 14],
-		[Item::DYE, 13],
-		[Item::DYE, 12],
-		[Item::DYE, 11],
-		[Item::DYE, 10],
-		[Item::DYE, 9],
-		[Item::DYE, 8],
-
-	];
-
 	/** @var \SplFixedArray */
 	public static $list = null;
 	/** @var \SplFixedArray */
@@ -548,7 +272,7 @@ class Block extends Position implements Metadatable{
 	protected $meta = 0;
 
 	/** @var AxisAlignedBB */
-	protected $boundingBox = null;
+	public $boundingBox = null;
 
 	/**
 	 * Backwards-compatibility with old way to define block properties
@@ -615,7 +339,7 @@ class Block extends Position implements Metadatable{
 			self::$list[self::DEAD_BUSH] = DeadBush::class;
 			self::$list[self::WOOL] = Wool::class;
 			self::$list[self::DANDELION] = Dandelion::class;
-			self::$list[self::POPPY] = Poppy::class;
+			self::$list[self::RED_FLOWER] = Flower::class;
 			self::$list[self::BROWN_MUSHROOM] = BrownMushroom::class;
 			self::$list[self::RED_MUSHROOM] = RedMushroom::class;
 			self::$list[self::GOLD_BLOCK] = Gold::class;
@@ -682,6 +406,7 @@ class Block extends Position implements Metadatable{
 			self::$list[self::STONE_BRICK_STAIRS] = StoneBrickStairs::class;
 
 			self::$list[self::MYCELIUM] = Mycelium::class;
+			self::$list[self::WATER_LILY] = WaterLily::class;
 			self::$list[self::NETHER_BRICKS] = NetherBrick::class;
 
 			self::$list[self::NETHER_BRICKS_STAIRS] = NetherBrickStairs::class;
@@ -700,6 +425,8 @@ class Block extends Position implements Metadatable{
 			self::$list[self::CARROT_BLOCK] = Carrot::class;
 			self::$list[self::POTATO_BLOCK] = Potato::class;
 
+			self::$list[self::REDSTONE_BLOCK] = Redstone::class;
+
 			self::$list[self::QUARTZ_BLOCK] = Quartz::class;
 			self::$list[self::QUARTZ_STAIRS] = QuartzStairs::class;
 			self::$list[self::DOUBLE_WOOD_SLAB] = DoubleWoodSlab::class;
@@ -723,11 +450,8 @@ class Block extends Position implements Metadatable{
 			self::$list[self::FENCE_GATE_JUNGLE] = FenceGateJungle::class;
 			self::$list[self::FENCE_GATE_DARK_OAK] = FenceGateDarkOak::class;
 			self::$list[self::FENCE_GATE_ACACIA] = FenceGateAcacia::class;
-			self::$list[self::FENCE_SPRUCE] = FenceSpruce::class;
-			self::$list[self::FENCE_BIRCH] = FenceBirch::class;
-			self::$list[self::FENCE_DARK_OAK] = FenceDarkOak::class;
-			self::$list[self::FENCE_JUNGLE] = FenceJungle::class;
-			self::$list[self::FENCE_ACACIA] = FenceAcacia::class;
+
+			self::$list[self::GRASS_PATH] = GrassPath::class;
 
 			self::$list[self::PODZOL] = Podzol::class;
 			self::$list[self::BEETROOT_BLOCK] = Beetroot::class;
@@ -880,6 +604,20 @@ class Block extends Position implements Metadatable{
 		return 10;
 	}
 
+	/**
+	 * @return int
+	 */
+	public function getResistance(){
+		return $this->getHardness() * 5;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getToolType(){
+		return Tool::TYPE_NONE;
+	}
+
 	/**
 	 * @return float
 	 */
@@ -945,6 +683,10 @@ class Block extends Position implements Metadatable{
 		return false;
 	}
 
+	public function canPassThrough(){
+		return false;
+	}
+
 	/**
 	 * @return string
 	 */
@@ -998,11 +740,11 @@ class Block extends Position implements Metadatable{
 	 * @return array
 	 */
 	public function getDrops(Item $item){
-		if(!isset(self::$list[$this->id])){ //Unknown blocks
+		if(!isset(self::$list[$this->getId()])){ //Unknown blocks
 			return [];
 		}else{
 			return [
-				[$this->id, $this->meta, 1],
+				[$this->getId(), $this->getDamage(), 1],
 			];
 		}
 	}
@@ -1015,7 +757,42 @@ class Block extends Position implements Metadatable{
 	 * @return float
 	 */
 	public function getBreakTime(Item $item){
-		return 0.20;
+		$base = $this->getHardness() * 1.5;
+		if($this->canBeBrokenWith($item)){
+			if($this->getToolType() === Tool::TYPE_SHEARS and $item->isShears()){
+				$base /= 15;
+			}elseif(
+				($this->getToolType() === Tool::TYPE_PICKAXE and ($tier = $item->isPickaxe()) !== false) or
+				($this->getToolType() === Tool::TYPE_AXE and ($tier = $item->isAxe()) !== false) or
+				($this->getToolType() === Tool::TYPE_SHOVEL and ($tier = $item->isShovel()) !== false)
+			){
+				switch($tier){
+					case Tool::TIER_WOODEN:
+						$base /= 2;
+						break;
+					case Tool::TIER_STONE:
+						$base /= 4;
+						break;
+					case Tool::TIER_IRON:
+						$base /= 6;
+						break;
+					case Tool::TIER_DIAMOND:
+						$base /= 8;
+						break;
+					case Tool::TIER_GOLD:
+						$base /= 12;
+						break;
+				}
+			}
+		}else{
+			$base *= 3.33;
+		}
+
+		return $base;
+	}
+
+	public function canBeBrokenWith(Item $item){
+		return $this->getHardness() !== -1;
 	}
 
 	/**
@@ -1038,20 +815,20 @@ class Block extends Position implements Metadatable{
 	 * @return string
 	 */
 	public function __toString(){
-		return "Block[" . $this->getName() . "] (" . $this->id . ":" . $this->meta . ")";
+		return "Block[" . $this->getName() . "] (" . $this->getId() . ":" . $this->getDamage() . ")";
 	}
 
 	/**
 	 * Checks for collision against an AxisAlignedBB
 	 *
 	 * @param AxisAlignedBB $bb
-	 * @param Block[]       $list
+	 *
+	 * @return bool
 	 */
-	public function collidesWithBB(AxisAlignedBB $bb, &$list = []){
+	public function collidesWithBB(AxisAlignedBB $bb){
 		$bb2 = $this->getBoundingBox();
-		if($bb2 !== null and $bb2->intersectsWith($bb)){
-			$list[] = $bb2;
-		}
+
+		return $bb2 !== null and $bb->intersectsWith($bb2);
 	}
 
 	/**
@@ -1065,11 +842,10 @@ class Block extends Position implements Metadatable{
 	 * @return AxisAlignedBB
 	 */
 	public function getBoundingBox(){
-		if($this->boundingBox !== null){
-			return $this->boundingBox;
-		}else{
-			return ($this->boundingBox = $this->recalculateBoundingBox());
+		if($this->boundingBox === null){
+			$this->boundingBox = $this->recalculateBoundingBox();
 		}
+		return $this->boundingBox;
 	}
 
 	/**
@@ -1086,6 +862,12 @@ class Block extends Position implements Metadatable{
 		);
 	}
 
+	/**
+	 * @param Vector3 $pos1
+	 * @param Vector3 $pos2
+	 *
+	 * @return MovingObjectPosition
+	 */
 	public function calculateIntercept(Vector3 $pos1, Vector3 $pos2){
 		$bb = $this->getBoundingBox();
 		if($bb === null){
@@ -1176,8 +958,10 @@ class Block extends Position implements Metadatable{
 
 	public function getMetadata($metadataKey){
 		if($this->getLevel() instanceof Level){
-			$this->getLevel()->getBlockMetadata()->getMetadata($this, $metadataKey);
+			return $this->getLevel()->getBlockMetadata()->getMetadata($this, $metadataKey);
 		}
+
+		return null;
 	}
 
 	public function hasMetadata($metadataKey){
@@ -1191,4 +975,4 @@ class Block extends Position implements Metadatable{
 			$this->getLevel()->getBlockMetadata()->removeMetadata($this, $metadataKey, $plugin);
 		}
 	}
-}
+}

src/pocketmine/block/Bookshelf.php

@@ -22,6 +22,8 @@
 namespace pocketmine\block;
 
 
+use pocketmine\item\Tool;
+
 class Bookshelf extends Solid{
 
 	protected $id = self::BOOKSHELF;
@@ -35,7 +37,11 @@ class Bookshelf extends Solid{
 	}
 
 	public function getHardness(){
-		return 7.5;
+		return 1.5;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_AXE;
 	}
 
 }

src/pocketmine/block/BrickStairs.php

@@ -22,6 +22,8 @@
 namespace pocketmine\block;
 
 
+use pocketmine\item\Tool;
+
 class BrickStairs extends Stair{
 
 	protected $id = self::BRICK_STAIRS;
@@ -30,6 +32,18 @@ class BrickStairs extends Stair{
 		$this->meta = $meta;
 	}
 
+	public function getHardness(){
+		return 2;
+	}
+
+	public function getResistance(){
+		return 30;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getName(){
 		return "Brick Stairs";
 	}

src/pocketmine/block/Bricks.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class Bricks extends Solid{
 
@@ -32,30 +33,21 @@ class Bricks extends Solid{
 	}
 
 	public function getHardness(){
+		return 2;
+	}
+
+	public function getResistance(){
 		return 30;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getName(){
 		return "Bricks";
 	}
 
-	public function getBreakTime(Item $item){
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.4;
-			case 4:
-				return 0.5;
-			case 3:
-				return 0.75;
-			case 2:
-				return 0.25;
-			case 1:
-				return 1.5;
-			default:
-				return 10;
-		}
-	}
-
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 1){
 			return [

src/pocketmine/block/BurningFurnace.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 use pocketmine\nbt\NBT;
 use pocketmine\nbt\tag\Compound;
 use pocketmine\nbt\tag\Enum;
@@ -48,7 +49,11 @@ class BurningFurnace extends Solid{
 	}
 
 	public function getHardness(){
-		return 17.5;
+		return 3.5;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
 	}
 
 	public function getLightLevel(){
@@ -64,7 +69,7 @@ class BurningFurnace extends Solid{
 		];
 		$this->meta = $faces[$player instanceof Player ? $player->getDirection() : 0];
 		$this->getLevel()->setBlock($block, $this, true, true);
-		$nbt = new Compound(false, [
+		$nbt = new Compound("", [
 			new Enum("Items", []),
 			new String("id", Tile::FURNACE),
 			new Int("x", $this->x),
@@ -90,7 +95,7 @@ class BurningFurnace extends Solid{
 			if($t instanceof Furnace){
 				$furnace = $t;
 			}else{
-				$nbt = new Compound(false, [
+				$nbt = new Compound("", [
 					new Enum("Items", []),
 					new String("id", Tile::FURNACE),
 					new Int("x", $this->x),
@@ -101,7 +106,7 @@ class BurningFurnace extends Solid{
 				$furnace = Tile::createTile("Furnace", $this->getLevel()->getChunk($this->x >> 4, $this->z >> 4), $nbt);
 			}
 
-			if(($player->getGamemode() & 0x01) === 0x01){
+			if($player->isCreative()){
 				return true;
 			}
 
@@ -111,23 +116,6 @@ class BurningFurnace extends Solid{
 		return true;
 	}
 
-	public function getBreakTime(Item $item){
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.7;
-			case 4:
-				return 0.9;
-			case 3:
-				return 1.35;
-			case 2:
-				return 0.45;
-			case 1:
-				return 2.65;
-			default:
-				return 17.5;
-		}
-	}
-
 	public function getDrops(Item $item){
 		$drops = [];
 		if($item->isPickaxe() >= 1){

src/pocketmine/block/Cactus.php

@@ -41,7 +41,7 @@ class Cactus extends Transparent{
 	}
 
 	public function getHardness(){
-		return 2;
+		return 0.4;
 	}
 
 	public function hasEntityCollision(){
@@ -56,10 +56,10 @@ class Cactus extends Transparent{
 
 		return new AxisAlignedBB(
 			$this->x + 0.0625,
-			$this->y,
+			$this->y + 0.0625,
 			$this->z + 0.0625,
 			$this->x + 0.9375,
-			$this->y + 1,
+			$this->y + 0.9375,
 			$this->z + 0.9375
 		);
 	}

src/pocketmine/block/Cake.php

@@ -41,7 +41,7 @@ class Cake extends Transparent{
 	}
 
 	public function getHardness(){
-		return 2.5;
+		return 0.5;
 	}
 
 	public function getName(){
@@ -90,12 +90,12 @@ class Cake extends Transparent{
 	}
 
 	public function onActivate(Item $item, Player $player = null){
-		if($player instanceof Player and $player->getHealth() < 20){
+		if($player instanceof Player and $player->getHealth() < $player->getMaxHealth()){
 			++$this->meta;
-			Server::getInstance()->getPluginManager()->callEvent($ev = new EntityRegainHealthEvent($player, 3, EntityRegainHealthEvent::CAUSE_EATING));
-			if(!$ev->isCancelled()){
-				$player->heal($ev->getAmount(), $ev);
-			}
+
+			$ev = new EntityRegainHealthEvent($player, 3, EntityRegainHealthEvent::CAUSE_EATING);
+			$player->heal($ev->getAmount(), $ev);
+
 			if($this->meta >= 0x06){
 				$this->getLevel()->setBlock($this, new Air(), true);
 			}else{

src/pocketmine/block/Carpet.php

@@ -34,6 +34,10 @@ class Carpet extends Flowable{
 		$this->meta = $meta;
 	}
 
+	public function getHardness(){
+		return 0.1;
+	}
+
 	public function isSolid(){
 		return true;
 	}

src/pocketmine/block/Chest.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\nbt\NBT;
 use pocketmine\nbt\tag\Compound;
@@ -45,13 +46,17 @@ class Chest extends Transparent{
 	}
 
 	public function getHardness(){
-		return 15;
+		return 2.5;
 	}
 
 	public function getName(){
 		return "Chest";
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_AXE;
+	}
+
 	protected function recalculateBoundingBox(){
 		return new AxisAlignedBB(
 			$this->x + 0.0625,
@@ -91,7 +96,7 @@ class Chest extends Transparent{
 		}
 
 		$this->getLevel()->setBlock($block, $this, true, true);
-		$nbt = new Compound(false, [
+		$nbt = new Compound("", [
 			new Enum("Items", []),
 			new String("id", Tile::CHEST),
 			new Int("x", $this->x),
@@ -131,7 +136,7 @@ class Chest extends Transparent{
 			if($t instanceof TileChest){
 				$chest = $t;
 			}else{
-				$nbt = new Compound(false, [
+				$nbt = new Compound("", [
 					new Enum("Items", []),
 					new String("id", Tile::CHEST),
 					new Int("x", $this->x),

src/pocketmine/block/Clay.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class Clay extends Solid{
 
@@ -32,7 +33,11 @@ class Clay extends Solid{
 	}
 
 	public function getHardness(){
-		return 3;
+		return 0.6;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_SHOVEL;
 	}
 
 	public function getName(){

src/pocketmine/block/Coal.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class Coal extends Solid{
 
@@ -32,30 +33,17 @@ class Coal extends Solid{
 	}
 
 	public function getHardness(){
-		return 30;
+		return 5;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
 	}
 
 	public function getName(){
 		return "Coal Block";
 	}
 
-	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){
 		if($item->isPickaxe() >= 1){
 			return [

src/pocketmine/block/CoalOre.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class CoalOre extends Solid{
 
@@ -32,30 +33,17 @@ class CoalOre extends Solid{
 	}
 
 	public function getHardness(){
-		return 15;
+		return 3;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
 	}
 
 	public function getName(){
 		return "Coal Ore";
 	}
 
-	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;
-		}
-	}
-
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 1){
 			return [

src/pocketmine/block/Cobblestone.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class Cobblestone extends Solid{
 
@@ -31,29 +32,16 @@ class Cobblestone extends Solid{
 
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getName(){
 		return "Cobblestone";
 	}
 
 	public function getHardness(){
-		return 30;
-	}
-
-	public function getBreakTime(Item $item){
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.4;
-			case 4:
-				return 0.5;
-			case 3:
-				return 0.75;
-			case 2:
-				return 0.25;
-			case 1:
-				return 1.5;
-			default:
-				return 10;
-		}
+		return 2;
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/CobblestoneStairs.php

@@ -22,6 +22,8 @@
 namespace pocketmine\block;
 
 
+use pocketmine\item\Tool;
+
 class CobblestoneStairs extends Stair{
 
 	protected $id = self::COBBLESTONE_STAIRS;
@@ -30,6 +32,14 @@ class CobblestoneStairs extends Stair{
 		$this->meta = $meta;
 	}
 
+	public function getHardness(){
+		return 2;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getName(){
 		return "Cobblestone Stairs";
 	}

src/pocketmine/block/Cobweb.php

@@ -23,6 +23,7 @@ namespace pocketmine\block;
 
 use pocketmine\entity\Entity;
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class Cobweb extends Flowable{
 
@@ -41,11 +42,15 @@ class Cobweb extends Flowable{
 	}
 
 	public function getHardness(){
-		return 25;
+		return 4;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_SWORD;
 	}
 
 	public function onEntityCollide(Entity $entity){
-		$entity->fallDistance = 0;
+		$entity->resetFallDistance();
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/DarkOakWoodStairs.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class DarkOakWoodStairs extends Stair{
 
@@ -35,6 +36,10 @@ class DarkOakWoodStairs extends Stair{
 		return "Dark Oak Wood Stairs";
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_AXE;
+	}
+
 	public function getDrops(Item $item){
 		return [
 			[$this->id, 0, 1],

src/pocketmine/block/Diamond.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class Diamond extends Solid{
 
@@ -32,22 +33,15 @@ class Diamond extends Solid{
 	}
 
 	public function getHardness(){
-		return 30;
+		return 5;
 	}
 
 	public function getName(){
 		return "Diamond Block";
 	}
 
-	public function getBreakTime(Item $item){
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.95;
-			case 4:
-				return 1.25;
-			default:
-				return 25;
-		}
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/DiamondOre.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class DiamondOre extends Solid{
 
@@ -32,22 +33,15 @@ class DiamondOre extends Solid{
 	}
 
 	public function getHardness(){
-		return 15;
+		return 3;
 	}
 
 	public function getName(){
 		return "Diamond Ore";
 	}
 
-	public function getBreakTime(Item $item){
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.6;
-			case 4:
-				return 0.75;
-			default:
-				return 15;
-		}
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/Dirt.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 use pocketmine\Player;
 
 class Dirt extends Solid{
@@ -37,7 +38,11 @@ class Dirt extends Solid{
 	}
 
 	public function getHardness(){
-		return 2.5;
+		return 0.5;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_SHOVEL;
 	}
 
 	public function getName(){

src/pocketmine/block/Door.php

@@ -23,7 +23,9 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\level\Level;
+use pocketmine\level\sound\DoorSound;
 use pocketmine\math\AxisAlignedBB;
+use pocketmine\math\Vector3;
 use pocketmine\network\protocol\LevelEventPacket;
 use pocketmine\Player;
 use pocketmine\Server;
@@ -41,19 +43,19 @@ abstract class Door extends Transparent{
 
 	private function getFullDamage(){
 		$damage = $this->getDamage();
-		$flag = ($damage & 0x08) > 0;
+		$isUp = ($damage & 0x08) > 0;
 
-		if($flag){
-			$first = $this->getSide(0)->getDamage();
-			$second = $damage;
+		if($isUp){
+			$down = $this->getSide(Vector3::SIDE_DOWN)->getDamage();
+			$up = $damage;
 		}else{
-			$first = $damage;
-			$second = $this->getSide(1)->getDamage();
+			$down = $damage;
+			$up = $this->getSide(Vector3::SIDE_UP)->getDamage();
 		}
 
-		$flag1 = ($second & 0x01) > 0;
+		$isRight = ($up & 0x01) > 0;
 
-		return $first & 0x07 | ($flag ? 8 : 0) | ($flag1 ? 0x10 : 0);
+		return $down & 0x07 | ($isUp ? 8 : 0) | ($isRight ? 0x10 : 0);
 	}
 
 	protected function recalculateBoundingBox(){
@@ -71,12 +73,12 @@ abstract class Door extends Transparent{
 		);
 
 		$j = $damage & 0x03;
-		$flag = (($damage & 0x04) > 0);
-		$flag1 = (($damage & 0x10) > 0);
+		$isOpen = (($damage & 0x04) > 0);
+		$isRight = (($damage & 0x10) > 0);
 
 		if($j === 0){
-			if($flag){
-				if(!$flag1){
+			if($isOpen){
+				if(!$isRight){
 					$bb->setBounds(
 						$this->x,
 						$this->y,
@@ -106,8 +108,8 @@ abstract class Door extends Transparent{
 				);
 			}
 		}elseif($j === 1){
-			if($flag){
-				if(!$flag1){
+			if($isOpen){
+				if(!$isRight){
 					$bb->setBounds(
 						$this->x + 1 - $f,
 						$this->y,
@@ -137,8 +139,8 @@ abstract class Door extends Transparent{
 				);
 			}
 		}elseif($j === 2){
-			if($flag){
-				if(!$flag1){
+			if($isOpen){
+				if(!$isRight){
 					$bb->setBounds(
 						$this->x,
 						$this->y,
@@ -168,8 +170,8 @@ abstract class Door extends Transparent{
 				);
 			}
 		}elseif($j === 3){
-			if($flag){
-				if(!$flag1){
+			if($isOpen){
+				if(!$isRight){
 					$bb->setBounds(
 						$this->x,
 						$this->y,
@@ -235,13 +237,13 @@ abstract class Door extends Transparent{
 			$next = $this->getSide($face[(($direction + 2) % 4)]);
 			$next2 = $this->getSide($face[$direction]);
 			$metaUp = 0x08;
-			if($next->getId() === $this->id or ($next2->isTransparent() === false and $next->isTransparent() === true)){ //Door hinge
+			if($next->getId() === $this->getId() or ($next2->isTransparent() === false and $next->isTransparent() === true)){ //Door hinge
 				$metaUp |= 0x01;
 			}
 
-			$this->meta = $player->getDirection() & 0x03;
+			$this->setDamage($player->getDirection() & 0x03);
 			$this->getLevel()->setBlock($block, $this, true, true); //Bottom
-			$this->getLevel()->setBlock($blockUp, $b = Block::get($this->id, $metaUp), true); //Top
+			$this->getLevel()->setBlock($blockUp, $b = Block::get($this->getId(), $metaUp), true); //Top
 			return true;
 		}
 
@@ -249,14 +251,14 @@ abstract class Door extends Transparent{
 	}
 
 	public function onBreak(Item $item){
-		if(($this->meta & 0x08) === 0x08){
+		if(($this->getDamage() & 0x08) === 0x08){
 			$down = $this->getSide(0);
-			if($down->getId() === $this->id){
+			if($down->getId() === $this->getId()){
 				$this->getLevel()->setBlock($down, new Air(), true);
 			}
 		}else{
 			$up = $this->getSide(1);
-			if($up->getId() === $this->id){
+			if($up->getId() === $this->getId()){
 				$this->getLevel()->setBlock($up, new Air(), true);
 			}
 		}
@@ -266,23 +268,17 @@ abstract class Door extends Transparent{
 	}
 
 	public function onActivate(Item $item, Player $player = null){
-		if(($this->meta & 0x08) === 0x08){ //Top
+		if(($this->getDamage() & 0x08) === 0x08){ //Top
 			$down = $this->getSide(0);
-			if($down->getId() === $this->id){
+			if($down->getId() === $this->getId()){
 				$meta = $down->getDamage() ^ 0x04;
-				$this->getLevel()->setBlock($down, Block::get($this->id, $meta), true);
-				$players = $this->getLevel()->getUsingChunk($this->x >> 4, $this->z >> 4);
+				$this->getLevel()->setBlock($down, Block::get($this->getId(), $meta), true);
+				$players = $this->getLevel()->getChunkPlayers($this->x >> 4, $this->z >> 4);
 				if($player instanceof Player){
-					unset($players[$player->getId()]);
+					unset($players[$player->getLoaderId()]);
 				}
-				$pk = new LevelEventPacket();
-				$pk->x = $this->x;
-				$pk->y = $this->y;
-				$pk->z = $this->z;
-				$pk->evid = 1003;
-				$pk->data = 0;
-				Server::broadcastPacket($players, $pk);
 
+				$this->level->addSound(new DoorSound($this));
 				return true;
 			}
 
@@ -290,17 +286,11 @@ abstract class Door extends Transparent{
 		}else{
 			$this->meta ^= 0x04;
 			$this->getLevel()->setBlock($this, $this, true);
-			$players = $this->getLevel()->getUsingChunk($this->x >> 4, $this->z >> 4);
+			$players = $this->getLevel()->getChunkPlayers($this->x >> 4, $this->z >> 4);
 			if($player instanceof Player){
-				unset($players[$player->getId()]);
+				unset($players[$player->getLoaderId()]);
 			}
-			$pk = new LevelEventPacket();
-			$pk->x = $this->x;
-			$pk->y = $this->y;
-			$pk->z = $this->z;
-			$pk->evid = 1003;
-			$pk->data = 0;
-			Server::broadcastPacket($players, $pk);
+			$this->level->addSound(new DoorSound($this));
 		}
 
 		return true;

src/pocketmine/block/DoubleSlab.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class DoubleSlab extends Solid{
 
@@ -32,7 +33,11 @@ class DoubleSlab extends Solid{
 	}
 
 	public function getHardness(){
-		return 30;
+		return 2;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
 	}
 
 	public function getName(){
@@ -49,23 +54,6 @@ class DoubleSlab extends Solid{
 		return "Double " . $names[$this->meta & 0x07] . " Slab";
 	}
 
-	public function getBreakTime(Item $item){
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.4;
-			case 4:
-				return 0.5;
-			case 3:
-				return 0.75;
-			case 2:
-				return 0.25;
-			case 1:
-				return 1.5;
-			default:
-				return 10;
-		}
-	}
-
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 1){
 			return [

src/pocketmine/block/DoubleWoodSlab.php

@@ -32,7 +32,11 @@ class DoubleWoodSlab extends Solid{
 	}
 
 	public function getHardness(){
-		return 15;
+		return 2;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_AXE;
 	}
 
 	public function getName(){
@@ -49,23 +53,6 @@ class DoubleWoodSlab extends Solid{
 		return "Double " . $names[$this->meta & 0x07] . " Wooden Slab";
 	}
 
-	public function getBreakTime(Item $item){
-		switch($item->isAxe()){
-			case 5:
-				return 0.4;
-			case 4:
-				return 0.5;
-			case 3:
-				return 0.75;
-			case 2:
-				return 0.25;
-			case 1:
-				return 1.5;
-			default:
-				return 3;
-		}
-	}
-
 	public function getDrops(Item $item){
 		return [
 			[Item::WOOD_SLAB, $this->meta & 0x07, 2],

src/pocketmine/block/Emerald.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class Emerald extends Solid{
 
@@ -32,24 +33,17 @@ class Emerald extends Solid{
 	}
 
 	public function getHardness(){
-		return 30;
+		return 5;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
 	}
 
 	public function getName(){
 		return "Emerald Block";
 	}
 
-	public function getBreakTime(Item $item){
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.95;
-			case 4:
-				return 1.25;
-			default:
-				return 25;
-		}
-	}
-
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 4){
 			return [

src/pocketmine/block/EmeraldOre.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class EmeraldOre extends Solid{
 
@@ -35,19 +36,12 @@ class EmeraldOre extends Solid{
 		return "Emerald Ore";
 	}
 
-	public function getHardness(){
-		return 15;
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
 	}
 
-	public function getBreakTime(Item $item){
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.6;
-			case 4:
-				return 0.75;
-			default:
-				return 15;
-		}
+	public function getHardness(){
+		return 3;
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/EndPortalFrame.php

@@ -41,6 +41,10 @@ class EndPortalFrame extends Solid{
 	}
 
 	public function getHardness(){
+		return -1;
+	}
+
+	public function getResistance(){
 		return 18000000;
 	}
 

src/pocketmine/block/EndStone.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class EndStone extends Solid{
 
@@ -35,24 +36,11 @@ class EndStone extends Solid{
 		return "End Stone";
 	}
 
-	public function getHardness(){
-		return 45;
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
 	}
 
-	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;
-		}
+	public function getHardness(){
+		return 3;
 	}
 }

src/pocketmine/block/Fallable.php

@@ -24,6 +24,7 @@ namespace pocketmine\block;
 use pocketmine\entity\Entity;
 use pocketmine\item\Item;
 use pocketmine\level\Level;
+use pocketmine\math\Vector3;
 use pocketmine\nbt\tag\Byte;
 use pocketmine\nbt\tag\Compound;
 use pocketmine\nbt\tag\Double;
@@ -42,7 +43,7 @@ abstract class Fallable extends Solid{
 
 	public function onUpdate($type){
 		if($type === Level::BLOCK_UPDATE_NORMAL){
-			$down = $this->getSide(0);
+			$down = $this->getSide(Vector3::SIDE_DOWN);
 			if($down->getId() === self::AIR or ($down instanceof Liquid)){
 				$fall = Entity::createEntity("FallingSand", $this->getLevel()->getChunk($this->x >> 4, $this->z >> 4), new Compound("", [
 					"Pos" => new Enum("Pos", [

src/pocketmine/block/Farmland.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 use pocketmine\math\AxisAlignedBB;
 
 class Farmland extends Solid{
@@ -37,7 +38,11 @@ class Farmland extends Solid{
 	}
 
 	public function getHardness(){
-		return 3;
+		return 0.6;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_SHOVEL;
 	}
 
 	protected function recalculateBoundingBox(){

src/pocketmine/block/Fence.php

@@ -21,48 +21,65 @@
 
 namespace pocketmine\block;
 
+use pocketmine\item\Tool;
 use pocketmine\math\AxisAlignedBB;
+use pocketmine\math\Vector3;
 
 class Fence extends Transparent{
 
 	protected $id = self::FENCE;
 
-	public function __construct(){
-
+	public function __construct($meta = 0){
+		$this->meta = $meta;
 	}
 
 	public function getHardness(){
-		return 15;
+		return 2;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
+
 	public function getName(){
-		return "Oak Fence";
+		static $names = [
+			0 => "Oak Fence",
+			1 => "Spruce Fence",
+			2 => "Birch Fence",
+			3 => "Jungle Fence",
+			4 => "Acacia Fence",
+			5 => "Dark Oak Fence",
+			"",
+			""
+		];
+		return $names[$this->meta & 0x07];
 	}
 
 	protected function recalculateBoundingBox(){
 
-		$flag = $this->canConnect($this->getSide(2));
-		$flag1 = $this->canConnect($this->getSide(3));
-		$flag2 = $this->canConnect($this->getSide(4));
-		$flag3 = $this->canConnect($this->getSide(5));
+		$north = $this->canConnect($this->getSide(Vector3::SIDE_NORTH));
+		$south = $this->canConnect($this->getSide(Vector3::SIDE_SOUTH));
+		$west = $this->canConnect($this->getSide(Vector3::SIDE_WEST));
+		$east = $this->canConnect($this->getSide(Vector3::SIDE_EAST));
 
-		$f = $flag2 ? 0 : 0.375;
-		$f1 = $flag3 ? 1 : 0.625;
-		$f2 = $flag ? 0 : 0.375;
-		$f3 = $flag1 ? 1 : 0.625;
+		$n = $north ? 0 : 0.375;
+		$s = $south ? 1 : 0.625;
+		$w = $west ? 0 : 0.375;
+		$e = $east ? 1 : 0.625;
 
 		return new AxisAlignedBB(
-			$this->x + $f,
+			$this->x + $w,
 			$this->y,
-			$this->z + $f2,
-			$this->x + $f1,
+			$this->z + $n,
+			$this->x + $e,
 			$this->y + 1.5,
-			$this->z + $f3
+			$this->z + $s
 		);
 	}
 
 	public function canConnect(Block $block){
-		return (!($block instanceof Fence) and !($block instanceof FenceGate)) ? $block->isSolid() : true;
+		return ($block instanceof Fence or $block instanceof FenceGate) ? true : $block->isSolid() and !$block->isTransparent();
 	}
 
-}
+}

src/pocketmine/block/FenceGate.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\Player;
 
@@ -38,13 +39,17 @@ class FenceGate extends Transparent{
 	}
 
 	public function getHardness(){
-		return 15;
+		return 2;
 	}
 
 	public function canBeActivated(){
 		return true;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_AXE;
+	}
+
 
 	protected function recalculateBoundingBox(){
 

src/pocketmine/block/FenceSpruce.php

@@ -1,31 +0,0 @@
-<?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 FenceSpruce extends Fence{
-
-	protected $id = self::FENCE_SPRUCE;
-
-	public function getName(){
-		return "Spruce Fence";
-	}
-}

src/pocketmine/block/Fire.php

@@ -21,6 +21,7 @@
 
 namespace pocketmine\block;
 
+use pocketmine\entity\Effect;
 use pocketmine\entity\Entity;
 use pocketmine\event\entity\EntityCombustByBlockEvent;
 use pocketmine\event\entity\EntityDamageByBlockEvent;
@@ -58,8 +59,10 @@ class Fire extends Flowable{
 	}
 
 	public function onEntityCollide(Entity $entity){
-		$ev = new EntityDamageByBlockEvent($this, $entity, EntityDamageEvent::CAUSE_FIRE, 1);
-		$entity->attack($ev->getFinalDamage(), $ev);
+		if(!$entity->hasEffect(Effect::FIRE_RESISTANCE)){
+			$ev = new EntityDamageByBlockEvent($this, $entity, EntityDamageEvent::CAUSE_FIRE, 1);
+			$entity->attack($ev->getFinalDamage(), $ev);
+		}
 
 		$ev = new EntityCombustByBlockEvent($this, $entity, 8);
 		Server::getInstance()->getPluginManager()->callEvent($ev);

src/pocketmine/block/Flowable.php

@@ -22,12 +22,22 @@
 namespace pocketmine\block;
 
 
+use pocketmine\item\Item;
+
 abstract class Flowable extends Transparent{
 
 	public function canBeFlowedInto(){
 		return true;
 	}
 
+	public function getHardness(){
+		return 0;
+	}
+
+	public function getResistance(){
+		return 0;
+	}
+
 	public function isSolid(){
 		return false;
 	}
@@ -35,8 +45,4 @@ abstract class Flowable extends Transparent{
 	public function getBoundingBox(){
 		return null;
 	}
-
-	public function getHardness(){
-		return 0;
-	}
 }

src/pocketmine/block/Flower.php

@@ -0,0 +1,91 @@
+<?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\math\Vector3;
+use pocketmine\Player;
+
+class Flower extends Flowable{
+	const TYPE_POPPY = 0;
+	const TYPE_BLUE_ORCHID = 1;
+	const TYPE_ALLIUM = 2;
+	const TYPE_AZURE_BLUET = 3;
+	const TYPE_RED_TULIP = 4;
+	const TYPE_ORANGE_TULIP = 5;
+	const TYPE_WHITE_TULIP = 6;
+	const TYPE_PINK_TULIP = 7;
+	const TYPE_OXEYE_DAISY = 8;
+
+	protected $id = self::RED_FLOWER;
+
+	public function __construct($meta = 0){
+		$this->meta = $meta;
+	}
+
+	public function getName(){
+		static $names = [
+			self::TYPE_POPPY => "Poppy",
+			self::TYPE_BLUE_ORCHID => "Blue Orchid",
+			self::TYPE_ALLIUM => "Allium",
+			self::TYPE_AZURE_BLUET => "Azure Bluet",
+			self::TYPE_RED_TULIP => "Red Tulip",
+			self::TYPE_ORANGE_TULIP => "Orange Tulip",
+			self::TYPE_WHITE_TULIP => "White Tulip",
+			self::TYPE_PINK_TULIP => "Pink Tulip",
+			self::TYPE_OXEYE_DAISY => "Oxeye Daisy",
+			9 => "Unknown",
+			10 => "Unknown",
+			11 => "Unknown",
+			12 => "Unknown",
+			13 => "Unknown",
+			14 => "Unknown",
+			15 => "Unknown"
+		];
+		return $names[$this->meta];
+	}
+
+
+	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
+		$down = $this->getSide(0);
+		if($down->getId() === Block::GRASS or $down->getId() === Block::DIRT or $down->getId() === Block::FARMLAND){
+			$this->getLevel()->setBlock($block, $this, true);
+
+			return true;
+		}
+
+		return false;
+	}
+
+	public function onUpdate($type){
+		if($type === Level::BLOCK_UPDATE_NORMAL){
+			if($this->getSide(Vector3::SIDE_DOWN)->isTransparent()){
+				$this->getLevel()->useBreakOn($this);
+
+				return Level::BLOCK_UPDATE_NORMAL;
+			}
+		}
+
+		return false;
+	}
+}

src/pocketmine/block/Glass.php

@@ -36,7 +36,7 @@ class Glass extends Transparent{
 	}
 
 	public function getHardness(){
-		return 1.5;
+		return 0.3;
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/GlassPane.php

@@ -22,6 +22,8 @@
 namespace pocketmine\block;
 
 
+use pocketmine\item\Item;
+
 class GlassPane extends Thin{
 
 	protected $id = self::GLASS_PANE;
@@ -35,7 +37,10 @@ class GlassPane extends Thin{
 	}
 
 	public function getHardness(){
-		return 1.5;
+		return 0.3;
 	}
 
+	public function getDrops(Item $item){
+		return [];
+	}
 }

src/pocketmine/block/GlowingRedstoneOre.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 use pocketmine\level\Level;
 
 class GlowingRedstoneOre extends Solid{
@@ -40,6 +41,10 @@ class GlowingRedstoneOre extends Solid{
 		return "Glowing Redstone Ore";
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getLightLevel(){
 		return 9;
 	}
@@ -54,18 +59,6 @@ class GlowingRedstoneOre extends Solid{
 		return false;
 	}
 
-
-	public function getBreakTime(Item $item){
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.6;
-			case 4:
-				return 0.75;
-			default:
-				return 15;
-		}
-	}
-
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 4){
 			return [

src/pocketmine/block/Glowstone.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class Glowstone extends Transparent{
 
@@ -36,7 +37,11 @@ class Glowstone extends Transparent{
 	}
 
 	public function getHardness(){
-		return 1.5;
+		return 0.3;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
 	}
 
 	public function getLightLevel(){

src/pocketmine/block/Gold.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class Gold extends Solid{
 
@@ -36,18 +37,11 @@ class Gold extends Solid{
 	}
 
 	public function getHardness(){
-		return 30;
+		return 3;
 	}
 
-	public function getBreakTime(Item $item){
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.6;
-			case 4:
-				return 0.75;
-			default:
-				return 15;
-		}
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/GoldOre.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class GoldOre extends Solid{
 
@@ -36,18 +37,11 @@ class GoldOre extends Solid{
 	}
 
 	public function getHardness(){
-		return 15;
+		return 3;
 	}
 
-	public function getBreakTime(Item $item){
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.6;
-			case 4:
-				return 0.75;
-			default:
-				return 15;
-		}
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/Grass.php

@@ -23,6 +23,7 @@ namespace pocketmine\block;
 
 use pocketmine\event\block\BlockSpreadEvent;
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 use pocketmine\level\generator\object\TallGrass as TallGrassObject;
 use pocketmine\level\Level;
 use pocketmine\math\Vector3;
@@ -47,7 +48,11 @@ class Grass extends Solid{
 	}
 
 	public function getHardness(){
-		return 3;
+		return 0.6;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_SHOVEL;
 	}
 
 	public function getDrops(Item $item){
@@ -84,6 +89,11 @@ class Grass extends Solid{
 			$item->useOn($this);
 			$this->getLevel()->setBlock($this, new Farmland());
 
+			return true;
+		}elseif($item->isShovel() and $this->getSide(1)->getId() === Block::AIR){
+			$item->useOn($this);
+			$this->getLevel()->setBlock($this, new GrassPath());
+
 			return true;
 		}
 

src/pocketmine/block/GrassPath.php

@@ -0,0 +1,71 @@
+<?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\event\block\BlockSpreadEvent;
+use pocketmine\item\Item;
+use pocketmine\item\Tool;
+use pocketmine\level\generator\object\TallGrass as TallGrassObject;
+use pocketmine\level\Level;
+use pocketmine\math\AxisAlignedBB;
+use pocketmine\math\Vector3;
+use pocketmine\Player;
+use pocketmine\Server;
+use pocketmine\utils\Random;
+
+class GrassPath extends Transparent{
+
+	protected $id = self::GRASS_PATH;
+
+	public function __construct(){
+
+	}
+
+	public function getName(){
+		return "Grass Path";
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_SHOVEL;
+	}
+
+	protected function recalculateBoundingBox(){
+		return new AxisAlignedBB(
+			$this->x,
+			$this->y,
+			$this->z,
+			$this->x + 1,
+			$this->y + 0.9375,
+			$this->z + 1
+		);
+	}
+
+	public function getHardness(){
+		return 0.6;
+	}
+
+	public function getDrops(Item $item){
+		return [
+			[Item::DIRT, 0, 1],
+		];
+	}
+}

src/pocketmine/block/Gravel.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class Gravel extends Fallable{
 
@@ -36,7 +37,11 @@ class Gravel extends Fallable{
 	}
 
 	public function getHardness(){
-		return 3;
+		return 0.6;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_SHOVEL;
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/HardenedClay.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class HardenedClay extends Solid{
 
@@ -35,25 +36,11 @@ class HardenedClay extends Solid{
 		return "Hardened Clay";
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getHardness(){
-		return 30;
+		return 1.25;
 	}
-
-	public function getBreakTime(Item $item){
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.25;
-			case 4:
-				return 0.35;
-			case 3:
-				return 0.5;
-			case 2:
-				return 0.2;
-			case 1:
-				return 0.95;
-			default:
-				return 6.25;
-		}
-	}
-
 }

src/pocketmine/block/HayBale.php

@@ -37,7 +37,7 @@ class HayBale extends Solid{
 	}
 
 	public function getHardness(){
-		return 10;
+		return 0.5;
 	}
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){

src/pocketmine/block/Ice.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class Ice extends Transparent{
 
@@ -36,7 +37,11 @@ class Ice extends Transparent{
 	}
 
 	public function getHardness(){
-		return 2.5;
+		return 0.5;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
 	}
 
 	public function onBreak(Item $item){
@@ -45,23 +50,6 @@ class Ice extends Transparent{
 		return true;
 	}
 
-	public function getBreakTime(Item $item){
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.1;
-			case 4:
-				return 0.15;
-			case 3:
-				return 0.2;
-			case 2:
-				return 0.1;
-			case 1:
-				return 0.4;
-			default:
-				return 0.75;
-		}
-	}
-
 	public function getDrops(Item $item){
 		return [];
 	}

src/pocketmine/block/Iron.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class Iron extends Solid{
 
@@ -35,21 +36,12 @@ class Iron extends Solid{
 		return "Iron Block";
 	}
 
-	public function getHardness(){
-		return 30;
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
 	}
 
-	public function getBreakTime(Item $item){
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.95;
-			case 4:
-				return 1.25;
-			case 3:
-				return 1.9;
-			default:
-				return 25;
-		}
+	public function getHardness(){
+		return 5;
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/IronBars.php

@@ -21,6 +21,8 @@
 
 namespace pocketmine\block;
 
+use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class IronBars extends Thin{
 
@@ -34,4 +36,23 @@ class IronBars extends Thin{
 		return "Iron Bars";
 	}
 
-}
+	public function getHardness(){
+		return 5;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
+	public function getDrops(Item $item){
+		if($item->isPickaxe() >= 1){
+			return [
+				[Item::IRON_BARS, 0, 1],
+			];
+		}else{
+			return [];
+		}
+	}
+
+}
+

src/pocketmine/block/IronDoor.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class IronDoor extends Door{
 
@@ -35,25 +36,12 @@ class IronDoor extends Door{
 		return "Iron Door Block";
 	}
 
-	public function getHardness(){
-		return 25;
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
 	}
 
-	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 getHardness(){
+		return 5;
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/IronOre.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class IronOre extends Solid{
 
@@ -35,21 +36,12 @@ class IronOre extends Solid{
 		return "Iron Ore";
 	}
 
-	public function getHardness(){
-		return 15;
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
 	}
 
-	public function getBreakTime(Item $item){
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.6;
-			case 4:
-				return 0.75;
-			case 3:
-				return 1.15;
-			default:
-				return 15;
-		}
+	public function getHardness(){
+		return 3;
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/JungleWoodStairs.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class JungleWoodStairs extends Stair{
 
@@ -35,6 +36,10 @@ class JungleWoodStairs extends Stair{
 		return "Jungle Wood Stairs";
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_AXE;
+	}
+
 	public function getDrops(Item $item){
 		return [
 			[$this->id, 0, 1],

src/pocketmine/block/Ladder.php

@@ -23,6 +23,7 @@ namespace pocketmine\block;
 
 use pocketmine\entity\Entity;
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 use pocketmine\level\Level;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\Player;
@@ -48,11 +49,11 @@ class Ladder extends Transparent{
 	}
 
 	public function getHardness(){
-		return 2;
+		return 0.4;
 	}
 
 	public function onEntityCollide(Entity $entity){
-		$entity->fallDistance = 0;
+		$entity->resetFallDistance();
 		$entity->onGround = true;
 	}
 
@@ -133,6 +134,10 @@ class Ladder extends Transparent{
 		return false;
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_AXE;
+	}
+
 	public function getDrops(Item $item){
 		return [
 			[$this->id, 0, 1],

src/pocketmine/block/Lapis.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class Lapis extends Solid{
 
@@ -32,24 +33,15 @@ class Lapis extends Solid{
 	}
 
 	public function getName(){
-		return "Lapis Block";
+		return "Lapis Lazuli Block";
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
 	}
 
 	public function getHardness(){
-		return 15;
-	}
-
-	public function getBreakTime(Item $item){
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.6;
-			case 4:
-				return 0.75;
-			case 3:
-				return 1.15;
-			default:
-				return 15;
-		}
+		return 3;
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/LapisOre.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class LapisOre extends Solid{
 
@@ -32,25 +33,15 @@ class LapisOre extends Solid{
 	}
 
 	public function getHardness(){
-		return 15;
+		return 3;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
 	}
 
 	public function getName(){
-		return "Lapis Ore";
-	}
-
-	public function getBreakTime(Item $item){
-
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.6;
-			case 4:
-				return 0.75;
-			case 3:
-				return 1.15;
-			default:
-				return 15;
-		}
+		return "Lapis Lazuli Ore";
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/Lava.php

@@ -21,6 +21,7 @@
 
 namespace pocketmine\block;
 
+use pocketmine\entity\Effect;
 use pocketmine\entity\Entity;
 use pocketmine\event\entity\EntityCombustByBlockEvent;
 use pocketmine\event\entity\EntityDamageByBlockEvent;
@@ -45,14 +46,12 @@ class Lava extends Liquid{
 		return "Lava";
 	}
 
-	public function getHardness(){
-		return 0;
-	}
-
 	public function onEntityCollide(Entity $entity){
 		$entity->fallDistance *= 0.5;
-		$ev = new EntityDamageByBlockEvent($this, $entity, EntityDamageEvent::CAUSE_LAVA, 4);
-		$entity->attack($ev->getFinalDamage(), $ev);
+		if(!$entity->hasEffect(Effect::FIRE_RESISTANCE)){
+			$ev = new EntityDamageByBlockEvent($this, $entity, EntityDamageEvent::CAUSE_LAVA, 4);
+			$entity->attack($ev->getFinalDamage(), $ev);
+		}
 
 		$ev = new EntityCombustByBlockEvent($this, $entity, 15);
 		Server::getInstance()->getPluginManager()->callEvent($ev);
@@ -60,9 +59,7 @@ class Lava extends Liquid{
 			$entity->setOnFire($ev->getDuration());
 		}
 
-		if($entity instanceof Player){
-			$entity->onGround = true;
-		}
+		$entity->resetFallDistance();
 	}
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){

src/pocketmine/block/Leaves.php

@@ -23,6 +23,7 @@ namespace pocketmine\block;
 
 use pocketmine\event\block\LeavesDecayEvent;
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 use pocketmine\level\Level;
 use pocketmine\Player;
 use pocketmine\Server;
@@ -42,7 +43,11 @@ class Leaves extends Transparent{
 	}
 
 	public function getHardness(){
-		return 1;
+		return 0.2;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_SHEARS;
 	}
 
 	public function getName(){

src/pocketmine/block/Liquid.php

@@ -310,7 +310,7 @@ abstract class Liquid extends Transparent{
 				$this->getLevel()->useBreakOn($block);
 			}
 
-			$this->getLevel()->setBlock($block, Block::get($this->id, $newFlowDecay), true);
+			$this->getLevel()->setBlock($block, Block::get($this->getId(), $newFlowDecay), true);
 			$this->getLevel()->scheduleUpdate($block, $this->tickRate());
 		}
 	}
@@ -363,6 +363,10 @@ abstract class Liquid extends Transparent{
 		return $cost;
 	}
 
+	public function getHardness(){
+		return 100;
+	}
+
 	private function getOptimalFlowDirections(){
 		if($this->temporalVector === null){
 			$this->temporalVector = new Vector3(0, 0, 0);
@@ -446,4 +450,8 @@ abstract class Liquid extends Transparent{
 	public function getBoundingBox(){
 		return null;
 	}
+
+	public function getDrops(Item $item){
+		return [];
+	}
 }

src/pocketmine/block/LitPumpkin.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 use pocketmine\Player;
 
 class LitPumpkin extends Solid{
@@ -33,7 +34,11 @@ class LitPumpkin extends Solid{
 	}
 
 	public function getHardness(){
-		return 5;
+		return 1;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_AXE;
 	}
 
 	public function getName(){

src/pocketmine/block/Melon.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class Melon extends Transparent{
 
@@ -36,7 +37,11 @@ class Melon extends Transparent{
 	}
 
 	public function getHardness(){
-		return 5;
+		return 1;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_AXE;
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/MonsterSpawner.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class MonsterSpawner extends Solid{
 
@@ -32,30 +33,17 @@ class MonsterSpawner extends Solid{
 	}
 
 	public function getHardness(){
-		return 25;
+		return 5;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
 	}
 
 	public function getName(){
 		return "Monster Spawner";
 	}
 
-	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

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class MossStone extends Solid{
 
@@ -36,25 +37,11 @@ class MossStone extends Solid{
 	}
 
 	public function getHardness(){
-		return 30;
+		return 2;
 	}
 
-	public function getBreakTime(Item $item){
-
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.4;
-			case 4:
-				return 0.5;
-			case 3:
-				return 0.75;
-			case 2:
-				return 0.25;
-			case 1:
-				return 1.5;
-			default:
-				return 10;
-		}
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/Mycelium.php

@@ -23,6 +23,7 @@ namespace pocketmine\block;
 
 use pocketmine\event\block\BlockSpreadEvent;
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Server;
@@ -39,8 +40,12 @@ class Mycelium extends Solid{
 		return "Mycelium";
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_SHOVEL;
+	}
+
 	public function getHardness(){
-		return 2.5;
+		return 0.6;
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/NetherBrick.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class NetherBrick extends Solid{
 
@@ -31,30 +32,16 @@ class NetherBrick extends Solid{
 
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getName(){
 		return "Nether Bricks";
 	}
 
 	public function getHardness(){
-		return 30;
-	}
-
-	public function getBreakTime(Item $item){
-
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.4;
-			case 4:
-				return 0.5;
-			case 3:
-				return 0.75;
-			case 2:
-				return 0.25;
-			case 1:
-				return 1.5;
-			default:
-				return 10;
-		}
+		return 2;
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/NetherBrickStairs.php

@@ -22,6 +22,8 @@
 namespace pocketmine\block;
 
 
+use pocketmine\item\Tool;
+
 class NetherBrickStairs extends Stair{
 
 	protected $id = self::NETHER_BRICKS_STAIRS;
@@ -30,6 +32,14 @@ class NetherBrickStairs extends Stair{
 		return "Nether Bricks Stairs";
 	}
 
+	public function getHardness(){
+		return 2;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function __construct($meta = 0){
 		$this->meta = $meta;
 	}

src/pocketmine/block/Netherrack.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class Netherrack extends Solid{
 
@@ -39,22 +40,8 @@ class Netherrack extends Solid{
 		return 2;
 	}
 
-	public function getBreakTime(Item $item){
-
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.1;
-			case 4:
-				return 0.1;
-			case 3:
-				return 0.15;
-			case 2:
-				return 0.05;
-			case 1:
-				return 0.3;
-			default:
-				return 2;
-		}
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/Obsidian.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class Obsidian extends Solid{
 
@@ -35,17 +36,12 @@ class Obsidian extends Solid{
 		return "Obsidian";
 	}
 
-	public function getHardness(){
-		return 6000;
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
 	}
 
-	public function getBreakTime(Item $item){
-
-		if($item->isPickaxe() >= 5){
-			return 9.4;
-		}else{
-			return 250;
-		}
+	public function getHardness(){
+		return 50;
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/Planks.php

@@ -22,6 +22,8 @@
 namespace pocketmine\block;
 
 
+use pocketmine\item\Tool;
+
 class Planks extends Solid{
 	const OAK = 0;
 	const SPRUCE = 1;
@@ -37,7 +39,11 @@ class Planks extends Solid{
 	}
 
 	public function getHardness(){
-		return 15;
+		return 2;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_AXE;
 	}
 
 	public function getName(){

src/pocketmine/block/Podzol.php

@@ -21,6 +21,8 @@
 
 namespace pocketmine\block;
 
+use pocketmine\item\Tool;
+
 class Podzol extends Solid{
 
 	protected $id = self::PODZOL;
@@ -29,6 +31,10 @@ class Podzol extends Solid{
 
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_SHOVEL;
+	}
+
 	public function getName(){
 		return "Podzol";
 	}

src/pocketmine/block/Pumpkin.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 use pocketmine\Player;
 
 class Pumpkin extends Solid{
@@ -33,7 +34,11 @@ class Pumpkin extends Solid{
 	}
 
 	public function getHardness(){
-		return 5;
+		return 1;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_AXE;
 	}
 
 	public function getName(){

src/pocketmine/block/PumpkinStem.php

@@ -40,7 +40,7 @@ class PumpkinStem extends Crops{
 
 	public function onUpdate($type){
 		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->isTransparent() === true){
+			if($this->getSide(0)->isTransparent()){
 				$this->getLevel()->useBreakOn($this);
 				return Level::BLOCK_UPDATE_NORMAL;
 			}

src/pocketmine/block/Quartz.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class Quartz extends Solid{
 
@@ -31,6 +32,10 @@ class Quartz extends Solid{
 		$this->meta = $meta;
 	}
 
+	public function getHardness(){
+		return 0.8;
+	}
+
 	public function getName(){
 		static $names = [
 			0 => "Quartz Block",
@@ -41,22 +46,8 @@ class Quartz extends Solid{
 		return $names[$this->meta & 0x03];
 	}
 
-	public function getBreakTime(Item $item){
-
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.15;
-			case 4:
-				return 0.2;
-			case 3:
-				return 0.3;
-			case 2:
-				return 0.1;
-			case 1:
-				return 0.6;
-			default:
-				return 4;
-		}
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/QuartzStairs.php

@@ -22,6 +22,8 @@
 namespace pocketmine\block;
 
 
+use pocketmine\item\Tool;
+
 class QuartzStairs extends Stair{
 
 	protected $id = self::QUARTZ_STAIRS;
@@ -30,6 +32,14 @@ class QuartzStairs extends Stair{
 		$this->meta = $meta;
 	}
 
+	public function getHardness(){
+		return 0.8;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getName(){
 		return "Quartz Stairs";
 	}

src/pocketmine/block/Redstone.php

@@ -0,0 +1,56 @@
+<?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\item\Tool;
+
+class Redstone extends Solid{
+
+	protected $id = self::REDSTONE_BLOCK;
+
+	public function __construct(){
+
+	}
+
+	public function getHardness(){
+		return 5;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
+	public function getName(){
+		return "Redstone Block";
+	}
+
+	public function getDrops(Item $item){
+		if($item->isPickaxe() >= 1){
+			return [
+				[Item::REDSTONE_BLOCK, 0, 1],
+			];
+		}else{
+			return [];
+		}
+	}
+}

src/pocketmine/block/RedstoneOre.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 use pocketmine\level\Level;
 
 class RedstoneOre extends Solid{
@@ -37,12 +38,12 @@ class RedstoneOre extends Solid{
 	}
 
 	public function getHardness(){
-		return 15;
+		return 3;
 	}
 
 	public function onUpdate($type){
 		if($type === Level::BLOCK_UPDATE_NORMAL or $type === Level::BLOCK_UPDATE_TOUCH){
-			$this->getLevel()->setBlock($this, Block::get(Item::GLOWING_REDSTONE_ORE, $this->meta), false, false, true);
+			$this->getLevel()->setBlock($this, Block::get(Item::GLOWING_REDSTONE_ORE, $this->meta), false, true);
 
 			return Level::BLOCK_UPDATE_WEAK;
 		}
@@ -50,6 +51,12 @@ class RedstoneOre extends Solid{
 		return false;
 	}
 
+
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 2){
 			return [

src/pocketmine/block/Sand.php

@@ -22,6 +22,8 @@
 namespace pocketmine\block;
 
 
+use pocketmine\item\Tool;
+
 class Sand extends Fallable{
 
 	protected $id = self::SAND;
@@ -31,7 +33,11 @@ class Sand extends Fallable{
 	}
 
 	public function getHardness(){
-		return 2.5;
+		return 0.5;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_SHOVEL;
 	}
 
 	public function getName(){

src/pocketmine/block/Sandstone.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class Sandstone extends Solid{
 
@@ -32,7 +33,7 @@ class Sandstone extends Solid{
 	}
 
 	public function getHardness(){
-		return 4;
+		return 0.8;
 	}
 
 	public function getName(){
@@ -45,22 +46,8 @@ class Sandstone extends Solid{
 		return $names[$this->meta & 0x03];
 	}
 
-	public function getBreakTime(Item $item){
-
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.15;
-			case 4:
-				return 0.2;
-			case 3:
-				return 0.3;
-			case 2:
-				return 0.1;
-			case 1:
-				return 0.6;
-			default:
-				return 4;
-		}
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/SandstoneStairs.php

@@ -22,6 +22,8 @@
 namespace pocketmine\block;
 
 
+use pocketmine\item\Tool;
+
 class SandstoneStairs extends Stair{
 
 	protected $id = self::SANDSTONE_STAIRS;
@@ -30,6 +32,14 @@ class SandstoneStairs extends Stair{
 		$this->meta = $meta;
 	}
 
+	public function getHardness(){
+		return 0.8;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
+
 	public function getName(){
 		return "Sandstone Stairs";
 	}

src/pocketmine/block/Sapling.php

@@ -38,7 +38,7 @@ class Sapling extends Flowable{
 	protected $id = self::SAPLING;
 
 	public function __construct($meta = 0){
-		$this->meta = 0;
+		$this->meta = $meta;
 	}
 
 	public function canBeActivated(){

src/pocketmine/block/SignPost.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 use pocketmine\level\Level;
 use pocketmine\Player;
 
@@ -34,7 +35,7 @@ class SignPost extends Transparent{
 	}
 
 	public function getHardness(){
-		return 5;
+		return 1;
 	}
 
 	public function isSolid(){
@@ -97,4 +98,8 @@ class SignPost extends Transparent{
 			[Item::SIGN, 0, 1],
 		];
 	}
+
+	public function getToolType(){
+		return Tool::TYPE_AXE;
+	}
 }

src/pocketmine/block/Slab.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\Player;
 
@@ -34,7 +35,7 @@ class Slab extends Transparent{
 	}
 
 	public function getHardness(){
-		return 30;
+		return 2;
 	}
 
 	public function getName(){
@@ -48,7 +49,7 @@ class Slab extends Transparent{
 			6 => "Quartz",
 			7 => "",
 		];
-		return (($this->meta & 0x08) === 0x08 ? "Upper " : "") . $names[$this->meta & 0x07] . " Slab";
+		return (($this->meta & 0x08) > 0 ? "Upper " : "") . $names[$this->meta & 0x07] . " Slab";
 	}
 
 	protected function recalculateBoundingBox(){
@@ -123,24 +124,6 @@ class Slab extends Transparent{
 		return true;
 	}
 
-	public function getBreakTime(Item $item){
-
-		switch($item->isPickaxe()){
-			case 5:
-				return 0.4;
-			case 4:
-				return 0.5;
-			case 3:
-				return 0.75;
-			case 2:
-				return 0.25;
-			case 1:
-				return 1.5;
-			default:
-				return 10;
-		}
-	}
-
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 1){
 			return [
@@ -150,4 +133,10 @@ class Slab extends Transparent{
 			return [];
 		}
 	}
+
+
+
+	public function getToolType(){
+		return Tool::TYPE_PICKAXE;
+	}
 }

src/pocketmine/block/Snow.php

@@ -22,6 +22,8 @@
 namespace pocketmine\block;
 
 
+use pocketmine\item\Tool;
+
 class Snow extends Solid{
 
 	protected $id = self::SNOW_BLOCK;
@@ -31,7 +33,11 @@ class Snow extends Solid{
 	}
 
 	public function getHardness(){
-		return 1;
+		return 0.2;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_SHOVEL;
 	}
 
 	public function getName(){

src/pocketmine/block/SnowLayer.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 use pocketmine\level\Level;
 use pocketmine\Player;
 
@@ -42,13 +43,17 @@ class SnowLayer extends Flowable{
 	}
 
 	public function getHardness(){
-		return 0.5;
+		return 0.1;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_SHOVEL;
 	}
 
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		$down = $this->getSide(0);
-		if($down instanceof Solid){
+		if($down->isSolid()){
 			$this->getLevel()->setBlock($block, $this, true);
 
 			return true;

src/pocketmine/block/SoulSand.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 
+use pocketmine\item\Tool;
 use pocketmine\math\AxisAlignedBB;
 
 class SoulSand extends Solid{
@@ -37,7 +38,11 @@ class SoulSand extends Solid{
 	}
 
 	public function getHardness(){
-		return 2.5;
+		return 0.5;
+	}
+
+	public function getToolType(){
+		return Tool::TYPE_SHOVEL;
 	}
 
 	protected function recalculateBoundingBox(){

src/pocketmine/block/Sponge.php

@@ -31,7 +31,7 @@ class Sponge extends Solid{
 	}
 
 	public function getHardness(){
-		return 3;
+		return 0.6;
 	}
 
 	public function getName(){

src/pocketmine/block/SpruceWoodStairs.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class SpruceWoodStairs extends Stair{
 
@@ -35,6 +36,10 @@ class SpruceWoodStairs extends Stair{
 		return "Spruce Wood Stairs";
 	}
 
+	public function getToolType(){
+		return Tool::TYPE_AXE;
+	}
+
 	public function getDrops(Item $item){
 		return [
 			[$this->id, 0, 1],