Reenabled collision against entities on move

Update BaseInventory.php

.gitmodules

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

.mailmap

@@ -0,0 +1,5 @@
+Shoghi Cervantes <shoghicp@gmail.com>
+Shoghi Cervantes <shoghicp@gmail.com> Shoghi Cervantes <shoghicp@pocketmine.net>
+Brandon V <brandon15811@gmail.com>
+Michael Yoo <sekjun9878@gmail.com> Michael Yoo <michael@yoo.id.au>
+Michael Yoo <sekjun9878@gmail.com> Michael Yoo <sekjun9878@sekjun9878.info>

.travis.yml

@@ -1,23 +1,21 @@
 language: php
 
 php:
- - 5.4
- - 5.5
  - 5.6
 
 branches:
-  except:
-    - Core-Rewrite
-    - master
-    - 0.9.0
+ - master
 
 before_script:
- - pecl install channel://pecl.php.net/pthreads-2.0.4
+ - mkdir plugins
+ - wget -O plugins/DevTools.phar https://github.com/PocketMine/DevTools/releases/download/v1.9.0/DevTools_v1.9.0.phar
+ - pecl install channel://pecl.php.net/pthreads-2.0.10
+ - pecl install channel://pecl.php.net/weakref-0.2.4
  - echo | pecl install channel://pecl.php.net/yaml-1.1.1
 
 script:
- - php src/tests/ServerSuiteTest.php --no-wizard
+ - php tests/TravisTest.php
  
 notifications:
  email: false
- webhooks: http://n.tkte.ch/h/214/wsNvmG43-ncxUVRrFPwSM-r0
+ #webhooks: http://n.tkte.ch/h/214/wsNvmG43-ncxUVRrFPwSM-r0

CONTRIBUTING.md

@@ -72,6 +72,19 @@ class ExampleClass{
 
 }
 ```
+
+### RFC and Voting
+* These are big Pull Requests or contributions that change important behavior.
+* RFCs will be tagged with the *PR: RFC* label
+* A vote will be held once the RFC is ready. All users can vote commenting on the Pull Request
+* Comments MUST use "Yes" or "No" on the FIRST sentence to signify the vote, except when they don't want it to be counted.
+* If your comment is a voting comment, specify the reason of your vote or it won't be counted.
+* After voting has been closed, no further votes will be counted.
+* An RFC will be rejected if less than 50% + 1 (simple majority) has voted Yes.
+* If the RFC is approved, Team Members have the final word on its implementation or rejection.
+* RFCs with complex voting options will specify the vote percentage or other details.
+
+
 ## Bug Tracking for Collaborators
 
 ### Labels
@@ -91,6 +104,7 @@ Category labels are prefixed by `C:`. Multiple category labels may be applied to
 Pull Requests are prefixed by `PR:`. Only one label may be applied for a Pull Request.
  - PR: Bug Fix - This label is applied when the Pull Request fixes a bug. 
  - PR: Contribution - This label is applied when the Pull Request contributes code to PocketMine-MP such as a new feature or an improvement.
+ - PR: RFC - Request for Comments
 
 #### Status
 Status labels show the status of the issue. Multiple status labels may be applied.

src/pocketmine/Achievement.php

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

src/pocketmine/CompatibleClassLoader.php

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

src/pocketmine/CrashDump.php

@@ -22,6 +22,7 @@
 namespace pocketmine;
 
 use pocketmine\network\protocol\Info;
+use pocketmine\plugin\PluginBase;
 use pocketmine\plugin\PluginLoadOrder;
 use pocketmine\utils\Utils;
 use pocketmine\utils\VersionString;
@@ -43,7 +44,7 @@ class CrashDump{
 		$this->path = $this->server->getDataPath() . "CrashDump_" . date("D_M_j-H.i.s-T_Y", $this->time) . ".log";
 		$this->fp = fopen($this->path, "wb");
 		$this->data["time"] = $this->time;
-		$this->addLine("PocketMine-MP Crash Dump " . date("D M j H:i:s T Y", $this->time));
+		$this->addLine($this->server->getName() . " Crash Dump " . date("D M j H:i:s T Y", $this->time));
 		$this->addLine();
 		$this->baseCrash();
 		$this->generalData();
@@ -136,8 +137,8 @@ class CrashDump{
 			$error = $lastExceptionError;
 		}else{
 			$error = (array) error_get_last();
-			$error["trace"] = getTrace(4);
-			$errorConversion = array(
+			$error["trace"] = @getTrace(4);
+			$errorConversion = [
 				E_ERROR => "E_ERROR",
 				E_WARNING => "E_WARNING",
 				E_PARSE => "E_PARSE",
@@ -153,7 +154,7 @@ class CrashDump{
 				E_RECOVERABLE_ERROR => "E_RECOVERABLE_ERROR",
 				E_DEPRECATED => "E_DEPRECATED",
 				E_USER_DEPRECATED => "E_USER_DEPRECATED",
-			);
+			];
 			$error["fullFile"] = $error["file"];
 			$error["file"] = cleanPath($error["file"]);
 			$error["type"] = isset($errorConversion[$error["type"]]) ? $errorConversion[$error["type"]] : $error["type"];
@@ -179,7 +180,7 @@ class CrashDump{
 			$this->addLine("THIS CRASH WAS CAUSED BY A PLUGIN");
 			$this->data["plugin"] = true;
 
-			$reflection = new \ReflectionClass("pocketmine\\plugin\\PluginBase");
+			$reflection = new \ReflectionClass(PluginBase::class);
 			$file = $reflection->getProperty("file");
 			$file->setAccessible(true);
 			foreach($this->server->getPluginManager()->getPlugins() as $plugin){
@@ -228,7 +229,7 @@ class CrashDump{
 		$this->data["general"]["zend"] = zend_version();
 		$this->data["general"]["php_os"] = PHP_OS;
 		$this->data["general"]["os"] = Utils::getOS();
-		$this->addLine("PocketMine-MP version: " . $version->get(false) . " #" . $version->getNumber() . " [Protocol " . Info::CURRENT_PROTOCOL . "; API " . API_VERSION . "]");
+		$this->addLine("PocketMine-MP version: " . $version->get(false) . " #" . $version->getBuild() . " [Protocol " . Info::CURRENT_PROTOCOL . "; API " . API_VERSION . "]");
 		$this->addLine("Git commit: " . GIT_COMMIT);
 		$this->addLine("uname -a: " . php_uname("a"));
 		$this->addLine("PHP Version: " . phpversion());

src/pocketmine/PocketMine.php

@@ -65,18 +65,23 @@ namespace {
 }
 
 namespace pocketmine {
-	use LogLevel;
 	use pocketmine\utils\Binary;
 	use pocketmine\utils\MainLogger;
 	use pocketmine\utils\Utils;
 	use pocketmine\wizard\Installer;
-	use raklib\RakLib;
 
 	const VERSION = "Alpha_1.4dev";
-	const API_VERSION = "1.3.0";
+	const API_VERSION = "1.7.0";
 	const CODENAME = "絶好(Zekkou)ケーキ(Cake)";
 	const MINECRAFT_VERSION = "v0.9.5 alpha";
 
+	/*
+	 * Startup code. Do not look at it, it may harm you.
+	 * Most of them are hacks to fix date-related bugs, or basic functions used after this
+	 * This is the only non-class based file on this project.
+	 * Enjoy it as much as I did writing it. I don't want to do it again.
+	 */
+
 	if(\Phar::running(true) !== ""){
 		@define("pocketmine\\PATH", \Phar::running(true) . "/");
 	}else{
@@ -89,56 +94,21 @@ namespace pocketmine {
 		exit(1);
 	}
 
-	if(!class_exists("SplClassLoader", false)){
-		require_once(\pocketmine\PATH . "src/spl/SplClassLoader.php");
+	if(!class_exists("ClassLoader", false)){
+		require_once(\pocketmine\PATH . "src/spl/ClassLoader.php");
+		require_once(\pocketmine\PATH . "src/spl/BaseClassLoader.php");
+		require_once(\pocketmine\PATH . "src/pocketmine/CompatibleClassLoader.php");
 	}
 
-	$autoloader = new \SplClassLoader();
-	$autoloader->setMode(\SplAutoloader::MODE_DEBUG);
-	$autoloader->add("pocketmine", [
-		\pocketmine\PATH . "src"
-	]);
-
+	$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);
-	if(!class_exists("raklib\\RakLib", false)){
-		require(\pocketmine\PATH . "src/raklib/raklib/RakLib.php");
-	}
-	RakLib::bootstrap($autoloader);
 
-	//Startup code. Do not look at it, it can harm you. Most of them are hacks to fix date-related bugs, or basic functions used after this
 
 	set_time_limit(0); //Who set it to 30 seconds?!?!
 
-	if(ini_get("date.timezone") == ""){ //No Timezone set
-		date_default_timezone_set("GMT");
-		if(strpos(" " . strtoupper(php_uname("s")), " WIN") !== false){
-			$time = time();
-			$time -= $time % 60;
-			//TODO: Parse different time & date formats by region. ¬¬ world
-			//Example: USA
-			@exec("time.exe /T", $hour);
-			$i = array_map("intval", explode(":", trim($hour[0])));
-			@exec("date.exe /T", $date);
-			$j = array_map("intval", explode(substr($date[0], 2, 1), trim($date[0])));
-			$offset = round((mktime($i[0], $i[1], 0, $j[1], $j[0], $j[2]) - $time) / 60) * 60;
-		}else{
-			@exec("date +%s", $t);
-			$offset = round((intval(trim($t[0])) - time()) / 60) * 60;
-		}
-
-		$daylight = (int) date("I");
-		$d = timezone_name_from_abbr("", $offset, $daylight);
-		@ini_set("date.timezone", $d);
-		date_default_timezone_set($d);
-	}else{
-		$d = @date_default_timezone_get();
-		if(strpos($d, "/") === false){
-			$d = timezone_name_from_abbr($d);
-			@ini_set("date.timezone", $d);
-			date_default_timezone_set($d);
-		}
-	}
-
 	gc_enable();
 	error_reporting(-1);
 	ini_set("allow_url_fopen", 1);
@@ -149,15 +119,170 @@ namespace pocketmine {
 	ini_set("memory_limit", "256M"); //Default
 	define("pocketmine\\START_TIME", microtime(true));
 
-	$opts = getopt("", array("enable-ansi", "disable-ansi", "data:", "plugins:", "no-wizard"));
+	$opts = getopt("", ["enable-ansi", "disable-ansi", "data:", "plugins:", "no-wizard", "enable-profiler"]);
 
-	define("pocketmine\\DATA", isset($opts["data"]) ? realpath($opts["data"]) . DIRECTORY_SEPARATOR : \getcwd() . DIRECTORY_SEPARATOR);
-	define("pocketmine\\PLUGIN_PATH", isset($opts["plugins"]) ? realpath($opts["plugins"]) . DIRECTORY_SEPARATOR : \getcwd() . DIRECTORY_SEPARATOR . "plugins" . DIRECTORY_SEPARATOR);
+	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", ((strpos(strtoupper(php_uname("s")), "WIN") === false or isset($opts["enable-ansi"])) and !isset($opts["disable-ansi"])));
+	define("pocketmine\\ANSI", (Utils::getOS() !== "win" or isset($opts["enable-ansi"])) and !isset($opts["disable-ansi"]));
 
+
+	@mkdir(\pocketmine\DATA, 0777, true);
+
+	//Logger has a dependency on timezone, so we'll set it to UTC until we can get the actual timezone.
+	date_default_timezone_set("UTC");
 	$logger = new MainLogger(\pocketmine\DATA . "server.log", \pocketmine\ANSI);
 
+	if(!ini_get("date.timezone")){
+		if(($timezone = detect_system_timezone()) and date_default_timezone_set($timezone)){
+			//Success! Timezone has already been set and validated in the if statement.
+			//This here is just for redundancy just in case some stupid program wants to read timezone data from the ini.
+			ini_set("date.timezone", $timezone);
+		}else{
+			//If system timezone detection fails or timezone is an invalid value.
+			if($response = Utils::getURL("http://ip-api.com/json")
+				and $ip_geolocation_data = json_decode($response, true)
+				and $ip_geolocation_data['status'] != 'fail'
+				and date_default_timezone_set($ip_geolocation_data['timezone']))
+			{
+				//Again, for redundancy.
+				ini_set("date.timezone", $ip_geolocation_data['timezone']);
+			}else{
+				ini_set("date.timezone", "UTC");
+				date_default_timezone_set("UTC");
+				$logger->warning("Timezone could not be automatically determined. An incorrect timezone will result in incorrect timestamps on console logs. It has been set to \"UTC\" by default. You can change it on the php.ini file.");
+			}
+		}
+	}else{
+		/*
+		 * This is here so that stupid idiots don't come to us complaining and fill up the issue tracker when they put an incorrect timezone abbreviation in php.ini apparently.
+		 */
+		$default_timezone = date_default_timezone_get();
+		if(strpos($default_timezone, "/") === false){
+			$default_timezone = timezone_name_from_abbr($default_timezone);
+			ini_set("date.timezone", $default_timezone);
+			date_default_timezone_set($default_timezone);
+		}
+	}
+
+	function detect_system_timezone(){
+		switch(Utils::getOS()){
+			case 'win':
+				$regex = '/(?:Time Zone:\s*\()(UTC)(\+*\-*\d*\d*\:*\d*\d*)(?:\))/';
+
+				exec("systeminfo", $output);
+
+				$string = trim(implode("\n", $output));
+
+				//Detect the Time Zone string in systeminfo
+				preg_match($regex, $string, $matches);
+
+				if(!isset($matches[2]))
+				{
+					return false;
+				}
+
+				$offset = $matches[2];
+
+				if($offset == ""){
+					return "UTC";
+				}
+
+				return parse_offset($offset);
+				break;
+			case 'linux':
+				// Ubuntu / Debian.
+				if(file_exists('/etc/timezone')){
+					$data = file_get_contents('/etc/timezone');
+					if($data){
+						return trim($data);
+					}
+				}
+
+				// RHEL / CentOS
+				if(file_exists('/etc/sysconfig/clock')){
+					$data = parse_ini_file('/etc/sysconfig/clock');
+					if(!empty($data['ZONE'])){
+						return trim($data['ZONE']);
+					}
+				}
+
+				//Portable method for incompatible linux distributions.
+
+				$offset = trim(exec('date +%:z'));
+
+				if($offset == "+00:00"){
+					return "UTC";
+				}
+
+				return parse_offset($offset);
+				break;
+			case 'mac':
+				if(is_link('/etc/localtime')){
+					$filename = readlink('/etc/localtime');
+					if(strpos($filename, '/usr/share/zoneinfo/') === 0){
+						$timezone = substr($filename, 20);
+						return trim($timezone);
+					}
+				}
+
+				return false;
+				break;
+			default:
+				return false;
+				break;
+		}
+	}
+
+	/**
+	 * @param string $offset In the format of +09:00, +02:00, -04:00 etc.
+	 * @return string
+	 */
+	function parse_offset($offset){
+		//Make signed offsets unsigned for date_parse
+		if(strpos($offset, '-') !== false){
+			$negative_offset = true;
+			$offset = str_replace('-', '', $offset);
+		}else{
+			if(strpos($offset, '+') !== false){
+				$negative_offset = false;
+				$offset = str_replace('+', '', $offset);
+			}else{
+				return false;
+			}
+		}
+
+		$parsed = date_parse($offset);
+		$offset = $parsed['hour'] * 3600 + $parsed['minute'] * 60 + $parsed['second'];
+
+		//After date_parse is done, put the sign back
+		if($negative_offset == true){
+			$offset = -abs($offset);
+		}
+
+		//And then, look the offset up.
+		//timezone_name_from_abbr is not used because it returns false on some(most) offsets because it's mapping function is weird.
+		//That's been a bug in PHP since 2008!
+		foreach(timezone_abbreviations_list() as $zones){
+			foreach($zones as $timezone){
+				if($timezone['offset'] == $offset){
+					return $timezone['timezone_id'];
+				}
+			}
+		}
+
+		return false;
+	}
+
+	if(isset($opts["enable-profiler"])){
+		if(function_exists("profiler_enable")){
+			\profiler_enable();
+			$logger->notice("Execution is being profiled");
+		}else{
+			$logger->notice("No profiler found. Please install https://github.com/krakjoe/profiler");
+		}
+	}
+
 	function kill($pid){
 		switch(Utils::getOS()){
 			case "win":
@@ -204,59 +329,12 @@ namespace pocketmine {
 		return rtrim(str_replace(["\\", ".php", "phar://", rtrim(str_replace(["\\", "phar://"], ["/", ""], \pocketmine\PATH), "/"), rtrim(str_replace(["\\", "phar://"], ["/", ""], \pocketmine\PLUGIN_PATH), "/")], ["/", "", "", "", ""], $path), "/");
 	}
 
-	function error_handler($errno, $errstr, $errfile, $errline, $trace = null){
-		global $lastError;
-		if(error_reporting() === 0){ //@ error-control
-			return false;
-		}
-		$errorConversion = array(
-			E_ERROR => "E_ERROR",
-			E_WARNING => "E_WARNING",
-			E_PARSE => "E_PARSE",
-			E_NOTICE => "E_NOTICE",
-			E_CORE_ERROR => "E_CORE_ERROR",
-			E_CORE_WARNING => "E_CORE_WARNING",
-			E_COMPILE_ERROR => "E_COMPILE_ERROR",
-			E_COMPILE_WARNING => "E_COMPILE_WARNING",
-			E_USER_ERROR => "E_USER_ERROR",
-			E_USER_WARNING => "E_USER_WARNING",
-			E_USER_NOTICE => "E_USER_NOTICE",
-			E_STRICT => "E_STRICT",
-			E_RECOVERABLE_ERROR => "E_RECOVERABLE_ERROR",
-			E_DEPRECATED => "E_DEPRECATED",
-			E_USER_DEPRECATED => "E_USER_DEPRECATED",
-		);
-		$type = ($errno === E_ERROR or $errno === E_WARNING or $errno === E_USER_ERROR or $errno === E_USER_WARNING) ? LogLevel::ERROR : LogLevel::NOTICE;
-		$errno = isset($errorConversion[$errno]) ? $errorConversion[$errno] : $errno;
-		if(($pos = strpos($errstr, "\n")) !== false){
-			$errstr = substr($errstr, 0, $pos);
-		}
-		$logger = MainLogger::getLogger();
-		$oldFile = $errfile;
-		$errfile = cleanPath($errfile);
-		$logger->log($type, "An $errno error happened: \"$errstr\" in \"$errfile\" at line $errline");
-
-		foreach(($trace = getTrace($trace === null ? 3 : 0, $trace)) as $i => $line){
-			$logger->debug($line);
-		}
-		$lastError = [
-			"type" => $type,
-			"message" => $errstr,
-			"fullFile" => $oldFile,
-			"file" => $errfile,
-			"line" => $errline,
-			"trace" => $trace
-		];
-
-		return true;
-	}
-
-	set_error_handler("\\pocketmine\\error_handler", E_ALL);
+	set_error_handler([\ExceptionHandler::class, "handler"], -1);
 
 	$errors = 0;
 
-	if(version_compare("5.4.0", PHP_VERSION) > 0){
-		$logger->critical("Use PHP >= 5.4.0");
+	if(version_compare("5.6.0", PHP_VERSION) > 0){
+		$logger->critical("You must use PHP >= 5.6");
 		++$errors;
 	}
 
@@ -274,8 +352,8 @@ namespace pocketmine {
 	if(substr_count($pthreads_version, ".") < 2){
 		$pthreads_version = "0.$pthreads_version";
 	}
-	if(version_compare($pthreads_version, "2.0.4") < 0){
-		$logger->critical("pthreads >= 2.0.4 is required, while you have $pthreads_version.");
+	if(version_compare($pthreads_version, "2.0.8") < 0){
+		$logger->critical("pthreads >= 2.0.8 is required, while you have $pthreads_version.");
 		++$errors;
 	}
 
@@ -353,14 +431,14 @@ namespace pocketmine {
 			$logger->debug("Stopping " . (new \ReflectionClass($thread))->getShortName() . " thread");
 			if($thread instanceof Thread){
 				$thread->kill();
-
-				if($thread->isRunning() or !$thread->join()){
+				sleep(1);
+				if($thread->isRunning()){
 					$thread->detach();
 				}
 			}elseif($thread instanceof Worker){
 				$thread->kill();
 				sleep(1);
-				if($thread->isRunning() or !$thread->join()){
+				if($thread->isRunning()){
 					$thread->detach();
 				}
 			}

src/pocketmine/Thread.php

@@ -29,6 +29,6 @@ abstract class Thread extends \Thread{
 	public final function start($options = PTHREADS_INHERIT_ALL){
 		ThreadManager::getInstance()->add($this);
 
-		return parent::start($options & ~PTHREADS_INHERIT_CLASSES);
+		return parent::start($options);
 	}
 }

src/pocketmine/Worker.php

@@ -29,6 +29,6 @@ abstract class Worker extends \Worker{
 	public final function start($options = PTHREADS_INHERIT_ALL){
 		ThreadManager::getInstance()->add($this);
 
-		return parent::start($options & ~PTHREADS_INHERIT_CLASSES);
+		return parent::start($options);
 	}
 }

src/pocketmine/block/AcaciaWoodStairs.php

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

src/pocketmine/block/Air.php

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

src/pocketmine/block/Bed.php

@@ -22,6 +22,8 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\level\Level;
+use pocketmine\math\AxisAlignedBB;
 use pocketmine\network\protocol\ChatPacket;
 use pocketmine\Player;
 
@@ -33,14 +35,30 @@ class Bed extends Transparent{
 		$this->hardness = 1;
 	}
 
+	protected function recalculateBoundingBox(){
+		return new AxisAlignedBB(
+			$this->x,
+			$this->y,
+			$this->z,
+			$this->x + 1,
+			$this->y + 0.5625,
+			$this->z + 1
+		);
+	}
+
 	public function onActivate(Item $item, Player $player = null){
-		/*if($player instanceof Player and Server::getInstance()->api->time->getPhase($this->getLevel()) !== "night"){
-			$pk = new ChatPacket;
+
+		$time = $this->getLevel()->getTime() % Level::TIME_FULL;
+
+		$isNight = ($time >= Level::TIME_NIGHT and $time < Level::TIME_SUNRISE);
+
+		if($player instanceof Player and !$isNight){
+			$pk = new ChatPacket();
 			$pk->message = "You can only sleep at night";
 			$player->dataPacket($pk);
 
 			return true;
-		}*/
+		}
 
 		$blockNorth = $this->getSide(2); //Gets the blocks around them
 		$blockSouth = $this->getSide(3);
@@ -57,17 +75,19 @@ class Bed extends Transparent{
 				$b = $blockEast;
 			}elseif($blockWest->getID() === $this->id and ($blockWest->meta & 0x08) === 0x08){
 				$b = $blockWest;
-			}elseif($player instanceof Player){
-				$pk = new ChatPacket;
-				$pk->message = "This bed is incomplete";
-				$player->dataPacket($pk);
+			}else{
+				if($player instanceof Player){
+					$pk = new ChatPacket();
+					$pk->message = "This bed is incomplete";
+					$player->dataPacket($pk);
+				}
 
 				return true;
 			}
 		}
 
 		if($player instanceof Player and $player->sleepOn($b) === false){
-			$pk = new ChatPacket;
+			$pk = new ChatPacket();
 			$pk->message = "This bed is occupied";
 			$player->dataPacket($pk);
 		}
@@ -78,19 +98,19 @@ class Bed extends Transparent{
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		$down = $this->getSide(0);
 		if($down->isTransparent === false){
-			$faces = array(
+			$faces = [
 				0 => 3,
 				1 => 4,
 				2 => 2,
 				3 => 5,
-			);
+			];
 			$d = $player instanceof Player ? $player->getDirection() : 0;
 			$next = $this->getSide($faces[(($d + 3) % 4)]);
 			$downNext = $this->getSide(0);
 			if($next->isReplaceable === true and $downNext->isTransparent === false){
 				$meta = (($d + 3) % 4) & 0x03;
-				$this->getLevel()->setBlock($block, Block::get($this->id, $meta), true, false, true);
-				$this->getLevel()->setBlock($next, Block::get($this->id, $meta | 0x08), true, false, true);
+				$this->getLevel()->setBlock($block, Block::get($this->id, $meta), true, true);
+				$this->getLevel()->setBlock($next, Block::get($this->id, $meta | 0x08), true, true);
 
 				return true;
 			}
@@ -107,34 +127,34 @@ class Bed extends Transparent{
 
 		if(($this->meta & 0x08) === 0x08){ //This is the Top part of bed
 			if($blockNorth->getID() === $this->id and $blockNorth->meta !== 0x08){ //Checks if the block ID and meta are right
-				$this->getLevel()->setBlock($blockNorth, new Air(), true, false, true);
+				$this->getLevel()->setBlock($blockNorth, new Air(), true, true);
 			}elseif($blockSouth->getID() === $this->id and $blockSouth->meta !== 0x08){
-				$this->getLevel()->setBlock($blockSouth, new Air(), true, false, true);
+				$this->getLevel()->setBlock($blockSouth, new Air(), true, true);
 			}elseif($blockEast->getID() === $this->id and $blockEast->meta !== 0x08){
-				$this->getLevel()->setBlock($blockEast, new Air(), true, false, true);
+				$this->getLevel()->setBlock($blockEast, new Air(), true, true);
 			}elseif($blockWest->getID() === $this->id and $blockWest->meta !== 0x08){
-				$this->getLevel()->setBlock($blockWest, new Air(), true, false, true);
+				$this->getLevel()->setBlock($blockWest, new Air(), true, true);
 			}
 		}else{ //Bottom Part of Bed
 			if($blockNorth->getID() === $this->id and ($blockNorth->meta & 0x08) === 0x08){
-				$this->getLevel()->setBlock($blockNorth, new Air(), true, false, true);
+				$this->getLevel()->setBlock($blockNorth, new Air(), true, true);
 			}elseif($blockSouth->getID() === $this->id and ($blockSouth->meta & 0x08) === 0x08){
-				$this->getLevel()->setBlock($blockSouth, new Air(), true, false, true);
+				$this->getLevel()->setBlock($blockSouth, new Air(), true, true);
 			}elseif($blockEast->getID() === $this->id and ($blockEast->meta & 0x08) === 0x08){
-				$this->getLevel()->setBlock($blockEast, new Air(), true, false, true);
+				$this->getLevel()->setBlock($blockEast, new Air(), true, true);
 			}elseif($blockWest->getID() === $this->id and ($blockWest->meta & 0x08) === 0x08){
-				$this->getLevel()->setBlock($blockWest, new Air(), true, false, true);
+				$this->getLevel()->setBlock($blockWest, new Air(), true, true);
 			}
 		}
-		$this->getLevel()->setBlock($this, new Air(), true, false, true);
+		$this->getLevel()->setBlock($this, new Air(), true, true);
 
 		return true;
 	}
 
 	public function getDrops(Item $item){
-		return array(
-			array(Item::BED, 0, 1),
-		);
+		return [
+			[Item::BED, 0, 1],
+		];
 	}
 
 }

src/pocketmine/block/Beetroot.php

@@ -22,70 +22,19 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\level\Level;
-use pocketmine\Player;
 
-class Beetroot extends Flowable{
+class Beetroot extends Crops{
 	public function __construct($meta = 0){
 		parent::__construct(self::BEETROOT_BLOCK, $meta, "Beetroot Block");
-		$this->isActivable = true;
-		$this->hardness = 0;
-	}
-
-	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
-		$down = $this->getSide(0);
-		if($down->getID() === self::FARMLAND){
-			$this->getLevel()->setBlock($block, $this, true, false, true);
-
-			return true;
-		}
-
-		return false;
-	}
-
-	public function onActivate(Item $item, Player $player = null){
-		if($item->getID() === Item::DYE and $item->getDamage() === 0x0F){ //Bonemeal
-			$this->meta = 0x07;
-			$this->getLevel()->setBlock($this, $this, true, false, true);
-			$item->count--;
-
-			return true;
-		}
-
-		return false;
-	}
-
-	public function onUpdate($type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->isTransparent === true){ //TODO: Replace with common break method
-				$this->getLevel()->dropItem($this, Item::get(Item::BEETROOT_SEEDS, 0, 1));
-				$this->getLevel()->setBlock($this, new Air(), false, false, true);
-
-				return Level::BLOCK_UPDATE_NORMAL;
-			}
-		}elseif($type === Level::BLOCK_UPDATE_RANDOM){
-			if(mt_rand(0, 2) == 1){
-				if($this->meta < 0x07){
-					++$this->meta;
-					$this->getLevel()->setBlock($this, $this, true, false, true);
-
-					return Level::BLOCK_UPDATE_RANDOM;
-				}
-			}else{
-				return Level::BLOCK_UPDATE_RANDOM;
-			}
-		}
-
-		return false;
 	}
 
 	public function getDrops(Item $item){
 		$drops = [];
 		if($this->meta >= 0x07){
-			$drops[] = array(Item::BEETROOT, 0, 1);
-			$drops[] = array(Item::BEETROOT_SEEDS, 0, mt_rand(0, 3));
+			$drops[] = [Item::BEETROOT, 0, 1];
+			$drops[] = [Item::BEETROOT_SEEDS, 0, mt_rand(0, 3)];
 		}else{
-			$drops[] = array(Item::BEETROOT_SEEDS, 0, 1);
+			$drops[] = [Item::BEETROOT_SEEDS, 0, 1];
 		}
 
 		return $drops;

src/pocketmine/block/BirchWoodStairs.php

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

src/pocketmine/block/Block.php

@@ -24,19 +24,22 @@
  */
 namespace pocketmine\block;
 
+use pocketmine\entity\Entity;
 use pocketmine\entity\Villager;
 use pocketmine\entity\Zombie;
 use pocketmine\item\Item;
 use pocketmine\level\Level;
+use pocketmine\level\MovingObjectPosition;
 use pocketmine\level\Position;
 use pocketmine\math\AxisAlignedBB;
+use pocketmine\math\Vector3;
 use pocketmine\metadata\Metadatable;
 use pocketmine\metadata\MetadataValue;
 use pocketmine\Player;
 use pocketmine\plugin\Plugin;
 
 
-abstract class Block extends Position implements Metadatable{
+class Block extends Position implements Metadatable{
 	const AIR = 0;
 	const STONE = 1;
 	const GRASS = 2;
@@ -164,7 +167,8 @@ abstract class Block extends Position implements Metadatable{
 	const MELON_BLOCK = 103;
 	const PUMPKIN_STEM = 104;
 	const MELON_STEM = 105;
-
+	const VINE = 106;
+	const VINES = 106;
 	const FENCE_GATE = 107;
 	const BRICK_STAIRS = 108;
 	const STONE_BRICK_STAIRS = 109;
@@ -230,7 +234,7 @@ abstract class Block extends Position implements Metadatable{
 	const GLOWING_OBSIDIAN = 246;
 	const NETHER_REACTOR = 247;
 
-	public static $creative = array(
+	public static $creative = [
 		//Building
 		[Item::COBBLESTONE, 0],
 		[Item::STONE_BRICKS, 0],
@@ -342,7 +346,7 @@ abstract class Block extends Position implements Metadatable{
 		[Item::SNOW_LAYER, 0],
 		[Item::GLASS, 0],
 		[Item::GLOWSTONE_BLOCK, 0],
-		//TODO: Vines
+		[Item::VINES, 0],
 		[Item::NETHER_REACTOR, 0],
 		[Item::LADDER, 0],
 		[Item::SPONGE, 0],
@@ -359,7 +363,6 @@ abstract class Block extends Position implements Metadatable{
 		[Item::STONECUTTER, 0],
 		[Item::CHEST, 0],
 		[Item::FURNACE, 0],
-		//TODO: End Portal
 		[Item::END_PORTAL, 0],
 		[Item::DANDELION, 0],
 		[Item::POPPY, 0],
@@ -500,15 +503,16 @@ abstract class Block extends Position implements Metadatable{
 		[Item::DYE, 9],
 		[Item::DYE, 8],
 
-	);
+	];
 
-	/** @var Block[] */
-	public static $list = [];
+	/** @var \SplFixedArray */
+	public static $list = null;
 	protected $id;
 	protected $meta;
-	protected $name;
-	protected $breakTime;
-	protected $hardness;
+	protected $name = "Unknown";
+	protected $breakTime = 0.20;
+	protected $hardness = 10;
+	public $hasEntityCollision = false;
 	public $isActivable = false;
 	public $breakable = true;
 	public $isFlowable = false;
@@ -524,146 +528,149 @@ abstract class Block extends Position implements Metadatable{
 	public $z = 0;
 	public $frictionFactor = 0.6;
 
+	/** @var AxisAlignedBB */
+	protected $boundingBox = null;
+
 	public static function init(){
-		if(count(self::$list) === 0){
-			self::$list = array(
-				self::AIR => new Air(),
-				self::STONE => new Stone(),
-				self::GRASS => new Grass(),
-				self::DIRT => new Dirt(),
-				self::COBBLESTONE => new Cobblestone(),
-				self::PLANKS => new Planks(),
-				self::SAPLING => new Sapling(),
-				self::BEDROCK => new Bedrock(),
-				self::WATER => new Water(),
-				self::STILL_WATER => new StillWater(),
-				self::LAVA => new Lava(),
-				self::STILL_LAVA => new StillLava(),
-				self::SAND => new Sand(),
-				self::GRAVEL => new Gravel(),
-				self::GOLD_ORE => new GoldOre(),
-				self::IRON_ORE => new IronOre(),
-				self::COAL_ORE => new CoalOre(),
-				self::WOOD => new Wood(),
-				self::LEAVES => new Leaves(),
-				self::SPONGE => new Sponge(),
-				self::GLASS => new Glass(),
-				self::LAPIS_ORE => new LapisOre(),
-				self::LAPIS_BLOCK => new Lapis(),
-				self::SANDSTONE => new Sandstone(),
-				self::BED_BLOCK => new Bed(),
-				self::COBWEB => new Cobweb(),
-				self::TALL_GRASS => new TallGrass(),
-				self::DEAD_BUSH => new DeadBush(),
-				self::WOOL => new Wool(),
-				self::DANDELION => new Dandelion(),
-				self::POPPY => new CyanFlower(),
-				self::BROWN_MUSHROOM => new BrownMushroom(),
-				self::RED_MUSHROOM => new RedMushroom(),
-				self::GOLD_BLOCK => new Gold(),
-				self::IRON_BLOCK => new Iron(),
-				self::DOUBLE_SLAB => new DoubleSlab(),
-				self::SLAB => new Slab(),
-				self::BRICKS_BLOCK => new Bricks(),
-				self::TNT => new TNT(),
-				self::BOOKSHELF => new Bookshelf(),
-				self::MOSS_STONE => new MossStone(),
-				self::OBSIDIAN => new Obsidian(),
-				self::TORCH => new Torch(),
-				self::FIRE => new Fire(),
-				self::MONSTER_SPAWNER => new MonsterSpawner(),
-				self::WOOD_STAIRS => new WoodStairs(),
-				self::CHEST => new Chest(),
+		if(self::$list === null){
+			self::$list = new \SplFixedArray(256);
+			self::$list[self::AIR] = Air::class;;
+			self::$list[self::STONE] = Stone::class;;
+			self::$list[self::GRASS] = Grass::class;;
+			self::$list[self::DIRT] = Dirt::class;;
+			self::$list[self::COBBLESTONE] = Cobblestone::class;;
+			self::$list[self::PLANKS] = Planks::class;;
+			self::$list[self::SAPLING] = Sapling::class;;
+			self::$list[self::BEDROCK] = Bedrock::class;;
+			self::$list[self::WATER] = Water::class;;
+			self::$list[self::STILL_WATER] = StillWater::class;;
+			self::$list[self::LAVA] = Lava::class;;
+			self::$list[self::STILL_LAVA] = StillLava::class;;
+			self::$list[self::SAND] = Sand::class;;
+			self::$list[self::GRAVEL] = Gravel::class;;
+			self::$list[self::GOLD_ORE] = GoldOre::class;;
+			self::$list[self::IRON_ORE] = IronOre::class;;
+			self::$list[self::COAL_ORE] = CoalOre::class;;
+			self::$list[self::WOOD] = Wood::class;;
+			self::$list[self::LEAVES] = Leaves::class;;
+			self::$list[self::SPONGE] = Sponge::class;;
+			self::$list[self::GLASS] = Glass::class;;
+			self::$list[self::LAPIS_ORE] = LapisOre::class;;
+			self::$list[self::LAPIS_BLOCK] = Lapis::class;;
+			self::$list[self::SANDSTONE] = Sandstone::class;;
+			self::$list[self::BED_BLOCK] = Bed::class;;
+			self::$list[self::COBWEB] = Cobweb::class;;
+			self::$list[self::TALL_GRASS] = TallGrass::class;;
+			self::$list[self::DEAD_BUSH] = DeadBush::class;;
+			self::$list[self::WOOL] = Wool::class;;
+			self::$list[self::DANDELION] = Dandelion::class;;
+			self::$list[self::POPPY] = CyanFlower::class;;
+			self::$list[self::BROWN_MUSHROOM] = BrownMushroom::class;;
+			self::$list[self::RED_MUSHROOM] = RedMushroom::class;;
+			self::$list[self::GOLD_BLOCK] = Gold::class;;
+			self::$list[self::IRON_BLOCK] = Iron::class;;
+			self::$list[self::DOUBLE_SLAB] = DoubleSlab::class;;
+			self::$list[self::SLAB] = Slab::class;;
+			self::$list[self::BRICKS_BLOCK] = Bricks::class;;
+			self::$list[self::TNT] = TNT::class;;
+			self::$list[self::BOOKSHELF] = Bookshelf::class;;
+			self::$list[self::MOSS_STONE] = MossStone::class;;
+			self::$list[self::OBSIDIAN] = Obsidian::class;;
+			self::$list[self::TORCH] = Torch::class;;
+			self::$list[self::FIRE] = Fire::class;;
+			self::$list[self::MONSTER_SPAWNER] = MonsterSpawner::class;;
+			self::$list[self::WOOD_STAIRS] = WoodStairs::class;;
+			self::$list[self::CHEST] = Chest::class;;
 
-				self::DIAMOND_ORE => new DiamondOre(),
-				self::DIAMOND_BLOCK => new Diamond(),
-				self::WORKBENCH => new Workbench(),
-				self::WHEAT_BLOCK => new Wheat(),
-				self::FARMLAND => new Farmland(),
-				self::FURNACE => new Furnace(),
-				self::BURNING_FURNACE => new BurningFurnace(),
-				self::SIGN_POST => new SignPost(),
-				self::WOOD_DOOR_BLOCK => new WoodDoor(),
-				self::LADDER => new Ladder(),
+			self::$list[self::DIAMOND_ORE] = DiamondOre::class;;
+			self::$list[self::DIAMOND_BLOCK] = Diamond::class;;
+			self::$list[self::WORKBENCH] = Workbench::class;;
+			self::$list[self::WHEAT_BLOCK] = Wheat::class;;
+			self::$list[self::FARMLAND] = Farmland::class;;
+			self::$list[self::FURNACE] = Furnace::class;;
+			self::$list[self::BURNING_FURNACE] = BurningFurnace::class;;
+			self::$list[self::SIGN_POST] = SignPost::class;;
+			self::$list[self::WOOD_DOOR_BLOCK] = WoodDoor::class;;
+			self::$list[self::LADDER] = Ladder::class;;
 
-				self::COBBLESTONE_STAIRS => new CobblestoneStairs(),
-				self::WALL_SIGN => new WallSign(),
+			self::$list[self::COBBLESTONE_STAIRS] = CobblestoneStairs::class;;
+			self::$list[self::WALL_SIGN] = WallSign::class;;
 
-				self::IRON_DOOR_BLOCK => new IronDoor(),
-				self::REDSTONE_ORE => new RedstoneOre(),
-				self::GLOWING_REDSTONE_ORE => new GlowingRedstoneOre(),
+			self::$list[self::IRON_DOOR_BLOCK] = IronDoor::class;;
+			self::$list[self::REDSTONE_ORE] = RedstoneOre::class;;
+			self::$list[self::GLOWING_REDSTONE_ORE] = GlowingRedstoneOre::class;;
 
-				self::SNOW_LAYER => new SnowLayer(),
-				self::ICE => new Ice(),
-				self::SNOW_BLOCK => new Snow(),
-				self::CACTUS => new Cactus(),
-				self::CLAY_BLOCK => new Clay(),
-				self::SUGARCANE_BLOCK => new Sugarcane(),
+			self::$list[self::SNOW_LAYER] = SnowLayer::class;;
+			self::$list[self::ICE] = Ice::class;;
+			self::$list[self::SNOW_BLOCK] = Snow::class;;
+			self::$list[self::CACTUS] = Cactus::class;;
+			self::$list[self::CLAY_BLOCK] = Clay::class;;
+			self::$list[self::SUGARCANE_BLOCK] = Sugarcane::class;;
 
-				self::FENCE => new Fence(),
-				self::PUMPKIN => new Pumpkin(),
-				self::NETHERRACK => new Netherrack(),
-				self::SOUL_SAND => new SoulSand(),
-				self::GLOWSTONE_BLOCK => new Glowstone(),
+			self::$list[self::FENCE] = Fence::class;;
+			self::$list[self::PUMPKIN] = Pumpkin::class;;
+			self::$list[self::NETHERRACK] = Netherrack::class;;
+			self::$list[self::SOUL_SAND] = SoulSand::class;;
+			self::$list[self::GLOWSTONE_BLOCK] = Glowstone::class;;
 
-				self::LIT_PUMPKIN => new LitPumpkin(),
-				self::CAKE_BLOCK => new Cake(),
+			self::$list[self::LIT_PUMPKIN] = LitPumpkin::class;;
+			self::$list[self::CAKE_BLOCK] = Cake::class;;
 
-				self::TRAPDOOR => new Trapdoor(),
+			self::$list[self::TRAPDOOR] = Trapdoor::class;;
 
-				self::STONE_BRICKS => new StoneBricks(),
+			self::$list[self::STONE_BRICKS] = StoneBricks::class;;
 
-				self::IRON_BARS => new IronBars(),
-				self::GLASS_PANE => new GlassPane(),
-				self::MELON_BLOCK => new Melon(),
-				self::PUMPKIN_STEM => new PumpkinStem(),
-				self::MELON_STEM => new MelonStem(),
+			self::$list[self::IRON_BARS] = IronBars::class;;
+			self::$list[self::GLASS_PANE] = GlassPane::class;;
+			self::$list[self::MELON_BLOCK] = Melon::class;;
+			self::$list[self::PUMPKIN_STEM] = PumpkinStem::class;;
+			self::$list[self::MELON_STEM] = MelonStem::class;;
+			self::$list[self::VINE] = Vine::class;;
+			self::$list[self::FENCE_GATE] = FenceGate::class;;
+			self::$list[self::BRICK_STAIRS] = BrickStairs::class;;
+			self::$list[self::STONE_BRICK_STAIRS] = StoneBrickStairs::class;;
 
-				self::FENCE_GATE => new FenceGate(),
-				self::BRICK_STAIRS => new BrickStairs(),
-				self::STONE_BRICK_STAIRS => new StoneBrickStairs(),
+			self::$list[self::MYCELIUM] = Mycelium::class;;
+			self::$list[self::NETHER_BRICKS] = NetherBrick::class;;
 
-				self::MYCELIUM => new Mycelium(),
-				self::NETHER_BRICKS => new NetherBrick(),
+			self::$list[self::NETHER_BRICKS_STAIRS] = NetherBrickStairs::class;;
 
-				self::NETHER_BRICKS_STAIRS => new NetherBrickStairs(),
+			self::$list[self::END_PORTAL] = EndPortal::class;;
+			self::$list[self::END_STONE] = EndStone::class;;
+			self::$list[self::SANDSTONE_STAIRS] = SandstoneStairs::class;;
+			self::$list[self::EMERALD_ORE] = EmeraldOre::class;;
 
-				self::END_PORTAL => new EndPortal(),
-				self::END_STONE => new EndStone(),
-				self::SANDSTONE_STAIRS => new SandstoneStairs(),
-				self::EMERALD_ORE => new EmeraldOre(),
+			self::$list[self::EMERALD_BLOCK] = Emerald::class;;
+			self::$list[self::SPRUCE_WOOD_STAIRS] = SpruceWoodStairs::class;;
+			self::$list[self::BIRCH_WOOD_STAIRS] = BirchWoodStairs::class;;
+			self::$list[self::JUNGLE_WOOD_STAIRS] = JungleWoodStairs::class;;
+			self::$list[self::STONE_WALL] = StoneWall::class;;
 
-				self::EMERALD_BLOCK => new Emerald(),
-				self::SPRUCE_WOOD_STAIRS => new SpruceWoodStairs(),
-				self::BIRCH_WOOD_STAIRS => new BirchWoodStairs(),
-				self::JUNGLE_WOOD_STAIRS => new JungleWoodStairs(),
-				self::STONE_WALL => new StoneWall(),
+			self::$list[self::CARROT_BLOCK] = Carrot::class;;
+			self::$list[self::POTATO_BLOCK] = Potato::class;;
 
-				self::CARROT_BLOCK => new Carrot(),
-				self::POTATO_BLOCK => new Potato(),
+			self::$list[self::QUARTZ_BLOCK] = Quartz::class;;
+			self::$list[self::QUARTZ_STAIRS] = QuartzStairs::class;;
+			self::$list[self::DOUBLE_WOOD_SLAB] = DoubleWoodSlab::class;;
+			self::$list[self::WOOD_SLAB] = WoodSlab::class;;
+			self::$list[self::STAINED_CLAY] = StainedClay::class;;
 
-				self::QUARTZ_BLOCK => new Quartz(),
-				self::QUARTZ_STAIRS => new QuartzStairs(),
-				self::DOUBLE_WOOD_SLAB => new DoubleWoodSlab(),
-				self::WOOD_SLAB => new WoodSlab(),
-				self::STAINED_CLAY => new StainedClay(),
+			self::$list[self::LEAVES2] = Leaves2::class;;
+			self::$list[self::WOOD2] = Wood2::class;;
+			self::$list[self::ACACIA_WOOD_STAIRS] = AcaciaWoodStairs::class;;
+			self::$list[self::DARK_OAK_WOOD_STAIRS] = DarkOakWoodStairs::class;;
 
-				self::LEAVES2 => new Leaves2(),
-				self::WOOD2 => new Wood2(),
-				self::ACACIA_WOOD_STAIRS => new AcaciaWoodStairs(),
-				self::DARK_OAK_WOOD_STAIRS => new DarkOakWoodStairs(),
+			self::$list[self::HAY_BALE] = HayBale::class;;
+			self::$list[self::CARPET] = Carpet::class;;
+			self::$list[self::HARDENED_CLAY] = HardenedClay::class;;
+			self::$list[self::COAL_BLOCK] = Coal::class;;
 
-				self::HAY_BALE => new HayBale(),
-				self::CARPET => new Carpet(),
-				self::HARDENED_CLAY => new HardenedClay(),
-				self::COAL_BLOCK => new Coal(),
+			self::$list[self::PODZOL] = Podzol::class;;
+			self::$list[self::BEETROOT_BLOCK] = Beetroot::class;;
+			self::$list[self::STONECUTTER] = Stonecutter::class;;
+			self::$list[self::GLOWING_OBSIDIAN] = GlowingObsidian::class;;
+			self::$list[self::NETHER_REACTOR] = NetherReactor::class;;
 
-				self::PODZOL => new Podzol(),
-				self::BEETROOT_BLOCK => new Beetroot(),
-				self::STONECUTTER => new Stonecutter(),
-				self::GLOWING_OBSIDIAN => new GlowingObsidian(),
-				self::NETHER_REACTOR => new NetherReactor(),
-			);
 		}
 	}
 
@@ -675,14 +682,22 @@ abstract class Block extends Position implements Metadatable{
 	 * @return Block
 	 */
 	public static function get($id, $meta = 0, Position $pos = null){
-		if(isset(self::$list[$id])){
-			$block = clone self::$list[$id];
-			$block->setDamage($meta);
-		}else{
-			$block = new Generic($id, $meta);
+		try{
+			$block = self::$list[$id];
+			if($block !== null){
+				$block = new $block($meta);
+			}else{
+				$block = new Block($id, $meta);
+			}
+		}catch(\RuntimeException $e){
+			$block = new Block($id, $meta);
 		}
-		if($pos instanceof Position){
-			$block->position($pos);
+
+		if($pos !== null){
+			$block->x = $pos->x;
+			$block->y = $pos->y;
+			$block->z = $pos->z;
+			$block->level = $pos->level;
 		}
 
 		return $block;
@@ -697,8 +712,69 @@ abstract class Block extends Position implements Metadatable{
 		$this->id = (int) $id;
 		$this->meta = (int) $meta;
 		$this->name = $name;
-		$this->breakTime = 0.20;
-		$this->hardness = 10;
+	}
+
+	/**
+	 * Places the Block, using block space and block target, and side. Returns if the block has been placed.
+	 *
+	 * @param Item   $item
+	 * @param Block  $block
+	 * @param Block  $target
+	 * @param int    $face
+	 * @param float  $fx
+	 * @param float  $fy
+	 * @param float  $fz
+	 * @param Player $player = null
+	 *
+	 * @return bool
+	 */
+	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
+		return $this->getLevel()->setBlock($this, $this, true, true);
+	}
+
+	/**
+	 * Returns if the item can be broken with an specific Item
+	 *
+	 * @param Item $item
+	 *
+	 * @return bool
+	 */
+	public function isBreakable(Item $item){
+		return $this->breakable;
+	}
+
+	/**
+	 * Do the actions needed so the block is broken with the Item
+	 *
+	 * @param Item $item
+	 *
+	 * @return mixed
+	 */
+	public function onBreak(Item $item){
+		return $this->getLevel()->setBlock($this, new Air(), true, true);
+	}
+
+	/**
+	 * Fires a block update on the Block
+	 *
+	 * @param int $type
+	 *
+	 * @return void
+	 */
+	public function onUpdate($type){
+
+	}
+
+	/**
+	 * Do actions when activated by Item. Returns if it has done anything
+	 *
+	 * @param Item   $item
+	 * @param Player $player
+	 *
+	 * @return bool
+	 */
+	public function onActivate(Item $item, Player $player = null){
+		return $this->isActivable;
 	}
 
 	/**
@@ -718,10 +794,14 @@ abstract class Block extends Position implements Metadatable{
 	/**
 	 * @return int
 	 */
-	final public function getID(){
+	final public function getId(){
 		return $this->id;
 	}
 
+	public function addVelocityToEntity(Entity $entity, Vector3 $vector){
+
+	}
+
 	/**
 	 * @return int
 	 */
@@ -760,7 +840,7 @@ abstract class Block extends Position implements Metadatable{
 			return [];
 		}else{
 			return [
-				array($this->id, $this->meta, 1),
+				[$this->id, $this->meta, 1],
 			];
 		}
 	}
@@ -800,41 +880,41 @@ abstract class Block extends Position implements Metadatable{
 		return "Block " . $this->name . " (" . $this->id . ":" . $this->meta . ")";
 	}
 
-	/**
-	 * Returns if the item can be broken with an specific Item
-	 *
-	 * @param Item $item
-	 *
-	 * @return bool
-	 */
-	abstract function isBreakable(Item $item);
-
-	/**
-	 * Do the actions needed so the block is broken with the Item
-	 *
-	 * @param Item $item
-	 *
-	 * @return mixed
-	 */
-	abstract function onBreak(Item $item);
-
 	/**
 	 * Checks for collision against an AxisAlignedBB
 	 *
 	 * @param AxisAlignedBB $bb
 	 * @param Block[]       $list
 	 */
-	public function collidesWithBB(AxisAlignedBB $bb, &$list = array()){
+	public function collidesWithBB(AxisAlignedBB $bb, &$list = []){
 		$bb2 = $this->getBoundingBox();
-		if($bb2->intersectsWith($bb)){
+		if($bb2 !== null and $bb2->intersectsWith($bb)){
 			$list[] = $bb2;
 		}
 	}
 
+	/**
+	 * @param Entity $entity
+	 */
+	public function onEntityCollide(Entity $entity){
+
+	}
+
 	/**
 	 * @return AxisAlignedBB
 	 */
 	public function getBoundingBox(){
+		if($this->boundingBox !== null){
+			return $this->boundingBox;
+		}else{
+			return $this->boundingBox = $this->recalculateBoundingBox();
+		}
+	}
+
+	/**
+	 * @return AxisAlignedBB
+	 */
+	protected function recalculateBoundingBox(){
 		return new AxisAlignedBB(
 			$this->x,
 			$this->y,
@@ -845,40 +925,87 @@ abstract class Block extends Position implements Metadatable{
 		);
 	}
 
-	/**
-	 * Places the Block, using block space and block target, and side. Returns if the block has been placed.
-	 *
-	 * @param Item   $item
-	 * @param Block  $block
-	 * @param Block  $target
-	 * @param int    $face
-	 * @param float  $fx
-	 * @param float  $fy
-	 * @param float  $fz
-	 * @param Player $player = null
-	 *
-	 * @return bool
-	 */
-	abstract function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null);
+	public function calculateIntercept(Vector3 $pos1, Vector3 $pos2){
+		$bb = $this->getBoundingBox();
+		if($bb === null){
+			return null;
+		}
 
-	/**
-	 * Do actions when activated by Item. Returns if it has done anything
-	 *
-	 * @param Item   $item
-	 * @param Player $player
-	 *
-	 * @return bool
-	 */
-	abstract function onActivate(Item $item, Player $player = null);
+		$v1 = $pos1->getIntermediateWithXValue($pos2, $bb->minX);
+		$v2 = $pos1->getIntermediateWithXValue($pos2, $bb->maxX);
+		$v3 = $pos1->getIntermediateWithYValue($pos2, $bb->minY);
+		$v4 = $pos1->getIntermediateWithYValue($pos2, $bb->maxY);
+		$v5 = $pos1->getIntermediateWithZValue($pos2, $bb->minZ);
+		$v6 = $pos1->getIntermediateWithZValue($pos2, $bb->maxZ);
 
-	/**
-	 * Fires a block update on the Block
-	 *
-	 * @param int $type
-	 *
-	 * @return void
-	 */
-	abstract function onUpdate($type);
+		if($v1 !== null and !$bb->isVectorInYZ($v1)){
+			$v1 = null;
+		}
+
+		if($v2 !== null and !$bb->isVectorInYZ($v2)){
+			$v2 = null;
+		}
+
+		if($v3 !== null and !$bb->isVectorInXZ($v3)){
+			$v3 = null;
+		}
+
+		if($v4 !== null and !$bb->isVectorInXZ($v4)){
+			$v4 = null;
+		}
+
+		if($v5 !== null and !$bb->isVectorInXY($v5)){
+			$v5 = null;
+		}
+
+		if($v6 !== null and !$bb->isVectorInXY($v6)){
+			$v6 = null;
+		}
+
+		$vector = $v1;
+
+		if($v2 !== null and ($vector === null or $pos1->distanceSquared($v2) < $pos1->distanceSquared($vector))){
+			$vector = $v2;
+		}
+
+		if($v3 !== null and ($vector === null or $pos1->distanceSquared($v3) < $pos1->distanceSquared($vector))){
+			$vector = $v3;
+		}
+
+		if($v4 !== null and ($vector === null or $pos1->distanceSquared($v4) < $pos1->distanceSquared($vector))){
+			$vector = $v4;
+		}
+
+		if($v5 !== null and ($vector === null or $pos1->distanceSquared($v5) < $pos1->distanceSquared($vector))){
+			$vector = $v5;
+		}
+
+		if($v6 !== null and ($vector === null or $pos1->distanceSquared($v6) < $pos1->distanceSquared($vector))){
+			$vector = $v6;
+		}
+
+		if($vector === null){
+			return null;
+		}
+
+		$f = -1;
+
+		if($vector === $v1){
+			$f = 4;
+		}elseif($vector === $v2){
+			$f = 5;
+		}elseif($vector === $v3){
+			$f = 0;
+		}elseif($vector === $v4){
+			$f = 1;
+		}elseif($vector === $v5){
+			$f = 2;
+		}elseif($vector === $v6){
+			$f = 3;
+		}
+
+		return MovingObjectPosition::fromBlock($this->x, $this->y, $this->z, $f, $vector->add($this->x, $this->y, $this->z));
+	}
 
 	public function setMetadata($metadataKey, MetadataValue $metadataValue){
 		if($this->getLevel() instanceof Level){

src/pocketmine/block/Bricks.php

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

src/pocketmine/block/BrownMushroom.php

@@ -33,9 +33,8 @@ class BrownMushroom extends Flowable{
 
 	public function onUpdate($type){
 		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->isTransparent === true){ //Replace with common break method
-				$this->getLevel()->dropItem($this, Item::get($this->id));
-				$this->getLevel()->setBlock($this, new Air(), false, false, true);
+			if($this->getSide(0)->isTransparent === true){
+				$this->getLevel()->useBreakOn($this);
 
 				return Level::BLOCK_UPDATE_NORMAL;
 			}
@@ -47,11 +46,16 @@ class BrownMushroom extends Flowable{
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		$down = $this->getSide(0);
 		if($down->isTransparent === false){
-			$this->getLevel()->setBlock($block, $this, true, false, true);
+			$this->getLevel()->setBlock($block, $this, true, true);
 
 			return true;
 		}
 
 		return false;
 	}
+
+	public function getBoundingBox(){
+		return null;
+	}
+
 }

src/pocketmine/block/BurningFurnace.php

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

src/pocketmine/block/Cactus.php

@@ -21,26 +21,56 @@
 
 namespace pocketmine\block;
 
+use pocketmine\entity\Entity;
+use pocketmine\event\block\BlockGrowEvent;
+use pocketmine\event\entity\EntityDamageByBlockEvent;
+use pocketmine\event\entity\EntityDamageEvent;
 use pocketmine\item\Item;
 use pocketmine\level\Level;
-use pocketmine\math\Vector3 as Vector3;
+use pocketmine\math\AxisAlignedBB;
+use pocketmine\math\Vector3;
 use pocketmine\Player;
+use pocketmine\Server;
 
 class Cactus extends Transparent{
+
+	public $hasEntityCollision = true;
+
 	public function __construct($meta = 0){
 		parent::__construct(self::CACTUS, $meta, "Cactus");
 		$this->isFullBlock = false;
 		$this->hardness = 2;
 	}
 
+	protected function recalculateBoundingBox(){
+
+		return new AxisAlignedBB(
+			$this->x + 0.0625,
+			$this->y,
+			$this->z + 0.0625,
+			$this->x + 0.9375,
+			$this->y + 1,
+			$this->z + 0.9375
+		);
+	}
+
+	public function onEntityCollide(Entity $entity){
+		$ev = new EntityDamageByBlockEvent($this, $entity, EntityDamageEvent::CAUSE_CONTACT, 1);
+		$entity->attack($ev->getFinalDamage(), $ev);
+	}
+
 	public function onUpdate($type){
 		if($type === Level::BLOCK_UPDATE_NORMAL){
 			$down = $this->getSide(0);
-			if($down->getID() !== self::SAND and $down->getID() !== self::CACTUS){ //Replace with common break method
-				$this->getLevel()->setBlock($this, new Air(), false);
-				$this->getLevel()->dropItem($this, Item::get($this->id));
-
-				return Level::BLOCK_UPDATE_NORMAL;
+			if($down->getID() !== self::SAND and $down->getID() !== self::CACTUS){
+				$this->getLevel()->useBreakOn($this);
+			}else{
+				for($side = 2; $side <= 5; ++$side){
+					$b = $this->getSide($side);
+					if(!$b->isFlowable){
+						$this->getLevel()->useBreakOn($this);
+					}
+				}
 			}
 		}elseif($type === Level::BLOCK_UPDATE_RANDOM){
 			if($this->getSide(0)->getID() !== self::CACTUS){
@@ -48,18 +78,18 @@ class Cactus extends Transparent{
 					for($y = 1; $y < 3; ++$y){
 						$b = $this->getLevel()->getBlock(new Vector3($this->x, $this->y + $y, $this->z));
 						if($b->getID() === self::AIR){
-							$this->getLevel()->setBlock($b, new Cactus(), true, false, true);
-							break;
+							Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($b, new Cactus()));
+							if(!$ev->isCancelled()){
+								$this->getLevel()->setBlock($b, $ev->getNewState(), true);
+							}
 						}
 					}
 					$this->meta = 0;
-					$this->getLevel()->setBlock($this, $this, false);
+					$this->getLevel()->setBlock($this, $this);
 				}else{
 					++$this->meta;
-					$this->getLevel()->setBlock($this, $this, false);
+					$this->getLevel()->setBlock($this, $this);
 				}
-
-				return Level::BLOCK_UPDATE_RANDOM;
 			}
 		}
 
@@ -74,7 +104,7 @@ class Cactus extends Transparent{
 			$block2 = $this->getSide(4);
 			$block3 = $this->getSide(5);
 			if($block0->isTransparent === true and $block1->isTransparent === true and $block2->isTransparent === true and $block3->isTransparent === true){
-				$this->getLevel()->setBlock($this, $this, true, false, true);
+				$this->getLevel()->setBlock($this, $this, true);
 
 				return true;
 			}
@@ -84,8 +114,8 @@ class Cactus extends Transparent{
 	}
 
 	public function getDrops(Item $item){
-		return array(
-			array($this->id, 0, 1),
-		);
+		return [
+			[$this->id, 0, 1],
+		];
 	}
 }

src/pocketmine/block/Cake.php

@@ -21,9 +21,12 @@
 
 namespace pocketmine\block;
 
+use pocketmine\event\entity\EntityRegainHealthEvent;
 use pocketmine\item\Item;
 use pocketmine\level\Level;
+use pocketmine\math\AxisAlignedBB;
 use pocketmine\Player;
+use pocketmine\Server;
 
 class Cake extends Transparent{
 	public function __construct($meta = 0){
@@ -34,10 +37,24 @@ class Cake extends Transparent{
 		$this->hardness = 2.5;
 	}
 
+	protected function recalculateBoundingBox(){
+
+		$f = (1 + $this->getDamage() * 2) / 16;
+
+		return new AxisAlignedBB(
+			$this->x + $f,
+			$this->y,
+			$this->z + 0.0625,
+			$this->x + 1 - 0.0625,
+			$this->y + 0.5,
+			$this->z + 1 - 0.0625
+		);
+	}
+
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		$down = $this->getSide(0);
 		if($down->getID() !== self::AIR){
-			$this->getLevel()->setBlock($block, $this, true, false, true);
+			$this->getLevel()->setBlock($block, $this, true, true);
 
 			return true;
 		}
@@ -48,7 +65,7 @@ class Cake extends Transparent{
 	public function onUpdate($type){
 		if($type === Level::BLOCK_UPDATE_NORMAL){
 			if($this->getSide(0)->getID() === self::AIR){ //Replace with common break method
-				$this->getLevel()->setBlock($this, new Air(), true, false, true);
+				$this->getLevel()->setBlock($this, new Air(), true);
 
 				return Level::BLOCK_UPDATE_NORMAL;
 			}
@@ -64,11 +81,14 @@ class Cake extends Transparent{
 	public function onActivate(Item $item, Player $player = null){
 		if($player instanceof Player and $player->getHealth() < 20){
 			++$this->meta;
-			$player->heal(3, "cake");
+			Server::getInstance()->getPluginManager()->callEvent($ev = new EntityRegainHealthEvent($player, 3, EntityRegainHealthEvent::CAUSE_EATING));
+			if(!$ev->isCancelled()){
+				$player->heal($ev->getAmount(), $ev);
+			}
 			if($this->meta >= 0x06){
-				$this->getLevel()->setBlock($this, new Air(), true, false, true);
+				$this->getLevel()->setBlock($this, new Air(), true);
 			}else{
-				$this->getLevel()->setBlock($this, $this, true, false, true);
+				$this->getLevel()->setBlock($this, $this, true);
 			}
 
 			return true;

src/pocketmine/block/Carpet.php

@@ -23,12 +23,13 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\level\Level;
+use pocketmine\math\AxisAlignedBB;
 use pocketmine\Player;
 
 class Carpet extends Flowable{
 	public function __construct($meta = 0){
 		parent::__construct(self::CARPET, $meta, "Carpet");
-		$names = array(
+		$names = [
 			0 => "White Carpet",
 			1 => "Orange Carpet",
 			2 => "Magenta Carpet",
@@ -45,17 +46,29 @@ class Carpet extends Flowable{
 			13 => "Green Carpet",
 			14 => "Red Carpet",
 			15 => "Black Carpet",
-		);
+		];
 		$this->name = $names[$this->meta];
 		$this->hardness = 0;
 		$this->isFullBlock = false;
 		$this->isSolid = true;
 	}
 
+	protected function recalculateBoundingBox(){
+
+		return new AxisAlignedBB(
+			$this->x,
+			$this->y,
+			$this->z,
+			$this->x + 1,
+			$this->y + 0.0625,
+			$this->z + 1
+		);
+	}
+
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		$down = $this->getSide(0);
 		if($down->getID() !== self::AIR){
-			$this->getLevel()->setBlock($block, $this, true, false, true);
+			$this->getLevel()->setBlock($block, $this, true, true);
 
 			return true;
 		}
@@ -65,9 +78,8 @@ class Carpet extends Flowable{
 
 	public function onUpdate($type){
 		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->getID() === self::AIR){ //TODO: Replace with common break method
-				$this->getLevel()->dropItem($this, Item::get($this->id, $this->meta, 1));
-				$this->getLevel()->setBlock($this, new Air(), true, false, true);
+			if($this->getSide(0)->getID() === self::AIR){
+				$this->getLevel()->useBreakOn($this);
 
 				return Level::BLOCK_UPDATE_NORMAL;
 			}

src/pocketmine/block/Carrot.php

@@ -22,70 +22,18 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\level\Level;
-use pocketmine\Player;
 
-class Carrot extends Flowable{
+class Carrot extends Crops{
 	public function __construct($meta = 0){
 		parent::__construct(self::CARROT_BLOCK, $meta, "Carrot Block");
-		$this->isActivable = true;
-		$this->hardness = 0;
-	}
-
-	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
-		$down = $this->getSide(0);
-		if($down->getID() === self::FARMLAND){
-			$this->getLevel()->setBlock($block, $this, true, false, true);
-
-			return true;
-		}
-
-		return false;
-	}
-
-	public function onActivate(Item $item, Player $player = null){
-		if($item->getID() === Item::DYE and $item->getDamage() === 0x0F){ //Bonemeal
-			$this->meta = 0x07;
-			$this->getLevel()->setBlock($this, $this, true, false, true);
-			$item->count--;
-
-			return true;
-		}
-
-		return false;
-	}
-
-	public function onUpdate($type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->isTransparent === true){ //Replace with common break method
-				//TODO
-				//Server::getInstance()->api->entity->drop($this, Item::get(CARROT, 0, 1));
-				$this->getLevel()->setBlock($this, new Air(), false, false, true);
-
-				return Level::BLOCK_UPDATE_NORMAL;
-			}
-		}elseif($type === Level::BLOCK_UPDATE_RANDOM){
-			if(mt_rand(0, 2) == 1){
-				if($this->meta < 0x07){
-					++$this->meta;
-					$this->getLevel()->setBlock($this, $this, true, false, true);
-
-					return Level::BLOCK_UPDATE_RANDOM;
-				}
-			}else{
-				return Level::BLOCK_UPDATE_RANDOM;
-			}
-		}
-
-		return false;
 	}
 
 	public function getDrops(Item $item){
 		$drops = [];
 		if($this->meta >= 0x07){
-			$drops[] = array(Item::CARROT, 0, mt_rand(1, 4));
+			$drops[] = [Item::CARROT, 0, mt_rand(1, 4)];
 		}else{
-			$drops[] = array(Item::CARROT, 0, 1);
+			$drops[] = [Item::CARROT, 0, 1];
 		}
 
 		return $drops;

src/pocketmine/block/Chest.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\math\AxisAlignedBB;
 use pocketmine\nbt\NBT;
 use pocketmine\nbt\tag\Compound;
 use pocketmine\nbt\tag\Enum;
@@ -41,15 +42,27 @@ class Chest extends Transparent{
 		$this->hardness = 15;
 	}
 
+	protected function recalculateBoundingBox(){
+
+		return new AxisAlignedBB(
+			$this->x + 0.0625,
+			$this->y,
+			$this->z + 0.0625,
+			$this->x + 0.9375,
+			$this->y + 0.9475,
+			$this->z + 0.9375
+		);
+	}
+
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
-		$faces = array(
+		$faces = [
 			0 => 4,
 			1 => 2,
 			2 => 5,
 			3 => 3,
-		);
+		];
 
-		$chest = false;
+		$chest = null;
 		$this->meta = $faces[$player instanceof Player ? $player->getDirection() : 0];
 
 		for($side = 2; $side <= 5; ++$side){
@@ -68,18 +81,18 @@ class Chest extends Transparent{
 			}
 		}
 
-		$this->getLevel()->setBlock($block, $this, true, false, true);
-		$nbt = new Compound(false, array(
+		$this->getLevel()->setBlock($block, $this, true, true);
+		$nbt = new Compound(false, [
 			new Enum("Items", []),
 			new String("id", Tile::CHEST),
 			new Int("x", $this->x),
 			new Int("y", $this->y),
 			new Int("z", $this->z)
-		));
+		]);
 		$nbt->Items->setTagType(NBT::TAG_Compound);
-		$tile = new TileChest($this->getLevel()->getChunkAt($this->x >> 4, $this->z >> 4), $nbt);
+		$tile = Tile::createTile("Chest", $this->getLevel()->getChunk($this->x >> 4, $this->z >> 4), $nbt);
 
-		if($chest instanceof TileChest){
+		if($chest instanceof TileChest and $tile instanceof TileChest){
 			$chest->pairWith($tile);
 			$tile->pairWith($chest);
 		}
@@ -92,7 +105,7 @@ class Chest extends Transparent{
 		if($t instanceof TileChest){
 			$t->unpair();
 		}
-		$this->getLevel()->setBlock($this, new Air(), true, true, true);
+		$this->getLevel()->setBlock($this, new Air(), true, true);
 
 		return true;
 	}
@@ -109,19 +122,19 @@ class Chest extends Transparent{
 			if($t instanceof TileChest){
 				$chest = $t;
 			}else{
-				$nbt = new Compound(false, array(
+				$nbt = new Compound(false, [
 					new Enum("Items", []),
 					new String("id", Tile::CHEST),
 					new Int("x", $this->x),
 					new Int("y", $this->y),
 					new Int("z", $this->z)
-				));
+				]);
 				$nbt->Items->setTagType(NBT::TAG_Compound);
-				$chest = new TileChest($this->getLevel()->getChunkAt($this->x >> 4, $this->z >> 4), $nbt);
+				$chest = Tile::createTile("Chest", $this->getLevel()->getChunk($this->x >> 4, $this->z >> 4), $nbt);
 			}
 
 
-			if(($player->gamemode & 0x01) === 0x01){
+			if($player->isCreative()){
 				return true;
 			}
 			$player->addWindow($chest->getInventory());
@@ -131,19 +144,8 @@ class Chest extends Transparent{
 	}
 
 	public function getDrops(Item $item){
-		$drops = array(
-			array($this->id, 0, 1),
-		);
-		$t = $this->getLevel()->getTile($this);
-		if($t instanceof TileChest){
-			for($s = 0; $s < $t->getRealInventory()->getSize(); ++$s){
-				$slot = $t->getRealInventory()->getItem($s);
-				if($slot->getID() > Item::AIR and $slot->getCount() > 0){
-					$drops[] = array($slot->getID(), $slot->getDamage(), $slot->getCount());
-				}
-			}
-		}
-
-		return $drops;
+		return [
+			[$this->id, 0, 1],
+		];
 	}
 }

src/pocketmine/block/Clay.php

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

src/pocketmine/block/Coal.php

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

src/pocketmine/block/CoalOre.php

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

src/pocketmine/block/Cobblestone.php

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

src/pocketmine/block/Cobweb.php

@@ -21,9 +21,13 @@
 
 namespace pocketmine\block;
 
+use pocketmine\entity\Entity;
 use pocketmine\item\Item;
 
 class Cobweb extends Flowable{
+
+	public $hasEntityCollision = true;
+
 	public function __construct(){
 		parent::__construct(self::COBWEB, 0, "Cobweb");
 		$this->isSolid = true;
@@ -31,6 +35,10 @@ class Cobweb extends Flowable{
 		$this->hardness = 25;
 	}
 
+	public function onEntityCollide(Entity $entity){
+		$entity->fallDistance = 0;
+	}
+
 	public function getDrops(Item $item){
 		return [];
 	}

src/pocketmine/block/Crops.php

@@ -0,0 +1,100 @@
+<?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\BlockGrowEvent;
+use pocketmine\item\Item;
+use pocketmine\level\Level;
+use pocketmine\Player;
+use pocketmine\Server;
+
+abstract class Crops extends Flowable{
+
+	public $isActivable = true;
+	public $hardness = 0;
+
+
+	public function getBoundingBox(){
+		return null;
+	}
+
+	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
+		$down = $this->getSide(0);
+		if($down->getID() === self::FARMLAND){
+			$this->getLevel()->setBlock($block, $this, true, true);
+
+			return true;
+		}
+
+		return false;
+	}
+
+
+	public function onActivate(Item $item, Player $player = null){
+		if($item->getID() === Item::DYE and $item->getDamage() === 0x0F){ //Bonemeal
+			$block = clone $this;
+			$block->meta += mt_rand(2, 5);
+			if($block->meta > 7){
+				$block->meta = 7;
+			}
+
+			Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($this, $block));
+
+			if(!$ev->isCancelled()){
+				$this->getLevel()->setBlock($this, $ev->getNewState(), true, true);
+			}
+
+			$item->count--;
+
+			return true;
+		}
+
+		return false;
+	}
+
+	public function onUpdate($type){
+		if($type === Level::BLOCK_UPDATE_NORMAL){
+			if($this->getSide(0)->isTransparent === true){
+				$this->getLevel()->useBreakOn($this);
+				return Level::BLOCK_UPDATE_NORMAL;
+			}
+		}elseif($type === Level::BLOCK_UPDATE_RANDOM){
+			if(mt_rand(0, 2) == 1){
+				if($this->meta < 0x07){
+					$block = clone $this;
+					++$block->meta;
+					Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($this, $block));
+
+					if(!$ev->isCancelled()){
+						$this->getLevel()->setBlock($this, $ev->getNewState(), true, true);
+					}else{
+						return Level::BLOCK_UPDATE_RANDOM;
+					}
+				}
+			}else{
+				return Level::BLOCK_UPDATE_RANDOM;
+			}
+		}
+
+		return false;
+	}
+}

src/pocketmine/block/CyanFlower.php

@@ -31,10 +31,15 @@ class CyanFlower extends Flowable{
 		$this->hardness = 0;
 	}
 
+	public function getBoundingBox(){
+		return null;
+	}
+
+
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		$down = $this->getSide(0);
 		if($down->getID() === 2 or $down->getID() === 3 or $down->getID() === 60){
-			$this->getLevel()->setBlock($block, $this, true, false, true);
+			$this->getLevel()->setBlock($block, $this, true, true);
 
 			return true;
 		}
@@ -44,9 +49,8 @@ class CyanFlower extends Flowable{
 
 	public function onUpdate($type){
 		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->isTransparent === true){ //TODO: Replace with common break method
-				$this->getLevel()->dropItem($this, Item::get($this->id, 0, 1));
-				$this->getLevel()->setBlock($this, new Air(), false, false, true);
+			if($this->getSide(0)->isTransparent === true){
+				$this->getLevel()->useBreakOn($this);
 
 				return Level::BLOCK_UPDATE_NORMAL;
 			}

src/pocketmine/block/Dandelion.php

@@ -31,10 +31,15 @@ class Dandelion extends Flowable{
 		$this->hardness = 0;
 	}
 
+	public function getBoundingBox(){
+		return null;
+	}
+
+
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		$down = $this->getSide(0);
 		if($down->getID() === 2 or $down->getID() === 3 or $down->getID() === 60){
-			$this->getLevel()->setBlock($block, $this, true, false, true);
+			$this->getLevel()->setBlock($block, $this, true, true);
 
 			return true;
 		}
@@ -44,10 +49,8 @@ class Dandelion extends Flowable{
 
 	public function onUpdate($type){
 		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->isTransparent === true){ //Replace with common break method
-				//TODO
-				//Server::getInstance()->api->entity->drop($this, Item::get($this->id));
-				$this->getLevel()->setBlock($this, new Air(), false, false, true);
+			if($this->getSide(0)->isTransparent === true){
+				$this->getLevel()->useBreakOn($this);
 
 				return Level::BLOCK_UPDATE_NORMAL;
 			}

src/pocketmine/block/DarkOakWoodStairs.php

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

src/pocketmine/block/DeadBush.php

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

src/pocketmine/block/Diamond.php

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

src/pocketmine/block/DiamondOre.php

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

src/pocketmine/block/Dirt.php

@@ -25,16 +25,21 @@ use pocketmine\item\Item;
 use pocketmine\Player;
 
 class Dirt extends Solid{
+
+	public $isActivable = true;
+	protected $hardness = 2.5;
+	protected $id = self::DIRT;
+	protected $meta = 0;
+	protected $name = "Dirt";
+
 	public function __construct(){
-		parent::__construct(self::DIRT, 0, "Dirt");
-		$this->isActivable = true;
-		$this->hardness = 2.5;
+
 	}
 
 	public function onActivate(Item $item, Player $player = null){
 		if($item->isHoe()){
 			$item->useOn($this);
-			$this->getLevel()->setBlock($this, Block::get(Item::FARMLAND, 0), true, false, true);
+			$this->getLevel()->setBlock($this, Block::get(Item::FARMLAND, 0), true);
 
 			return true;
 		}

src/pocketmine/block/Door.php

@@ -23,6 +23,7 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\level\Level;
+use pocketmine\math\AxisAlignedBB;
 use pocketmine\network\protocol\LevelEventPacket;
 use pocketmine\Player;
 use pocketmine\Server;
@@ -34,6 +35,170 @@ abstract class Door extends Transparent{
 		$this->isSolid = false;
 	}
 
+	private function getFullDamage(){
+		$damage = $this->getDamage();
+		$flag = ($damage & 0x08) > 0;
+
+		if($flag){
+			$first = $this->getSide(0)->getDamage();
+			$second = $damage;
+		}else{
+			$first = $damage;
+			$second = $this->getSide(1)->getDamage();
+		}
+
+		$flag1 = ($second & 0x01) > 0;
+
+		return $first & 0x07 | ($flag ? 8 : 0) | ($flag1 ? 0x10 : 0);
+	}
+
+	protected function recalculateBoundingBox(){
+
+		$f = 0.1875;
+		$damage = $this->getFullDamage();
+
+		$bb = new AxisAlignedBB(
+			$this->x,
+			$this->y,
+			$this->z,
+			$this->x + 1,
+			$this->y + 2,
+			$this->z + 1
+		);
+
+		$j = $damage & 0x03;
+		$flag = (($damage & 0x04) > 0);
+		$flag1 = (($damage & 0x10) > 0);
+
+		if($j === 0){
+			if($flag){
+				if(!$flag1){
+					$bb->setBounds(
+						$this->x,
+						$this->y,
+						$this->z,
+						$this->x + 1,
+						$this->y + 1,
+						$this->z + $f
+					);
+				}else{
+					$bb->setBounds(
+						$this->x,
+						$this->y,
+						$this->z + 1 - $f,
+						$this->x + 1,
+						$this->y + 1,
+						$this->z + 1
+					);
+				}
+			}else{
+				$bb->setBounds(
+					$this->x,
+					$this->y,
+					$this->z,
+					$this->x + $f,
+					$this->y + 1,
+					$this->z + 1
+				);
+			}
+		}elseif($j === 1){
+			if($flag){
+				if(!$flag1){
+					$bb->setBounds(
+						$this->x + 1 - $f,
+						$this->y,
+						$this->z,
+						$this->x + 1,
+						$this->y + 1,
+						$this->z + 1
+					);
+				}else{
+					$bb->setBounds(
+						$this->x,
+						$this->y,
+						$this->z,
+						$this->x + $f,
+						$this->y + 1,
+						$this->z + 1
+					);
+				}
+			}else{
+				$bb->setBounds(
+					$this->x,
+					$this->y,
+					$this->z,
+					$this->x + 1,
+					$this->y + 1,
+					$this->z + $f
+				);
+			}
+		}elseif($j === 2){
+			if($flag){
+				if(!$flag1){
+					$bb->setBounds(
+						$this->x,
+						$this->y,
+						$this->z + 1 - $f,
+						$this->x + 1,
+						$this->y + 1,
+						$this->z + 1
+					);
+				}else{
+					$bb->setBounds(
+						$this->x,
+						$this->y,
+						$this->z,
+						$this->x + 1,
+						$this->y + 1,
+						$this->z + $f
+					);
+				}
+			}else{
+				$bb->setBounds(
+					$this->x + 1 - $f,
+					$this->y,
+					$this->z,
+					$this->x + 1,
+					$this->y + 1,
+					$this->z + 1
+				);
+			}
+		}elseif($j === 3){
+			if($flag){
+				if(!$flag1){
+					$bb->setBounds(
+						$this->x,
+						$this->y,
+						$this->z,
+						$this->x + $f,
+						$this->y + 1,
+						$this->z + 1
+					);
+				}else{
+					$bb->setBounds(
+						$this->x + 1 - $f,
+						$this->y,
+						$this->z,
+						$this->x + 1,
+						$this->y + 1,
+						$this->z + 1
+					);
+				}
+			}else{
+				$bb->setBounds(
+					$this->x,
+					$this->y,
+					$this->z + 1 - $f,
+					$this->x + 1,
+					$this->y + 1,
+					$this->z + 1
+				);
+			}
+		}
+
+		return $bb;
+	}
+
 	public function onUpdate($type){
 		if($type === Level::BLOCK_UPDATE_NORMAL){
 			if($this->getSide(0)->getID() === self::AIR){ //Replace with common break method
@@ -57,22 +222,22 @@ abstract class Door extends Transparent{
 				return false;
 			}
 			$direction = $player instanceof Player ? $player->getDirection() : 0;
-			$face = array(
+			$face = [
 				0 => 3,
 				1 => 4,
 				2 => 2,
 				3 => 5,
-			);
+			];
 			$next = $this->getSide($face[(($direction + 2) % 4)]);
 			$next2 = $this->getSide($face[$direction]);
 			$metaUp = 0x08;
 			if($next->getID() === $this->id or ($next2->isTransparent === false and $next->isTransparent === true)){ //Door hinge
 				$metaUp |= 0x01;
 			}
-			$this->getLevel()->setBlock($blockUp, Block::get($this->id, $metaUp), true, false, true); //Top
 
 			$this->meta = $player->getDirection() & 0x03;
-			$this->getLevel()->setBlock($block, $this, true, false, true); //Bottom
+			$this->getLevel()->setBlock($block, $this, true, true); //Bottom
+			$this->getLevel()->setBlock($blockUp, $b = Block::get($this->id, $metaUp), true); //Top
 			return true;
 		}
 
@@ -83,15 +248,15 @@ abstract class Door extends Transparent{
 		if(($this->meta & 0x08) === 0x08){
 			$down = $this->getSide(0);
 			if($down->getID() === $this->id){
-				$this->getLevel()->setBlock($down, new Air(), true, false, true);
+				$this->getLevel()->setBlock($down, new Air(), true);
 			}
 		}else{
 			$up = $this->getSide(1);
 			if($up->getID() === $this->id){
-				$this->getLevel()->setBlock($up, new Air(), true, false, true);
+				$this->getLevel()->setBlock($up, new Air(), true);
 			}
 		}
-		$this->getLevel()->setBlock($this, new Air(), true, false, true);
+		$this->getLevel()->setBlock($this, new Air(), true);
 
 		return true;
 	}
@@ -101,12 +266,12 @@ abstract class Door extends Transparent{
 			$down = $this->getSide(0);
 			if($down->getID() === $this->id){
 				$meta = $down->getDamage() ^ 0x04;
-				$this->getLevel()->setBlock($down, Block::get($this->id, $meta), true, false, true);
+				$this->getLevel()->setBlock($down, Block::get($this->id, $meta), true);
 				$players = $this->getLevel()->getUsingChunk($this->x >> 4, $this->z >> 4);
 				if($player instanceof Player){
 					unset($players[$player->getID()]);
 				}
-				$pk = new LevelEventPacket;
+				$pk = new LevelEventPacket();
 				$pk->x = $this->x;
 				$pk->y = $this->y;
 				$pk->z = $this->z;
@@ -120,12 +285,12 @@ abstract class Door extends Transparent{
 			return false;
 		}else{
 			$this->meta ^= 0x04;
-			$this->getLevel()->setBlock($this, $this, true, false, true);
+			$this->getLevel()->setBlock($this, $this, true);
 			$players = $this->getLevel()->getUsingChunk($this->x >> 4, $this->z >> 4);
 			if($player instanceof Player){
 				unset($players[$player->getID()]);
 			}
-			$pk = new LevelEventPacket;
+			$pk = new LevelEventPacket();
 			$pk->x = $this->x;
 			$pk->y = $this->y;
 			$pk->z = $this->z;

src/pocketmine/block/DoubleSlab.php

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

src/pocketmine/block/DoubleWoodSlab.php

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

src/pocketmine/block/Emerald.php

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

src/pocketmine/block/EmeraldOre.php

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

src/pocketmine/block/EndPortal.php

@@ -21,11 +21,23 @@
 
 namespace pocketmine\block;
 
-use pocketmine\item\Item;
+use pocketmine\math\AxisAlignedBB;
 
 class EndPortal extends Solid{
 	public function __construct($meta = 0){
 		parent::__construct(self::END_PORTAL, $meta, "End Portal");
 		$this->hardness = 18000000;
 	}
+
+	protected function recalculateBoundingBox(){
+
+		return new AxisAlignedBB(
+			$this->x,
+			$this->y,
+			$this->z,
+			$this->x + 1,
+			$this->y + (($this->getDamage() & 0x04) > 0 ? 1 : 0.8125),
+			$this->z + 1
+		);
+	}
 }

src/pocketmine/block/Fallable.php

@@ -21,19 +21,52 @@
 
 namespace pocketmine\block;
 
+use pocketmine\entity\Entity;
 use pocketmine\item\Item;
+use pocketmine\level\Level;
+use pocketmine\nbt\tag\Byte;
+use pocketmine\nbt\tag\Compound;
+use pocketmine\nbt\tag\Double;
+use pocketmine\nbt\tag\Enum;
+use pocketmine\nbt\tag\Float;
+use pocketmine\nbt\tag\Int;
 use pocketmine\Player;
 
-class Fallable extends Solid{
+abstract class Fallable extends Solid{
 
-	public function __construct($id, $meta = 0, $name = "Unknown"){
-		parent::__construct($id, $meta, $name);
-		$this->hasPhysics = true;
-	}
+	public $hasPhysics = true;
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
-		$ret = $this->getLevel()->setBlock($this, $this, true, false, true);
+		$ret = $this->getLevel()->setBlock($this, $this, true, true);
 
 		return $ret;
 	}
+
+	public function onUpdate($type){
+		if($this->hasPhysics === true and $type === Level::BLOCK_UPDATE_NORMAL){
+			$down = $this->getSide(0);
+			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", [
+						new Double("", $this->x + 0.5),
+						new Double("", $this->y),
+						new Double("", $this->z + 0.5)
+					]),
+					"Motion" => new Enum("Motion", [
+						new Double("", 0),
+						new Double("", 0),
+						new Double("", 0)
+					]),
+					"Rotation" => new Enum("Rotation", [
+						new Float("", 0),
+						new Float("", 0)
+					]),
+					"TileID" => new Int("TileID", $this->getID()),
+					"Data" => new Byte("Data", $this->getDamage()),
+				]));
+
+				$fall->spawnToAll();
+			}
+		}
+	}
 }

src/pocketmine/block/Farmland.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\math\AxisAlignedBB;
 
 class Farmland extends Solid{
 	public function __construct($meta = 0){
@@ -29,9 +30,21 @@ class Farmland extends Solid{
 		$this->hardness = 3;
 	}
 
-	public function getDrops(Item $item){
-		return array(
-			array(Item::DIRT, 0, 1),
+	protected function recalculateBoundingBox(){
+
+		return new AxisAlignedBB(
+			$this->x,
+			$this->y,
+			$this->z,
+			$this->x + 1,
+			$this->y + 0.9375,
+			$this->z + 1
 		);
 	}
+
+	public function getDrops(Item $item){
+		return [
+			[Item::DIRT, 0, 1],
+		];
+	}
 }

src/pocketmine/block/Fence.php

@@ -22,6 +22,8 @@
 namespace pocketmine\block;
 
 
+use pocketmine\math\AxisAlignedBB;
+
 class Fence extends Transparent{
 	public function __construct(){
 		parent::__construct(self::FENCE, 0, "Fence");
@@ -29,4 +31,30 @@ class Fence extends Transparent{
 		$this->hardness = 15;
 	}
 
+	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));
+
+		$f =  $flag2 ? 0 : 0.375;
+		$f1 = $flag3 ? 1 : 0.625;
+		$f2 = $flag ? 0 : 0.375;
+		$f3 = $flag1 ? 1 : 0.625;
+
+		return new AxisAlignedBB(
+			$this->x + $f,
+			$this->y,
+			$this->z + $f2,
+			$this->x + $f1,
+			$this->y + 1,
+			$this->z + $f3
+		);
+	}
+
+	public function canConnect(Block $block){
+		return ($block->getID() !== self::FENCE and $block->getID() !== self::FENCE_GATE) ? $block->isSolid : true;
+	}
+
 }

src/pocketmine/block/FenceGate.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\math\AxisAlignedBB;
 use pocketmine\Player;
 
 class FenceGate extends Transparent{
@@ -36,39 +37,68 @@ class FenceGate extends Transparent{
 		$this->hardness = 15;
 	}
 
+
+	protected function recalculateBoundingBox(){
+
+		if(($this->getDamage() & 0x04) > 0){
+			return null;
+		}
+
+		$i = ($this->getDamage() & 0x03);
+		if($i === 2 and $i === 0){
+			return new AxisAlignedBB(
+				$this->x,
+				$this->y,
+				$this->z + 0.375,
+				$this->x + 1,
+				$this->y + 1,
+				$this->z + 0.625
+			);
+		}else{
+			return new AxisAlignedBB(
+				$this->x + 0.375,
+				$this->y,
+				$this->z,
+				$this->x + 0.625,
+				$this->y + 1,
+				$this->z + 1
+			);
+		}
+	}
+
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
-		$faces = array(
+		$faces = [
 			0 => 3,
 			1 => 0,
 			2 => 1,
 			3 => 2,
-		);
+		];
 		$this->meta = $faces[$player instanceof Player ? $player->getDirection() : 0] & 0x03;
-		$this->getLevel()->setBlock($block, $this, true, false, true);
+		$this->getLevel()->setBlock($block, $this, true, true);
 
 		return true;
 	}
 
 	public function getDrops(Item $item){
-		return array(
-			array($this->id, 0, 1),
-		);
+		return [
+			[$this->id, 0, 1],
+		];
 	}
 
 	public function onActivate(Item $item, Player $player = null){
-		$faces = array(
+		$faces = [
 			0 => 3,
 			1 => 0,
 			2 => 1,
 			3 => 2,
-		);
+		];
 		$this->meta = ($faces[$player instanceof Player ? $player->getDirection() : 0] & 0x03) | ((~$this->meta) & 0x04);
 		if(($this->meta & 0x04) === 0x04){
 			$this->isFullBlock = true;
 		}else{
 			$this->isFullBlock = false;
 		}
-		$this->getLevel()->setBlock($this, $this, true, false, true);
+		$this->getLevel()->setBlock($this, $this, true);
 
 		return true;
 	}

src/pocketmine/block/Fire.php

@@ -21,10 +21,18 @@
 
 namespace pocketmine\block;
 
+use pocketmine\entity\Entity;
+use pocketmine\event\entity\EntityCombustByBlockEvent;
+use pocketmine\event\entity\EntityDamageByBlockEvent;
+use pocketmine\event\entity\EntityDamageEvent;
 use pocketmine\item\Item;
 use pocketmine\level\Level;
+use pocketmine\Server;
 
 class Fire extends Flowable{
+
+	public $hasEntityCollision = true;
+
 	public function __construct($meta = 0){
 		parent::__construct(self::FIRE, $meta, "Fire");
 		$this->isReplaceable = true;
@@ -33,6 +41,21 @@ class Fire extends Flowable{
 		$this->hardness = 0;
 	}
 
+	public function getBoundingBox(){
+		return null;
+	}
+
+	public function onEntityCollide(Entity $entity){
+		$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);
+		if(!$ev->isCancelled()){
+			$entity->setOnFire($ev->getDuration());
+		}
+	}
+
 	public function getDrops(Item $item){
 		return [];
 	}
@@ -45,12 +68,12 @@ class Fire extends Flowable{
 					return false;
 				}
 			}
-			$this->getLevel()->setBlock($this, new Air(), true, false, true);
+			$this->getLevel()->setBlock($this, new Air(), true);
 
 			return Level::BLOCK_UPDATE_NORMAL;
 		}elseif($type === Level::BLOCK_UPDATE_RANDOM){
 			if($this->getSide(0)->getID() !== self::NETHERRACK){
-				$this->getLevel()->setBlock($this, new Air(), true, false, true);
+				$this->getLevel()->setBlock($this, new Air(), true);
 
 				return Level::BLOCK_UPDATE_NORMAL;
 			}

src/pocketmine/block/Flowable.php

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

src/pocketmine/block/Generic.php

@@ -1,77 +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;
-
-use pocketmine\item\Item;
-use pocketmine\level\Level;
-use pocketmine\Player;
-
-class Generic extends Block{
-
-	/**
-	 * @param int    $id
-	 * @param int    $meta
-	 * @param string $name
-	 */
-	public function __construct($id, $meta = 0, $name = "Unknown"){
-		parent::__construct($id, $meta, $name);
-	}
-
-	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
-		return $this->getLevel()->setBlock($this, $this, true, false, true);
-	}
-
-	public function isBreakable(Item $item){
-		return $this->breakable;
-	}
-
-	public function onBreak(Item $item){
-		return $this->getLevel()->setBlock($this, new Air(), true, false, true);
-	}
-
-	public function onUpdate($type){
-		if($this->hasPhysics === true and $type === Level::BLOCK_UPDATE_NORMAL){
-			$down = $this->getSide(0);
-			if($down->getID() === self::AIR or ($down instanceof Liquid)){
-				$data = array(
-					"x" => $this->x + 0.5,
-					"y" => $this->y + 0.5,
-					"z" => $this->z + 0.5,
-					"Tile" => $this->id,
-				);
-				/*$this->getLevel()->setBlock($this, new Air(), false, false, true);
-				//TODO
-				//$e = $server->api->entity->add($this->getLevel(), ENTITY_FALLING, FALLING_SAND, $data);
-				//$e->spawnToAll();
-				$server->api->block->blockUpdateAround(clone $this, Level::BLOCK_UPDATE_NORMAL, 1);*/
-			}
-
-			return false;
-		}
-
-		return false;
-	}
-
-	public function onActivate(Item $item, Player $player = null){
-		return $this->isActivable;
-	}
-}

src/pocketmine/block/GlassPane.php

@@ -22,11 +22,9 @@
 namespace pocketmine\block;
 
 
-class GlassPane extends Transparent{
+class GlassPane extends Thin{
 	public function __construct(){
 		parent::__construct(self::GLASS_PANE, 0, "Glass Pane");
-		$this->isFullBlock = false;
-		$this->isSolid = false;
 	}
 
 }

src/pocketmine/block/GlowingRedstoneOre.php

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

src/pocketmine/block/Glowstone.php

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

src/pocketmine/block/Gold.php

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

src/pocketmine/block/GoldOre.php

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

src/pocketmine/block/Grass.php

@@ -21,18 +21,25 @@
 
 namespace pocketmine\block;
 
+use pocketmine\event\block\BlockSpreadEvent;
 use pocketmine\item\Item;
-use pocketmine\level\generator\object\TallGrass;
+use pocketmine\level\generator\object\TallGrass as TallGrassObject;
 use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
+use pocketmine\Server;
 use pocketmine\utils\Random;
 
 class Grass extends Solid{
+
+	public $isActivable = true;
+	protected $hardness = 3;
+	protected $id = self::GRASS;
+	protected $meta = 0;
+	protected $name = "Grass";
+
 	public function __construct(){
-		parent::__construct(self::GRASS, 0, "Grass");
-		$this->isActivable = true;
-		$this->hardness = 3;
+
 	}
 
 	public function getDrops(Item $item){
@@ -47,11 +54,13 @@ class Grass extends Solid{
 			$x = mt_rand($this->x - 1, $this->x + 1);
 			$y = mt_rand($this->y - 2, $this->y + 2);
 			$z = mt_rand($this->z - 1, $this->z + 1);
-			$block = $this->getLevel()->getBlockIdAt($x, $y, $z);
-			if($block === Block::DIRT){
-				$block = $this->getLevel()->getBlock(new Vector3($x, $y, $z));
+			$block = $this->getLevel()->getBlock(new Vector3($x, $y, $z));
+			if($block->getID() === Block::DIRT){
 				if($block->getSide(1) instanceof Transparent){
-					$this->getLevel()->setBlock($block, new Grass());
+					Server::getInstance()->getPluginManager()->callEvent($ev = new BlockSpreadEvent($block, $this, new Grass()));
+					if(!$ev->isCancelled()){
+						$this->getLevel()->setBlock($block, $ev->getNewState());
+					}
 				}
 			}
 		}
@@ -60,7 +69,7 @@ class Grass extends Solid{
 	public function onActivate(Item $item, Player $player = null){
 		if($item->getID() === Item::DYE and $item->getDamage() === 0x0F){
 			$item->count--;
-			TallGrass::growGrass($this->getLevel(), $this, new Random(mt_rand()), 8, 2);
+			TallGrassObject::growGrass($this->getLevel(), $this, new Random(mt_rand()), 8, 2);
 
 			return true;
 		}elseif($item->isHoe()){

src/pocketmine/block/Gravel.php

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

src/pocketmine/block/HayBale.php

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

src/pocketmine/block/Ice.php

@@ -30,7 +30,7 @@ class Ice extends Transparent{
 	}
 
 	public function onBreak(Item $item){
-		$this->getLevel()->setBlock($this, new Water(), true, false, true);
+		$this->getLevel()->setBlock($this, new Water(), true);
 
 		return true;
 	}

src/pocketmine/block/Iron.php

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

src/pocketmine/block/IronBars.php

@@ -22,11 +22,9 @@
 namespace pocketmine\block;
 
 
-class IronBars extends Transparent{
+class IronBars extends Thin{
 	public function __construct(){
 		parent::__construct(self::IRON_BARS, 0, "Iron Bars");
-		$this->isFullBlock = false;
-		$this->isSolid = false;
 	}
 
 }

src/pocketmine/block/IronDoor.php

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

src/pocketmine/block/IronOre.php

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

src/pocketmine/block/JungleWoodStairs.php

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

src/pocketmine/block/Ladder.php

@@ -21,11 +21,16 @@
 
 namespace pocketmine\block;
 
+use pocketmine\entity\Entity;
 use pocketmine\item\Item;
 use pocketmine\level\Level;
+use pocketmine\math\AxisAlignedBB;
 use pocketmine\Player;
 
 class Ladder extends Transparent{
+
+	public $hasEntityCollision = true;
+
 	public function __construct($meta = 0){
 		parent::__construct(self::LADDER, $meta, "Ladder");
 		$this->isSolid = false;
@@ -33,17 +38,68 @@ class Ladder extends Transparent{
 		$this->hardness = 2;
 	}
 
+	public function onEntityCollide(Entity $entity){
+		$entity->fallDistance = 0;
+		$entity->onGround = true;
+	}
+
+	protected function recalculateBoundingBox(){
+
+		$f = 0.125;
+
+		if($this->meta === 2){
+			return new AxisAlignedBB(
+				$this->x,
+				$this->y,
+				$this->z + 1 - $f,
+				$this->x + 1,
+				$this->y + 1,
+				$this->z + 1
+			);
+		}elseif($this->meta === 3){
+			return new AxisAlignedBB(
+				$this->x,
+				$this->y,
+				$this->z,
+				$this->x + 1,
+				$this->y + 1,
+				$this->z + $f
+			);
+		}elseif($this->meta === 4){
+			return new AxisAlignedBB(
+				$this->x + 1 - $f,
+				$this->y,
+				$this->z,
+				$this->x + 1,
+				$this->y + 1,
+				$this->z + 1
+			);
+		}elseif($this->meta === 5){
+			return new AxisAlignedBB(
+				$this->x,
+				$this->y,
+				$this->z,
+				$this->x + $f,
+				$this->y + 1,
+				$this->z + 1
+			);
+		}
+
+		return null;
+	}
+
+
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		if($target->isTransparent === false){
-			$faces = array(
+			$faces = [
 				2 => 2,
 				3 => 3,
 				4 => 4,
 				5 => 5,
-			);
+			];
 			if(isset($faces[$face])){
 				$this->meta = $faces[$face];
-				$this->getLevel()->setBlock($block, $this, true, false, true);
+				$this->getLevel()->setBlock($block, $this, true, true);
 
 				return true;
 			}
@@ -65,8 +121,8 @@ class Ladder extends Transparent{
 	}
 
 	public function getDrops(Item $item){
-		return array(
-			array($this->id, 0, 1),
-		);
+		return [
+			[$this->id, 0, 1],
+		];
 	}
 }

src/pocketmine/block/Lapis.php

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

src/pocketmine/block/LapisOre.php

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

src/pocketmine/block/Lava.php

@@ -21,134 +21,42 @@
 
 namespace pocketmine\block;
 
+use pocketmine\entity\Entity;
+use pocketmine\event\entity\EntityCombustByBlockEvent;
+use pocketmine\event\entity\EntityDamageByBlockEvent;
+use pocketmine\event\entity\EntityDamageEvent;
 use pocketmine\item\Item;
-use pocketmine\level\Level;
-use pocketmine\level\Position;
 use pocketmine\Player;
 use pocketmine\Server;
 
 class Lava extends Liquid{
+
 	public function __construct($meta = 0){
 		parent::__construct(self::LAVA, $meta, "Lava");
 		$this->hardness = 0;
 	}
 
+	public function onEntityCollide(Entity $entity){
+		$entity->fallDistance *= 0.5;
+		$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);
+		if(!$ev->isCancelled()){
+			$entity->setOnFire($ev->getDuration());
+		}
+
+		if($entity instanceof Player){
+			$entity->onGround = true;
+		}
+	}
+
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
-		$ret = $this->getLevel()->setBlock($this, $this, true, false, true);
-		$this->getLevel()->scheduleUpdate(clone $this, 40);
+		$ret = $this->getLevel()->setBlock($this, $this, true, false);
+		$this->getLevel()->scheduleUpdate($this, $this->tickRate());
 
 		return $ret;
 	}
 
-	public function getSourceCount(){
-		$count = 0;
-		for($side = 2; $side <= 5; ++$side){
-			if($this->getSide($side) instanceof Lava){
-				$b = $this->getSide($side);
-				$level = $b->meta & 0x07;
-				if($level == 0x00){
-					$count++;
-				}
-			}
-		}
-
-		return $count;
-	}
-
-	public function checkWater(){
-		for($side = 1; $side <= 5; ++$side){
-			$b = $this->getSide($side);
-			if($b instanceof Water){
-				$level = $this->meta & 0x07;
-				if($level == 0x00){
-					$this->getLevel()->setBlock($this, new Obsidian(), false, false, true);
-				}else{
-					$this->getLevel()->setBlock($this, new Cobblestone(), false, false, true);
-				}
-			}
-		}
-	}
-
-	public function getFrom(){
-		for($side = 0; $side <= 5; ++$side){
-			$b = $this->getSide($side);
-			if($b instanceof Lava){
-				$tlevel = $b->meta & 0x07;
-				$level = $this->meta & 0x07;
-				if(($tlevel + 2) == $level || ($side == 0x01 && $level == 0x01) || ($tlevel == 6 && $level == 7)){
-					return $b;
-				}
-			}
-		}
-
-		return null;
-	}
-
-	public function onUpdate($type){
-		return false;
-		$newId = $this->id;
-		$level = $this->meta & 0x07;
-		if($type !== Level::BLOCK_UPDATE_NORMAL){
-			return false;
-		}
-
-		if($this->checkWater()){
-			return;
-		}
-
-		$falling = $this->meta >> 3;
-		$down = $this->getSide(0);
-
-		$from = $this->getFrom();
-		if($from !== null || $level == 0x00){
-			if($level !== 0x07){
-				if($down instanceof Air || $down instanceof Lava){
-					$this->getLevel()->setBlock($down, new Lava(0x01), false, false, true);
-					Server::getInstance()->api->block->scheduleBlockUpdate(new Position($down, 0, 0, $this->level), 40, Level::BLOCK_UPDATE_NORMAL);
-				}else{
-					for($side = 2; $side <= 5; ++$side){
-						$b = $this->getSide($side);
-						if($b instanceof Lava){
-
-						}elseif($b->isFlowable === true){
-							$this->getLevel()->setBlock($b, new Lava(min($level + 2, 7)), false, false, true);
-							Server::getInstance()->api->block->scheduleBlockUpdate(Position::fromObject($b, $this->level), 40, Level::BLOCK_UPDATE_NORMAL);
-						}
-					}
-				}
-			}
-		}else{
-			//Extend Remove for Left Lavas
-			for($side = 2; $side <= 5; ++$side){
-				$sb = $this->getSide($side);
-				if($sb instanceof Lava){
-					$tlevel = $sb->meta & 0x07;
-					if($tlevel != 0x00){
-						for($s = 0; $s <= 5; $s++){
-							$ssb = $sb->getSide($s);
-							Server::getInstance()->api->block->scheduleBlockUpdate(Position::fromObject($ssb, $this->level), 40, Level::BLOCK_UPDATE_NORMAL);
-						}
-						$this->getLevel()->setBlock($sb, new Air(), false, false, true);
-					}
-				}
-				$b = $this->getSide(0)->getSide($side);
-				if($b instanceof Lava){
-					$tlevel = $b->meta & 0x07;
-					if($tlevel != 0x00){
-						for($s = 0; $s <= 5; $s++){
-							$ssb = $sb->getSide($s);
-							Server::getInstance()->api->block->scheduleBlockUpdate(Position::fromObject($ssb, $this->level), 40, Level::BLOCK_UPDATE_NORMAL);
-						}
-						$this->getLevel()->setBlock($b, new Air(), false, false, true);
-					}
-				}
-				//Server::getInstance()->api->block->scheduleBlockUpdate(Position::fromObject($b, $this->level), 10, Level::BLOCK_UPDATE_NORMAL);
-			}
-
-			$this->getLevel()->setBlock($this, new Air(), false, false, true);
-		}
-
-		return false;
-	}
-
 }

src/pocketmine/block/Leaves.php

@@ -21,9 +21,11 @@
 
 namespace pocketmine\block;
 
+use pocketmine\event\block\LeavesDecayEvent;
 use pocketmine\item\Item;
 use pocketmine\level\Level;
 use pocketmine\Player;
+use pocketmine\Server;
 
 class Leaves extends Transparent{
 	const OAK = 0;
@@ -35,12 +37,12 @@ class Leaves extends Transparent{
 
 	public function __construct($meta = 0){
 		parent::__construct(self::LEAVES, $meta, "Leaves");
-		$names = array(
+		$names = [
 			self::OAK => "Oak Leaves",
 			self::SPRUCE => "Spruce Leaves",
 			self::BIRCH => "Birch Leaves",
 			self::JUNGLE => "Jungle Leaves",
-		);
+		];
 		$this->name = $names[$this->meta & 0x03];
 		$this->hardness = 1;
 	}
@@ -121,16 +123,13 @@ class Leaves extends Transparent{
 				$this->meta &= 0x03;
 				$visited = [];
 				$check = 0;
-				if($this->findLog($this, $visited, 0, $check) === true){
-					$this->getLevel()->setBlock($this, $this, false, false, true);
+
+				Server::getInstance()->getPluginManager()->callEvent($ev = new LeavesDecayEvent($this));
+
+				if($ev->isCancelled() or $this->findLog($this, $visited, 0, $check) === true){
+					$this->getLevel()->setBlock($this, $this, false, false);
 				}else{
-					$this->getLevel()->setBlock($this, new Air(), false, false, true);
-					if(mt_rand(1, 20) === 1){ //Saplings
-						$this->getLevel()->dropItem($this, Item::get($this->id, $this->meta & 0x03, 1));
-					}
-					if(($this->meta & 0x03) === self::OAK and mt_rand(1, 200) === 1){ //Apples
-						$this->getLevel()->dropItem($this, Item::get(Item::APPLE, 0, 1));
-					}
+					$this->getLevel()->useBreakOn($this);
 
 					return Level::BLOCK_UPDATE_NORMAL;
 				}
@@ -142,19 +141,19 @@ class Leaves extends Transparent{
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		$this->meta |= 0x04;
-		$this->getLevel()->setBlock($this, $this, true, false, true);
+		$this->getLevel()->setBlock($this, $this, true);
 	}
 
 	public function getDrops(Item $item){
 		$drops = [];
 		if($item->isShears()){
-			$drops[] = array(Item::LEAVES, $this->meta & 0x03, 1);
+			$drops[] = [Item::LEAVES, $this->meta & 0x03, 1];
 		}else{
 			if(mt_rand(1, 20) === 1){ //Saplings
-				$drops[] = array(Item::SAPLING, $this->meta & 0x03, 1);
+				$drops[] = [Item::SAPLING, $this->meta & 0x03, 1];
 			}
 			if(($this->meta & 0x03) === self::OAK and mt_rand(1, 200) === 1){ //Apples
-				$drops[] = array(Item::APPLE, 0, 1);
+				$drops[] = [Item::APPLE, 0, 1];
 			}
 		}
 

src/pocketmine/block/Leaves2.php

@@ -21,18 +21,20 @@
 
 namespace pocketmine\block;
 
+use pocketmine\event\block\LeavesDecayEvent;
 use pocketmine\item\Item;
 use pocketmine\level\Level;
 use pocketmine\Player;
+use pocketmine\Server;
 
 class Leaves2 extends Leaves{
 
 	public function __construct($meta = 0){
 		Transparent::__construct(self::LEAVES, $meta, "Leaves");
-		$names = array(
+		$names = [
 			self::ACACIA => "Acacia Leaves",
 			self::DARK_OAK => "Dark Oak Leaves",
-		);
+		];
 		$this->name = $names[$this->meta & 0x03];
 		$this->hardness = 1;
 	}
@@ -113,13 +115,13 @@ class Leaves2 extends Leaves{
 				$this->meta &= 0x03;
 				$visited = [];
 				$check = 0;
-				if($this->findLog($this, $visited, 0, $check) === true){
-					$this->getLevel()->setBlock($this, $this, false, false, true);
+
+				Server::getInstance()->getPluginManager()->callEvent($ev = new LeavesDecayEvent($this));
+
+				if($ev->isCancelled() or $this->findLog($this, $visited, 0, $check) === true){
+					$this->getLevel()->setBlock($this, $this, false, false);
 				}else{
-					$this->getLevel()->setBlock($this, new Air(), false, false, true);
-					if(mt_rand(1, 20) === 1){ //Saplings
-						$this->getLevel()->dropItem($this, Item::get($this->id, $this->meta & 0x03, 1));
-					}
+					$this->getLevel()->useBreakOn($this);
 
 					return Level::BLOCK_UPDATE_NORMAL;
 				}
@@ -131,16 +133,16 @@ class Leaves2 extends Leaves{
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		$this->meta |= 0x04;
-		$this->getLevel()->setBlock($this, $this, true, false, true);
+		$this->getLevel()->setBlock($this, $this, true);
 	}
 
 	public function getDrops(Item $item){
 		$drops = [];
 		if($item->isShears()){
-			$drops[] = array(Item::LEAVES2, $this->meta & 0x03, 1);
+			$drops[] = [Item::LEAVES2, $this->meta & 0x03, 1];
 		}else{
 			if(mt_rand(1, 20) === 1){ //Saplings
-				$drops[] = array(Item::SAPLING, $this->meta & 0x03, 1);
+				$drops[] = [Item::SAPLING, $this->meta & 0x03, 1];
 			}
 		}
 

src/pocketmine/block/Liquid.php

@@ -22,13 +22,400 @@
 namespace pocketmine\block;
 
 
-class Liquid extends Transparent{
-	public function __construct($id, $meta = 0, $name = "Unknown"){
-		parent::__construct($id, $meta, $name);
-		$this->isLiquid = true;
-		$this->breakable = false;
-		$this->isReplaceable = true;
-		$this->isSolid = false;
-		$this->isFullBlock = true;
+use pocketmine\entity\Entity;
+use pocketmine\item\Item;
+use pocketmine\level\Level;
+use pocketmine\math\Vector3;
+
+abstract class Liquid extends Transparent{
+	public $hasEntityCollision = true;
+
+	public $isLiquid = true;
+	public $breakable = false;
+	public $isReplaceable = true;
+	public $isSolid = false;
+	public $isFullBlock = true;
+
+	public $adjacentSources = 0;
+	public $isOptimalFlowDirection = [0, 0, 0, 0];
+	public $flowCost = [0, 0, 0, 0];
+
+	public function getFluidHeightPercent(){
+		$d = $this->meta;
+		if($d >= 8){
+			$d = 0;
+		}
+
+		return ($d + 1) / 9;
+	}
+
+	protected function getFlowDecay(Vector3 $pos){
+		if(!($pos instanceof Block)){
+			$pos = $this->getLevel()->getBlock($pos);
+		}
+
+		if($pos->getID() !== $this->getID()){
+			return -1;
+		}else{
+			return $pos->getDamage();
+		}
+	}
+
+	protected function getEffectiveFlowDecay(Vector3 $pos){
+		if(!($pos instanceof Block)){
+			$pos = $this->getLevel()->getBlock($pos);
+		}
+
+		if($pos->getID() !== $this->getID()){
+			return -1;
+		}
+
+		$decay = $pos->getDamage();
+
+		if($decay >= 8){
+			$decay = 0;
+		}
+
+		return $decay;
+	}
+
+	public function getFlowVector(){
+		$vector = new Vector3(0, 0, 0);
+
+		$decay = $this->getEffectiveFlowDecay($this);
+
+		for($j = 0; $j < 4; ++$j){
+
+			$x = $this->x;
+			$y = $this->y;
+			$z = $this->z;
+
+			if($j === 0){
+				--$x;
+			}elseif($j === 1){
+				++$x;
+			}elseif($j === 2){
+				--$z;
+			}elseif($j === 3){
+				++$z;
+			}
+			$sideBlock = $this->getLevel()->getBlock(new Vector3($x, $y, $z));
+			$blockDecay = $this->getEffectiveFlowDecay($sideBlock);
+
+			if($blockDecay < 0){
+				if(!$sideBlock->isFlowable){
+					continue;
+				}
+
+				$blockDecay = $this->getEffectiveFlowDecay($sideBlock->getSide(0));
+
+				if($blockDecay >= 0){
+					$realDecay = $blockDecay - ($decay - 8);
+					$vector = $vector->add(($sideBlock->x - $this->x) * $realDecay, ($sideBlock->y - $this->y) * $realDecay, ($sideBlock->z - $this->z) * $realDecay);
+				}
+
+				continue;
+			}else{
+				$realDecay = $blockDecay - $decay;
+				$vector = $vector->add(($sideBlock->x - $this->x) * $realDecay, ($sideBlock->y - $this->y) * $realDecay, ($sideBlock->z - $this->z) * $realDecay);
+			}
+		}
+
+		if($this->getDamage() >= 8){
+			$falling = false;
+
+			if(!$this->getLevel()->getBlock($this->add(0, 0, -1))->isFlowable){
+				$falling = true;
+			}elseif(!$this->getLevel()->getBlock($this->add(0, 0, 1))->isFlowable){
+				$falling = true;
+			}elseif(!$this->getLevel()->getBlock($this->add(-1, 0, 0))->isFlowable){
+				$falling = true;
+			}elseif(!$this->getLevel()->getBlock($this->add(1, 0, 0))->isFlowable){
+				$falling = true;
+			}elseif(!$this->getLevel()->getBlock($this->add(0, 1, -1))->isFlowable){
+				$falling = true;
+			}elseif(!$this->getLevel()->getBlock($this->add(0, 1, 1))->isFlowable){
+				$falling = true;
+			}elseif(!$this->getLevel()->getBlock($this->add(-1, 1, 0))->isFlowable){
+				$falling = true;
+			}elseif(!$this->getLevel()->getBlock($this->add(1, 1, 0))->isFlowable){
+				$falling = true;
+			}
+
+			if($falling){
+				$vector = $vector->normalize()->add(0, -6, 0);
+			}
+		}
+
+		return $vector->normalize();
+	}
+
+	public function addVelocityToEntity(Entity $entity, Vector3 $vector){
+		$flow = $this->getFlowVector();
+		$vector->x += $flow->x;
+		$vector->y += $flow->y;
+		$vector->z += $flow->z;
+	}
+
+	public function tickRate(){
+		if($this instanceof Water){
+			return 5;
+		}elseif($this instanceof Lava){
+			return 30;
+		}
+
+		return 0;
+	}
+
+	public function onUpdate($type){
+		if($type === Level::BLOCK_UPDATE_NORMAL){
+			$this->checkForHarden();
+			$this->getLevel()->scheduleUpdate($this, $this->tickRate());
+		}elseif($type === Level::BLOCK_UPDATE_SCHEDULED){
+			$decay = $this->getFlowDecay($this);
+			$multiplier = $this instanceof Lava ? 2 : 1;
+
+			$flag = true;
+
+			if($decay > 0){
+				$smallestFlowDecay = -100;
+				$this->adjacentSources = 0;
+				$smallestFlowDecay = $this->getSmallestFlowDecay($this->getSide(4), $smallestFlowDecay);
+				$smallestFlowDecay = $this->getSmallestFlowDecay($this->getSide(5), $smallestFlowDecay);
+				$smallestFlowDecay = $this->getSmallestFlowDecay($this->getSide(2), $smallestFlowDecay);
+				$smallestFlowDecay = $this->getSmallestFlowDecay($this->getSide(3), $smallestFlowDecay);
+
+				$k = $smallestFlowDecay + $multiplier;
+
+				if($k >= 8 or $smallestFlowDecay < 0){
+					$k = -1;
+				}
+
+				if(($topFlowDecay = $this->getFlowDecay($this->getSide(1))) >= 0){
+					if($topFlowDecay >= 8){
+						$k = $topFlowDecay;
+					}else{
+						$k = $topFlowDecay | 0x08;
+					}
+				}
+
+				if($this->adjacentSources >= 2 and $this instanceof Water){
+					$bottomBlock = $this->getSide(0);
+					if($bottomBlock->isSolid){
+						$k = 0;
+					}elseif($bottomBlock instanceof Water and $bottomBlock->getDamage() === 0){
+						$k = 0;
+					}
+				}
+
+				if($this instanceof Lava and $decay < 8 and $k < 8 and $k > 1 and mt_rand(0, 4) !== 0){
+					$k = $decay;
+					$flag = false;
+				}
+
+				if($k !== $decay){
+					$decay = $k;
+					if($decay < 0){
+						$this->getLevel()->setBlock($this, Block::get(Item::AIR), true);
+					}else{
+						$this->getLevel()->setBlock($this, Block::get($this->id, $decay), true);
+						$this->getLevel()->scheduleUpdate($this, $this->tickRate());
+					}
+				}elseif($flag){
+					//$this->getLevel()->scheduleUpdate($this, $this->tickRate());
+					//$this->updateFlow();
+				}
+			}else{
+				//$this->updateFlow();
+			}
+
+			$bottomBlock = $this->getSide(0);
+
+			if($bottomBlock->isFlowable or $bottomBlock instanceof Liquid){
+				if($this instanceof Lava and $bottomBlock instanceof Water){
+					$this->getLevel()->setBlock($bottomBlock, Block::get(Item::STONE), true);
+					return;
+				}
+
+				if($decay >= 8){
+					$this->getLevel()->setBlock($bottomBlock, Block::get($this->id, $decay), true);
+					$this->getLevel()->scheduleUpdate($bottomBlock, $this->tickRate());
+				}else{
+					$this->getLevel()->setBlock($bottomBlock, Block::get($this->id, $decay + 8), true);
+					$this->getLevel()->scheduleUpdate($bottomBlock, $this->tickRate());
+				}
+			}elseif($decay >= 0 and ($decay === 0 or !$bottomBlock->isFlowable)){
+				$flags = $this->getOptimalFlowDirections();
+
+				$l = $decay + $multiplier;
+
+				if($decay >= 8){
+					$l = 1;
+				}
+
+				if($l >= 8){
+					$this->checkForHarden();
+					return;
+				}
+
+				if($flags[0]){
+					$this->flowIntoBlock($this->getSide(4), $l);
+				}
+
+				if($flags[1]){
+					$this->flowIntoBlock($this->getSide(5), $l);
+				}
+
+				if($flags[2]){
+					$this->flowIntoBlock($this->getSide(2), $l);
+				}
+
+				if($flags[3]){
+					$this->flowIntoBlock($this->getSide(3), $l);
+				}
+			}
+
+			$this->checkForHarden();
+
+		}
+	}
+
+	private function flowIntoBlock(Block $block, $newFlowDecay){
+		if($block->isFlowable){
+			if($block->getID() > 0){
+				$this->getLevel()->useBreakOn($block);
+			}
+
+			$this->getLevel()->setBlock($block, Block::get($this->id, $newFlowDecay), true);
+			$this->getLevel()->scheduleUpdate($block, $this->tickRate());
+		}
+	}
+
+	private function calculateFlowCost(Block $block, $accumulatedCost, $previousDirection){
+		$cost = 1000;
+
+		for($j = 0; $j < 4; ++$j){
+			if(
+				($j === 0 and $previousDirection === 1) or
+				($j === 1 and $previousDirection === 0) or
+				($j === 2 and $previousDirection === 3) or
+				($j === 3 and $previousDirection === 2)
+			){
+				$x = $block->x;
+				$y = $block->y;
+				$z = $block->z;
+
+				if($j === 0){
+					--$x;
+				}elseif($j === 1){
+					++$x;
+				}elseif($j === 2){
+					--$z;
+				}elseif($j === 3){
+					++$z;
+				}
+				$blockSide = $this->getLevel()->getBlock(new Vector3($x, $y, $z));
+
+				if(!$blockSide->isFlowable and !($blockSide instanceof Liquid)){
+					continue;
+				}elseif($blockSide instanceof Liquid and $blockSide->getDamage() === 0){
+					continue;
+				}elseif($blockSide->getSide(0)->isFlowable){
+					return $accumulatedCost;
+				}
+
+				if($accumulatedCost >= 4){
+					continue;
+				}
+
+				$realCost = $this->calculateFlowCost($blockSide, $accumulatedCost + 1, $j);
+
+				if($realCost < $cost){
+					$cost = $realCost;
+				}
+			}
+		}
+
+		return $cost;
+	}
+
+	private function getOptimalFlowDirections(){
+		for($j = 0; $j < 4; ++$j){
+			$this->flowCost[$j] = 1000;
+
+			$x = $this->x;
+			$y = $this->y;
+			$z = $this->z;
+
+			if($j === 0){
+				--$x;
+			}elseif($j === 1){
+				++$x;
+			}elseif($j === 2){
+				--$z;
+			}elseif($j === 3){
+				++$z;
+			}
+			$block = $this->getLevel()->getBlock(new Vector3($x, $y, $z));
+
+			if(!$block->isFlowable and !($block instanceof Liquid)){
+				continue;
+			}elseif($block instanceof Liquid and $block->getDamage() === 0){
+				continue;
+			}elseif($block->getSide(0)->isFlowable){
+				$this->flowCost[$j] = 0;
+			}else{
+				$this->flowCost[$j] = $this->calculateFlowCost($block, 1, $j);
+			}
+		}
+
+		$minCost = $this->flowCost[0];
+
+		for($i = 1; $i < 4; ++$i){
+			if($this->flowCost[$i] < $minCost){
+				$minCost = $this->flowCost[$i];
+			}
+		}
+
+		for($i = 0; $i < 4; ++$i){
+			$this->isOptimalFlowDirection[$i] = ($this->flowCost[$i] === $minCost);
+		}
+
+		return $this->isOptimalFlowDirection;
+	}
+
+	private function getSmallestFlowDecay(Vector3 $pos, $decay){
+		$blockDecay = $this->getFlowDecay($pos);
+
+		if($blockDecay < 0){
+			return $decay;
+		}elseif($blockDecay === 0){
+			++$this->adjacentSources;
+		}elseif($blockDecay >= 8){
+			$blockDecay = 0;
+		}
+
+		return ($decay >= 0 && $blockDecay >= $decay) ? $decay : $blockDecay;
+	}
+
+	private function checkForHarden(){
+		if($this instanceof Lava){
+			$colliding = false;
+			for($side = 0; $side <= 5 and !$colliding; ++$side){
+				$colliding = $this->getSide($side) instanceof Water;
+			}
+
+			if($colliding){
+				if($this->getDamage() === 0){
+					$this->getLevel()->setBlock($this, Block::get(Item::OBSIDIAN), true);
+				}elseif($this->getDamage() <= 4){
+					$this->getLevel()->setBlock($this, Block::get(Item::COBBLESTONE), true);
+				}
+			}
+		}
+	}
+
+	public function getBoundingBox(){
+		return null;
 	}
 }

src/pocketmine/block/LitPumpkin.php

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

src/pocketmine/block/Melon.php

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

src/pocketmine/block/MelonStem.php

@@ -21,41 +21,31 @@
 
 namespace pocketmine\block;
 
+use pocketmine\event\block\BlockGrowEvent;
 use pocketmine\item\Item;
 use pocketmine\level\Level;
-use pocketmine\Player;
+use pocketmine\Server;
 
-class MelonStem extends Flowable{
+class MelonStem extends Crops{
 	public function __construct($meta = 0){
 		parent::__construct(self::MELON_STEM, $meta, "Melon Stem");
-		$this->isActivable = true;
-		$this->hardness = 0;
-	}
-
-	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
-		$down = $this->getSide(0);
-		if($down->getID() === self::FARMLAND){
-			$this->getLevel()->setBlock($block, $this, true, false, true);
-
-			return true;
-		}
-
-		return false;
 	}
 
 	public function onUpdate($type){
 		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->isTransparent === true){ //TODO: Replace with common break method
-				$this->getLevel()->dropItem($this, Item::get(Item::MELON_SEEDS, 0, mt_rand(0, 2)));
-				$this->getLevel()->setBlock($this, new Air(), false, false, true);
-
+			if($this->getSide(0)->isTransparent === true){
+				$this->getLevel()->useBreakOn($this);
 				return Level::BLOCK_UPDATE_NORMAL;
 			}
 		}elseif($type === Level::BLOCK_UPDATE_RANDOM){
 			if(mt_rand(0, 2) == 1){
 				if($this->meta < 0x07){
-					++$this->meta;
-					$this->getLevel()->setBlock($this, $this, true, false, true);
+					$block = clone $this;
+					++$block->meta;
+					Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($this, $block));
+					if(!$ev->isCancelled()){
+						$this->getLevel()->setBlock($this, $ev->getNewState(), true);
+					}
 
 					return Level::BLOCK_UPDATE_RANDOM;
 				}else{
@@ -68,7 +58,10 @@ class MelonStem extends Flowable{
 					$side = $this->getSide(mt_rand(2, 5));
 					$d = $side->getSide(0);
 					if($side->getID() === self::AIR and ($d->getID() === self::FARMLAND or $d->getID() === self::GRASS or $d->getID() === self::DIRT)){
-						$this->getLevel()->setBlock($side, new Melon(), true, false, true);
+						Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($side, new Melon()));
+						if(!$ev->isCancelled()){
+							$this->getLevel()->setBlock($side, $ev->getNewState(), true);
+						}
 					}
 				}
 			}
@@ -79,23 +72,9 @@ class MelonStem extends Flowable{
 		return false;
 	}
 
-	public function onActivate(Item $item, Player $player = null){
-		if($item->getID() === Item::DYE and $item->getDamage() === 0x0F){ //Bonemeal
-			$this->meta = 0x07;
-			$this->getLevel()->setBlock($this, $this, true, false, true);
-			if(($player->gamemode & 0x01) === 0){
-				$item->count--;
-			}
-
-			return true;
-		}
-
-		return false;
-	}
-
 	public function getDrops(Item $item){
-		return array(
-			array(Item::MELON_SEEDS, 0, mt_rand(0, 2)),
-		);
+		return [
+			[Item::MELON_SEEDS, 0, mt_rand(0, 2)],
+		];
 	}
 }

src/pocketmine/block/MossStone.php

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

src/pocketmine/block/Mycelium.php

@@ -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
@@ -21,7 +21,11 @@
 
 namespace pocketmine\block;
 
+use pocketmine\event\block\BlockSpreadEvent;
 use pocketmine\item\Item;
+use pocketmine\level\Level;
+use pocketmine\math\Vector3;
+use pocketmine\Server;
 
 class Mycelium extends Solid{
 	public function __construct(){
@@ -29,25 +33,27 @@ class Mycelium extends Solid{
 		$this->hardness = 2.5;
 	}
 
-    public function getDrops(Item $item){
-        return [
-            [Item::DIRT, 0, 1],
-        ];
-    }
+	public function getDrops(Item $item){
+		return [
+			[Item::DIRT, 0, 1],
+		];
+	}
 
-    public function onUpdate($type){
-        if($type === Level::BLOCK_UPDATE_RANDOM){
-            //TODO: light levels
-            $x = mt_rand($this->x - 1, $this->x + 1);
-            $y = mt_rand($this->y - 2, $this->y + 2);
-            $z = mt_rand($this->z - 1, $this->z + 1);
-            $block = $this->getLevel()->getBlockIdAt($x, $y, $z);
-            if($block === Block::DIRT){
-                $block = $this->getLevel()->getBlock(new Vector3($x, $y, $z));
-                if($block->getSide(1) instanceof Transparent){
-                    $this->getLevel()->setBlock($block, new Mycelium());
-                }
-            }
-        }
-    }
-}
+	public function onUpdate($type){
+		if($type === Level::BLOCK_UPDATE_RANDOM){
+			//TODO: light levels
+			$x = mt_rand($this->x - 1, $this->x + 1);
+			$y = mt_rand($this->y - 2, $this->y + 2);
+			$z = mt_rand($this->z - 1, $this->z + 1);
+			$block = $this->getLevel()->getBlock(new Vector3($x, $y, $z));
+			if($block->getID() === Block::DIRT){
+				if($block->getSide(1) instanceof Transparent){
+					Server::getInstance()->getPluginManager()->callEvent($ev = new BlockSpreadEvent($block, $this, new Mycelium()));
+					if(!$ev->isCancelled()){
+						$this->getLevel()->setBlock($block, $ev->getNewState());
+					}
+				}
+			}
+		}
+	}
+}

src/pocketmine/block/NetherBrick.php

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

src/pocketmine/block/Netherrack.php

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

src/pocketmine/block/Obsidian.php

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

src/pocketmine/block/Planks.php

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

src/pocketmine/block/Podzol.php

@@ -21,8 +21,6 @@
 
 namespace pocketmine\block;
 
-use pocketmine\item\Item;
-
 class Podzol extends Solid{
 	public function __construct(){
 		parent::__construct(self::PODZOL, 0, "Podzol");	

src/pocketmine/block/Potato.php

@@ -22,71 +22,18 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\level\Level;
-use pocketmine\Player;
 
-class Potato extends Flowable{
+class Potato extends Crops{
 	public function __construct($meta = 0){
 		parent::__construct(self::POTATO_BLOCK, $meta, "Potato Block");
-		$this->isActivable = true;
-		$this->hardness = 0;
-	}
-
-	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
-		$down = $this->getSide(0);
-		if($down->getID() === self::FARMLAND){
-			$this->getLevel()->setBlock($block, $this, true, false, true);
-
-			return true;
-		}
-
-		return false;
-	}
-
-	public function onActivate(Item $item, Player $player = null){
-		if($item->getID() === Item::DYE and $item->getDamage() === 0x0F){ //Bonemeal
-			$this->meta = 0x07;
-			$this->getLevel()->setBlock($this, $this, true, false, true);
-			if(($player->gamemode & 0x01) === 0){
-				$item->count--;
-			}
-
-			return true;
-		}
-
-		return false;
-	}
-
-	public function onUpdate($type){
-		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->isTransparent === true){ //TODO: Replace with common break method
-				$this->getLevel()->dropItem($this, Item::get(Item::POTATO, 0, 1));
-				$this->getLevel()->setBlock($this, new Air(), false, false, true);
-
-				return Level::BLOCK_UPDATE_NORMAL;
-			}
-		}elseif($type === Level::BLOCK_UPDATE_RANDOM){
-			if(mt_rand(0, 2) == 1){
-				if($this->meta < 0x07){
-					++$this->meta;
-					$this->getLevel()->setBlock($this, $this, true, false, true);
-
-					return Level::BLOCK_UPDATE_RANDOM;
-				}
-			}else{
-				return Level::BLOCK_UPDATE_RANDOM;
-			}
-		}
-
-		return false;
 	}
 
 	public function getDrops(Item $item){
 		$drops = [];
 		if($this->meta >= 0x07){
-			$drops[] = array(Item::POTATO, 0, mt_rand(1, 4));
+			$drops[] = [Item::POTATO, 0, mt_rand(1, 4)];
 		}else{
-			$drops[] = array(Item::POTATO, 0, 1);
+			$drops[] = [Item::POTATO, 0, 1];
 		}
 
 		return $drops;

src/pocketmine/block/Pumpkin.php

@@ -21,6 +21,8 @@
 
 namespace pocketmine\block;
 
+use pocketmine\item\Item;
+use pocketmine\Player;
 
 class Pumpkin extends Solid{
 	public function __construct(){
@@ -28,4 +30,13 @@ class Pumpkin extends Solid{
 		$this->hardness = 5;
 	}
 
+	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
+		if($player instanceof Player){
+			$this->meta = ((int) $player->getDirection() + 5) % 4;
+		}
+		$this->getLevel()->setBlock($block, $this, true, true);
+
+		return true;
+	}
+
 }

src/pocketmine/block/PumpkinStem.php

@@ -21,42 +21,31 @@
 
 namespace pocketmine\block;
 
+use pocketmine\event\block\BlockGrowEvent;
 use pocketmine\item\Item;
 use pocketmine\level\Level;
-use pocketmine\Player;
+use pocketmine\Server;
 
-class PumpkinStem extends Flowable{
+class PumpkinStem extends Crops{
 	public function __construct($meta = 0){
 		parent::__construct(self::PUMPKIN_STEM, $meta, "Pumpkin Stem");
-		$this->isActivable = true;
-		$this->hardness = 0;
-	}
-
-	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
-		$down = $this->getSide(0);
-		if($down->getID() === self::FARMLAND){
-			$this->getLevel()->setBlock($block, $this, true, false, true);
-
-			return true;
-		}
-
-		return false;
 	}
 
 	public function onUpdate($type){
 		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->isTransparent === true){ //Replace with common break method
-				//TODO
-				//Server::getInstance()->api->entity->drop($this, Item::get(PUMPKIN_SEEDS, 0, mt_rand(0, 2)));
-				$this->getLevel()->setBlock($this, new Air(), false, false, true);
-
+			if($this->getSide(0)->isTransparent === true){
+				$this->getLevel()->useBreakOn($this);
 				return Level::BLOCK_UPDATE_NORMAL;
 			}
 		}elseif($type === Level::BLOCK_UPDATE_RANDOM){
 			if(mt_rand(0, 2) == 1){
 				if($this->meta < 0x07){
-					++$this->meta;
-					$this->getLevel()->setBlock($this, $this, true, false, true);
+					$block = clone $this;
+					++$block->meta;
+					Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($this, $block));
+					if(!$ev->isCancelled()){
+						$this->getLevel()->setBlock($this, $ev->getNewState(), true);
+					}
 
 					return Level::BLOCK_UPDATE_RANDOM;
 				}else{
@@ -69,7 +58,10 @@ class PumpkinStem extends Flowable{
 					$side = $this->getSide(mt_rand(2, 5));
 					$d = $side->getSide(0);
 					if($side->getID() === self::AIR and ($d->getID() === self::FARMLAND or $d->getID() === self::GRASS or $d->getID() === self::DIRT)){
-						$this->getLevel()->setBlock($side, new Pumpkin(), true, false, true);
+						Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($side, new Pumpkin()));
+						if(!$ev->isCancelled()){
+							$this->getLevel()->setBlock($side, $ev->getNewState(), true);
+						}
 					}
 				}
 			}
@@ -80,23 +72,9 @@ class PumpkinStem extends Flowable{
 		return false;
 	}
 
-	public function onActivate(Item $item, Player $player = null){
-		if($item->getID() === Item::DYE and $item->getDamage() === 0x0F){ //Bonemeal
-			$this->meta = 0x07;
-			$this->getLevel()->setBlock($this, $this, true, false, true);
-			if(($player->gamemode & 0x01) === 0){
-				$item->count--;
-			}
-
-			return true;
-		}
-
-		return false;
-	}
-
 	public function getDrops(Item $item){
-		return array(
-			array(Item::PUMPKIN_SEEDS, 0, mt_rand(0, 2)),
-		);
+		return [
+			[Item::PUMPKIN_SEEDS, 0, mt_rand(0, 2)],
+		];
 	}
 }

src/pocketmine/block/Quartz.php

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

src/pocketmine/block/RedMushroom.php

@@ -31,12 +31,15 @@ class RedMushroom extends Flowable{
 		$this->hardness = 0;
 	}
 
+	public function getBoundingBox(){
+		return null;
+	}
+
+
 	public function onUpdate($type){
 		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->isTransparent === true){ //Replace with common break method
-				//TODO
-				//Server::getInstance()->api->entity->drop($this, Item::get($this->id));
-				$this->getLevel()->setBlock($this, new Air(), false);
+			if($this->getSide(0)->isTransparent === true){
+				$this->getLevel()->useBreakOn($this);
 
 				return Level::BLOCK_UPDATE_NORMAL;
 			}
@@ -48,7 +51,7 @@ class RedMushroom extends Flowable{
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		$down = $this->getSide(0);
 		if($down->isTransparent === false){
-			$this->getLevel()->setBlock($block, $this, true, false, true);
+			$this->getLevel()->setBlock($block, $this, true, true);
 
 			return true;
 		}

src/pocketmine/block/RedstoneOre.php

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

src/pocketmine/block/Sandstone.php

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

src/pocketmine/block/Sapling.php

@@ -37,22 +37,27 @@ class Sapling extends Flowable{
 	public function __construct($meta = Sapling::OAK){
 		parent::__construct(self::SAPLING, $meta, "Sapling");
 		$this->isActivable = true;
-		$names = array(
+		$names = [
 			0 => "Oak Sapling",
 			1 => "Spruce Sapling",
 			2 => "Birch Sapling",
 			3 => "Jungle Sapling",
 			4 => "Acacia Sapling",
 			5 => "Dark Oak Sapling",
-		);
+		];
 		$this->name = $names[$this->meta & 0x07];
 		$this->hardness = 0;
 	}
 
+	public function getBoundingBox(){
+		return null;
+	}
+
+
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		$down = $this->getSide(0);
 		if($down->getID() === self::GRASS or $down->getID() === self::DIRT or $down->getID() === self::FARMLAND){
-			$this->getLevel()->setBlock($block, $this, true, false, true);
+			$this->getLevel()->setBlock($block, $this, true, true);
 
 			return true;
 		}
@@ -76,10 +81,8 @@ class Sapling extends Flowable{
 
 	public function onUpdate($type){
 		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->isTransparent === true){ //Replace with common break method
-				//TODO
-				//Server::getInstance()->api->entity->drop($this, Item::get($this->id));
-				$this->getLevel()->setBlock($this, new Air(), false, false, true);
+			if($this->getSide(0)->isTransparent === true){
+				$this->getLevel()->useBreakOn($this);
 
 				return Level::BLOCK_UPDATE_NORMAL;
 			}
@@ -89,7 +92,7 @@ class Sapling extends Flowable{
 					Tree::growTree($this->getLevel(), $this->x, $this->y, $this->z, new Random(mt_rand()), $this->meta & 0x07);
 				}else{
 					$this->meta |= 0x08;
-					$this->getLevel()->setBlock($this, $this, true, false, true);
+					$this->getLevel()->setBlock($this, $this, true);
 
 					return Level::BLOCK_UPDATE_RANDOM;
 				}
@@ -102,8 +105,8 @@ class Sapling extends Flowable{
 	}
 
 	public function getDrops(Item $item){
-		return array(
-			array($this->id, $this->meta & 0x07, 1),
-		);
+		return [
+			[$this->id, $this->meta & 0x07, 1],
+		];
 	}
 }

src/pocketmine/block/SignPost.php

@@ -33,22 +33,27 @@ class SignPost extends Transparent{
 		$this->hardness = 5;
 	}
 
+	public function getBoundingBox(){
+		return null;
+	}
+
+
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		if($face !== 0){
-			$faces = array(
+			$faces = [
 				2 => 2,
 				3 => 3,
 				4 => 4,
 				5 => 5,
-			);
+			];
 			if(!isset($faces[$face])){
 				$this->meta = floor((($player->yaw + 180) * 16 / 360) + 0.5) & 0x0F;
-				$this->getLevel()->setBlock($block, Block::get(Item::SIGN_POST, $this->meta), true, false, true);
+				$this->getLevel()->setBlock($block, Block::get(Item::SIGN_POST, $this->meta), true);
 
 				return true;
 			}else{
 				$this->meta = $faces[$face];
-				$this->getLevel()->setBlock($block, Block::get(Item::WALL_SIGN, $this->meta), true, false, true);
+				$this->getLevel()->setBlock($block, Block::get(Item::WALL_SIGN, $this->meta), true);
 
 				return true;
 			}
@@ -59,10 +64,8 @@ class SignPost extends Transparent{
 
 	public function onUpdate($type){
 		if($type === Level::BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->getID() === self::AIR){ //Replace with common break method
-				//TODO
-				//Server::getInstance()->api->entity->drop($this, Item::get(SIGN, 0, 1));
-				$this->getLevel()->setBlock($this, new Air(), true, true, true);
+			if($this->getSide(0)->getID() === self::AIR){
+				$this->getLevel()->useBreakOn($this);
 
 				return Level::BLOCK_UPDATE_NORMAL;
 			}
@@ -78,8 +81,8 @@ class SignPost extends Transparent{
 	}
 
 	public function getDrops(Item $item){
-		return array(
-			array(Item::SIGN, 0, 1),
-		);
+		return [
+			[Item::SIGN, 0, 1],
+		];
 	}
 }

src/pocketmine/block/Slab.php

@@ -22,12 +22,13 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\math\AxisAlignedBB;
 use pocketmine\Player;
 
 class Slab extends Transparent{
 	public function __construct($meta = 0){
 		parent::__construct(self::SLAB, $meta, "Slab");
-		$names = array(
+		$names = [
 			0 => "Stone",
 			1 => "Sandstone",
 			2 => "Wooden",
@@ -36,7 +37,7 @@ class Slab extends Transparent{
 			5 => "Stone Brick",
 			6 => "Quartz",
 			7 => "",
-		);
+		];
 		$this->name = (($this->meta & 0x08) === 0x08 ? "Upper " : "") . $names[$this->meta & 0x07] . " Slab";
 		if(($this->meta & 0x08) === 0x08){
 			$this->isFullBlock = true;
@@ -46,15 +47,38 @@ class Slab extends Transparent{
 		$this->hardness = 30;
 	}
 
+	protected function recalculateBoundingBox(){
+
+		if(($this->meta & 0x08) > 0){
+			return new AxisAlignedBB(
+				$this->x,
+				$this->y + 0.5,
+				$this->z,
+				$this->x + 1,
+				$this->y + 1,
+				$this->z + 1
+			);
+		}else{
+			return new AxisAlignedBB(
+				$this->x,
+				$this->y,
+				$this->z,
+				$this->x + 1,
+				$this->y + 0.5,
+				$this->z + 1
+			);
+		}
+	}
+
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		$this->meta &= 0x07;
 		if($face === 0){
 			if($target->getID() === self::SLAB and ($target->getDamage() & 0x08) === 0x08 and ($target->getDamage() & 0x07) === ($this->meta & 0x07)){
-				$this->getLevel()->setBlock($target, Block::get(Item::DOUBLE_SLAB, $this->meta), true, false, true);
+				$this->getLevel()->setBlock($target, Block::get(Item::DOUBLE_SLAB, $this->meta), true);
 
 				return true;
 			}elseif($block->getID() === self::SLAB and ($block->getDamage() & 0x07) === ($this->meta & 0x07)){
-				$this->getLevel()->setBlock($block, Block::get(Item::DOUBLE_SLAB, $this->meta), true, false, true);
+				$this->getLevel()->setBlock($block, Block::get(Item::DOUBLE_SLAB, $this->meta), true);
 
 				return true;
 			}else{
@@ -62,19 +86,19 @@ class Slab extends Transparent{
 			}
 		}elseif($face === 1){
 			if($target->getID() === self::SLAB and ($target->getDamage() & 0x08) === 0 and ($target->getDamage() & 0x07) === ($this->meta & 0x07)){
-				$this->getLevel()->setBlock($target, Block::get(Item::DOUBLE_SLAB, $this->meta), true, false, true);
+				$this->getLevel()->setBlock($target, Block::get(Item::DOUBLE_SLAB, $this->meta), true);
 
 				return true;
 			}elseif($block->getID() === self::SLAB and ($block->getDamage() & 0x07) === ($this->meta & 0x07)){
-				$this->getLevel()->setBlock($block, Block::get(Item::DOUBLE_SLAB, $this->meta), true, false, true);
+				$this->getLevel()->setBlock($block, Block::get(Item::DOUBLE_SLAB, $this->meta), true);
 
 				return true;
 			}
 			//TODO: check for collision
-		}elseif(!($player instanceof Player)){
+		}else{
 			if($block->getID() === self::SLAB){
 				if(($block->getDamage() & 0x07) === ($this->meta & 0x07)){
-					$this->getLevel()->setBlock($block, Block::get(Item::DOUBLE_SLAB, $this->meta), true, false, true);
+					$this->getLevel()->setBlock($block, Block::get(Item::DOUBLE_SLAB, $this->meta), true);
 
 					return true;
 				}
@@ -85,13 +109,12 @@ class Slab extends Transparent{
 					$this->meta |= 0x08;
 				}
 			}
-		}else{
-			return false;
 		}
+
 		if($block->getID() === self::SLAB and ($target->getDamage() & 0x07) !== ($this->meta & 0x07)){
 			return false;
 		}
-		$this->getLevel()->setBlock($block, $this, true, false, true);
+		$this->getLevel()->setBlock($block, $this, true, true);
 
 		return true;
 	}
@@ -116,9 +139,9 @@ class Slab extends Transparent{
 
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 1){
-			return array(
-				array($this->id, $this->meta & 0x07, 1),
-			);
+			return [
+				[$this->id, $this->meta & 0x07, 1],
+			];
 		}else{
 			return [];
 		}

src/pocketmine/block/SnowLayer.php

@@ -34,10 +34,15 @@ class SnowLayer extends Flowable{
 		$this->hardness = 0.5;
 	}
 
+	public function getBoundingBox(){
+		return null;
+	}
+
+
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
 		$down = $this->getSide(0);
 		if($down instanceof Solid){
-			$this->getLevel()->setBlock($block, $this, true, false, true);
+			$this->getLevel()->setBlock($block, $this, true);
 
 			return true;
 		}
@@ -48,7 +53,7 @@ class SnowLayer extends Flowable{
 	public function onUpdate($type){
 		if($type === Level::BLOCK_UPDATE_NORMAL){
 			if($this->getSide(0)->getID() === self::AIR){ //Replace with common break method
-				$this->getLevel()->setBlock($this, new Air(), true, false, true);
+				$this->getLevel()->setBlock($this, new Air(), true);
 
 				return Level::BLOCK_UPDATE_NORMAL;
 			}
@@ -59,9 +64,9 @@ class SnowLayer extends Flowable{
 
 	public function getDrops(Item $item){
 		if($item->isShovel() !== false){
-			return array(
-				array(Item::SNOWBALL, 0, 1),
-			);
+			return [
+				[Item::SNOWBALL, 0, 1],
+			];
 		}
 
 		return [];

src/pocketmine/block/Solid.php

@@ -22,7 +22,7 @@
 namespace pocketmine\block;
 
 
-class Solid extends Generic{
+abstract class Solid extends Block{
 
 	public function __construct($id, $meta = 0, $name = "Unknown"){
 		parent::__construct($id, $meta, $name);

src/pocketmine/block/SoulSand.php

@@ -22,10 +22,24 @@
 namespace pocketmine\block;
 
 
+use pocketmine\math\AxisAlignedBB;
+
 class SoulSand extends Solid{
 	public function __construct(){
 		parent::__construct(self::SOUL_SAND, 0, "Soul Sand");
 		$this->hardness = 2.5;
 	}
 
+	protected function recalculateBoundingBox(){
+
+		return new AxisAlignedBB(
+			$this->x,
+			$this->y,
+			$this->z,
+			$this->x + 1,
+			$this->y + 1 - 0.125,
+			$this->z + 1
+		);
+	}
+
 }

src/pocketmine/block/SpruceWoodStairs.php

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

src/pocketmine/block/StainedClay.php

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

src/pocketmine/block/Stair.php

@@ -22,9 +22,10 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\math\AxisAlignedBB;
 use pocketmine\Player;
 
-class Stair extends Transparent{
+abstract class Stair extends Transparent{
 
 	public function __construct($id, $meta = 0, $name = "Unknown"){
 		parent::__construct($id, $meta, $name);
@@ -36,27 +37,126 @@ class Stair extends Transparent{
 		$this->hardness = 30;
 	}
 
+	/*
+	public function collidesWithBB(AxisAlignedBB $bb, &$list = []){
+		$damage = $this->getDamage();
+		$j = $damage & 0x03;
+
+		$f = 0;
+		$f1 = 0.5;
+		$f2 = 0.5;
+		$f3 = 1;
+
+		if(($damage & 0x04) > 0){
+			$f = 0.5;
+			$f1 = 1;
+			$f2 = 0;
+			$f3 = 0.5;
+		}
+
+		if($bb->intersectsWith($bb2 = AxisAlignedBB::getBoundingBoxFromPool(
+			$this->x,
+			$this->y + $f,
+			$this->z,
+			$this->x + 1,
+			$this->y + $f1,
+			$this->z + 1
+		))){
+			$list[] = $bb2;
+		}
+
+		if($j === 0){
+			if($bb->intersectsWith($bb2 = AxisAlignedBB::getBoundingBoxFromPool(
+				$this->x + 0.5,
+				$this->y + $f2,
+				$this->z,
+				$this->x + 1,
+				$this->y + $f3,
+				$this->z + 1
+			))){
+				$list[] = $bb2;
+			}
+		}elseif($j === 1){
+			if($bb->intersectsWith($bb2 = AxisAlignedBB::getBoundingBoxFromPool(
+				$this->x,
+				$this->y + $f2,
+				$this->z,
+				$this->x + 0.5,
+				$this->y + $f3,
+				$this->z + 1
+			))){
+				$list[] = $bb2;
+			}
+		}elseif($j === 2){
+			if($bb->intersectsWith($bb2 = AxisAlignedBB::getBoundingBoxFromPool(
+				$this->x,
+				$this->y + $f2,
+				$this->z + 0.5,
+				$this->x + 1,
+				$this->y + $f3,
+				$this->z + 1
+			))){
+				$list[] = $bb2;
+			}
+		}elseif($j === 3){
+			if($bb->intersectsWith($bb2 = AxisAlignedBB::getBoundingBoxFromPool(
+				$this->x,
+				$this->y + $f2,
+				$this->z,
+				$this->x + 1,
+				$this->y + $f3,
+				$this->z + 0.5
+			))){
+				$list[] = $bb2;
+			}
+		}
+	}
+	*/
+
+	protected function recalculateBoundingBox(){
+
+		if(($this->getDamage() & 0x04) > 0){
+			return new AxisAlignedBB(
+				$this->x,
+				$this->y + 0.5,
+				$this->z,
+				$this->x + 1,
+				$this->y + 1,
+				$this->z + 1
+			);
+		}else{
+			return new AxisAlignedBB(
+				$this->x,
+				$this->y,
+				$this->z,
+				$this->x + 1,
+				$this->y + 0.5,
+				$this->z + 1
+			);
+		}
+	}
+
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
-		$faces = array(
+		$faces = [
 			0 => 0,
 			1 => 2,
 			2 => 1,
 			3 => 3,
-		);
+		];
 		$this->meta = $faces[$player->getDirection()] & 0x03;
 		if(($fy > 0.5 and $face !== 1) or $face === 0){
 			$this->meta |= 0x04; //Upside-down stairs
 		}
-		$this->getLevel()->setBlock($block, $this, true, false, true);
+		$this->getLevel()->setBlock($block, $this, true, true);
 
 		return true;
 	}
 
 	public function getDrops(Item $item){
 		if($item->isPickaxe() >= 1){
-			return array(
-				array($this->id, 0, 1),
-			);
+			return [
+				[$this->id, 0, 1],
+			];
 		}else{
 			return [];
 		}

src/pocketmine/block/StillLava.php

@@ -21,8 +21,7 @@
 
 namespace pocketmine\block;
 
-
-class StillLava extends Liquid{
+class StillLava extends Lava{
 	public function __construct($meta = 0){
 		parent::__construct(self::STILL_LAVA, $meta, "Still Lava");
 		$this->hardness = 500;