Enabled batch block sending again

Fixed Server->getOps() capitalization

.travis.yml

@@ -10,7 +10,7 @@ before_script:
  - 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
+ - pecl install channel://pecl.php.net/weakref-0.2.6
  - echo | pecl install channel://pecl.php.net/yaml-1.1.1
 
 script:
@@ -18,4 +18,4 @@ script:
  
 notifications:
  email: false
- #webhooks: http://n.tkte.ch/h/214/wsNvmG43-ncxUVRrFPwSM-r0
+ #webhooks: http://n.tkte.ch/h/214/wsNvmG43-ncxUVRrFPwSM-r0

src/pocketmine/CrashDump.php

@@ -137,7 +137,7 @@ class CrashDump{
 			$error = $lastExceptionError;
 		}else{
 			$error = (array) error_get_last();
-			$error["trace"] = getTrace(4);
+			$error["trace"] = @getTrace(4);
 			$errorConversion = [
 				E_ERROR => "E_ERROR",
 				E_WARNING => "E_WARNING",

src/pocketmine/PocketMine.php

@@ -65,17 +65,15 @@ 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.4.1";
+	const API_VERSION = "1.8.0";
 	const CODENAME = "絶好(Zekkou)ケーキ(Cake)";
-	const MINECRAFT_VERSION = "v0.9.5 alpha";
+	const MINECRAFT_VERSION = "v0.10.4 alpha";
 
 	/*
 	 * Startup code. Do not look at it, it may harm you.
@@ -123,10 +121,13 @@ namespace pocketmine {
 
 	$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");
@@ -135,7 +136,7 @@ namespace pocketmine {
 	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.
+			//This here is just for redundancy just in case some 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.
@@ -154,7 +155,8 @@ namespace pocketmine {
 		}
 	}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.
+		 * This is here so that people 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){
@@ -167,13 +169,27 @@ namespace pocketmine {
 	function detect_system_timezone(){
 		switch(Utils::getOS()){
 			case 'win':
-				$regex = '/(?:Time Zone:\s*\()(UTC)(\+*\-*\d*\d*\:*\d*\d*)(?:\))/';
+				$regex = '/(UTC)(\+*\-*\d*\d*\:*\d*\d*)/';
 
-				exec("systeminfo", $output);
+				/*
+				 * wmic timezone get Caption
+				 * Get the timezone offset
+				 *
+				 * Sample Output var_dump
+				 * array(3) {
+				 *	  [0] =>
+				 *	  string(7) "Caption"
+				 *	  [1] =>
+				 *	  string(20) "(UTC+09:30) Adelaide"
+				 *	  [2] =>
+				 *	  string(0) ""
+				 *	}
+				 */
+				exec("wmic timezone get Caption", $output);
 
 				$string = trim(implode("\n", $output));
 
-				//Detect the Time Zone string in systeminfo
+				//Detect the Time Zone string
 				preg_match($regex, $string, $matches);
 
 				if(!isset($matches[2]))
@@ -328,54 +344,7 @@ 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 = [
-			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;
 
@@ -398,8 +367,8 @@ namespace pocketmine {
 	if(substr_count($pthreads_version, ".") < 2){
 		$pthreads_version = "0.$pthreads_version";
 	}
-	if(version_compare($pthreads_version, "2.0.8") < 0){
-		$logger->critical("pthreads >= 2.0.8 is required, while you have $pthreads_version.");
+	if(version_compare($pthreads_version, "2.0.9") < 0){
+		$logger->critical("pthreads >= 2.0.9 is required, while you have $pthreads_version.");
 		++$errors;
 	}
 
@@ -477,14 +446,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/Server.php

@@ -31,7 +31,15 @@ use pocketmine\command\CommandSender;
 use pocketmine\command\ConsoleCommandSender;
 use pocketmine\command\PluginIdentifiableCommand;
 use pocketmine\command\SimpleCommandMap;
+use pocketmine\entity\Arrow;
 use pocketmine\entity\Entity;
+use pocketmine\entity\FallingSand;
+use pocketmine\entity\Human;
+use pocketmine\entity\Item as DroppedItem;
+use pocketmine\entity\PrimedTNT;
+use pocketmine\entity\Snowball;
+use pocketmine\entity\Villager;
+use pocketmine\entity\Zombie;
 use pocketmine\event\HandlerList;
 use pocketmine\event\level\LevelInitEvent;
 use pocketmine\event\level\LevelLoadEvent;
@@ -79,13 +87,19 @@ use pocketmine\plugin\PluginManager;
 use pocketmine\scheduler\CallbackTask;
 use pocketmine\scheduler\SendUsageTask;
 use pocketmine\scheduler\ServerScheduler;
+use pocketmine\tile\Chest;
+use pocketmine\tile\Furnace;
+use pocketmine\tile\Sign;
 use pocketmine\tile\Tile;
 use pocketmine\updater\AutoUpdater;
 use pocketmine\utils\Binary;
 use pocketmine\utils\Cache;
 use pocketmine\utils\Config;
+use pocketmine\utils\LevelException;
 use pocketmine\utils\MainLogger;
+use pocketmine\utils\ServerException;
 use pocketmine\utils\TextFormat;
+use pocketmine\utils\TextWrapper;
 use pocketmine\utils\Utils;
 use pocketmine\utils\VersionString;
 
@@ -114,6 +128,8 @@ class Server{
 	/** @var bool */
 	private $isRunning = true;
 
+	private $hasStopped = false;
+
 	/** @var PluginManager */
 	private $pluginManager = null;
 
@@ -283,21 +299,21 @@ class Server{
 	 * @return int
 	 */
 	public function getViewDistance(){
-		return max(56, $this->getProperty("chunk-sending.max-chunks"));
+		return max(56, $this->getProperty("chunk-sending.max-chunks", 96));
 	}
 
 	/**
 	 * @return string
 	 */
 	public function getIp(){
-		return $this->getConfigString("server-ip", "");
+		return $this->getConfigString("server-ip", "0.0.0.0");
 	}
 
 	/**
 	 * @return string
 	 */
 	public function getServerName(){
-		return $this->getConfigString("server-name", "Unknown server");
+		return $this->getConfigString("motd", "Minecraft: PE Server");
 	}
 
 	/**
@@ -611,9 +627,16 @@ class Server{
 	 * @param string $payload
 	 */
 	public function handlePacket($address, $port, $payload){
-		if(strlen($payload) > 2 and substr($payload, 0, 2) === "\xfe\xfd" and $this->queryHandler instanceof QueryHandler){
-			$this->queryHandler->handle($address, $port, $payload);
-		} //TODO: add raw packet events
+		try{
+			if(strlen($payload) > 2 and substr($payload, 0, 2) === "\xfe\xfd" and $this->queryHandler instanceof QueryHandler){
+				$this->queryHandler->handle($address, $port, $payload);
+			}
+		}catch(\Exception $e){
+			if($this->logger instanceof MainLogger){
+				$this->logger->logException($e);
+			}
+		}
+		//TODO: add raw packet events
 	}
 
 	/**
@@ -644,7 +667,7 @@ class Server{
 		$result = $this->getPlayerExact($name);
 
 		if($result === null){
-			$result = new OfflinePlayer($this, $name);
+			return new OfflinePlayer($this, $name);
 		}
 
 		return $result;
@@ -658,107 +681,112 @@ class Server{
 	public function getOfflinePlayerData($name){
 		$name = strtolower($name);
 		$path = $this->getDataPath() . "players/";
-		if(!file_exists($path . "$name.dat")){
-			$spawn = $this->getDefaultLevel()->getSafeSpawn();
-			$nbt = new Compound(false, [
-				new Long("firstPlayed", floor(microtime(true) * 1000)),
-				new Long("lastPlayed", floor(microtime(true) * 1000)),
-				new Enum("Pos", [
-					new Double(0, $spawn->x),
-					new Double(1, $spawn->y),
-					new Double(2, $spawn->z)
-				]),
-				new String("Level", $this->getDefaultLevel()->getName()),
-				//new String("SpawnLevel", $this->getDefaultLevel()->getName()),
-				//new Int("SpawnX", (int) $spawn->x),
-				//new Int("SpawnY", (int) $spawn->y),
-				//new Int("SpawnZ", (int) $spawn->z),
-				//new Byte("SpawnForced", 1), //TODO
-				new Enum("Inventory", []),
-				new Compound("Achievements", []),
-				new Int("playerGameType", $this->getGamemode()),
-				new Enum("Motion", [
-					new Double(0, 0.0),
-					new Double(1, 0.0),
-					new Double(2, 0.0)
-				]),
-				new Enum("Rotation", [
-					new Float(0, 0.0),
-					new Float(1, 0.0)
-				]),
-				new Float("FallDistance", 0.0),
-				new Short("Fire", 0),
-				new Short("Air", 0),
-				new Byte("OnGround", 1),
-				new Byte("Invulnerable", 0),
-				new String("NameTag", $name),
-			]);
-			$nbt->Pos->setTagType(NBT::TAG_Double);
-			$nbt->Inventory->setTagType(NBT::TAG_Compound);
-			$nbt->Motion->setTagType(NBT::TAG_Double);
-			$nbt->Rotation->setTagType(NBT::TAG_Float);
+		if(file_exists($path . "$name.dat")){
+			try{
+				$nbt = new NBT(NBT::BIG_ENDIAN);
+				$nbt->readCompressed(file_get_contents($path . "$name.dat"));
 
-			if(file_exists($path . "$name.yml")){ //Importing old PocketMine-MP files
-				$data = new Config($path . "$name.yml", Config::YAML, []);
-				$nbt["playerGameType"] = (int) $data->get("gamemode");
-				$nbt["Level"] = $data->get("position")["level"];
-				$nbt["Pos"][0] = $data->get("position")["x"];
-				$nbt["Pos"][1] = $data->get("position")["y"];
-				$nbt["Pos"][2] = $data->get("position")["z"];
-				$nbt["SpawnLevel"] = $data->get("spawn")["level"];
-				$nbt["SpawnX"] = (int) $data->get("spawn")["x"];
-				$nbt["SpawnY"] = (int) $data->get("spawn")["y"];
-				$nbt["SpawnZ"] = (int) $data->get("spawn")["z"];
-				$this->logger->notice("Old Player data found for \"" . $name . "\", upgrading profile");
-				foreach($data->get("inventory") as $slot => $item){
-					if(count($item) === 3){
-						$nbt->Inventory[$slot + 9] = new Compound(false, [
-							new Short("id", $item[0]),
-							new Short("Damage", $item[1]),
-							new Byte("Count", $item[2]),
-							new Byte("Slot", $slot + 9),
-							new Byte("TrueSlot", $slot + 9)
-						]);
-					}
-				}
-				foreach($data->get("hotbar") as $slot => $itemSlot){
-					if(isset($nbt->Inventory[$itemSlot + 9])){
-						$item = $nbt->Inventory[$itemSlot + 9];
-						$nbt->Inventory[$slot] = new Compound(false, [
-							new Short("id", $item["id"]),
-							new Short("Damage", $item["Damage"]),
-							new Byte("Count", $item["Count"]),
-							new Byte("Slot", $slot),
-							new Byte("TrueSlot", $item["TrueSlot"])
-						]);
-					}
-				}
-				foreach($data->get("armor") as $slot => $item){
-					if(count($item) === 2){
-						$nbt->Inventory[$slot + 100] = new Compound(false, [
-							new Short("id", $item[0]),
-							new Short("Damage", $item[1]),
-							new Byte("Count", 1),
-							new Byte("Slot", $slot + 100)
-						]);
-					}
-				}
-				foreach($data->get("achievements") as $achievement => $status){
-					$nbt->Achievements[$achievement] = new Byte($achievement, $status == true ? 1 : 0);
-				}
-				unlink($path . "$name.yml");
-			}else{
-				$this->logger->notice("Player data not found for \"" . $name . "\", creating new profile");
+				return $nbt->getData();
+			}catch(\Exception $e){ //zlib decode error / corrupt data
+				rename($path . "$name.dat", $path . "$name.dat.bak");
+				$this->logger->warning("Corrupted data found for \"" . $name . "\", creating new profile");
 			}
-			$this->saveOfflinePlayerData($name, $nbt);
-
-			return $nbt;
 		}else{
-			$nbt = new NBT(NBT::BIG_ENDIAN);
-			$nbt->readCompressed(file_get_contents($path . "$name.dat"));
-
-			return $nbt->getData();
+			$this->logger->notice("Player data not found for \"" . $name . "\", creating new profile");
 		}
+		$spawn = $this->getDefaultLevel()->getSafeSpawn();
+		$nbt = new Compound(false, [
+			new Long("firstPlayed", floor(microtime(true) * 1000)),
+			new Long("lastPlayed", floor(microtime(true) * 1000)),
+			new Enum("Pos", [
+				new Double(0, $spawn->x),
+				new Double(1, $spawn->y),
+				new Double(2, $spawn->z)
+			]),
+			new String("Level", $this->getDefaultLevel()->getName()),
+			//new String("SpawnLevel", $this->getDefaultLevel()->getName()),
+			//new Int("SpawnX", (int) $spawn->x),
+			//new Int("SpawnY", (int) $spawn->y),
+			//new Int("SpawnZ", (int) $spawn->z),
+			//new Byte("SpawnForced", 1), //TODO
+			new Enum("Inventory", []),
+			new Compound("Achievements", []),
+			new Int("playerGameType", $this->getGamemode()),
+			new Enum("Motion", [
+				new Double(0, 0.0),
+				new Double(1, 0.0),
+				new Double(2, 0.0)
+			]),
+			new Enum("Rotation", [
+				new Float(0, 0.0),
+				new Float(1, 0.0)
+			]),
+			new Float("FallDistance", 0.0),
+			new Short("Fire", 0),
+			new Short("Air", 0),
+			new Byte("OnGround", 1),
+			new Byte("Invulnerable", 0),
+			new String("NameTag", $name),
+		]);
+		$nbt->Pos->setTagType(NBT::TAG_Double);
+		$nbt->Inventory->setTagType(NBT::TAG_Compound);
+		$nbt->Motion->setTagType(NBT::TAG_Double);
+		$nbt->Rotation->setTagType(NBT::TAG_Float);
+
+		if(file_exists($path . "$name.yml")){ //Importing old PocketMine-MP files
+			$data = new Config($path . "$name.yml", Config::YAML, []);
+			$nbt["playerGameType"] = (int) $data->get("gamemode");
+			$nbt["Level"] = $data->get("position")["level"];
+			$nbt["Pos"][0] = $data->get("position")["x"];
+			$nbt["Pos"][1] = $data->get("position")["y"];
+			$nbt["Pos"][2] = $data->get("position")["z"];
+			$nbt["SpawnLevel"] = $data->get("spawn")["level"];
+			$nbt["SpawnX"] = (int) $data->get("spawn")["x"];
+			$nbt["SpawnY"] = (int) $data->get("spawn")["y"];
+			$nbt["SpawnZ"] = (int) $data->get("spawn")["z"];
+			$this->logger->notice("Old Player data found for \"" . $name . "\", upgrading profile");
+			foreach($data->get("inventory") as $slot => $item){
+				if(count($item) === 3){
+					$nbt->Inventory[$slot + 9] = new Compound(false, [
+						new Short("id", $item[0]),
+						new Short("Damage", $item[1]),
+						new Byte("Count", $item[2]),
+						new Byte("Slot", $slot + 9),
+						new Byte("TrueSlot", $slot + 9)
+					]);
+				}
+			}
+			foreach($data->get("hotbar") as $slot => $itemSlot){
+				if(isset($nbt->Inventory[$itemSlot + 9])){
+					$item = $nbt->Inventory[$itemSlot + 9];
+					$nbt->Inventory[$slot] = new Compound(false, [
+						new Short("id", $item["id"]),
+						new Short("Damage", $item["Damage"]),
+						new Byte("Count", $item["Count"]),
+						new Byte("Slot", $slot),
+						new Byte("TrueSlot", $item["TrueSlot"])
+					]);
+				}
+			}
+			foreach($data->get("armor") as $slot => $item){
+				if(count($item) === 2){
+					$nbt->Inventory[$slot + 100] = new Compound(false, [
+						new Short("id", $item[0]),
+						new Short("Damage", $item[1]),
+						new Byte("Count", 1),
+						new Byte("Slot", $slot + 100)
+					]);
+				}
+			}
+			foreach($data->get("achievements") as $achievement => $status){
+				$nbt->Achievements[$achievement] = new Byte($achievement, $status == true ? 1 : 0);
+			}
+			unlink($path . "$name.yml");
+		}
+		$this->saveOfflinePlayerData($name, $nbt);
+
+		return $nbt;
+
 	}
 
 	/**
@@ -931,11 +959,11 @@ class Server{
 	 *
 	 * @return bool
 	 *
-	 * @throws \Exception
+	 * @throws LevelException
 	 */
 	public function loadLevel($name){
 		if(trim($name) === ""){
-			throw new \Exception("Invalid empty level name");
+			throw new LevelException("Invalid empty level name");
 		}
 		if($this->isLevelLoaded($name)){
 			return true;
@@ -1084,7 +1112,7 @@ class Server{
 			return false;
 		}
 
-		$seed = $seed === null ? Binary::readInt(Utils::getRandomBytes(4, false)) : (int) $seed;
+		$seed = $seed === null ? Binary::readInt(@Utils::getRandomBytes(4, false)) : (int) $seed;
 
 		if($generator !== null and class_exists($generator) and is_subclass_of($generator, Generator::class)){
 			$generator = new $generator($options);
@@ -1116,8 +1144,8 @@ class Server{
 		$radiusSquared = ($this->getViewDistance() + 1) / M_PI;
 		$radius = ceil(sqrt($radiusSquared));
 
-		$centerX = $level->getSpawn()->getX() >> 4;
-		$centerZ = $level->getSpawn()->getZ() >> 4;
+		$centerX = $level->getSpawnLocation()->getX() >> 4;
+		$centerZ = $level->getSpawnLocation()->getZ() >> 4;
 
 		$order = [];
 
@@ -1378,7 +1406,7 @@ class Server{
 	/**
 	 * @return Config
 	 */
-	public function getOPs(){
+	public function getOps(){
 		return $this->operators;
 	}
 
@@ -1428,11 +1456,12 @@ class Server{
 		$this->autoloader = $autoloader;
 		$this->logger = $logger;
 		$this->filePath = $filePath;
-		$this->dataPath = $dataPath;
-		$this->pluginPath = $pluginPath;
-		@mkdir($this->dataPath . "worlds/", 0777, true);
-		@mkdir($this->dataPath . "players/", 0777);
-		@mkdir($this->pluginPath, 0777);
+		@mkdir($dataPath . "worlds/", 0777);
+		@mkdir($dataPath . "players/", 0777);
+		@mkdir($pluginPath, 0777);
+
+		$this->dataPath = realpath($dataPath) . DIRECTORY_SEPARATOR;
+		$this->pluginPath = realpath($pluginPath) . DIRECTORY_SEPARATOR;
 
 		$this->entityMetadata = new EntityMetadataStore();
 		$this->playerMetadata = new PlayerMetadataStore();
@@ -1489,7 +1518,7 @@ class Server{
 			"level-type" => "DEFAULT",
 			"enable-query" => true,
 			"enable-rcon" => false,
-			"rcon.password" => substr(base64_encode(Utils::getRandomBytes(20, false)), 3, 10),
+			"rcon.password" => substr(base64_encode(@Utils::getRandomBytes(20, false)), 3, 10),
 			"auto-save" => true,
 		]);
 
@@ -1535,12 +1564,12 @@ class Server{
 		}
 
 		$this->logger->info("Starting Minecraft PE server on " . ($this->getIp() === "" ? "*" : $this->getIp()) . ":" . $this->getPort());
-		define("BOOTUP_RANDOM", Utils::getRandomBytes(16));
+		define("BOOTUP_RANDOM", @Utils::getRandomBytes(16));
 		$this->serverID = Binary::readLong(substr(Utils::getUniqueID(true, $this->getIp() . $this->getPort()), 0, 8));
 
 		$this->addInterface($this->mainInterface = new RakLibInterface($this));
 
-		$this->logger->info("This server is running " . $this->getName() . " version " . ($version->isDev() ? TextFormat::YELLOW : "") . $version->get(false) . TextFormat::RESET . " \"" . $this->getCodename() . "\" (API " . $this->getApiVersion() . ")", true, true, 0);
+		$this->logger->info("This server is running " . $this->getName() . " version " . ($version->isDev() ? TextFormat::YELLOW : "") . $version->get(true) . TextFormat::WHITE . " \"" . $this->getCodename() . "\" (API " . $this->getApiVersion() . ")", true, true, 0);
 		$this->logger->info($this->getName() . " is distributed under the LGPL License", true, true, 0);
 
 		PluginManager::$pluginParentTimer = new TimingsHandler("** Plugins");
@@ -1549,9 +1578,13 @@ class Server{
 		$this->consoleSender = new ConsoleCommandSender();
 		$this->commandMap = new SimpleCommandMap($this);
 
+		$this->registerEntities();
+		$this->registerTiles();
+
 		InventoryType::init();
 		Block::init();
 		Item::init();
+		TextWrapper::init();
 		$this->craftingManager = new CraftingManager();
 
 		$this->pluginManager = new PluginManager($this, $this->commandMap);
@@ -1561,7 +1594,6 @@ class Server{
 
 		set_exception_handler([$this, "exceptionHandler"]);
 		register_shutdown_function([$this, "crashDump"]);
-		register_shutdown_function([$this, "forceShutdown"]);
 
 		$this->pluginManager->loadPlugins($this->pluginPath);
 
@@ -1583,14 +1615,7 @@ class Server{
 		Generator::addGenerator(Normal::class, "normal");
 		Generator::addGenerator(Normal::class, "default");
 
-		//Temporal workaround, pthreads static property nullification test
-		if(PluginManager::$pluginParentTimer === null){
-			$this->getLogger()->emergency("You are using an invalid pthreads version. Please update your binaries.");
-			kill(getmypid());
-			return;
-		}
-
-		foreach($this->getProperty("worlds", []) as $name => $worldSetting){
+		foreach((array) $this->getProperty("worlds", []) as $name => $worldSetting){
 			if($this->loadLevel($name) === false){
 				$seed = $this->getProperty("worlds.$name.seed", time());
 				$options = explode(":", $this->getProperty("worlds.$name.generator", Generator::getGenerator("default")));
@@ -1692,8 +1717,13 @@ class Server{
 	 * @param DataPacket $packet
 	 */
 	public static function broadcastPacket(array $players, DataPacket $packet){
+		$packet->encode();
+		$packet->isEncoded = true;
 		foreach($players as $player){
-			$player->dataPacket(clone $packet);
+			$player->dataPacket($packet);
+		}
+		if(isset($packet->__encapsulatedPacket)){
+			unset($packet->__encapsulatedPacket);
 		}
 	}
 
@@ -1757,7 +1787,7 @@ class Server{
 	 */
 	public function dispatchCommand(CommandSender $sender, $commandLine){
 		if(!($sender instanceof CommandSender)){
-			throw new \Exception("CommandSender is not valid");
+			throw new ServerException("CommandSender is not valid");
 		}
 
 		if($this->commandMap->dispatch($sender, $commandLine)){
@@ -1825,40 +1855,54 @@ class Server{
 	}
 
 	public function forceShutdown(){
-		$this->shutdown();
-		if($this->rcon instanceof RCON){
-			$this->rcon->stop();
+		if($this->hasStopped){
+			return;
 		}
 
-		if($this->getProperty("settings.upnp-forwarding", false) === true){
-			$this->logger->info("[UPnP] Removing port forward...");
-			UPnP::RemovePortForward($this->getPort());
+		try{
+			$this->hasStopped = true;
+
+			$this->shutdown();
+			if($this->rcon instanceof RCON){
+				$this->rcon->stop();
+			}
+
+			if($this->getProperty("settings.upnp-forwarding", false) === true){
+				$this->logger->info("[UPnP] Removing port forward...");
+				UPnP::RemovePortForward($this->getPort());
+			}
+
+			$this->pluginManager->disablePlugins();
+
+			foreach($this->players as $player){
+				$player->close(TextFormat::YELLOW . $player->getName() . " has left the game", $this->getProperty("settings.shutdown-message", "Server closed"));
+			}
+
+			foreach($this->getLevels() as $level){
+				$this->unloadLevel($level, true);
+			}
+
+			if($this->generationManager instanceof GenerationRequestManager){
+				$this->generationManager->shutdown();
+			}
+
+			HandlerList::unregisterAll();
+
+			$this->scheduler->cancelAllTasks();
+			$this->scheduler->mainThreadHeartbeat(PHP_INT_MAX);
+
+			$this->properties->save();
+
+			$this->console->kill();
+
+			foreach($this->interfaces as $interface){
+				$interface->shutdown();
+			}
+		}catch (\Exception $e){
+			$this->logger->emergency("Crashed while crashing, killing process");
+			@kill(getmypid());
 		}
 
-		$this->pluginManager->disablePlugins();
-
-		foreach($this->players as $player){
-			$player->close(TextFormat::YELLOW . $player->getName() . " has left the game", $this->getProperty("settings.shutdown-message", "Server closed"));
-		}
-
-		foreach($this->getLevels() as $level){
-			$this->unloadLevel($level, true);
-		}
-
-		if($this->generationManager instanceof GenerationRequestManager){
-			$this->generationManager->shutdown();
-		}
-
-		HandlerList::unregisterAll();
-		$this->scheduler->cancelAllTasks();
-		$this->scheduler->mainThreadHeartbeat(PHP_INT_MAX);
-
-		$this->properties->save();
-
-		$this->console->kill();
-		foreach($this->interfaces as $interface){
-			$interface->shutdown();
-		}
 	}
 
 	/**
@@ -1927,25 +1971,52 @@ class Server{
 		}
 	}
 
-	public function exceptionHandler(\Exception $e){
+	public function exceptionHandler(\Exception $e, $trace = null){
 		if($e === null){
 			return;
 		}
 
-		error_handler(E_ERROR, $e->getMessage(), $e->getFile(), $e->getLine(), $e->getTrace());
+		global $lastError;
+
+		$errstr = $e->getMessage();
+		$errfile = $e->getFile();
+		$errno = $e->getCode();
+		$errline = $e->getLine();
+
+		$type = ($errno === E_ERROR or $errno === E_USER_ERROR) ? \LogLevel::ERROR : (($errno === E_USER_WARNING or $errno === E_WARNING) ? \LogLevel::WARNING : \LogLevel::NOTICE);
+		if(($pos = strpos($errstr, "\n")) !== false){
+			$errstr = substr($errstr, 0, $pos);
+		}
+
+		$errfile = cleanPath($errfile);
+
+		if($this->logger instanceof MainLogger){
+			$this->logger->logException($e, $trace);
+		}
+
+		$lastError = [
+			"type" => $type,
+			"message" => $errstr,
+			"fullFile" => $e->getFile(),
+			"file" => $errfile,
+			"line" => $errline,
+			"trace" => @getTrace($trace === null ? 3 : 0, $trace)
+		];
+
 		global $lastExceptionError, $lastError;
 		$lastExceptionError = $lastError;
 		$this->crashDump();
-		$this->forceShutdown();
-		kill(getmypid());
-		exit(1);
 	}
 
 	public function crashDump(){
 		if($this->isRunning === false){
 			return;
 		}
-		ini_set("memory_limit", "-1"); //Fix error dump not dumped on memory problems
+		$this->isRunning = false;
+		$this->hasStopped = false;
+
+		ini_set("error_reporting", 0);
+		ini_set("memory_limit", -1); //Fix error dump not dumped on memory problems
 		$this->logger->emergency("An unrecoverable error has occurred and the server has crashed. Creating a crash dump");
 		$dump = new CrashDump($this);
 
@@ -1953,44 +2024,49 @@ class Server{
 
 
 		if($this->getProperty("auto-report.enabled", true) !== false){
+			$report = true;
 			$plugin = $dump->getData()["plugin"];
 			if(is_string($plugin)){
 				$p = $this->pluginManager->getPlugin($plugin);
 				if($p instanceof Plugin and !($p->getPluginLoader() instanceof PharPluginLoader)){
-					return;
+					$report = false;
 				}
 			}elseif(\Phar::running(true) == ""){
-				return;
+				$report = false;
 			}
 			if($dump->getData()["error"]["type"] === "E_PARSE" or $dump->getData()["error"]["type"] === "E_COMPILE_ERROR"){
-				return;
+				$report = false;
 			}
 
-			$reply = Utils::postURL("http://" . $this->getProperty("auto-report.host", "crash.pocketmine.net") . "/submit/api", [
-				"report" => "yes",
-				"name" => $this->getName() . " " . $this->getPocketMineVersion(),
-				"email" => "crash@pocketmine.net",
-				"reportPaste" => base64_encode($dump->getEncodedData())
-			]);
+			if($report){
+				$reply = Utils::postURL("http://" . $this->getProperty("auto-report.host", "crash.pocketmine.net") . "/submit/api", [
+					"report" => "yes",
+					"name" => $this->getName() . " " . $this->getPocketMineVersion(),
+					"email" => "crash@pocketmine.net",
+					"reportPaste" => base64_encode($dump->getEncodedData())
+				]);
 
-			if(($data = json_decode($reply)) !== false and isset($data->crashId)){
-				$reportId = $data->crashId;
-				$reportUrl = $data->crashUrl;
-				$this->logger->emergency("The crash dump has been automatically submitted to the Crash Archive. You can view it on $reportUrl or use the ID #$reportId.");
+				if(($data = json_decode($reply)) !== false and isset($data->crashId)){
+					$reportId = $data->crashId;
+					$reportUrl = $data->crashUrl;
+					$this->logger->emergency("The crash dump has been automatically submitted to the Crash Archive. You can view it on $reportUrl or use the ID #$reportId.");
+				}
 			}
 		}
 
 		//$this->checkMemory();
 		//$dump .= "Memory Usage Tracking: \r\n" . chunk_split(base64_encode(gzdeflate(implode(";", $this->memoryStats), 9))) . "\r\n";
 
+		$this->forceShutdown();
+		@kill(getmypid());
+		exit(1);
 	}
 
 	public function __debugInfo(){
-		return get_class($this);
+		return [];
 	}
 
 	private function tickProcessor(){
-		$lastLoop = 0;
 		while($this->isRunning){
 			$this->tick();
 			usleep((int) max(1, ($this->nextTick - microtime(true)) * 1000000));
@@ -2005,7 +2081,14 @@ class Server{
 
 		//Do level ticks
 		foreach($this->getLevels() as $level){
-			$level->doTick($currentTick);
+			try{
+				$level->doTick($currentTick);
+			}catch (\Exception $e){
+				$this->logger->critical("Could not tick level ".$level->getName().": ".$e->getMessage());
+				if($this->logger instanceof MainLogger){
+					$this->logger->logException($e);
+				}
+			}
 		}
 	}
 
@@ -2104,11 +2187,30 @@ class Server{
 		if(($this->tickCounter & 0b1111) === 0){
 			$this->titleTick();
 			if(isset($this->queryHandler) and ($this->tickCounter & 0b111111111) === 0){
-				$this->queryHandler->regenerateInfo();
+				try{
+					$this->queryHandler->regenerateInfo();
+				}catch(\Exception $e){
+					if($this->logger instanceof MainLogger){
+						$this->logger->logException($e);
+					}
+				}
+			}
+		}
+
+		try{
+			$this->generationManager->process();
+		}catch (\Exception $e){
+			if($this->logger instanceof MainLogger){
+				$this->logger->logException($e);
+			}
+		}
+
+		if(($this->tickCounter % 100) === 0){
+			foreach($this->levels as $level){
+				$level->clearCache();
 			}
 		}
 
-		$this->generationManager->process();
 
 		Timings::$serverTickTimer->stopTiming();
 
@@ -2124,9 +2226,26 @@ class Server{
 			$this->nextTick = $tickTime;
 		}
 		$this->nextTick += 0.05;
-		$this->inTick = false;
 
 		return true;
 	}
 
+	private function registerEntities(){
+		Entity::registerEntity(Arrow::class);
+		Entity::registerEntity(DroppedItem::class);
+		Entity::registerEntity(FallingSand::class);
+		Entity::registerEntity(PrimedTNT::class);
+		Entity::registerEntity(Snowball::class);
+		Entity::registerEntity(Villager::class);
+		Entity::registerEntity(Zombie::class);
+
+		Entity::registerEntity(Human::class, true);
+	}
+
+	private function registerTiles(){
+		Tile::registerTile(Chest::class);
+		Tile::registerTile(Furnace::class);
+		Tile::registerTile(Sign::class);
+	}
+
 }

src/pocketmine/block/Bed.php

@@ -35,7 +35,7 @@ class Bed extends Transparent{
 		$this->hardness = 1;
 	}
 
-	public function getBoundingBox(){
+	protected function recalculateBoundingBox(){
 		return new AxisAlignedBB(
 			$this->x,
 			$this->y,
@@ -53,7 +53,7 @@ class Bed extends Transparent{
 		$isNight = ($time >= Level::TIME_NIGHT and $time < Level::TIME_SUNRISE);
 
 		if($player instanceof Player and !$isNight){
-			$pk = new ChatPacket;
+			$pk = new ChatPacket();
 			$pk->message = "You can only sleep at night";
 			$player->dataPacket($pk);
 
@@ -77,7 +77,7 @@ class Bed extends Transparent{
 				$b = $blockWest;
 			}else{
 				if($player instanceof Player){
-					$pk = new ChatPacket;
+					$pk = new ChatPacket();
 					$pk->message = "This bed is incomplete";
 					$player->dataPacket($pk);
 				}
@@ -87,7 +87,7 @@ class Bed extends Transparent{
 		}
 
 		if($player instanceof Player and $player->sleepOn($b) === false){
-			$pk = new ChatPacket;
+			$pk = new ChatPacket();
 			$pk->message = "This bed is occupied";
 			$player->dataPacket($pk);
 		}

src/pocketmine/block/Beetroot.php

@@ -22,68 +22,10 @@
 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 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
-			$this->meta += mt_rand(2, 5);
-			if($this->meta > 7){
-				$this->meta = 7;
-			}
-			$this->getLevel()->setBlock($this, $this, true, 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);
-
-				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);
-
-					return Level::BLOCK_UPDATE_RANDOM;
-				}
-			}else{
-				return Level::BLOCK_UPDATE_RANDOM;
-			}
-		}
-
-		return false;
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/Block.php

@@ -39,7 +39,7 @@ 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;
@@ -144,6 +144,7 @@ abstract class Block extends Position implements Metadatable{
 	const SUGARCANE_BLOCK = 83;
 
 	const FENCE = 85;
+	const FENCE_OAK = 85;
 	const PUMPKIN = 86;
 	const NETHERRACK = 87;
 	const SOUL_SAND = 88;
@@ -167,7 +168,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;
@@ -227,6 +229,17 @@ abstract class Block extends Position implements Metadatable{
 	const HARDENED_CLAY = 172;
 	const COAL_BLOCK = 173;
 
+	const FENCE_GATE_SPRUCE = 183;
+	const FENCE_GATE_BIRCH = 184;
+	const FENCE_GATE_JUNGLE = 185;
+	const FENCE_GATE_DARK_OAK = 186;
+	const FENCE_GATE_ACACIA = 187;
+	const FENCE_SPRUCE = 188;
+	const FENCE_BIRCH = 189;
+	const FENCE_JUNGLE = 190;
+	const FENCE_DARK_OAK = 191;
+	const FENCE_ACACIA = 192;
+
 	const PODZOL = 243;
 	const BEETROOT_BLOCK = 244;
 	const STONECUTTER = 245;
@@ -345,7 +358,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],
@@ -353,7 +366,16 @@ abstract class Block extends Position implements Metadatable{
 		[Item::WOODEN_DOOR, 0],
 		[Item::TRAPDOOR, 0],
 		[Item::FENCE, 0],
+		[Item::FENCE_SPRUCE, 0],
+		[Item::FENCE_BIRCH, 0],
+		[Item::FENCE_DARK_OAK, 0],
+		[Item::FENCE_JUNGLE, 0],
 		[Item::FENCE_GATE, 0],
+		[Item::FENCE_GATE_BIRCH, 0],
+		[Item::FENCE_GATE_SPRUCE, 0],
+		[Item::FENCE_GATE_DARK_OAK, 0],
+		[Item::FENCE_GATE_JUNGLE, 0],
+		[Item::FENCE_GATE_ACACIA, 0],
 		[Item::IRON_BARS, 0],
 		[Item::BED, 0],
 		[Item::BOOKSHELF, 0],
@@ -362,7 +384,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],
@@ -505,13 +526,22 @@ abstract class Block extends Position implements Metadatable{
 
 	];
 
-	/** @var Block[] */
-	public static $list = [];
+	/** @var \SplFixedArray */
+	public static $list = null;
+	/** @var \SplFixedArray */
+	public static $light = null;
+	/** @var \SplFixedArray */
+	public static $lightFilter = null;
+	/** @var \SplFixedArray */
+	public static $solid = null;
+	/** @var \SplFixedArray */
+	public static $transparent = null;
 	protected $id;
 	protected $meta;
 	protected $name = "Unknown";
 	protected $breakTime = 0.20;
 	protected $hardness = 10;
+	public $hasEntityCollision = false;
 	public $isActivable = false;
 	public $breakable = true;
 	public $isFlowable = false;
@@ -520,153 +550,196 @@ abstract class Block extends Position implements Metadatable{
 	public $isReplaceable = false;
 	public $isPlaceable = true;
 	public $hasPhysics = false;
-	public $isLiquid = false;
 	public $isFullBlock = true;
+	public $lightLevel = 0;
 	public $x = 0;
 	public $y = 0;
 	public $z = 0;
 	public $frictionFactor = 0.6;
 
+	/** @var AxisAlignedBB */
+	protected $boundingBox = null;
+
 	public static function init(){
-		if(count(self::$list) === 0){
-			self::$list = [
-				self::AIR => Air::class,
-				self::STONE => Stone::class,
-				self::GRASS => Grass::class,
-				self::DIRT => Dirt::class,
-				self::COBBLESTONE => Cobblestone::class,
-				self::PLANKS => Planks::class,
-				self::SAPLING => Sapling::class,
-				self::BEDROCK => Bedrock::class,
-				self::WATER => Water::class,
-				self::STILL_WATER => StillWater::class,
-				self::LAVA => Lava::class,
-				self::STILL_LAVA => StillLava::class,
-				self::SAND => Sand::class,
-				self::GRAVEL => Gravel::class,
-				self::GOLD_ORE => GoldOre::class,
-				self::IRON_ORE => IronOre::class,
-				self::COAL_ORE => CoalOre::class,
-				self::WOOD => Wood::class,
-				self::LEAVES => Leaves::class,
-				self::SPONGE => Sponge::class,
-				self::GLASS => Glass::class,
-				self::LAPIS_ORE => LapisOre::class,
-				self::LAPIS_BLOCK => Lapis::class,
-				self::SANDSTONE => Sandstone::class,
-				self::BED_BLOCK => Bed::class,
-				self::COBWEB => Cobweb::class,
-				self::TALL_GRASS => TallGrass::class,
-				self::DEAD_BUSH => DeadBush::class,
-				self::WOOL => Wool::class,
-				self::DANDELION => Dandelion::class,
-				self::POPPY => CyanFlower::class,
-				self::BROWN_MUSHROOM => BrownMushroom::class,
-				self::RED_MUSHROOM => RedMushroom::class,
-				self::GOLD_BLOCK => Gold::class,
-				self::IRON_BLOCK => Iron::class,
-				self::DOUBLE_SLAB => DoubleSlab::class,
-				self::SLAB => Slab::class,
-				self::BRICKS_BLOCK => Bricks::class,
-				self::TNT => TNT::class,
-				self::BOOKSHELF => Bookshelf::class,
-				self::MOSS_STONE => MossStone::class,
-				self::OBSIDIAN => Obsidian::class,
-				self::TORCH => Torch::class,
-				self::FIRE => Fire::class,
-				self::MONSTER_SPAWNER => MonsterSpawner::class,
-				self::WOOD_STAIRS => WoodStairs::class,
-				self::CHEST => Chest::class,
+		if(self::$list === null){
+			self::$list = new \SplFixedArray(256);
+			self::$light = new \SplFixedArray(256);
+			self::$lightFilter = new \SplFixedArray(256);
+			self::$solid = new \SplFixedArray(256);
+			self::$transparent = 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 => DiamondOre::class,
-				self::DIAMOND_BLOCK => Diamond::class,
-				self::WORKBENCH => Workbench::class,
-				self::WHEAT_BLOCK => Wheat::class,
-				self::FARMLAND => Farmland::class,
-				self::FURNACE => Furnace::class,
-				self::BURNING_FURNACE => BurningFurnace::class,
-				self::SIGN_POST => SignPost::class,
-				self::WOOD_DOOR_BLOCK => WoodDoor::class,
-				self::LADDER => Ladder::class,
+			self::$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 => CobblestoneStairs::class,
-				self::WALL_SIGN => WallSign::class,
+			self::$list[self::COBBLESTONE_STAIRS] = CobblestoneStairs::class;;
+			self::$list[self::WALL_SIGN] = WallSign::class;;
 
-				self::IRON_DOOR_BLOCK => IronDoor::class,
-				self::REDSTONE_ORE => RedstoneOre::class,
-				self::GLOWING_REDSTONE_ORE => GlowingRedstoneOre::class,
+			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 => SnowLayer::class,
-				self::ICE => Ice::class,
-				self::SNOW_BLOCK => Snow::class,
-				self::CACTUS => Cactus::class,
-				self::CLAY_BLOCK => Clay::class,
-				self::SUGARCANE_BLOCK => Sugarcane::class,
+			self::$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 => Fence::class,
-				self::PUMPKIN => Pumpkin::class,
-				self::NETHERRACK => Netherrack::class,
-				self::SOUL_SAND => SoulSand::class,
-				self::GLOWSTONE_BLOCK => Glowstone::class,
+			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 => LitPumpkin::class,
-				self::CAKE_BLOCK => Cake::class,
+			self::$list[self::LIT_PUMPKIN] = LitPumpkin::class;;
+			self::$list[self::CAKE_BLOCK] = Cake::class;;
 
-				self::TRAPDOOR => Trapdoor::class,
+			self::$list[self::TRAPDOOR] = Trapdoor::class;;
 
-				self::STONE_BRICKS => StoneBricks::class,
+			self::$list[self::STONE_BRICKS] = StoneBricks::class;;
 
-				self::IRON_BARS => IronBars::class,
-				self::GLASS_PANE => GlassPane::class,
-				self::MELON_BLOCK => Melon::class,
-				self::PUMPKIN_STEM => PumpkinStem::class,
-				self::MELON_STEM => MelonStem::class,
+			self::$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 => FenceGate::class,
-				self::BRICK_STAIRS => BrickStairs::class,
-				self::STONE_BRICK_STAIRS => StoneBrickStairs::class,
+			self::$list[self::MYCELIUM] = Mycelium::class;;
+			self::$list[self::NETHER_BRICKS] = NetherBrick::class;;
 
-				self::MYCELIUM => Mycelium::class,
-				self::NETHER_BRICKS => NetherBrick::class,
+			self::$list[self::NETHER_BRICKS_STAIRS] = NetherBrickStairs::class;;
 
-				self::NETHER_BRICKS_STAIRS => NetherBrickStairs::class,
+			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 => EndPortal::class,
-				self::END_STONE => EndStone::class,
-				self::SANDSTONE_STAIRS => SandstoneStairs::class,
-				self::EMERALD_ORE => EmeraldOre::class,
+			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 => Emerald::class,
-				self::SPRUCE_WOOD_STAIRS => SpruceWoodStairs::class,
-				self::BIRCH_WOOD_STAIRS => BirchWoodStairs::class,
-				self::JUNGLE_WOOD_STAIRS => JungleWoodStairs::class,
-				self::STONE_WALL => StoneWall::class,
+			self::$list[self::CARROT_BLOCK] = Carrot::class;;
+			self::$list[self::POTATO_BLOCK] = Potato::class;;
 
-				self::CARROT_BLOCK => Carrot::class,
-				self::POTATO_BLOCK => Potato::class,
+			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 => Quartz::class,
-				self::QUARTZ_STAIRS => QuartzStairs::class,
-				self::DOUBLE_WOOD_SLAB => DoubleWoodSlab::class,
-				self::WOOD_SLAB => WoodSlab::class,
-				self::STAINED_CLAY => StainedClay::class,
+			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 => Leaves2::class,
-				self::WOOD2 => Wood2::class,
-				self::ACACIA_WOOD_STAIRS => AcaciaWoodStairs::class,
-				self::DARK_OAK_WOOD_STAIRS => DarkOakWoodStairs::class,
+			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 => HayBale::class,
-				self::CARPET => Carpet::class,
-				self::HARDENED_CLAY => HardenedClay::class,
-				self::COAL_BLOCK => Coal::class,
+			self::$list[self::FENCE_GATE_SPRUCE] = FenceGateSpruce::class;
+			self::$list[self::FENCE_GATE_BIRCH] = FenceGateBirch::class;
+			self::$list[self::FENCE_GATE_JUNGLE] = FenceGateJungle::class;
+			self::$list[self::FENCE_GATE_DARK_OAK] = FenceGateDarkOak::class;
+			self::$list[self::FENCE_GATE_ACACIA] = FenceGateAcacia::class;
+			self::$list[self::FENCE_SPRUCE] = FenceSpruce::class;
+			self::$list[self::FENCE_BIRCH] = FenceBirch::class;
+			self::$list[self::FENCE_DARK_OAK] = FenceDarkOak::class;
+			self::$list[self::FENCE_JUNGLE] = FenceJungle::class;
+			self::$list[self::FENCE_ACACIA] = FenceAcacia::class;
 
-				self::PODZOL => Podzol::class,
-				self::BEETROOT_BLOCK => Beetroot::class,
-				self::STONECUTTER => Stonecutter::class,
-				self::GLOWING_OBSIDIAN => GlowingObsidian::class,
-				self::NETHER_REACTOR => NetherReactor::class,
-			];
+			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;
+
+			foreach(self::$list as $id => $class){
+				if($class !== null){
+					/** @var Block $block */
+					$block = new $class();
+					self::$solid[$id] = (bool) $block->isSolid;
+					self::$transparent[$id] = (bool) $block->isTransparent;
+					self::$light[$id] = (int) $block->lightLevel;
+
+					if($block->isSolid){
+						if($block->isTransparent){
+							if($block instanceof Liquid or $block instanceof Ice){
+								self::$lightFilter[$id] = 2;
+							}else{
+								self::$lightFilter[$id] = 1;
+							}
+						}else{
+							self::$lightFilter[$id] = 15;
+						}
+					}else{
+						self::$lightFilter[$id] = 1;
+					}
+				}else{
+					self::$lightFilter[$id] = 1;
+				}
+			}
 		}
 	}
 
@@ -678,15 +751,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])){
+		try{
 			$block = self::$list[$id];
-			$block = new $block($meta);
-		}else{
-			$block = new Generic($id, $meta);
+			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;
@@ -703,6 +783,69 @@ abstract class Block extends Position implements Metadatable{
 		$this->name = $name;
 	}
 
+	/**
+	 * 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;
+	}
+
 	/**
 	 * @return int
 	 */
@@ -720,7 +863,7 @@ abstract class Block extends Position implements Metadatable{
 	/**
 	 * @return int
 	 */
-	final public function getID(){
+	final public function getId(){
 		return $this->id;
 	}
 
@@ -806,24 +949,6 @@ 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
 	 *
@@ -848,6 +973,17 @@ abstract class Block extends Position implements Metadatable{
 	 * @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,
@@ -940,41 +1076,6 @@ abstract class Block extends Position implements Metadatable{
 		return MovingObjectPosition::fromBlock($this->x, $this->y, $this->z, $f, $vector->add($this->x, $this->y, $this->z));
 	}
 
-	/**
-	 * 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);
-
-	/**
-	 * 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);
-
-	/**
-	 * Fires a block update on the Block
-	 *
-	 * @param int $type
-	 *
-	 * @return void
-	 */
-	abstract function onUpdate($type);
-
 	public function setMetadata($metadataKey, MetadataValue $metadataValue){
 		if($this->getLevel() instanceof Level){
 			$this->getLevel()->getBlockMetadata()->setMetadata($this, $metadataKey, $metadataValue);

src/pocketmine/block/BrownMushroom.php

@@ -26,6 +26,9 @@ use pocketmine\level\Level;
 use pocketmine\Player;
 
 class BrownMushroom extends Flowable{
+
+	public $lightLevel = 1;
+
 	public function __construct(){
 		parent::__construct(self::BROWN_MUSHROOM, 0, "Brown Mushroom");
 		$this->hardness = 0;
@@ -33,9 +36,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;
 			}

src/pocketmine/block/BurningFurnace.php

@@ -32,6 +32,9 @@ use pocketmine\tile\Furnace;
 use pocketmine\tile\Tile;
 
 class BurningFurnace extends Solid{
+
+	public $lightLevel = 13;
+
 	public function __construct($meta = 0){
 		parent::__construct(self::BURNING_FURNACE, $meta, "Burning Furnace");
 		$this->isActivable = true;
@@ -55,7 +58,7 @@ class BurningFurnace extends Solid{
 			new Int("z", $this->z)
 		]);
 		$nbt->Items->setTagType(NBT::TAG_Compound);
-		new Furnace($this->getLevel()->getChunk($this->x >> 4, $this->z >> 4), $nbt);
+		Tile::createTile("Furnace", $this->getLevel()->getChunk($this->x >> 4, $this->z >> 4), $nbt);
 
 		return true;
 	}
@@ -81,7 +84,7 @@ class BurningFurnace extends Solid{
 					new Int("z", $this->z)
 				]);
 				$nbt->Items->setTagType(NBT::TAG_Compound);
-				$furnace = new Furnace($this->getLevel()->getChunk($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){

src/pocketmine/block/Cactus.php

@@ -21,23 +21,29 @@
 
 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\AxisAlignedBB;
-use pocketmine\math\Vector3 as Vector3;
+use pocketmine\math\Vector3;
 use pocketmine\Player;
-use pocketmine\entity\Entity;
-use pocketmine\event\entity\EntityDamageEvent;
 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;
 	}
 
-	public function getBoundingBox(){
+	protected function recalculateBoundingBox(){
+
 		return new AxisAlignedBB(
 			$this->x + 0.0625,
 			$this->y,
@@ -49,29 +55,20 @@ class Cactus extends Transparent{
 	}
 
 	public function onEntityCollide(Entity $entity){
-		$ev = new EntityDamageEvent($entity, EntityDamageEvent::CAUSE_CONTACT, 1);
-		Server::getInstance()->getPluginManager()->callEvent($ev);
-		if(!$ev->isCancelled()){
-			$entity->attack($ev->getFinalDamage(), $ev);
-		}
+		$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;
+			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()->setBlock($this, new Air(), false);
-						$this->getLevel()->dropItem($this, Item::get($this->id));
-
-						return;
+						$this->getLevel()->useBreakOn($this);
 					}
 				}
 			}
@@ -81,8 +78,10 @@ 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);
-							break;
+							Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($b, new Cactus()));
+							if(!$ev->isCancelled()){
+								$this->getLevel()->setBlock($b, $ev->getNewState(), true);
+							}
 						}
 					}
 					$this->meta = 0;
@@ -91,8 +90,6 @@ class Cactus extends Transparent{
 					++$this->meta;
 					$this->getLevel()->setBlock($this, $this);
 				}
-
-				return;
 			}
 		}
 

src/pocketmine/block/Cake.php

@@ -21,10 +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){
@@ -35,7 +37,8 @@ class Cake extends Transparent{
 		$this->hardness = 2.5;
 	}
 
-	public function getBoundingBox(){
+	protected function recalculateBoundingBox(){
+
 		$f = (1 + $this->getDamage() * 2) / 16;
 
 		return new AxisAlignedBB(
@@ -78,7 +81,10 @@ 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);
 			}else{

src/pocketmine/block/Carpet.php

@@ -53,7 +53,8 @@ class Carpet extends Flowable{
 		$this->isSolid = true;
 	}
 
-	public function getBoundingBox(){
+	protected function recalculateBoundingBox(){
+
 		return new AxisAlignedBB(
 			$this->x,
 			$this->y,
@@ -77,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);
+			if($this->getSide(0)->getID() === self::AIR){
+				$this->getLevel()->useBreakOn($this);
 
 				return Level::BLOCK_UPDATE_NORMAL;
 			}

src/pocketmine/block/Carrot.php

@@ -22,70 +22,10 @@
 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 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
-			$this->meta += mt_rand(2, 5);
-			if($this->meta > 7){
-				$this->meta = 7;
-			}
-			$this->getLevel()->setBlock($this, $this, 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);
-
-					return Level::BLOCK_UPDATE_RANDOM;
-				}
-			}else{
-				return Level::BLOCK_UPDATE_RANDOM;
-			}
-		}
-
-		return false;
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/Chest.php

@@ -42,13 +42,14 @@ class Chest extends Transparent{
 		$this->hardness = 15;
 	}
 
-	public function getBoundingBox(){
+	protected function recalculateBoundingBox(){
+
 		return new AxisAlignedBB(
 			$this->x + 0.0625,
 			$this->y,
 			$this->z + 0.0625,
 			$this->x + 0.9375,
-			$this->y + 0.875,
+			$this->y + 0.9475,
 			$this->z + 0.9375
 		);
 	}
@@ -61,7 +62,7 @@ class Chest extends Transparent{
 			3 => 3,
 		];
 
-		$chest = false;
+		$chest = null;
 		$this->meta = $faces[$player instanceof Player ? $player->getDirection() : 0];
 
 		for($side = 2; $side <= 5; ++$side){
@@ -89,9 +90,9 @@ class Chest extends Transparent{
 			new Int("z", $this->z)
 		]);
 		$nbt->Items->setTagType(NBT::TAG_Compound);
-		$tile = new TileChest($this->getLevel()->getChunk($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);
 		}
@@ -129,11 +130,11 @@ class Chest extends Transparent{
 					new Int("z", $this->z)
 				]);
 				$nbt->Items->setTagType(NBT::TAG_Compound);
-				$chest = new TileChest($this->getLevel()->getChunk($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());

src/pocketmine/block/Cobweb.php

@@ -21,10 +21,13 @@
 
 namespace pocketmine\block;
 
-use pocketmine\item\Item;
 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;

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

@@ -49,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

@@ -49,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/Door.php

@@ -52,7 +52,8 @@ abstract class Door extends Transparent{
 		return $first & 0x07 | ($flag ? 8 : 0) | ($flag1 ? 0x10 : 0);
 	}
 
-	public function getBoundingBox(){
+	protected function recalculateBoundingBox(){
+
 		$f = 0.1875;
 		$damage = $this->getFullDamage();
 
@@ -72,7 +73,7 @@ abstract class Door extends Transparent{
 		if($j === 0){
 			if($flag){
 				if(!$flag1){
-					$bb = new AxisAlignedBB(
+					$bb->setBounds(
 						$this->x,
 						$this->y,
 						$this->z,
@@ -81,7 +82,7 @@ abstract class Door extends Transparent{
 						$this->z + $f
 					);
 				}else{
-					$bb = new AxisAlignedBB(
+					$bb->setBounds(
 						$this->x,
 						$this->y,
 						$this->z + 1 - $f,
@@ -91,7 +92,7 @@ abstract class Door extends Transparent{
 					);
 				}
 			}else{
-				$bb = new AxisAlignedBB(
+				$bb->setBounds(
 					$this->x,
 					$this->y,
 					$this->z,
@@ -103,7 +104,7 @@ abstract class Door extends Transparent{
 		}elseif($j === 1){
 			if($flag){
 				if(!$flag1){
-					$bb = new AxisAlignedBB(
+					$bb->setBounds(
 						$this->x + 1 - $f,
 						$this->y,
 						$this->z,
@@ -112,7 +113,7 @@ abstract class Door extends Transparent{
 						$this->z + 1
 					);
 				}else{
-					$bb = new AxisAlignedBB(
+					$bb->setBounds(
 						$this->x,
 						$this->y,
 						$this->z,
@@ -122,7 +123,7 @@ abstract class Door extends Transparent{
 					);
 				}
 			}else{
-				$bb = new AxisAlignedBB(
+				$bb->setBounds(
 					$this->x,
 					$this->y,
 					$this->z,
@@ -134,7 +135,7 @@ abstract class Door extends Transparent{
 		}elseif($j === 2){
 			if($flag){
 				if(!$flag1){
-					$bb = new AxisAlignedBB(
+					$bb->setBounds(
 						$this->x,
 						$this->y,
 						$this->z + 1 - $f,
@@ -143,7 +144,7 @@ abstract class Door extends Transparent{
 						$this->z + 1
 					);
 				}else{
-					$bb = new AxisAlignedBB(
+					$bb->setBounds(
 						$this->x,
 						$this->y,
 						$this->z,
@@ -153,7 +154,7 @@ abstract class Door extends Transparent{
 					);
 				}
 			}else{
-				$bb = new AxisAlignedBB(
+				$bb->setBounds(
 					$this->x + 1 - $f,
 					$this->y,
 					$this->z,
@@ -165,7 +166,7 @@ abstract class Door extends Transparent{
 		}elseif($j === 3){
 			if($flag){
 				if(!$flag1){
-					$bb = new AxisAlignedBB(
+					$bb->setBounds(
 						$this->x,
 						$this->y,
 						$this->z,
@@ -174,7 +175,7 @@ abstract class Door extends Transparent{
 						$this->z + 1
 					);
 				}else{
-					$bb = new AxisAlignedBB(
+					$bb->setBounds(
 						$this->x + 1 - $f,
 						$this->y,
 						$this->z,
@@ -184,7 +185,7 @@ abstract class Door extends Transparent{
 					);
 				}
 			}else{
-				$bb = new AxisAlignedBB(
+				$bb->setBounds(
 					$this->x,
 					$this->y,
 					$this->z + 1 - $f,
@@ -270,7 +271,7 @@ abstract class Door extends Transparent{
 				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;
@@ -289,7 +290,7 @@ abstract class Door extends Transparent{
 			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/EndPortal.php

@@ -24,12 +24,16 @@ namespace pocketmine\block;
 use pocketmine\math\AxisAlignedBB;
 
 class EndPortal extends Solid{
+
+	public $lightLevel = 1;
+
 	public function __construct($meta = 0){
 		parent::__construct(self::END_PORTAL, $meta, "End Portal");
 		$this->hardness = 18000000;
 	}
 
-	public function getBoundingBox(){
+	protected function recalculateBoundingBox(){
+
 		return new AxisAlignedBB(
 			$this->x,
 			$this->y,

src/pocketmine/block/Fallable.php

@@ -21,15 +21,16 @@
 
 namespace pocketmine\block;
 
+use pocketmine\entity\Entity;
 use pocketmine\item\Item;
-use pocketmine\Player;
 use pocketmine\level\Level;
-use pocketmine\entity\FallingBlock;
-use pocketmine\nbt\tag\Compound;
-use pocketmine\nbt\tag\Enum;
-use pocketmine\nbt\tag\Double;
-use pocketmine\nbt\tag\Float;
 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;
 
 abstract class Fallable extends Solid{
 
@@ -45,13 +46,12 @@ abstract class Fallable extends Solid{
 		if($this->hasPhysics === true and $type === Level::BLOCK_UPDATE_NORMAL){
 			$down = $this->getSide(0);
 			if($down->getID() === self::AIR or ($down instanceof Liquid)){
-				$fall = new FallingBlock($this->getLevel()->getChunk($this->x >> 4, $this->z >> 4), new Compound("", [
+				$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 + 0.5),
+						new Double("", $this->y),
 						new Double("", $this->z + 0.5)
 					]),
-					//TODO: add random motion with physics
 					"Motion" => new Enum("Motion", [
 						new Double("", 0),
 						new Double("", 0),
@@ -61,13 +61,12 @@ abstract class Fallable extends Solid{
 						new Float("", 0),
 						new Float("", 0)
 					]),
-					"Tile" => new Byte("Tile", $this->getID())
+					"TileID" => new Int("TileID", $this->getID()),
+					"Data" => new Byte("Data", $this->getDamage()),
 				]));
 
 				$fall->spawnToAll();
 			}
-
-			return false;
 		}
 	}
 }

src/pocketmine/block/Farmland.php

@@ -30,7 +30,8 @@ class Farmland extends Solid{
 		$this->hardness = 3;
 	}
 
-	public function getBoundingBox(){
+	protected function recalculateBoundingBox(){
+
 		return new AxisAlignedBB(
 			$this->x,
 			$this->y,

src/pocketmine/block/Fence.php

@@ -21,18 +21,17 @@
 
 namespace pocketmine\block;
 
-
 use pocketmine\math\AxisAlignedBB;
-use pocketmine\math\Vector3;
 
 class Fence extends Transparent{
 	public function __construct(){
-		parent::__construct(self::FENCE, 0, "Fence");
+		parent::__construct(self::FENCE, 0, "Oak Fence");
 		$this->isFullBlock = false;
 		$this->hardness = 15;
 	}
 
-	public function getBoundingBox(){
+	protected function recalculateBoundingBox(){
+
 		$flag = $this->canConnect($this->getSide(2));
 		$flag1 = $this->canConnect($this->getSide(3));
 		$flag2 = $this->canConnect($this->getSide(4));
@@ -48,13 +47,13 @@ class Fence extends Transparent{
 			$this->y,
 			$this->z + $f2,
 			$this->x + $f1,
-			$this->y + 1, //TODO: check this, add extra bounding box
+			$this->y + 1.5,
 			$this->z + $f3
 		);
 	}
 
 	public function canConnect(Block $block){
-		return ($block->getID() !== self::FENCE and $block->getID() !== self::FENCE_GATE) ? $block->isSolid : true;
+		return (!($block instanceof Fence) and !($block instanceof FenceGate)) ? $block->isSolid : true;
 	}
 
 }

src/pocketmine/block/FenceAcacia.php

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

src/pocketmine/block/FenceBirch.php

@@ -21,29 +21,10 @@
 
 namespace pocketmine\block;
 
-use pocketmine\item\Item;
-use pocketmine\level\Level;
-use pocketmine\Player;
-
-class Generic extends Block{
-
-	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
-		return $this->getLevel()->setBlock($this, $this, true, true);
-	}
-
-	public function isBreakable(Item $item){
-		return $this->breakable;
-	}
-
-	public function onBreak(Item $item){
-		return $this->getLevel()->setBlock($this, new Air(), true, true);
-	}
-
-	public function onUpdate($type){
-		return false;
-	}
-
-	public function onActivate(Item $item, Player $player = null){
-		return $this->isActivable;
+class FenceBirch extends Fence{
+	public function __construct(){
+		Transparent::__construct(self::FENCE_BIRCH, 0, "Birch Fence");
+		$this->isFullBlock = false;
+		$this->hardness = 15;
 	}
 }

src/pocketmine/block/FenceDarkOak.php

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

src/pocketmine/block/FenceGate.php

@@ -27,7 +27,7 @@ use pocketmine\Player;
 
 class FenceGate extends Transparent{
 	public function __construct($meta = 0){
-		parent::__construct(self::FENCE_GATE, $meta, "Fence Gate");
+		parent::__construct(self::FENCE_GATE, $meta, "Oak Fence Gate");
 		$this->isActivable = true;
 		if(($this->meta & 0x04) === 0x04){
 			$this->isFullBlock = true;
@@ -38,7 +38,8 @@ class FenceGate extends Transparent{
 	}
 
 
-	public function getBoundingBox(){
+	protected function recalculateBoundingBox(){
+
 		if(($this->getDamage() & 0x04) > 0){
 			return null;
 		}
@@ -50,7 +51,7 @@ class FenceGate extends Transparent{
 				$this->y,
 				$this->z + 0.375,
 				$this->x + 1,
-				$this->y + 1,
+				$this->y + 1.5,
 				$this->z + 0.625
 			);
 		}else{
@@ -59,7 +60,7 @@ class FenceGate extends Transparent{
 				$this->y,
 				$this->z,
 				$this->x + 0.625,
-				$this->y + 1,
+				$this->y + 1.5,
 				$this->z + 1
 			);
 		}

src/pocketmine/block/FenceGateAcacia.php

@@ -0,0 +1,36 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+namespace pocketmine\block;
+
+
+class FenceGateAcacia extends FenceGate{
+	public function __construct($meta = 0){
+		Transparent::__construct(self::FENCE_GATE_ACACIA, $meta, "Acacia Fence Gate");
+		$this->isActivable = true;
+		if(($this->meta & 0x04) === 0x04){
+			$this->isFullBlock = true;
+		}else{
+			$this->isFullBlock = false;
+		}
+		$this->hardness = 15;
+	}
+}

src/pocketmine/block/FenceGateBirch.php

@@ -0,0 +1,36 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+namespace pocketmine\block;
+
+
+class FenceGateBirch extends FenceGate{
+	public function __construct($meta = 0){
+		Transparent::__construct(self::FENCE_GATE_BIRCH, $meta, "Birch Fence Gate");
+		$this->isActivable = true;
+		if(($this->meta & 0x04) === 0x04){
+			$this->isFullBlock = true;
+		}else{
+			$this->isFullBlock = false;
+		}
+		$this->hardness = 15;
+	}
+}

src/pocketmine/block/FenceGateDarkOak.php

@@ -0,0 +1,36 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+namespace pocketmine\block;
+
+
+class FenceGateDarkOak extends FenceGate{
+	public function __construct($meta = 0){
+		Transparent::__construct(self::FENCE_GATE_DARK_OAK, $meta, "Dark Oak Fence Gate");
+		$this->isActivable = true;
+		if(($this->meta & 0x04) === 0x04){
+			$this->isFullBlock = true;
+		}else{
+			$this->isFullBlock = false;
+		}
+		$this->hardness = 15;
+	}
+}

src/pocketmine/block/FenceGateJungle.php

@@ -0,0 +1,36 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+namespace pocketmine\block;
+
+
+class FenceGateJungle extends FenceGate{
+	public function __construct($meta = 0){
+		Transparent::__construct(self::FENCE_GATE_JUNGLE, $meta, "Jungle Fence Gate");
+		$this->isActivable = true;
+		if(($this->meta & 0x04) === 0x04){
+			$this->isFullBlock = true;
+		}else{
+			$this->isFullBlock = false;
+		}
+		$this->hardness = 15;
+	}
+}

src/pocketmine/block/FenceGateSpruce.php

@@ -0,0 +1,36 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+namespace pocketmine\block;
+
+
+class FenceGateSpruce extends FenceGate{
+	public function __construct($meta = 0){
+		Transparent::__construct(self::FENCE_GATE_SPRUCE, $meta, "Spruce Fence Gate");
+		$this->isActivable = true;
+		if(($this->meta & 0x04) === 0x04){
+			$this->isFullBlock = true;
+		}else{
+			$this->isFullBlock = false;
+		}
+		$this->hardness = 15;
+	}
+}

src/pocketmine/block/FenceJungle.php

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

src/pocketmine/block/FenceSpruce.php

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

src/pocketmine/block/Fire.php

@@ -21,13 +21,19 @@
 
 namespace pocketmine\block;
 
-use pocketmine\item\Item;
 use pocketmine\entity\Entity;
-use pocketmine\level\Level;
+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 $lightLevel = 15;
+
 	public function __construct($meta = 0){
 		parent::__construct(self::FIRE, $meta, "Fire");
 		$this->isReplaceable = true;
@@ -41,11 +47,13 @@ class Fire extends Flowable{
 	}
 
 	public function onEntityCollide(Entity $entity){
-		$entity->setOnFire(8);
-		$ev = new EntityDamageEvent($entity, EntityDamageEvent::CAUSE_FIRE, 1);
+		$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->attack($ev->getFinalDamage(), $ev);
+			$entity->setOnFire($ev->getDuration());
 		}
 	}
 

src/pocketmine/block/GlowingObsidian.php

@@ -23,6 +23,9 @@ namespace pocketmine\block;
 
 
 class GlowingObsidian extends Solid{
+
+	public $lightLevel = 12;
+
 	public function __construct($meta = 0){
 		parent::__construct(self::GLOWING_OBSIDIAN, $meta, "Glowing Obsidian");
 	}

src/pocketmine/block/GlowingRedstoneOre.php

@@ -25,6 +25,9 @@ use pocketmine\item\Item;
 use pocketmine\level\Level;
 
 class GlowingRedstoneOre extends Solid{
+
+	public $lightLevel = 9;
+
 	public function __construct(){
 		parent::__construct(self::GLOWING_REDSTONE_ORE, 0, "Glowing Redstone Ore");
 		$this->hardness = 15;

src/pocketmine/block/Glowstone.php

@@ -24,6 +24,9 @@ namespace pocketmine\block;
 use pocketmine\item\Item;
 
 class Glowstone extends Transparent{
+
+	public $lightLevel = 15;
+
 	public function __construct(){
 		parent::__construct(self::GLOWSTONE_BLOCK, 0, "Glowstone");
 		$this->hardness = 1.5;

src/pocketmine/block/Grass.php

@@ -21,11 +21,13 @@
 
 namespace pocketmine\block;
 
+use pocketmine\event\block\BlockSpreadEvent;
 use pocketmine\item\Item;
 use pocketmine\level\generator\object\TallGrass as TallGrassObject;
 use pocketmine\level\Level;
-use pocketmine\level\Position;
+use pocketmine\math\Vector3;
 use pocketmine\Player;
+use pocketmine\Server;
 use pocketmine\utils\Random;
 
 class Grass extends Solid{
@@ -52,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 = Block::get($block, $this->getLevel()->getBlockDataAt($x, $y, $z), new Position($x, $y, $z, $this->getLevel()));
+			$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());
+					}
 				}
 			}
 		}

src/pocketmine/block/Ladder.php

@@ -21,13 +21,16 @@
 
 namespace pocketmine\block;
 
+use pocketmine\entity\Entity;
 use pocketmine\item\Item;
 use pocketmine\level\Level;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\Player;
-use pocketmine\entity\Entity;
 
 class Ladder extends Transparent{
+
+	public $hasEntityCollision = true;
+
 	public function __construct($meta = 0){
 		parent::__construct(self::LADDER, $meta, "Ladder");
 		$this->isSolid = false;
@@ -37,9 +40,11 @@ class Ladder extends Transparent{
 
 	public function onEntityCollide(Entity $entity){
 		$entity->fallDistance = 0;
+		$entity->onGround = true;
 	}
 
-	public function getBoundingBox(){
+	protected function recalculateBoundingBox(){
+
 		$f = 0.125;
 
 		if($this->meta === 2){

src/pocketmine/block/Lava.php

@@ -21,31 +21,36 @@
 
 namespace pocketmine\block;
 
-use pocketmine\item\Item;
 use pocketmine\entity\Entity;
-use pocketmine\level\Level;
-use pocketmine\level\Position;
+use pocketmine\event\entity\EntityCombustByBlockEvent;
+use pocketmine\event\entity\EntityDamageByBlockEvent;
+use pocketmine\event\entity\EntityDamageEvent;
+use pocketmine\item\Item;
 use pocketmine\Player;
 use pocketmine\Server;
-use pocketmine\event\entity\EntityDamageEvent;
 
 class Lava extends Liquid{
+
+	public $lightLevel = 15;
+
 	public function __construct($meta = 0){
 		parent::__construct(self::LAVA, $meta, "Lava");
 		$this->hardness = 0;
 	}
 
-	public function getBoundingBox(){
-		return null;
-	}
-
 	public function onEntityCollide(Entity $entity){
 		$entity->fallDistance *= 0.5;
-		$entity->setOnFire(15);
-		$ev = new EntityDamageEvent($entity, EntityDamageEvent::CAUSE_LAVA, 4);
+		$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->attack($ev->getFinalDamage(), $ev);
+			$entity->setOnFire($ev->getDuration());
+		}
+
+		if($entity instanceof Player){
+			$entity->onGround = true;
 		}
 	}
 

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;
@@ -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;
 				}

src/pocketmine/block/Leaves2.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 Leaves2 extends Leaves{
 
@@ -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;
 				}

src/pocketmine/block/Liquid.php

@@ -28,15 +28,16 @@ use pocketmine\level\Level;
 use pocketmine\math\Vector3;
 
 abstract class Liquid extends Transparent{
-	public $isLiquid = true;
+	public $hasEntityCollision = true;
+
 	public $breakable = false;
 	public $isReplaceable = true;
 	public $isSolid = false;
 	public $isFullBlock = true;
 
 	public $adjacentSources = 0;
-	public $isOptimalFlowDirection = [0, 0, 0];
-	public $flowCost = [0, 0, 0];
+	public $isOptimalFlowDirection = [0, 0, 0, 0];
+	public $flowCost = [0, 0, 0, 0];
 
 	public function getFluidHeightPercent(){
 		$d = $this->meta;
@@ -220,7 +221,7 @@ abstract class Liquid extends Transparent{
 						$this->getLevel()->scheduleUpdate($this, $this->tickRate());
 					}
 				}elseif($flag){
-					$this->getLevel()->scheduleUpdate($this, $this->tickRate());
+					//$this->getLevel()->scheduleUpdate($this, $this->tickRate());
 					//$this->updateFlow();
 				}
 			}else{
@@ -314,7 +315,9 @@ abstract class Liquid extends Transparent{
 				}
 				$blockSide = $this->getLevel()->getBlock(new Vector3($x, $y, $z));
 
-				if(!$blockSide->isFlowable or ($blockSide instanceof Liquid and $blockSide->getDamage() === 0)){
+				if(!$blockSide->isFlowable and !($blockSide instanceof Liquid)){
+					continue;
+				}elseif($blockSide instanceof Liquid and $blockSide->getDamage() === 0){
 					continue;
 				}elseif($blockSide->getSide(0)->isFlowable){
 					return $accumulatedCost;
@@ -354,7 +357,9 @@ abstract class Liquid extends Transparent{
 			}
 			$block = $this->getLevel()->getBlock(new Vector3($x, $y, $z));
 
-			if(!$block->isFlowable or ($block instanceof Liquid and $block->getDamage() === 0)){
+			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;
@@ -408,4 +413,8 @@ abstract class Liquid extends Transparent{
 			}
 		}
 	}
+
+	public function getBoundingBox(){
+		return null;
+	}
 }

src/pocketmine/block/LitPumpkin.php

@@ -25,6 +25,9 @@ use pocketmine\item\Item;
 use pocketmine\Player;
 
 class LitPumpkin extends Solid{
+
+	public $lightLevel = 15;
+
 	public function __construct(){
 		parent::__construct(self::LIT_PUMPKIN, "Jack o'Lantern");
 		$this->hardness = 5;

src/pocketmine/block/MelonStem.php

@@ -21,46 +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 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 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);
+					$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{
@@ -73,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);
+						Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($side, new Melon()));
+						if(!$ev->isCancelled()){
+							$this->getLevel()->setBlock($side, $ev->getNewState(), true);
+						}
 					}
 				}
 			}
@@ -84,20 +72,6 @@ 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);
-			if(($player->gamemode & 0x01) === 0){
-				$item->count--;
-			}
-
-			return true;
-		}
-
-		return false;
-	}
-
 	public function getDrops(Item $item){
 		return [
 			[Item::MELON_SEEDS, 0, mt_rand(0, 2)],

src/pocketmine/block/Mycelium.php

@@ -21,9 +21,11 @@
 
 namespace pocketmine\block;
 
+use pocketmine\event\block\BlockSpreadEvent;
 use pocketmine\item\Item;
 use pocketmine\level\Level;
-use pocketmine\level\Position;
+use pocketmine\math\Vector3;
+use pocketmine\Server;
 
 class Mycelium extends Solid{
 	public function __construct(){
@@ -43,11 +45,13 @@ class Mycelium 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 = Block::get($block, $this->getLevel()->getBlockDataAt($x, $y, $z), new Position($x, $y, $z, $this->getLevel()));
+			$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 Mycelium());
+					Server::getInstance()->getPluginManager()->callEvent($ev = new BlockSpreadEvent($block, $this, new Mycelium()));
+					if(!$ev->isCancelled()){
+						$this->getLevel()->setBlock($block, $ev->getNewState());
+					}
 				}
 			}
 		}

src/pocketmine/block/Potato.php

@@ -22,71 +22,10 @@
 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 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
-			$this->meta += mt_rand(2, 5);
-			if($this->meta > 7){
-				$this->meta = 7;
-			}
-			$this->getLevel()->setBlock($this, $this, 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);
-
-					return Level::BLOCK_UPDATE_RANDOM;
-				}
-			}else{
-				return Level::BLOCK_UPDATE_RANDOM;
-			}
-		}
-
-		return false;
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/PumpkinStem.php

@@ -21,47 +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 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 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);
+					$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{
@@ -74,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);
+						Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($side, new Pumpkin()));
+						if(!$ev->isCancelled()){
+							$this->getLevel()->setBlock($side, $ev->getNewState(), true);
+						}
 					}
 				}
 			}
@@ -85,20 +72,6 @@ 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);
-			if(($player->gamemode & 0x01) === 0){
-				$item->count--;
-			}
-
-			return true;
-		}
-
-		return false;
-	}
-
 	public function getDrops(Item $item){
 		return [
 			[Item::PUMPKIN_SEEDS, 0, mt_rand(0, 2)],

src/pocketmine/block/RedMushroom.php

@@ -38,10 +38,8 @@ class RedMushroom 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);
+			if($this->getSide(0)->isTransparent === true){
+				$this->getLevel()->useBreakOn($this);
 
 				return Level::BLOCK_UPDATE_NORMAL;
 			}

src/pocketmine/block/Sapling.php

@@ -81,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;
 			}

src/pocketmine/block/SignPost.php

@@ -64,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;
 			}

src/pocketmine/block/Slab.php

@@ -47,7 +47,8 @@ class Slab extends Transparent{
 		$this->hardness = 30;
 	}
 
-	public function getBoundingBox(){
+	protected function recalculateBoundingBox(){
+
 		if(($this->meta & 0x08) > 0){
 			return new AxisAlignedBB(
 				$this->x,

src/pocketmine/block/Solid.php

@@ -21,12 +21,7 @@
 
 namespace pocketmine\block;
 
-
-abstract class Solid extends Generic{
-
-	public function __construct($id, $meta = 0, $name = "Unknown"){
-		parent::__construct($id, $meta, $name);
-		$this->isSolid = true;
-		$this->isFullBlock = true;
-	}
+abstract class Solid extends Block{
+	public $isSolid = true;
+	public $isFullBlock = true;
 }

src/pocketmine/block/SoulSand.php

@@ -30,7 +30,8 @@ class SoulSand extends Solid{
 		$this->hardness = 2.5;
 	}
 
-	public function getBoundingBox(){
+	protected function recalculateBoundingBox(){
+
 		return new AxisAlignedBB(
 			$this->x,
 			$this->y,

src/pocketmine/block/Stair.php

@@ -54,7 +54,7 @@ abstract class Stair extends Transparent{
 			$f3 = 0.5;
 		}
 
-		if($bb->intersectsWith($bb2 = new AxisAlignedBB(
+		if($bb->intersectsWith($bb2 = AxisAlignedBB::getBoundingBoxFromPool(
 			$this->x,
 			$this->y + $f,
 			$this->z,
@@ -66,7 +66,7 @@ abstract class Stair extends Transparent{
 		}
 
 		if($j === 0){
-			if($bb->intersectsWith($bb2 = new AxisAlignedBB(
+			if($bb->intersectsWith($bb2 = AxisAlignedBB::getBoundingBoxFromPool(
 				$this->x + 0.5,
 				$this->y + $f2,
 				$this->z,
@@ -77,7 +77,7 @@ abstract class Stair extends Transparent{
 				$list[] = $bb2;
 			}
 		}elseif($j === 1){
-			if($bb->intersectsWith($bb2 = new AxisAlignedBB(
+			if($bb->intersectsWith($bb2 = AxisAlignedBB::getBoundingBoxFromPool(
 				$this->x,
 				$this->y + $f2,
 				$this->z,
@@ -88,7 +88,7 @@ abstract class Stair extends Transparent{
 				$list[] = $bb2;
 			}
 		}elseif($j === 2){
-			if($bb->intersectsWith($bb2 = new AxisAlignedBB(
+			if($bb->intersectsWith($bb2 = AxisAlignedBB::getBoundingBoxFromPool(
 				$this->x,
 				$this->y + $f2,
 				$this->z + 0.5,
@@ -99,7 +99,7 @@ abstract class Stair extends Transparent{
 				$list[] = $bb2;
 			}
 		}elseif($j === 3){
-			if($bb->intersectsWith($bb2 = new AxisAlignedBB(
+			if($bb->intersectsWith($bb2 = AxisAlignedBB::getBoundingBoxFromPool(
 				$this->x,
 				$this->y + $f2,
 				$this->z,
@@ -113,7 +113,8 @@ abstract class Stair extends Transparent{
 	}
 	*/
 
-	public function getBoundingBox(){
+	protected function recalculateBoundingBox(){
+
 		if(($this->getDamage() & 0x04) > 0){
 			return new AxisAlignedBB(
 				$this->x,

src/pocketmine/block/StillLava.php

@@ -21,18 +21,10 @@
 
 namespace pocketmine\block;
 
-use pocketmine\event\entity\EntityDamageEvent;
-use pocketmine\Server;
-use pocketmine\entity\Entity;
-
 class StillLava extends Lava{
 	public function __construct($meta = 0){
 		parent::__construct(self::STILL_LAVA, $meta, "Still Lava");
 		$this->hardness = 500;
 	}
 
-	public function getBoundingBox(){
-		return null;
-	}
-
 }

src/pocketmine/block/Stone.php

@@ -22,6 +22,7 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
+use pocketmine\item\Tool;
 
 class Stone extends Solid{
 	const NORMAL = 0;
@@ -45,6 +46,7 @@ class Stone extends Solid{
 			self::POLISHED_DIORITE => "Polished Diorite",
 			self::ANDESITE => "Andesite",
 			self::POLISHED_ANDESITE => "Polished Andesite",
+			7 => "Unknown Stone",
 		];
 		$this->name = $names[$this->meta & 0x07];
 	}
@@ -67,7 +69,7 @@ class Stone extends Solid{
 	}
 
 	public function getDrops(Item $item){
-		if($item->isPickaxe() >= 1){
+		if($item->isPickaxe() >= Tool::TIER_WOODEN){
 			return [
 				[Item::COBBLESTONE, 0, 1],
 			];

src/pocketmine/block/StoneWall.php

@@ -36,7 +36,8 @@ class StoneWall extends Transparent{
 		$this->hardness = 30;
 	}
 
-	public function getBoundingBox(){
+	protected function recalculateBoundingBox(){
+
 		$flag = $this->canConnect($this->getSide(2));
 		$flag1 = $this->canConnect($this->getSide(3));
 		$flag2 = $this->canConnect($this->getSide(4));
@@ -46,14 +47,11 @@ class StoneWall extends Transparent{
 		$f1 = $flag3 ? 1 : 0.75;
 		$f2 = $flag ? 0 : 0.25;
 		$f3 = $flag1 ? 1 : 0.75;
-		$f4 = 1;
 
 		if($flag and $flag1 and !$flag2 and !$flag3){
-			$f4 = 0.8125;
 			$f = 0.3125;
 			$f1 = 0.6875;
 		}elseif(!$flag and !$flag1 and $flag2 and $flag3){
-			$f4 = 0.8125;
 			$f2 = 0.3125;
 			$f3 = 0.6875;
 		}
@@ -63,7 +61,7 @@ class StoneWall extends Transparent{
 			$this->y,
 			$this->z + $f2,
 			$this->x + $f1,
-			$this->y + $f4,
+			$this->y + 1.5,
 			$this->z + $f3
 		);
 	}

src/pocketmine/block/Sugarcane.php

@@ -21,10 +21,12 @@
 
 namespace pocketmine\block;
 
+use pocketmine\event\block\BlockGrowEvent;
 use pocketmine\item\Item;
 use pocketmine\level\Level;
 use pocketmine\math\Vector3 as Vector3;
 use pocketmine\Player;
+use pocketmine\Server;
 
 class Sugarcane extends Flowable{
 	public function __construct($meta = 0){
@@ -49,7 +51,10 @@ class Sugarcane extends Flowable{
 				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 Sugarcane(), true);
+						Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($b, new Sugarcane()));
+						if(!$ev->isCancelled()){
+							$this->getLevel()->setBlock($b, $ev->getNewState(), true);
+						}
 						break;
 					}
 				}
@@ -69,10 +74,8 @@ class Sugarcane extends Flowable{
 	public function onUpdate($type){
 		if($type === Level::BLOCK_UPDATE_NORMAL){
 			$down = $this->getSide(0);
-			if($down->isTransparent === true and $down->getID() !== self::SUGARCANE_BLOCK){ //Replace with common break method
-				//TODO
-				//Server::getInstance()->api->entity->drop($this, Item::get(SUGARCANE));
-				$this->getLevel()->setBlock($this, new Air(), false, false, true);
+			if($down->isTransparent === true and $down->getID() !== self::SUGARCANE_BLOCK){
+				$this->getLevel()->useBreakOn($this);
 
 				return Level::BLOCK_UPDATE_NORMAL;
 			}

src/pocketmine/block/TNT.php

@@ -21,8 +21,15 @@
 
 namespace pocketmine\block;
 
+use pocketmine\entity\Entity;
 use pocketmine\item\Item;
+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\Player;
+use pocketmine\utils\Random;
 
 class TNT extends Solid{
 	public function __construct(){
@@ -33,20 +40,29 @@ class TNT extends Solid{
 
 	public function onActivate(Item $item, Player $player = null){
 		if($item->getID() === Item::FLINT_STEEL){
-			if(($player->gamemode & 0x01) === 0){
-				$item->useOn($this);
-			}
-			$data = [
-				"x" => $this->x + 0.5,
-				"y" => $this->y + 0.5,
-				"z" => $this->z + 0.5,
-				"power" => 4,
-				"fuse" => 20 * 4, //4 seconds
-			];
-			$this->getLevel()->setBlock($this, new Air(), false, false, true);
-			//TODO
-			//$e = Server::getInstance()->api->entity->add($this->level, ENTITY_OBJECT, OBJECT_PRIMEDTNT, $data);
-			//$e->spawnToAll();
+			$item->useOn($this);
+			$this->getLevel()->setBlock($this, new Air(), true);
+
+			$mot = (new Random())->nextSignedFloat() * M_PI * 2;
+			$tnt = Entity::createEntity("PrimedTNT", $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("", -sin($mot) * 0.02),
+					new Double("", 0.2),
+					new Double("", -cos($mot) * 0.02)
+				]),
+				"Rotation" => new Enum("Rotation", [
+					new Float("", 0),
+					new Float("", 0)
+				]),
+				"Fuse" => new Byte("Fuse", 80)
+			]));
+
+			$tnt->spawnToAll();
 
 			return true;
 		}

src/pocketmine/block/Thin.php

@@ -29,7 +29,8 @@ abstract class Thin extends Transparent{
 	public $isFullBlock = false;
 	public $isSolid = false;
 
-	public function getBoundingBox(){
+	protected function recalculateBoundingBox(){
+
 		$f = 0.4375;
 		$f1 = 0.5625;
 		$f2 = 0.4375;

src/pocketmine/block/Torch.php

@@ -26,6 +26,9 @@ use pocketmine\level\Level;
 use pocketmine\Player;
 
 class Torch extends Flowable{
+
+	public $lightLevel = 15;
+
 	public function __construct($meta = 0){
 		parent::__construct(self::TORCH, $meta, "Torch");
 		$this->hardness = 0;
@@ -49,9 +52,8 @@ class Torch extends Flowable{
 				0 => 0,
 			];
 
-			if($this->getSide($faces[$side])->isTransparent === true and !($side === 0 and $this->getSide(0)->getID() === self::FENCE)){ //Replace with common break method
-				$this->getLevel()->setBlock($this, new Air(), true);
-				$this->getLevel()->dropItem($this->add(0.5, 0.5, 0.5), Item::get(Item::TORCH));
+			if($this->getSide($faces[$side])->isTransparent === true and !($side === 0 and $this->getSide(0)->getID() === self::FENCE)){
+				$this->getLevel()->useBreakOn($this);
 
 				return Level::BLOCK_UPDATE_NORMAL;
 			}

src/pocketmine/block/Transparent.php

@@ -23,7 +23,7 @@ namespace pocketmine\block;
 
 
 
-abstract class Transparent extends Generic{
+abstract class Transparent extends Block{
 	public $isActivable = false;
 	public $breakable = true;
 	public $isFlowable = false;

src/pocketmine/block/Trapdoor.php

@@ -37,13 +37,12 @@ class Trapdoor extends Transparent{
 		$this->hardness = 15;
 	}
 
-	public function getBoundingBox(){
+	protected function recalculateBoundingBox(){
+
 		$damage = $this->getDamage();
 
 		$f = 0.1875;
 
-		$bb = null;
-
 		if(($damage & 0x08) > 0){
 			$bb = new AxisAlignedBB(
 				$this->x,
@@ -66,7 +65,7 @@ class Trapdoor extends Transparent{
 
 		if(($damage & 0x04) > 0){
 			if(($damage & 0x03) === 0){
-				$bb = new AxisAlignedBB(
+				$bb->setBounds(
 					$this->x,
 					$this->y,
 					$this->z + 1 - $f,
@@ -75,7 +74,7 @@ class Trapdoor extends Transparent{
 					$this->z + 1
 				);
 			}elseif(($damage & 0x03) === 1){
-				$bb = new AxisAlignedBB(
+				$bb->setBounds(
 					$this->x,
 					$this->y,
 					$this->z,
@@ -84,7 +83,7 @@ class Trapdoor extends Transparent{
 					$this->z + $f
 				);
 			}if(($damage & 0x03) === 2){
-				$bb = new AxisAlignedBB(
+				$bb->setBounds(
 					$this->x + 1 - $f,
 					$this->y,
 					$this->z,
@@ -93,7 +92,7 @@ class Trapdoor extends Transparent{
 					$this->z + 1
 				);
 			}if(($damage & 0x03) === 3){
-				$bb = new AxisAlignedBB(
+				$bb->setBounds(
 					$this->x,
 					$this->y,
 					$this->z,

src/pocketmine/block/Vine.php

@@ -0,0 +1,172 @@
+<?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\entity\Entity;
+use pocketmine\item\Item;
+use pocketmine\item\Tool;
+use pocketmine\level\Level;
+use pocketmine\math\AxisAlignedBB;
+use pocketmine\Player;
+
+class Vine extends Transparent{
+
+	public $hasEntityCollision = true;
+
+	public function __construct($meta = 0){
+		parent::__construct(self::VINE, $meta, "Vines");
+		$this->isSolid = false;
+		$this->isFullBlock = false;
+		$this->hardness = 1;
+	}
+
+	public function onEntityCollide(Entity $entity){
+		$entity->fallDistance = 0;
+	}
+
+	protected function recalculateBoundingBox(){
+
+		$f1 = 1;
+		$f2 = 1;
+		$f3 = 1;
+		$f4 = 0;
+		$f5 = 0;
+		$f6 = 0;
+
+		$flag = $this->meta > 0;
+
+		if(($this->meta & 0x02) > 0){
+			$f4 = max($f4, 0.0625);
+			$f1 = 0;
+			$f2 = 0;
+			$f5 = 1;
+			$f3 = 0;
+			$f6 = 1;
+			$flag = true;
+		}
+
+		if(($this->meta & 0x08) > 0){
+			$f1 = min($f1, 0.9375);
+			$f4 = 1;
+			$f2 = 0;
+			$f5 = 1;
+			$f3 = 0;
+			$f6 = 1;
+			$flag = true;
+		}
+
+		if(($this->meta & 0x01) > 0){
+			$f3 = min($f3, 0.9375);
+			$f6 = 1;
+			$f1 = 0;
+			$f4 = 1;
+			$f2 = 0;
+			$f5 = 1;
+			$flag = true;
+		}
+
+		if(!$flag and $this->getSide(1)->isSolid){
+			$f2 = min($f2, 0.9375);
+			$f5 = 1;
+			$f1 = 0;
+			$f4 = 1;
+			$f3 = 0;
+			$f6 = 1;
+		}
+
+		return new AxisAlignedBB(
+			$this->x + $f1,
+			$this->y + $f2,
+			$this->z + $f3,
+			$this->x + $f4,
+			$this->y + $f5,
+			$this->z + $f6
+		);
+	}
+
+
+	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
+		if($target->isSolid){
+			$faces = [
+				0 => 0,
+				1 => 0,
+				2 => 1,
+				3 => 4,
+				4 => 8,
+				5 => 2,
+			];
+			if(isset($faces[$face])){
+				$this->meta = $faces[$face];
+				$this->getLevel()->setBlock($block, $this, true, true);
+
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	public function getBreakTime(Item $item){
+		if($item->isShears()){
+			return 0.02;
+		}elseif($item->isSword()){
+			return 0.2;
+		}elseif($item->isAxe()){
+			switch($item->isAxe()){
+				case Tool::TIER_WOODEN:
+					return 0.15;
+				case Tool::TIER_STONE:
+					return 0.075;
+				case Tool::TIER_IRON:
+					return 0.05;
+				case Tool::TIER_DIAMOND:
+					return 0.0375;
+				case Tool::TIER_GOLD:
+					return 0.025;
+			}
+		}
+
+		return 0.3;
+	}
+
+	public function onUpdate($type){
+		if($type === Level::BLOCK_UPDATE_NORMAL){
+			/*if($this->getSide(0)->getID() === self::AIR){ //Replace with common break method
+				Server::getInstance()->api->entity->drop($this, Item::get(LADDER, 0, 1));
+				$this->getLevel()->setBlock($this, new Air(), true, true, true);
+				return Level::BLOCK_UPDATE_NORMAL;
+			}*/
+		}
+
+		return false;
+	}
+
+	public function getDrops(Item $item){
+		if($item->isShears()){
+			return [
+				[$this->id, 0, 1],
+			];
+		}else{
+			return [];
+		}
+	}
+}

src/pocketmine/block/Water.php

@@ -21,26 +21,25 @@
 
 namespace pocketmine\block;
 
-use pocketmine\item\Item;
-use pocketmine\level\Level;
-use pocketmine\level\Position;
-use pocketmine\Player;
-use pocketmine\Server;
 use pocketmine\entity\Entity;
+use pocketmine\item\Item;
+use pocketmine\Player;
 
 class Water extends Liquid{
 	public function __construct($meta = 0){
 		parent::__construct(self::WATER, $meta, "Water");
 		$this->hardness = 500;
 	}
-
-	public function getBoundingBox(){
-		return null;
-	}
 	
 	public function onEntityCollide(Entity $entity){
 		$entity->fallDistance = 0;
-		$entity->extinguish();
+		if($entity->fireTicks > 0){
+			$entity->extinguish();
+		}
+
+		if($entity instanceof Player){
+			$entity->onGround = true;
+		}
 	}
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){

src/pocketmine/block/Wheat.php

@@ -22,68 +22,10 @@
 namespace pocketmine\block;
 
 use pocketmine\item\Item;
-use pocketmine\level\Level;
-use pocketmine\Player;
 
-class Wheat extends Flowable{
+class Wheat extends Crops{
 	public function __construct($meta = 0){
 		parent::__construct(self::WHEAT_BLOCK, $meta, "Wheat Block");
-		$this->isActivable = true;
-		$this->hardness = 0;
-	}
-
-	public function getBoundingBox(){
-		return null;
-	}
-
-
-	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
-		$down = $this->getSide(0);
-		if($down->getID() === self::FARMLAND){
-			$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
-			$this->meta += mt_rand(2, 5);
-			if($this->meta > 7){
-				$this->meta = 7;
-			}
-			$this->getLevel()->setBlock($this, $this, 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){ //Replace with common break method
-				//TODO
-				//Server::getInstance()->api->entity->drop($this, Item::get(WHEAT_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);
-				}
-			}
-		}
-
-		return false;
 	}
 
 	public function getDrops(Item $item){

src/pocketmine/block/Wood2.php

@@ -23,14 +23,18 @@ namespace pocketmine\block;
 
 
 class Wood2 extends Wood{
+	
+	const ACACIA = 0;
+	const DARK_OAK = 1;
 
 	public function __construct($meta = 0){
 		Solid::__construct(self::WOOD2, $meta, "Wood");
 		$names = [
 			0 => "Acacia Wood",
-			1 => "Dark Oak Wood"
+			1 => "Dark Oak Wood",
+			2 => ""
 		];
 		$this->name = $names[$this->meta & 0x03];
 		$this->hardness = 10;
 	}
-}
+}

src/pocketmine/block/WoodSlab.php

@@ -45,7 +45,8 @@ class WoodSlab extends Transparent{
 		$this->hardness = 15;
 	}
 
-	public function getBoundingBox(){
+	protected function recalculateBoundingBox(){
+
 		if(($this->meta & 0x08) > 0){
 			return new AxisAlignedBB(
 				$this->x,

src/pocketmine/command/FormattedCommandAlias.php

@@ -22,6 +22,7 @@
 namespace pocketmine\command;
 
 use pocketmine\Server;
+use pocketmine\utils\MainLogger;
 use pocketmine\utils\TextFormat;
 
 class FormattedCommandAlias extends Command{
@@ -49,6 +50,9 @@ class FormattedCommandAlias extends Command{
 					$sender->sendMessage(TextFormat::RED . $e->getMessage());
 				}else{
 					$sender->sendMessage(TextFormat::RED . "An internal error occurred while attempting to perform this command");
+					if(($logger = $sender->getServer()->getLogger()) instanceof MainLogger){
+						$logger->logException($e);
+					}
 				}
 
 				return false;

src/pocketmine/command/SimpleCommandMap.php

@@ -56,6 +56,7 @@ use pocketmine\command\defaults\VanillaCommand;
 use pocketmine\command\defaults\VersionCommand;
 use pocketmine\command\defaults\WhitelistCommand;
 use pocketmine\Server;
+use pocketmine\utils\MainLogger;
 
 class SimpleCommandMap implements CommandMap{
 
@@ -178,7 +179,14 @@ class SimpleCommandMap implements CommandMap{
 		}
 
 		$target->timings->startTiming();
-		$target->execute($sender, $sentCommandLabel, $args);
+		try{
+			$target->execute($sender, $sentCommandLabel, $args);
+		}catch(\Exception $e){
+			$this->server->getLogger()->critical("Unhandled exception executing command '". $commandLine ."' in ". $target.": ".$e->getMessage());
+			if(($logger = $sender->getServer()->getLogger()) instanceof MainLogger){
+				$logger->logException($e);
+			}
+		}
 		$target->timings->stopTiming();
 
 		return true;

src/pocketmine/command/defaults/DifficultyCommand.php

@@ -22,6 +22,7 @@
 namespace pocketmine\command\defaults;
 
 use pocketmine\command\CommandSender;
+use pocketmine\network\protocol\SetDifficultyPacket;
 use pocketmine\Server;
 use pocketmine\utils\TextFormat;
 
@@ -55,6 +56,9 @@ class DifficultyCommand extends VanillaCommand{
 
 		if($difficulty !== -1){
 			$sender->getServer()->setConfigInt("difficulty", $difficulty);
+			$pk = new SetDifficultyPacket();
+			$pk->difficulty = $sender->getServer()->getDifficulty();
+			Server::broadcastPacket($sender->getServer()->getOnlinePlayers(), $pk);
 			$sender->sendMessage("Set difficulty to " . $difficulty);
 		}else{
 			$sender->sendMessage("Unknown difficulty");

src/pocketmine/command/defaults/KillCommand.php

@@ -24,7 +24,6 @@ namespace pocketmine\command\defaults;
 use pocketmine\command\CommandSender;
 use pocketmine\event\entity\EntityDamageEvent;
 use pocketmine\Player;
-use pocketmine\Server;
 use pocketmine\utils\TextFormat;
 
 class KillCommand extends VanillaCommand{
@@ -45,9 +44,7 @@ class KillCommand extends VanillaCommand{
 		}
 
 		if($sender instanceof Player){
-			//TODO: EntityDamageEvent
-
-			Server::getInstance()->getPluginManager()->callEvent($ev = new EntityDamageEvent($sender, EntityDamageEvent::CAUSE_SUICIDE, 1000));
+			$sender->getServer()->getPluginManager()->callEvent($ev = new EntityDamageEvent($sender, EntityDamageEvent::CAUSE_SUICIDE, 1000));
 
 			if($ev->isCancelled()){
 				return true;

src/pocketmine/command/defaults/SetWorldSpawnCommand.php

@@ -46,7 +46,7 @@ class SetWorldSpawnCommand extends VanillaCommand{
 		if(count($args) === 0){
 			if($sender instanceof Player){
 				$level = $sender->getLevel();
-				$pos = $sender->round();
+				$pos = (new Vector3($sender->x, $sender->y, $sender->z))->round();
 			}else{
 				$sender->sendMessage(TextFormat::RED . "You can only perform this command as a player");
 

src/pocketmine/command/defaults/SpawnpointCommand.php

@@ -66,7 +66,7 @@ class SpawnpointCommand extends VanillaCommand{
 
 		if(count($args) === 4){
 			if($level !== null){
-				$pos = $sender instanceof Player ? $sender->getPosition() : $level->getSpawn();
+				$pos = $sender instanceof Player ? $sender->getPosition() : $level->getSpawnLocation();
 				$x = (int) $this->getRelativeDouble($pos->x, $sender, $args[1]);
 				$y = $this->getRelativeDouble($pos->y, $sender, $args[2], 0, 128);
 				$z = $this->getRelativeDouble($pos->z, $sender, $args[3]);

src/pocketmine/command/defaults/TeleportCommand.php

@@ -23,7 +23,6 @@ namespace pocketmine\command\defaults;
 
 use pocketmine\command\Command;
 use pocketmine\command\CommandSender;
-use pocketmine\level\Position;
 use pocketmine\math\Vector3;
 use pocketmine\Player;
 use pocketmine\utils\TextFormat;
@@ -88,8 +87,7 @@ class TeleportCommand extends VanillaCommand{
 		}
 
 		if(count($args) < 3){
-			$pos = new Position($target->x, $target->y, $target->z, $target->getLevel());
-			$origin->teleport($pos);
+			$origin->teleport($target);
 			Command::broadcastCommandMessage($sender, "Teleported " . $origin->getDisplayName() . " to " . $target->getDisplayName());
 
 			return true;

src/pocketmine/command/defaults/TimeCommand.php

@@ -32,12 +32,47 @@ class TimeCommand extends VanillaCommand{
 		parent::__construct(
 			$name,
 			"Changes the time on each world",
-			"/time set <value>\n/time add <value>"
+			"/time set <value>\n/time add <value>\n/time start|stop"
 		);
-		$this->setPermission("pocketmine.command.time.add;pocketmine.command.time.set");
+		$this->setPermission("pocketmine.command.time.add;pocketmine.command.time.set;pocketmine.command.time.start;pocketmine.command.time.stop");
 	}
 
 	public function execute(CommandSender $sender, $currentAlias, array $args){
+		if(count($args) < 1){
+			$sender->sendMessage(TextFormat::RED . "Usage: " . $this->usageMessage);
+
+			return false;
+		}
+
+		if($args[0] === "start"){
+			if(!$sender->hasPermission("pocketmine.command.time.start")){
+				$sender->sendMessage(TextFormat::RED . "You don't have permission to restart the time");
+
+				return true;
+			}
+			foreach($sender->getServer()->getLevels() as $level){
+				$level->checkTime();
+				$level->startTime();
+				$level->checkTime();
+			}
+			Command::broadcastCommandMessage($sender, "Restarted the time");
+			return true;
+		}elseif($args[0] === "stop"){
+			if(!$sender->hasPermission("pocketmine.command.time.stop")){
+				$sender->sendMessage(TextFormat::RED . "You don't have permission to stop the time");
+
+				return true;
+			}
+			foreach($sender->getServer()->getLevels() as $level){
+				$level->checkTime();
+				$level->stopTime();
+				$level->checkTime();
+			}
+			Command::broadcastCommandMessage($sender, "Stopped the time");
+			return true;
+		}
+
+
 		if(count($args) < 2){
 			$sender->sendMessage(TextFormat::RED . "Usage: " . $this->usageMessage);
 
@@ -78,6 +113,7 @@ class TimeCommand extends VanillaCommand{
 				$level->setTime($level->getTime() + $value);
 				$level->checkTime();
 			}
+			Command::broadcastCommandMessage($sender, "Added " . $value ." to time");
 		}else{
 			$sender->sendMessage(TextFormat::RED . "Usage: " . $this->usageMessage);
 		}

src/pocketmine/command/defaults/TimingsCommand.php

@@ -93,40 +93,39 @@ class TimingsCommand extends VanillaCommand{
 			if($paste){
 				fseek($fileTimings, 0);
 				$data = [
-					"public" => false,
-					"description" => $sender->getServer()->getName() . " Timings",
-					"files" => [
-						"timings.txt" => [
-							"content" => stream_get_contents($fileTimings)
-						]
-					]
+					"syntax" => "text",
+					"poster" => $sender->getServer()->getName(),
+					"content" => stream_get_contents($fileTimings)
 				];
 
-				$ch = curl_init("https://api.github.com/gists");
+				$ch = curl_init("http://paste.ubuntu.com/");
 				curl_setopt($ch, CURLOPT_POST, 1);
 				curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
 				curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
 				curl_setopt($ch, CURLOPT_FORBID_REUSE, 1);
 				curl_setopt($ch, CURLOPT_FRESH_CONNECT, 1);
-				curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($data, JSON_UNESCAPED_SLASHES));
-				curl_setopt($ch, CURLOPT_AUTOREFERER, true);
-				curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-				curl_setopt($ch, CURLOPT_HTTPHEADER, ["Content-Type: application/json", "User-Agent: " . $this->getName() . " " . $sender->getServer()->getPocketMineVersion()]);
+				curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
+				curl_setopt($ch, CURLOPT_AUTOREFERER, false);
+				curl_setopt($ch, CURLOPT_FOLLOWLOCATION, false);
+				curl_setopt($ch, CURLOPT_HEADER, true);
+				curl_setopt($ch, CURLOPT_HTTPHEADER, ["User-Agent: " . $this->getName() . " " . $sender->getServer()->getPocketMineVersion()]);
 				curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-				$ret = curl_exec($ch);
-				$data = json_decode($ret);
+				$data = curl_exec($ch);
 				curl_close($ch);
-				if($data === false or $data === null or !isset($data->html_url)){
+				if(preg_match('#^Location: http://paste\\.ubuntu\\.com/([0-9]{1,})/#m', $data, $matches) == 0){
 					$sender->sendMessage("An error happened while pasting the report");
 
 					return true;
 				}
-				$timings = $data->html_url;
-			}
 
-			fclose($fileTimings);
-			$sender->sendMessage("Timings written to " . $timings);
-			$sender->sendMessage("Paste contents of file into form at http://aikar.co/timings.php to read results.");
+
+				$sender->sendMessage("Timings uploaded to http://paste.ubuntu.com/".$matches[1]."/");
+				$sender->sendMessage("You can read the results at http://timings.aikar.co/?url=".$matches[1]);
+				fclose($fileTimings);
+			}else{
+				fclose($fileTimings);
+				$sender->sendMessage("Timings written to " . $timings);
+			}
 		}
 
 		return true;

src/pocketmine/entity/Arrow.php

@@ -21,17 +21,9 @@
 
 namespace pocketmine\entity;
 
-
-use pocketmine\event\entity\EntityDamageByEntityEvent;
-use pocketmine\event\entity\EntityDamageEvent;
 use pocketmine\level\format\FullChunk;
-use pocketmine\level\MovingObjectPosition;
-use pocketmine\math\Vector3;
 use pocketmine\nbt\tag\Compound;
-use pocketmine\nbt\tag\Short;
-use pocketmine\nbt\tag\String;
 use pocketmine\network\protocol\AddEntityPacket;
-use pocketmine\network\protocol\SetEntityMotionPacket;
 use pocketmine\Player;
 
 class Arrow extends Projectile{
@@ -41,149 +33,33 @@ class Arrow extends Projectile{
 	public $length = 0.5;
 	public $height = 0.5;
 
-	/** @var Entity */
-	public $shootingEntity = null;
-
 	protected $gravity = 0.05;
 	protected $drag = 0.01;
 
-	private $damage = 6;
+	protected $damage = 6;
 
 	public function __construct(FullChunk $chunk, Compound $nbt, Entity $shootingEntity = null){
 		$this->shootingEntity = $shootingEntity;
 		parent::__construct($chunk, $nbt);
 	}
 
-	protected function initEntity(){
-		$this->namedtag->id = new String("id", "Arrow");
-		$this->setMaxHealth(1);
-		$this->setHealth(1);
-		if(isset($this->namedtag->Age)){
-			$this->age = $this->namedtag["Age"];
-		}
-
-	}
-
-	public function onUpdate(){
+	public function onUpdate($currentTick){
 		if($this->closed){
 			return false;
 		}
 
 		$this->timings->startTiming();
 
-		$this->entityBaseTick();
-
-		if(!$this->dead){
-
-			$movingObjectPosition = null;
-
-			$this->motionY -= $this->gravity;
-
-			$this->inBlock = $this->checkObstruction($this->x, ($this->boundingBox->minY + $this->boundingBox->maxY) / 2, $this->z);
-
-			$moveVector = new Vector3($this->x + $this->motionX, $this->y + $this->motionY, $this->z + $this->motionZ);
-
-			$list = $this->getLevel()->getCollidingEntities($this->boundingBox->addCoord($this->motionX, $this->motionY, $this->motionZ)->expand(1, 1, 1), $this);
-
-			$nearDistance = PHP_INT_MAX;
-			$nearEntity = null;
-
-			foreach($list as $entity){
-				if(/*!$entity->canCollideWith($this) or */
-				($entity === $this->shootingEntity and $this->ticksLived < 5)
-				){
-					continue;
-				}
-
-				$axisalignedbb = $entity->boundingBox->grow(0.3, 0.3, 0.3);
-				$ob = $axisalignedbb->calculateIntercept($this, $moveVector);
-
-				if($ob === null){
-					continue;
-				}
-
-				$distance = $this->distance($ob->hitVector);
-
-				if($distance < $nearDistance){
-					$nearDistance = $distance;
-					$nearEntity = $entity;
-				}
-			}
-
-			if($nearEntity !== null){
-				$movingObjectPosition = MovingObjectPosition::fromEntity($nearEntity);
-			}
-
-			if($movingObjectPosition !== null){
-				if($movingObjectPosition->entityHit !== null){
-					$motion = sqrt($this->motionX ** 2 + $this->motionY ** 2 + $this->motionZ ** 2);
-					$damage = ceil($motion * $this->damage);
-
-
-					$ev = new EntityDamageByEntityEvent($this->shootingEntity === null ? $this : $this->shootingEntity, $movingObjectPosition->entityHit, EntityDamageEvent::CAUSE_PROJECTILE, $damage);
-
-					$this->server->getPluginManager()->callEvent($ev);
-
-					if(!$ev->isCancelled()){
-						$movingObjectPosition->entityHit->attack($damage, $ev);
-						if($this->fireTicks > 0){
-							$movingObjectPosition->entityHit->setOnFire(5);
-						}
-						$this->kill();
-					}
-				}
-			}
-
-			$this->move($this->motionX, $this->motionY, $this->motionZ);
-
-			if($this->onGround){
-				$this->motionX = 0;
-				$this->motionY = 0;
-				$this->motionZ = 0;
-			}
-
-			if($this->motionX != 0 or $this->motionY != 0 or $this->motionZ != 0){
-				$f = sqrt(($this->motionX ** 2) + ($this->motionZ ** 2));
-				$this->yaw = (atan2($this->motionX, $this->motionZ) * 180 / M_PI);
-				$this->pitch = (atan2($this->motionY, $f) * 180 / M_PI);
-			}
-
-			if($this->age > 1200){
-				$this->kill();
-			}
-			$this->updateMovement();
+		$hasUpdate = parent::onUpdate($currentTick);
 
+		if($this->age > 1200){
+			$this->kill();
+			$hasUpdate = true;
 		}
 
 		$this->timings->stopTiming();
 
-		return !$this->onGround or ($this->motionX == 0 and $this->motionY == 0 and $this->motionZ == 0);
-	}
-
-	public function attack($damage, $source = EntityDamageEvent::CAUSE_MAGIC){
-
-	}
-
-	public function heal($amount){
-
-	}
-
-	public function saveNBT(){
-		parent::saveNBT();
-		$this->namedtag->Age = new Short("Age", $this->age);
-	}
-
-	public function getData(){
-		$flags = 0;
-		$flags |= $this->fireTicks > 0 ? 1 : 0;
-
-		return [
-			0 => ["type" => 0, "value" => $flags]
-		];
-	}
-
-	public function canCollideWith(Entity $entity){
-		return $entity instanceof Living and !$this->onGround;
+		return $hasUpdate;
 	}
 
 	public function spawnTo(Player $player){
@@ -196,11 +72,7 @@ class Arrow extends Projectile{
 		$pk->did = 0; //TODO: send motion here
 		$player->dataPacket($pk);
 
-		$pk = new SetEntityMotionPacket();
-		$pk->entities = [
-			[$this->getID(), $this->motionX, $this->motionY, $this->motionZ]
-		];
-		$player->dataPacket($pk);
+		$player->addEntityMotion($this->getId(), $this->motionX, $this->motionY, $this->motionZ);
 
 		parent::spawnTo($player);
 	}

src/pocketmine/entity/Chicken.php

@@ -22,11 +22,6 @@
 namespace pocketmine\entity;
 
 
-use pocketmine\nbt\tag\String;
-
 class Chicken extends Animal{
 
-	protected function initEntity(){
-		$this->namedtag->id = new String("id", "Chicken");
-	}
 }

src/pocketmine/entity/Cow.php

@@ -22,10 +22,6 @@
 namespace pocketmine\entity;
 
 
-use pocketmine\nbt\tag\String;
-
 class Cow extends Animal{
-	protected function initEntity(){
-		$this->namedtag->id = new String("id", "Cow");
-	}
+
 }

src/pocketmine/entity/Creeper.php

@@ -22,10 +22,6 @@
 namespace pocketmine\entity;
 
 
-use pocketmine\nbt\tag\String;
-
 class Creeper extends Monster implements Explosive{
-	protected function initEntity(){
-		$this->namedtag->id = new String("id", "Creeper");
-	}
+
 }

src/pocketmine/entity/Egg.php

@@ -22,10 +22,6 @@
 namespace pocketmine\entity;
 
 
-use pocketmine\nbt\tag\String;
-
 class Egg extends Projectile{
-	protected function initEntity(){
-		$this->namedtag->id = new String("id", "Egg");
-	}
+
 }

src/pocketmine/entity/Enderman.php

@@ -23,10 +23,7 @@ namespace pocketmine\entity;
 
 
 use pocketmine\inventory\InventoryHolder;
-use pocketmine\nbt\tag\String;
 
 class Enderman extends Monster implements InventoryHolder{
-	protected function initEntity(){
-		$this->namedtag->id = new String("id", "Enderman");
-	}
+
 }

src/pocketmine/entity/Entity.php

@@ -24,24 +24,23 @@
  */
 namespace pocketmine\entity;
 
-use pocketmine\block\Block;
 use pocketmine\block\Water;
 use pocketmine\event\entity\EntityDamageEvent;
 use pocketmine\event\entity\EntityDespawnEvent;
 use pocketmine\event\entity\EntityLevelChangeEvent;
 use pocketmine\event\entity\EntityMotionEvent;
-use pocketmine\event\entity\EntityMoveEvent;
+use pocketmine\event\entity\EntityRegainHealthEvent;
 use pocketmine\event\entity\EntitySpawnEvent;
 use pocketmine\event\entity\EntityTeleportEvent;
 use pocketmine\event\Timings;
-use pocketmine\item\Item;
 use pocketmine\level\format\Chunk;
 use pocketmine\level\format\FullChunk;
 use pocketmine\level\Level;
+use pocketmine\level\Location;
 use pocketmine\level\Position;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Math;
-use pocketmine\math\Vector3 as Vector3;
+use pocketmine\math\Vector3;
 use pocketmine\metadata\Metadatable;
 use pocketmine\metadata\MetadataValue;
 use pocketmine\nbt\tag\Byte;
@@ -50,22 +49,26 @@ use pocketmine\nbt\tag\Double;
 use pocketmine\nbt\tag\Enum;
 use pocketmine\nbt\tag\Float;
 use pocketmine\nbt\tag\Short;
-use pocketmine\network\protocol\MoveEntityPacket;
+use pocketmine\nbt\tag\String;
 use pocketmine\Network;
 use pocketmine\network\protocol\MovePlayerPacket;
 use pocketmine\network\protocol\RemoveEntityPacket;
 use pocketmine\network\protocol\SetEntityDataPacket;
-use pocketmine\network\protocol\SetEntityMotionPacket;
 use pocketmine\network\protocol\SetTimePacket;
 use pocketmine\Player;
 use pocketmine\plugin\Plugin;
 use pocketmine\Server;
+use pocketmine\utils\ChunkException;
+
+abstract class Entity extends Location implements Metadatable{
 
-abstract class Entity extends Position implements Metadatable{
 
 	const NETWORK_ID = -1;
 
 	public static $entityCount = 1;
+	/** @var Entity[] */
+	private static $knownEntities = [];
+	private static $shortNames = [];
 
 	/**
 	 * @var Player[]
@@ -87,9 +90,9 @@ abstract class Entity extends Position implements Metadatable{
 
 	protected $lastDamageCause = null;
 
-	public $lastX;
-	public $lastY;
-	public $lastZ;
+	public $lastX = null;
+	public $lastY = null;
+	public $lastZ = null;
 
 	public $motionX;
 	public $motionY;
@@ -98,8 +101,6 @@ abstract class Entity extends Position implements Metadatable{
 	public $lastMotionY;
 	public $lastMotionZ;
 
-	public $yaw;
-	public $pitch;
 	public $lastYaw;
 	public $lastPitch;
 
@@ -125,7 +126,7 @@ abstract class Entity extends Position implements Metadatable{
 
 	protected $ySize = 0;
 	protected $stepHeight = 0;
-	public $keepMovement = true;
+	public $keepMovement = false;
 
 	public $fallDistance;
 	public $ticksLived;
@@ -137,15 +138,16 @@ abstract class Entity extends Position implements Metadatable{
 	public $canCollide = true;
 
 	protected $isStatic = false;
-	protected $isColliding = false;
+
+	public $isCollided = false;
+	public $isCollidedHorizontally = false;
+	public $isCollidedVertically = false;
 
 	public $noDamageTicks;
 	private $justCreated;
 	protected $fireProof;
 	private $invulnerable;
 
-	protected $spawnTime;
-
 	protected $gravity;
 	protected $drag;
 
@@ -160,18 +162,19 @@ abstract class Entity extends Position implements Metadatable{
 
 	public function __construct(FullChunk $chunk, Compound $nbt){
 		if($chunk === null or $chunk->getProvider() === null){
-			throw new \Exception("Invalid garbage Chunk given to Entity");
+			throw new ChunkException("Invalid garbage Chunk given to Entity");
 		}
 
 		$this->timings = Timings::getEntityTimings($this);
 
 		if($this->eyeHeight === null){
-			$this->eyeHeight = $this->height;
+			$this->eyeHeight = $this->height / 2 + 0.1;
 		}
 
 		$this->id = Entity::$entityCount++;
 		$this->justCreated = true;
 		$this->namedtag = $nbt;
+
 		$this->chunk = $chunk;
 		$this->setLevel($chunk->getProvider()->getLevel());
 		$this->server = $chunk->getProvider()->getLevel()->getServer();
@@ -215,16 +218,63 @@ abstract class Entity extends Position implements Metadatable{
 		$this->invulnerable = $this->namedtag["Invulnerable"] > 0 ? true : false;
 
 		$this->chunk->addEntity($this);
-		$this->getLevel()->addEntity($this);
+		$this->level->addEntity($this);
 		$this->initEntity();
-		$this->lastUpdate = $this->spawnTime = microtime(true);
+		$this->lastUpdate = $this->server->getTick();
 		$this->server->getPluginManager()->callEvent(new EntitySpawnEvent($this));
 
 		$this->scheduleUpdate();
 
 	}
 
+	/**
+	 * @param int|string $type
+	 * @param FullChunk  $chunk
+	 * @param Compound   $nbt
+	 * @param            $args
+	 *
+	 * @return Entity
+	 */
+	public static function createEntity($type, FullChunk $chunk, Compound $nbt, ...$args){
+		if(isset(self::$knownEntities[$type])){
+			$class = self::$knownEntities[$type];
+			return new $class($chunk, $nbt, ...$args);
+		}
+
+		return null;
+	}
+
+	public static function registerEntity($className, $force = false){
+		$class = new \ReflectionClass($className);
+		if(is_a($className, Entity::class, true) and !$class->isAbstract()){
+			if($className::NETWORK_ID !== -1){
+				self::$knownEntities[$className::NETWORK_ID] = $className;
+			}elseif(!$force){
+				return false;
+			}
+
+			self::$knownEntities[$class->getShortName()] = $className;
+			self::$shortNames[$className] = $class->getShortName();
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Returns the short save name
+	 *
+	 * @return string
+	 */
+	public function getSaveId(){
+		return self::$shortNames[static::class];
+	}
+
 	public function saveNBT(){
+		if(!($this instanceof Player)){
+			$this->namedtag->id = new String("id", $this->getSaveId());
+		}
+
 		$this->namedtag->Pos = new Enum("Pos", [
 			new Double(0, $this->x),
 			new Double(1, $this->y),
@@ -278,13 +328,15 @@ abstract class Entity extends Position implements Metadatable{
 		$pk = new SetEntityDataPacket();
 		$pk->eid = $this->id;
 		$pk->metadata = $this->getData();
+		$pk->encode();
+		$pk->isEncoded = true;
 		foreach($player as $p){
 			if($p === $this){
 				/** @var Player $p */
-				$pk = new SetEntityDataPacket();
-				$pk->eid = 0;
-				$pk->metadata = $this->getData();
-				$p->dataPacket($pk);
+				$pk2 = new SetEntityDataPacket();
+				$pk2->eid = 0;
+				$pk2->metadata = $this->getData();
+				$p->dataPacket($pk2);
 			}else{
 				$p->dataPacket($pk);
 			}
@@ -296,7 +348,7 @@ abstract class Entity extends Position implements Metadatable{
 	 */
 	public function despawnFrom(Player $player){
 		if(isset($this->hasSpawned[$player->getID()])){
-			$pk = new RemoveEntityPacket;
+			$pk = new RemoveEntityPacket();
 			$pk->eid = $this->id;
 			$player->dataPacket($pk);
 			unset($this->hasSpawned[$player->getID()]);
@@ -307,11 +359,15 @@ abstract class Entity extends Position implements Metadatable{
 	 * @param float                 $damage
 	 * @param int|EntityDamageEvent $source
 	 *
-	 * @return mixed
 	 */
 	abstract function attack($damage, $source = EntityDamageEvent::CAUSE_MAGIC);
 
-	abstract function heal($amount);
+	/**
+	 * @param float                       $amount
+	 * @param int|EntityRegainHealthEvent $source
+	 *
+	 */
+	abstract function heal($amount, $source = EntityRegainHealthEvent::CAUSE_MAGIC);
 
 	/**
 	 * @return int
@@ -346,7 +402,7 @@ abstract class Entity extends Position implements Metadatable{
 	 * @param int|EntityDamageEvent $type
 	 */
 	public function setLastDamageCause($type){
-		$this->lastDamageCause = $type;
+		$this->lastDamageCause = $type instanceof EntityDamageEvent ? clone $type : $type;
 	}
 
 	/**
@@ -384,17 +440,19 @@ abstract class Entity extends Position implements Metadatable{
 		$diffY = $y - $j;
 		$diffZ = $z - $k;
 
-		$list = $this->getLevel()->getCollisionBlocks($this->boundingBox);
+		$list = $this->level->getCollisionBlocks($this->boundingBox);
 
-		if(count($list) === 0 and !$this->getLevel()->isFullBlock(new Vector3($i, $j, $k))){
+		$v = new Vector3($i, $j, $k);
+
+		if(count($list) === 0 and !$this->level->isFullBlock($v->setComponents($i, $j, $k))){
 			return false;
 		}else{
-			$flag = !$this->getLevel()->isFullBlock(new Vector3($i - 1, $j, $k));
-			$flag1 = !$this->getLevel()->isFullBlock(new Vector3($i + 1, $j, $k));
-			//$flag2 = !$this->getLevel()->isFullBlock(new Vector3($i, $j - 1, $k));
-			$flag3 = !$this->getLevel()->isFullBlock(new Vector3($i, $j + 1, $k));
-			$flag4 = !$this->getLevel()->isFullBlock(new Vector3($i, $j, $k - 1));
-			$flag5 = !$this->getLevel()->isFullBlock(new Vector3($i, $j, $k + 1));
+			$flag = !$this->level->isFullBlock($v->setComponents($i - 1, $j, $k));
+			$flag1 = !$this->level->isFullBlock($v->setComponents($i + 1, $j, $k));
+			//$flag2 = !$this->level->isFullBlock($v->setComponents($i, $j - 1, $k));
+			$flag3 = !$this->level->isFullBlock($v->setComponents($i, $j + 1, $k));
+			$flag4 = !$this->level->isFullBlock($v->setComponents($i, $j, $k - 1));
+			$flag5 = !$this->level->isFullBlock($v->setComponents($i, $j, $k + 1));
 
 			$direction = 3; //UP!
 			$limit = 9999;
@@ -460,7 +518,7 @@ abstract class Entity extends Position implements Metadatable{
 		}
 	}
 
-	public function entityBaseTick(){
+	public function entityBaseTick($tickDiff = 1){
 
 		Timings::$tickEntityTimer->startTiming();
 		//TODO: check vehicles
@@ -468,12 +526,13 @@ abstract class Entity extends Position implements Metadatable{
 		$this->justCreated = false;
 		$isPlayer = $this instanceof Player;
 
-		if($this->dead === true and !$isPlayer){
-			$this->close();
-			Timings::$tickEntityTimer->stopTiming();
-			return false;
-		}elseif($this->dead === true){
+		if($this->dead === true){
 			$this->despawnFromAll();
+			if(!$isPlayer){
+				$this->close();
+			}
+			Timings::$tickEntityTimer->stopTiming();
+			return $isPlayer;
 		}
 
 		$hasUpdate = false;
@@ -481,40 +540,38 @@ abstract class Entity extends Position implements Metadatable{
 		$this->checkBlockCollision();
 
 		if($this->y < 0 and $this->dead !== true){
-			$this->server->getPluginManager()->callEvent($ev = new EntityDamageEvent($this, EntityDamageEvent::CAUSE_VOID, 10));
-			if(!$ev->isCancelled()){
-				$this->attack($ev->getFinalDamage(), $ev);
-			}
+			$ev = new EntityDamageEvent($this, EntityDamageEvent::CAUSE_VOID, 10);
+			$this->attack($ev->getFinalDamage(), $ev);
+			$hasUpdate = true;
 		}
 
 		if($this->fireTicks > 0){
 			if($this->fireProof){
-				$this->fireTicks -= 4;
+				$this->fireTicks -= 4 * $tickDiff;
 				if($this->fireTicks < 0){
 					$this->fireTicks = 0;
 				}
 			}else{
-				if(($this->fireTicks % 20) === 0){
+				if(($this->fireTicks % 20) === 0 or $tickDiff > 20){
 					$ev = new EntityDamageEvent($this, EntityDamageEvent::CAUSE_FIRE_TICK, 1);
-					$this->server->getPluginManager()->callEvent($ev);
-					if(!$ev->isCancelled()){
-						$this->attack($ev->getFinalDamage(), $ev);
-					}
+					$this->attack($ev->getFinalDamage(), $ev);
 				}
-				--$this->fireTicks;
+				$this->fireTicks -= $tickDiff;
 			}
 
 			if($this->fireTicks <= 0){
 				$this->extinguish();
+			}else{
+				$hasUpdate = true;
 			}
-
-			$hasUpdate = true;
 		}
 
-		++$this->age;
-		++$this->ticksLived;
+		$this->age += $tickDiff;
+		$this->ticksLived += $tickDiff;
 
 		Timings::$tickEntityTimer->stopTiming();
+
+		return $hasUpdate;
 	}
 
 	public function updateMovement(){
@@ -527,25 +584,21 @@ abstract class Entity extends Position implements Metadatable{
 			$this->lastPitch = $this->pitch;
 
 			if($this instanceof Human){
-				$pk = new MovePlayerPacket;
+				$pk = new MovePlayerPacket();
 				$pk->eid = $this->id;
 				$pk->x = $this->x;
-				$pk->y = $this->y; //teleport from head
+				$pk->y = $this->y;
 				$pk->z = $this->z;
 				$pk->yaw = $this->yaw;
 				$pk->pitch = $this->pitch;
 				$pk->bodyYaw = $this->yaw;
+				Server::broadcastPacket($this->hasSpawned, $pk);
 			}else{
-				//TODO: add to move list
-				$pk = new MoveEntityPacket();
-				$pk->entities = [
-					[$this->id, $this->x, $this->y, $this->z, $this->yaw, $this->pitch]
-				];
+				foreach($this->hasSpawned as $player){
+					$player->addEntityMovement($this->id, $this->x, $this->y + $this->getEyeHeight(), $this->z, $this->yaw, $this->pitch);
+				}
 			}
 
-			foreach($this->hasSpawned as $player){
-				$player->dataPacket($pk);
-			}
 		}
 
 		if(($this->lastMotionX != $this->motionX or $this->lastMotionY != $this->motionY or $this->lastMotionZ != $this->motionZ)){
@@ -553,12 +606,8 @@ abstract class Entity extends Position implements Metadatable{
 			$this->lastMotionY = $this->motionY;
 			$this->lastMotionZ = $this->motionZ;
 
-			$pk = new SetEntityMotionPacket;
-			$pk->entities = [
-				[$this->getID(), $this->motionX, $this->motionY, $this->motionZ]
-			];
 			foreach($this->hasSpawned as $player){
-				$player->dataPacket($pk);
+				$player->addEntityMotion($this->id, $this->motionX, $this->motionY, $this->motionZ);
 			}
 
 			if($this instanceof Player){
@@ -584,20 +633,24 @@ abstract class Entity extends Position implements Metadatable{
 		return new Vector3($x, $y, $z);
 	}
 
-	public function onUpdate(){
-		if($this->closed !== false){
+	public function onUpdate($currentTick){
+		if($this->closed){
 			return false;
 		}
+
+		$tickDiff = max(1, $currentTick - $this->lastUpdate);
+		$this->lastUpdate = $currentTick;
+
 		$this->timings->startTiming();
 
-		$hasUpdate = $this->entityBaseTick();
+		$hasUpdate = $this->entityBaseTick($tickDiff);
 
 		$this->updateMovement();
 
 		$this->timings->stopTiming();
 
 		//if($this->isStatic())
-		return true;
+		return $hasUpdate;
 		//return !($this instanceof Player);
 	}
 
@@ -669,10 +722,7 @@ abstract class Entity extends Position implements Metadatable{
 	public function fall($fallDistance){
 		$damage = floor($fallDistance - 3);
 		if($damage > 0){
-			$this->server->getPluginManager()->callEvent($ev = new EntityDamageEvent($this, EntityDamageEvent::CAUSE_FALL, $damage));
-			if($ev->isCancelled()){
-				return;
-			}
+			$ev = new EntityDamageEvent($this, EntityDamageEvent::CAUSE_FALL, $damage);
 			$this->attack($ev->getFinalDamage(), $ev);
 		}
 	}
@@ -695,34 +745,32 @@ abstract class Entity extends Position implements Metadatable{
 
 	protected function switchLevel(Level $targetLevel){
 		if($this->isValid()){
-			$this->server->getPluginManager()->callEvent($ev = new EntityLevelChangeEvent($this, $this->getLevel(), $targetLevel));
+			$this->server->getPluginManager()->callEvent($ev = new EntityLevelChangeEvent($this, $this->level, $targetLevel));
 			if($ev->isCancelled()){
 				return false;
 			}
 
-			$this->getLevel()->removeEntity($this);
-			$this->chunk->removeEntity($this);
+			$this->level->removeEntity($this);
+			if($this->chunk !== null){
+				$this->chunk->removeEntity($this);
+			}
 			$this->despawnFromAll();
 			if($this instanceof Player){
 				foreach($this->usedChunks as $index => $d){
 					$X = null;
 					$Z = null;
 					Level::getXZ($index, $X, $Z);
-					foreach($this->getLevel()->getChunkEntities($X, $Z) as $entity){
-						$entity->despawnFrom($this);
-					}
-
+					$this->unloadChunk($X, $Z);
 				}
-				$this->getLevel()->freeAllChunks($this);
 			}
 		}
-		$this->setLevel($targetLevel, $this instanceof Player ? true : false); //Hard reference
-		$this->getLevel()->addEntity($this);
+		$this->setLevel($targetLevel);
+		$this->level->addEntity($this);
 		if($this instanceof Player){
 			$this->usedChunks = [];
 			$pk = new SetTimePacket();
-			$pk->time = $this->getLevel()->getTime();
-			$pk->started = $this->getLevel()->stopTime == false;
+			$pk->time = $this->level->getTime();
+			$pk->started = $this->level->stopTime == false;
 			$this->dataPacket($pk);
 		}
 		$this->chunk = null;
@@ -731,14 +779,18 @@ abstract class Entity extends Position implements Metadatable{
 	}
 
 	public function getPosition(){
-		return new Position($this->x, $this->y, $this->z, $this->getLevel());
+		return new Position($this->x, $this->y, $this->z, $this->level);
+	}
+
+	public function getLocation(){
+		return new Location($this->x, $this->y, $this->z, $this->yaw, $this->pitch, $this->level);
 	}
 
 	public function isInsideOfWater(){
-		$block = $this->getLevel()->getBlock($pos = (new Vector3($this->x, $y = ($this->y + $this->getEyeHeight()), $this->z))->floor());
+		$block = $this->level->getBlock(new Vector3(Math::floorFloat($this->x), Math::floorFloat($y = ($this->y + $this->getEyeHeight())), Math::floorFloat($this->z)));
 
 		if($block instanceof Water){
-			$f = ($pos->y + 1) - ($block->getFluidHeightPercent() - 0.1111111);
+			$f = ($block->y + 1) - ($block->getFluidHeightPercent() - 0.1111111);
 			return $y < $f;
 		}
 
@@ -746,38 +798,27 @@ abstract class Entity extends Position implements Metadatable{
 	}
 
 	public function isInsideOfSolid(){
-		for($i = 0; $i < 8; ++$i){
-			$x = (($i % 2) - 0.5) * $this->width * 0.8;
-			$y = ((($i >> 1) % 2) - 0.5) * 0.1;
-			$z = ((($i >> 2) % 2) - 0.5) * $this->width * 0.8;
-			$block = $this->getLevel()->getBlock((new Vector3($this->x + $x, $this->y + $this->getEyeHeight() + $y, $this->z + $z))->floor());
+		$block = $this->level->getBlock(new Vector3(Math::floorFloat($this->x), Math::floorFloat($y = ($this->y + $this->getEyeHeight())), Math::floorFloat($this->z)));
 
-			$bb = $block->getBoundingBox();
+		$bb = $block->getBoundingBox();
 
-			if($bb !== null and $block->isSolid and !$block->isTransparent and $bb->intersectsWith($this->getBoundingBox())){
-				return true;
-			}
+		if($bb !== null and $block->isSolid and !$block->isTransparent and $bb->intersectsWith($this->getBoundingBox())){
+			return true;
 		}
 		return false;
 	}
 
-	public function collision(){
-		$this->isColliding = true;
-		$this->fallDistance = 0;
-	}
-
 	public function move($dx, $dy, $dz){
 
 		if($dx == 0 and $dz == 0 and $dy == 0){
 			return true;
 		}
 
-		//if($this->inBlock){ //TODO: noclip
-		//	$this->boundingBox->offset($dx, $dy, $dz);
-		//	$this->x = ($this->boundingBox->minX + $this->boundingBox->maxX) / 2;
-		//	$this->y = $this->boundingBox->minY/* + $this->height*/;
-		//	$this->z = ($this->boundingBox->minZ + $this->boundingBox->maxZ) / 2;
-		//}else{
+		if($this->keepMovement){
+			$this->boundingBox->offset($dx, $dy, $dz);
+			$this->setPosition(new Vector3(($this->boundingBox->minX + $this->boundingBox->maxX) / 2, $this->boundingBox->minY - $this->ySize, ($this->boundingBox->minZ + $this->boundingBox->maxZ) / 2));
+			$this->onGround = $this instanceof Player ? true : false;
+		}else{
 
 			Timings::$entityMoveTimer->startTiming();
 
@@ -804,7 +845,7 @@ abstract class Entity extends Position implements Metadatable{
 			/*$sneakFlag = $this->onGround and $this instanceof Player;
 
 			if($sneakFlag){
-				for($mov = 0.05; $dx != 0.0 and count($this->getLevel()->getCollisionCubes($this, $this->boundingBox->getOffsetBoundingBox($dx, -1, 0))) === 0; $movX = $dx){
+				for($mov = 0.05; $dx != 0.0 and count($this->level->getCollisionCubes($this, $this->boundingBox->getOffsetBoundingBox($dx, -1, 0))) === 0; $movX = $dx){
 					if($dx < $mov and $dx >= -$mov){
 						$dx = 0;
 					}elseif($dx > 0){
@@ -814,7 +855,7 @@ abstract class Entity extends Position implements Metadatable{
 					}
 				}
 
-				for(; $dz != 0.0 and count($this->getLevel()->getCollisionCubes($this, $this->boundingBox->getOffsetBoundingBox(0, -1, $dz))) === 0; $movZ = $dz){
+				for(; $dz != 0.0 and count($this->level->getCollisionCubes($this, $this->boundingBox->getOffsetBoundingBox(0, -1, $dz))) === 0; $movZ = $dz){
 					if($dz < $mov and $dz >= -$mov){
 						$dz = 0;
 					}elseif($dz > 0){
@@ -827,7 +868,7 @@ abstract class Entity extends Position implements Metadatable{
 				//TODO: big messy loop
 			}*/
 
-			$list = $this->getLevel()->getCollisionCubes($this, $this->boundingBox->getOffsetBoundingBox($dx, $dy, $dz));
+			$list = $this->level->getCollisionCubes($this, $this->boundingBox->getOffsetBoundingBox($dx, $dy, $dz));
 
 
 			foreach($list as $bb){
@@ -836,7 +877,7 @@ abstract class Entity extends Position implements Metadatable{
 
 			$this->boundingBox->offset(0, $dy, 0);
 
-			if(!$this->keepMovement and $movY != $dy){
+			if($movY != $dy){
 				$dx = 0;
 				$dy = 0;
 				$dz = 0;
@@ -850,7 +891,7 @@ abstract class Entity extends Position implements Metadatable{
 
 			$this->boundingBox->offset($dx, 0, 0);
 
-			if(!$this->keepMovement and $movX != $dx){
+			if($movX != $dx){
 				$dx = 0;
 				$dy = 0;
 				$dz = 0;
@@ -862,7 +903,7 @@ abstract class Entity extends Position implements Metadatable{
 
 			$this->boundingBox->offset(0, 0, $dz);
 
-			if(!$this->keepMovement and $movZ != $dz){
+			if($movZ != $dz){
 				$dx = 0;
 				$dy = 0;
 				$dz = 0;
@@ -881,14 +922,14 @@ abstract class Entity extends Position implements Metadatable{
 
 				$this->boundingBox->setBB($axisalignedbb);
 
-				$list = $this->getLevel()->getCollisionCubes($this, $this->boundingBox->getOffsetBoundingBox($movX, $dy, $movZ));
+				$list = $this->level->getCollisionCubes($this, $this->boundingBox->getOffsetBoundingBox($movX, $dy, $movZ), false);
 
 				foreach($list as $bb){
 					$dy = $bb->calculateYOffset($this->boundingBox, $dy);
 				}
 
 				$this->boundingBox->offset(0, $dy, 0);
-				if(!$this->keepMovement and $movY != $dy){
+				if($movY != $dy){
 					$dx = 0;
 					$dy = 0;
 					$dz = 0;
@@ -899,7 +940,7 @@ abstract class Entity extends Position implements Metadatable{
 				}
 
 				$this->boundingBox->offset($dx, 0, 0);
-				if(!$this->keepMovement and $movX != $dx){
+				if($movX != $dx){
 					$dx = 0;
 					$dy = 0;
 					$dz = 0;
@@ -910,13 +951,13 @@ abstract class Entity extends Position implements Metadatable{
 				}
 
 				$this->boundingBox->offset(0, 0, $dz);
-				if(!$this->keepMovement and $movZ != $dz){
+				if($movZ != $dz){
 					$dx = 0;
 					$dy = 0;
 					$dz = 0;
 				}
 
-				if(!$this->keepMovement and $movY != $dy){
+				if($movY != $dy){
 					$dx = 0;
 					$dy = 0;
 					$dz = 0;
@@ -939,7 +980,7 @@ abstract class Entity extends Position implements Metadatable{
 
 			$pos = new Vector3(
 				($this->boundingBox->minX + $this->boundingBox->maxX) / 2,
-				$this->boundingBox->minY - $this->ySize/* + $this->height*/,
+				$this->boundingBox->minY - $this->ySize,
 				($this->boundingBox->minZ + $this->boundingBox->maxZ) / 2
 			);
 
@@ -951,16 +992,20 @@ abstract class Entity extends Position implements Metadatable{
 			}else{
 
 				if($this instanceof Player){
-					if(($this->onGround and $movY != 0) or (!$this->onGround and $movY <= 0)){
-						if(count($this->getLevel()->getCollisionBlocks($this->boundingBox->getOffsetBoundingBox(0, $movY - 0.1, 0)->expand(0.01, 0, 0.01))) > 0){
-							$isColliding = true;
+					if(!$this->onGround or $movY != 0){
+						$bb = clone $this->boundingBox;
+						$bb->maxY = $bb->minY + 1;
+						if(count($this->level->getCollisionBlocks($bb->expand(0.01, 0.01, 0.01))) > 0){
+							$this->onGround = true;
 						}else{
-							$isColliding = false;
+							$this->onGround = false;
 						}
-
-						$this->onGround = ($movY <= 0 and $isColliding);
 					}
+					$this->isCollided = $this->onGround;
 				}else{
+					$this->isCollidedVertically = $movY != $dy;
+					$this->isCollidedHorizontally = ($movX != $dx or $movZ != $dz);
+					$this->isCollided = ($this->isCollidedHorizontally or $this->isCollidedVertically);
 					$this->onGround = ($movY != $dy and $movY < 0);
 				}
 				$this->updateFallState($dy, $this->onGround);
@@ -983,24 +1028,25 @@ abstract class Entity extends Position implements Metadatable{
 			Timings::$entityMoveTimer->stopTiming();
 
 			return $result;
-		//}
+		}
 	}
 
 	protected function checkBlockCollision(){
-		$minX = Math::floorFloat($this->boundingBox->minX - 0.001);
-		$minY = Math::floorFloat($this->boundingBox->minY - 0.001);
-		$minZ = Math::floorFloat($this->boundingBox->minZ - 0.001);
-		$maxX = Math::floorFloat($this->boundingBox->maxX + 0.001);
-		$maxY = Math::floorFloat($this->boundingBox->maxY + 0.001);
-		$maxZ = Math::floorFloat($this->boundingBox->maxZ + 0.001);
+		$minX = Math::floorFloat($this->boundingBox->minX + 0.001);
+		$minY = Math::floorFloat($this->boundingBox->minY + 0.001);
+		$minZ = Math::floorFloat($this->boundingBox->minZ + 0.001);
+		$maxX = Math::floorFloat($this->boundingBox->maxX - 0.001);
+		$maxY = Math::floorFloat($this->boundingBox->maxY - 0.001);
+		$maxZ = Math::floorFloat($this->boundingBox->maxZ - 0.001);
 
 		$vector = new Vector3(0, 0, 0);
+		$v = new Vector3(0, 0, 0);
 
-		for($z = $minZ; $z <= $maxZ; ++$z){
-			for($x = $minX; $x <= $maxX; ++$x){
-				for($y = $minY; $y <= $maxY; ++$y){
-					$block = $this->getLevel()->getBlock(new Vector3($x, $y, $z));
-					if($block !== null and $block->getID() > 0){
+		for($v->z = $minZ; $v->z <= $maxZ; ++$v->z){
+			for($v->x = $minX; $v->x <= $maxX; ++$v->x){
+				for($v->y = $minY; $v->y <= $maxY; ++$v->y){
+					$block = $this->level->getBlock($v);
+					if($block !== null and $block->hasEntityCollision){
 						$block->onEntityCollide($this);
 						if(!($this instanceof Player)){
 							$block->addVelocityToEntity($this, $vector);
@@ -1010,7 +1056,7 @@ abstract class Entity extends Position implements Metadatable{
 			}
 		}
 
-		if($vector->length() > 0){
+		if(!($this instanceof Player) and $vector->length() > 0){
 			$vector = $vector->normalize();
 			$d = 0.014;
 			$this->motionX += $vector->x * $d;
@@ -1019,8 +1065,8 @@ abstract class Entity extends Position implements Metadatable{
 		}
 	}
 
-	public function setPositionAndRotation(Vector3 $pos, $yaw, $pitch, $force = false){
-		if($this->setPosition($pos, $force) === true){
+	public function setPositionAndRotation(Vector3 $pos, $yaw, $pitch){
+		if($this->setPosition($pos) === true){
 			$this->setRotation($yaw, $pitch);
 
 			return true;
@@ -1035,18 +1081,13 @@ abstract class Entity extends Position implements Metadatable{
 		$this->scheduleUpdate();
 	}
 
-	public function setPosition(Vector3 $pos, $force = false){
-		if($pos instanceof Position and $pos->getLevel() instanceof Level and $pos->getLevel() !== $this->getLevel()){
-			if($this->switchLevel($pos->getLevel()) === false){
-				return false;
-			}
+	public function setPosition(Vector3 $pos){
+		if($this->closed){
+			return false;
 		}
 
-		if(!$this->justCreated and $force !== true){
-			$ev = new EntityMoveEvent($this, $pos);
-
-			$this->server->getPluginManager()->callEvent($ev);
-			if($ev->isCancelled()){
+		if($pos instanceof Position and $pos->level instanceof Level and $pos->level !== $this->level){
+			if($this->switchLevel($pos->getLevel()) === false){
 				return false;
 			}
 		}
@@ -1063,11 +1104,11 @@ abstract class Entity extends Position implements Metadatable{
 			if($this->chunk instanceof FullChunk){
 				$this->chunk->removeEntity($this);
 			}
-			$this->getLevel()->loadChunk($this->x >> 4, $this->z >> 4);
-			$this->chunk = $this->getLevel()->getChunk($this->x >> 4, $this->z >> 4);
+			$this->level->loadChunk($this->x >> 4, $this->z >> 4);
+			$this->chunk = $this->level->getChunk($this->x >> 4, $this->z >> 4);
 
 			if(!$this->justCreated){
-				$newChunk = $this->getLevel()->getUsingChunk($this->x >> 4, $this->z >> 4);
+				$newChunk = $this->level->getUsingChunk($this->x >> 4, $this->z >> 4);
 				foreach($this->hasSpawned as $player){
 					if(!isset($newChunk[$player->getID()])){
 						$this->despawnFrom($player);
@@ -1097,16 +1138,14 @@ abstract class Entity extends Position implements Metadatable{
 				return false;
 			}
 		}
+
 		$this->motionX = $motion->x;
 		$this->motionY = $motion->y;
 		$this->motionZ = $motion->z;
+
 		if(!$this->justCreated){
 			if($this instanceof Player){
-				$pk = new SetEntityMotionPacket;
-				$pk->entities = [
-					[0, $this->motionX, $this->motionY, $this->motionZ]
-				];
-				$this->dataPacket($pk);
+				$this->addEntityMotion(0, $this->motionX, $this->motionY, $this->motionZ);
 			}
 			$this->updateMovement();
 		}
@@ -1127,9 +1166,20 @@ abstract class Entity extends Position implements Metadatable{
 		$this->scheduleUpdate();
 	}
 
+	/**
+	 * @param Vector3|Position|Location $pos
+	 * @param float                     $yaw
+	 * @param float                     $pitch
+	 *
+	 * @return bool
+	 */
 	public function teleport(Vector3 $pos, $yaw = null, $pitch = null){
-		$from = Position::fromObject($this, $this->getLevel());
-		$to = Position::fromObject($pos, $pos instanceof Position ? $pos->getLevel() : $this->getLevel());
+		if($pos instanceof Location){
+			$yaw = $pos->yaw;
+			$pitch = $pos->pitch;
+		}
+		$from = Position::fromObject($this, $this->level);
+		$to = Position::fromObject($pos, $pos instanceof Position ? $pos->getLevel() : $this->level);
 		$this->server->getPluginManager()->callEvent($ev = new EntityTeleportEvent($this, $from, $to));
 		if($ev->isCancelled()){
 			return false;
@@ -1148,12 +1198,12 @@ abstract class Entity extends Position implements Metadatable{
 		return false;
 	}
 
-	public function getID(){
+	public function getId(){
 		return $this->id;
 	}
 
 	public function spawnToAll(){
-		foreach($this->getLevel()->getUsingChunk($this->x >> 4, $this->z >> 4) as $player){
+		foreach($this->level->getUsingChunk($this->x >> 4, $this->z >> 4) as $player){
 			if(isset($player->id) and $player->spawned === true){
 				$this->spawnTo($player);
 			}
@@ -1167,14 +1217,18 @@ abstract class Entity extends Position implements Metadatable{
 	}
 
 	public function close(){
-		if($this->closed === false){
+		if(!$this->closed){
 			$this->server->getPluginManager()->callEvent(new EntityDespawnEvent($this));
 			$this->closed = true;
 			unset($this->level->updateEntities[$this->id]);
-			if(($level = $this->getLevel()) instanceof Level){
-				$level->removeEntity($this);
+			if($this->chunk instanceof FullChunk){
+				$this->chunk->removeEntity($this);
+			}
+			if($this->level instanceof Level){
+				$this->level->removeEntity($this);
 			}
 			$this->despawnFromAll();
+			$this->level = null;
 		}
 	}
 

src/pocketmine/entity/Explosive.php

@@ -24,4 +24,5 @@ namespace pocketmine\entity;
 
 interface Explosive{
 
+	public function explode();
 }

src/pocketmine/entity/FallingSand.php

@@ -22,17 +22,18 @@
 namespace pocketmine\entity;
 
 
-use pocketmine\nbt\tag\String;
-use pocketmine\nbt\tag\Byte;
 use pocketmine\block\Block;
-use pocketmine\item\Item;
-use pocketmine\network\protocol\AddEntityPacket;
-use pocketmine\network\protocol\SetEntityMotionPacket;
-use pocketmine\Player;
+use pocketmine\event\entity\EntityBlockChangeEvent;
 use pocketmine\event\entity\EntityDamageEvent;
+use pocketmine\event\entity\EntityRegainHealthEvent;
+use pocketmine\item\Item as ItemItem;
+use pocketmine\math\Vector3;
+use pocketmine\nbt\tag\Byte;
+use pocketmine\nbt\tag\Int;
+use pocketmine\network\protocol\AddEntityPacket;
+use pocketmine\Player;
 
-class FallingBlock extends Entity{
-
+class FallingSand extends Entity{
 	const NETWORK_ID = 66;
 
 	public $width = 0.98;
@@ -42,13 +43,20 @@ class FallingBlock extends Entity{
 	protected $gravity = 0.04;
 	protected $drag = 0.02;
 	protected $blockId = 0;
+	protected $damage;
 
 	public $canCollide = false;
 
 	protected function initEntity(){
-		$this->namedtag->id = new String("id", "FallingSand");
-		if(isset($this->namedtag->Tile)){
+		if(isset($this->namedtag->TileID)){
+			$this->blockId = $this->namedtag["TileID"];
+		}elseif(isset($this->namedtag->Tile)){
 			$this->blockId = $this->namedtag["Tile"];
+			$this->namedtag["TileID"] = new Int("TileID", $this->blockId);
+		}
+
+		if(isset($this->namedtag->Data)){
+			$this->damage = $this->namedtag["Data"];
 		}
 
 		if($this->blockId === 0){
@@ -64,7 +72,7 @@ class FallingBlock extends Entity{
 		return [];
 	}
 
-	public function onUpdate(){
+	public function onUpdate($currentTick){
 
 		if($this->closed){
 			return false;
@@ -72,16 +80,19 @@ class FallingBlock extends Entity{
 
 		$this->timings->startTiming();
 
-		$this->entityBaseTick();
+		$tickDiff = max(1, $currentTick - $this->lastUpdate);
+		$this->lastUpdate = $currentTick;
+
+		$hasUpdate = $this->entityBaseTick($tickDiff);
 
 		if(!$this->dead){
 			if($this->ticksLived === 1){
-				$block = $this->level->getBlock($this->floor());
+				$block = $this->level->getBlock($pos = (new Vector3($this->x, $this->y, $this->z))->floor());
 				if($block->getID() != $this->blockId){
 					$this->kill();
 					return true;
 				}
-				$this->level->setBlock($this->floor(), Block::get(0, true));
+				$this->level->setBlock($pos, Block::get(0), true);
 
 			}
 
@@ -95,57 +106,60 @@ class FallingBlock extends Entity{
 			$this->motionY *= 1 - $this->drag;
 			$this->motionZ *= $friction;
 
-			$pos = $this->floor();
+			$pos = (new Vector3($this->x, $this->y, $this->z))->floor();
 
 			if($this->onGround){
 				$this->kill();
 				$block = $this->level->getBlock($pos);
 				if(!$block->isFullBlock){
-					$this->getLevel()->dropItem($this, Item::get($this->getBlock(), 0, 1));
+					$this->getLevel()->dropItem($this, ItemItem::get($this->getBlock(), $this->getDamage(), 1));
 				}else{
-					$this->getLevel()->setBlock($pos, Block::get($this->getBlock(), 0), true);
+					$this->server->getPluginManager()->callEvent($ev = new EntityBlockChangeEvent($this, $block, Block::get($this->getBlock(), $this->getDamage())));
+					if(!$ev->isCancelled()){
+						$this->getLevel()->setBlock($pos, $ev->getTo(), true);
+					}
 				}
+				$hasUpdate = true;
 			}
 
 			$this->updateMovement();
 		}
 
-
-		return !$this->onGround or ($this->motionX == 0 and $this->motionY == 0 and $this->motionZ == 0);
+		return $hasUpdate or !$this->onGround or $this->motionX != 0 or $this->motionY != 0 or $this->motionZ != 0;
 	}
 
 	public function getBlock(){
 		return $this->blockId;
 	}
+	public function getDamage(){
+		return $this->damage;
+	}
 
 	public function saveNBT(){
-		$this->namedtag->Tile = new Byte("Tile", $this->blockId);
+		$this->namedtag->TileID = new Int("TileID", $this->blockId);
+		$this->namedtag->Data = new Byte("Data", $this->damage);
 	}
 
 	public function attack($damage, $source = EntityDamageEvent::CAUSE_MAGIC){
 
 	}
 
-	public function heal($amount){
+	public function heal($amount, $source = EntityRegainHealthEvent::CAUSE_MAGIC){
 
 	}
 
 	public function spawnTo(Player $player){
-		$pk = new AddEntityPacket;
-		$pk->type = FallingBlock::NETWORK_ID;
+		$pk = new AddEntityPacket();
+		$pk->type = FallingSand::NETWORK_ID;
 		$pk->eid = $this->getID();
 		$pk->x = $this->x;
 		$pk->y = $this->y;
 		$pk->z = $this->z;
-		$pk->did = -$this->getBlock();
+		$pk->did = -($this->getBlock() | $this->getDamage() << 0x10);
 		$player->dataPacket($pk);
 
-		$pk = new SetEntityMotionPacket;
-		$pk->entities = [
-			[$this->getID(), $this->motionX, $this->motionY, $this->motionZ]
-		];
-		$player->dataPacket($pk);
+		$player->addEntityMotion($this->getId(), $this->motionX, $this->motionY, $this->motionZ);
 
 		parent::spawnTo($player);
 	}
-}
+}

src/pocketmine/entity/Human.php

@@ -23,16 +23,15 @@ namespace pocketmine\entity;
 
 use pocketmine\inventory\InventoryHolder;
 use pocketmine\inventory\PlayerInventory;
-use pocketmine\item\Item;
+use pocketmine\item\Item as ItemItem;
 use pocketmine\nbt\NBT;
 use pocketmine\nbt\tag\Byte;
 use pocketmine\nbt\tag\Compound;
 use pocketmine\nbt\tag\Enum;
 use pocketmine\nbt\tag\Short;
+use pocketmine\Network;
 use pocketmine\network\protocol\AddPlayerPacket;
 use pocketmine\network\protocol\RemovePlayerPacket;
-use pocketmine\network\protocol\SetEntityMotionPacket;
-use pocketmine\Network;
 use pocketmine\Player;
 use pocketmine\utils\TextFormat;
 
@@ -67,9 +66,9 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
 			if($item["Slot"] >= 0 and $item["Slot"] < 9){ //Hotbar
 				$this->inventory->setHotbarSlotIndex($item["Slot"], isset($item["TrueSlot"]) ? $item["TrueSlot"] : -1);
 			}elseif($item["Slot"] >= 100 and $item["Slot"] < 104){ //Armor
-				$this->inventory->setItem($this->inventory->getSize() + $item["Slot"] - 100, Item::get($item["id"], $item["Damage"], $item["Count"]), $this);
+				$this->inventory->setItem($this->inventory->getSize() + $item["Slot"] - 100, ItemItem::get($item["id"], $item["Damage"], $item["Count"]), $this);
 			}else{
-				$this->inventory->setItem($item["Slot"] - 9, Item::get($item["id"], $item["Damage"], $item["Count"]), $this);
+				$this->inventory->setItem($item["Slot"] - 9, ItemItem::get($item["id"], $item["Damage"], $item["Count"]), $this);
 			}
 		}
 
@@ -86,10 +85,6 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
 			foreach($this->inventory->getContents() as $item){
 				$drops[] = $item;
 			}
-
-			foreach($this->inventory->getArmorContents() as $item){
-				$drops[] = $item;
-			}
 		}
 
 		return $drops;
@@ -140,7 +135,7 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
 			//Armor
 			for($slot = 100; $slot < 104; ++$slot){
 				$item = $this->inventory->getItem($this->inventory->getSize() + $slot - 100);
-				if($item instanceof Item and $item->getID() !== Item::AIR){
+				if($item instanceof ItemItem and $item->getID() !== ItemItem::AIR){
 					$this->namedtag->Inventory[$slot] = new Compound(false, [
 						new Byte("Count", $item->getCount()),
 						new Short("Damage", $item->getDamage()),
@@ -156,7 +151,7 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
 		if($player !== $this and !isset($this->hasSpawned[$player->getID()])){
 			$this->hasSpawned[$player->getID()] = $player;
 
-			$pk = new AddPlayerPacket;
+			$pk = new AddPlayerPacket();
 			$pk->clientID = 0;
 			if($player->getRemoveFormat()){
 				$pk->username = TextFormat::clean($this->nameTag);
@@ -169,18 +164,13 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
 			$pk->z = $this->z;
 			$pk->yaw = $this->yaw;
 			$pk->pitch = $this->pitch;
-			$pk->unknown1 = 0;
-			$pk->unknown2 = 0;
+			$item = $this->getInventory()->getItemInHand();
+			$pk->item = $item->getID();
+			$pk->meta = $item->getDamage();
 			$pk->metadata = $this->getData();
 			$player->dataPacket($pk);
 
-			$pk = new SetEntityMotionPacket;
-			$pk->entities = [
-				[$this->getID(), $this->motionX, $this->motionY, $this->motionZ]
-			];
-			$player->dataPacket($pk);
-
-			$this->inventory->sendHeldItem($player);
+			$player->addEntityMotion($this->getId(), $this->motionX, $this->motionY, $this->motionZ);
 
 			$this->inventory->sendArmorContents($player);
 		}
@@ -188,7 +178,7 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
 
 	public function despawnFrom(Player $player){
 		if(isset($this->hasSpawned[$player->getID()])){
-			$pk = new RemovePlayerPacket;
+			$pk = new RemovePlayerPacket();
 			$pk->eid = $this->id;
 			$pk->clientID = 0;
 			$player->dataPacket($pk);
@@ -208,22 +198,18 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
 			17 => ["type" => 6, "value" => [0, 0, 0]],
 		];
 
-		/*if($this->class === ENTITY_MOB and $this->type === MOB_SHEEP){
-			if(!isset($this->data["Sheared"])){
-				$this->data["Sheared"] = 0;
-				$this->data["Color"] = mt_rand(0,15);
-			}
-			$d[16]["value"] = (($this->data["Sheared"] == 1 ? 1:0) << 4) | ($this->data["Color"] & 0x0F);
-		}elseif($this->type === OBJECT_PRIMEDTNT){
-			$d[16]["value"] = (int) max(0, $this->data["fuse"] - (microtime(true) - $this->spawntime) * 20);
-		}elseif($this->class === ENTITY_PLAYER){
-			if($this->player->sleeping !== false){
-				$d[16]["value"] = 2;
-				$d[17]["value"] = array($this->player->sleeping->x, $this->player->sleeping->y, $this->player->sleeping->z);
-			}
-		}*/
-
 		return $d;
 	}
 
+	public function close(){
+		if(!$this->closed){
+			if(!($this instanceof Player) or $this->loggedIn){
+				foreach($this->inventory->getViewers() as $viewer){
+					$viewer->removeWindow($this->inventory);
+				}
+			}
+			parent::close();
+		}
+	}
+
 }

src/pocketmine/entity/Item.php

@@ -22,22 +22,25 @@
 namespace pocketmine\entity;
 
 use pocketmine\event\entity\EntityDamageEvent;
-use pocketmine\item\Item;
+use pocketmine\event\entity\EntityRegainHealthEvent;
+use pocketmine\event\entity\ItemDespawnEvent;
+use pocketmine\event\entity\ItemSpawnEvent;
+use pocketmine\item\Item as ItemItem;
 use pocketmine\math\Vector3;
 use pocketmine\nbt\tag\Byte;
 use pocketmine\nbt\tag\Compound;
 use pocketmine\nbt\tag\Short;
 use pocketmine\nbt\tag\String;
 use pocketmine\network\protocol\AddItemEntityPacket;
-use pocketmine\network\protocol\SetEntityMotionPacket;
 use pocketmine\Player;
 
-class DroppedItem extends Entity{
+class Item extends Entity{
+	const NETWORK_ID = 64;
 
 	protected $owner = null;
 	protected $thrower = null;
 	protected $pickupDelay = 0;
-	/** @var Item */
+	/** @var ItemItem */
 	protected $item;
 
 	public $width = 0.25;
@@ -49,9 +52,8 @@ class DroppedItem extends Entity{
 	public $canCollide = false;
 
 	protected function initEntity(){
-		$this->namedtag->id = new String("id", "Item");
 		$this->setMaxHealth(5);
-		$this->setHealth(@$this->namedtag["Health"]);
+		$this->setHealth($this->namedtag["Health"]);
 		if(isset($this->namedtag->Age)){
 			$this->age = $this->namedtag["Age"];
 		}
@@ -64,27 +66,33 @@ class DroppedItem extends Entity{
 		if(isset($this->namedtag->Thrower)){
 			$this->thrower = $this->namedtag["Thrower"];
 		}
-		$this->item = Item::get($this->namedtag->Item["id"], $this->namedtag->Item["Damage"], $this->namedtag->Item["Count"]);
+		$this->item = ItemItem::get($this->namedtag->Item["id"], $this->namedtag->Item["Damage"], $this->namedtag->Item["Count"]);
+
+
+		$this->server->getPluginManager()->callEvent(new ItemSpawnEvent($this));
 	}
 
-	public function onUpdate(){
+	public function onUpdate($currentTick){
 		if($this->closed !== false){
 			return false;
 		}
 
+		$tickDiff = max(1, $currentTick - $this->lastUpdate);
+		$this->lastUpdate = $currentTick;
+
 		$this->timings->startTiming();
 
-		$this->entityBaseTick();
+		$hasUpdate = $this->entityBaseTick($tickDiff);
 
 		if(!$this->dead){
 
 			if($this->pickupDelay > 0 and $this->pickupDelay < 32767){ //Infinite delay
-				--$this->pickupDelay;
+				$this->pickupDelay -= $tickDiff;
 			}
 
 			$this->motionY -= $this->gravity;
 
-			$this->inBlock = $this->checkObstruction($this->x, ($this->boundingBox->minY + $this->boundingBox->maxY) / 2, $this->z);
+			$this->keepMovement = $this->checkObstruction($this->x, ($this->boundingBox->minY + $this->boundingBox->maxY) / 2, $this->z);
 			$this->move($this->motionX, $this->motionY, $this->motionZ);
 
 			$friction = 1 - $this->drag;
@@ -97,28 +105,42 @@ class DroppedItem extends Entity{
 			$this->motionY *= 1 - $this->drag;
 			$this->motionZ *= $friction;
 
+			$this->updateMovement();
+
 			if($this->onGround){
 				$this->motionY *= -0.5;
 			}
 
 			if($this->age > 6000){
-				$this->kill();
+				$this->server->getPluginManager()->callEvent($ev = new ItemDespawnEvent($this));
+				if($ev->isCancelled()){
+					$this->age = 0;
+				}else{
+					$this->kill();
+					$hasUpdate = true;
+				}
 			}
 
-			$this->updateMovement();
 		}
 
 		$this->timings->stopTiming();
 
-		return !$this->onGround or ($this->motionX == 0 and $this->motionY == 0 and $this->motionZ == 0);
+		return $hasUpdate or !$this->onGround or $this->motionX != 0 or $this->motionY != 0 or $this->motionZ != 0;
 	}
 
 	public function attack($damage, $source = EntityDamageEvent::CAUSE_MAGIC){
+		if($source instanceof EntityDamageEvent){
+			$this->server->getPluginManager()->callEvent($source);
+			$damage = $source->getFinalDamage();
+			if($source->isCancelled()){
+				return;
+			}
+		}
 		$this->setLastDamageCause($source);
 		$this->setHealth($this->getHealth() - $damage);
 	}
 
-	public function heal($amount){
+	public function heal($amount, $source = EntityRegainHealthEvent::CAUSE_MAGIC){
 
 	}
 
@@ -150,7 +172,7 @@ class DroppedItem extends Entity{
 	}
 
 	/**
-	 * @return Item
+	 * @return ItemItem
 	 */
 	public function getItem(){
 		return $this->item;
@@ -214,11 +236,7 @@ class DroppedItem extends Entity{
 		$pk->item = $this->getItem();
 		$player->dataPacket($pk);
 
-		$pk = new SetEntityMotionPacket;
-		$pk->entities = [
-			[$this->getID(), $this->motionX, $this->motionY, $this->motionZ]
-		];
-		$player->dataPacket($pk);
+		$player->addEntityMotion($this->getId(), $this->motionX, $this->motionY, $this->motionZ);
 
 		parent::spawnTo($player);
 	}

src/pocketmine/entity/Living.php

@@ -22,16 +22,18 @@
 namespace pocketmine\entity;
 
 
+use pocketmine\block\Block;
 use pocketmine\event\entity\EntityDamageByEntityEvent;
 use pocketmine\event\entity\EntityDamageEvent;
 use pocketmine\event\entity\EntityDeathEvent;
 use pocketmine\event\entity\EntityRegainHealthEvent;
 use pocketmine\event\Timings;
-use pocketmine\item\Item;
+use pocketmine\item\Item as ItemItem;
 use pocketmine\math\Vector3;
 use pocketmine\nbt\tag\Short;
 use pocketmine\network\protocol\EntityEventPacket;
 use pocketmine\Server;
+use pocketmine\utils\BlockIterator;
 
 abstract class Living extends Entity implements Damageable{
 
@@ -63,13 +65,28 @@ abstract class Living extends Entity implements Damageable{
 	public function hasLineOfSight(Entity $entity){
 		//TODO: head height
 		return true;
-		//return $this->getLevel()->rayTraceBlocks(new Vector3($this->x, $this->y + $this->height, $this->z), new Vector3($entity->x, $entity->y + $entity->height, $entity->z)) === null;
+		//return $this->getLevel()->rayTraceBlocks(Vector3::createVector($this->x, $this->y + $this->height, $this->z), Vector3::createVector($entity->x, $entity->y + $entity->height, $entity->z)) === null;
 	}
 
 	public function attack($damage, $source = EntityDamageEvent::CAUSE_MAGIC){
 		if($this->attackTime > 0){
 			$lastCause = $this->getLastDamageCause();
 			if($lastCause instanceof EntityDamageEvent and $lastCause->getDamage() >= $damage){
+				if($source instanceof EntityDamageEvent){
+					$source->setCancelled();
+					$this->server->getPluginManager()->callEvent($source);
+					$damage = $source->getFinalDamage();
+					if($source->isCancelled()){
+						return;
+					}
+				}else{
+					return;
+				}
+			}
+		}elseif($source instanceof EntityDamageEvent){
+			$this->server->getPluginManager()->callEvent($source);
+			$damage = $source->getFinalDamage();
+			if($source->isCancelled()){
 				return;
 			}
 		}
@@ -113,11 +130,7 @@ abstract class Living extends Entity implements Damageable{
 		$this->setMotion($motion);
 	}
 
-	public function heal($amount){
-		$this->server->getPluginManager()->callEvent($ev = new EntityRegainHealthEvent($this, $amount));
-		if($ev->isCancelled()){
-			return;
-		}
+	public function heal($amount, $source = EntityRegainHealthEvent::CAUSE_MAGIC){
 		$this->setHealth($this->getHealth() + $amount);
 	}
 
@@ -132,44 +145,100 @@ abstract class Living extends Entity implements Damageable{
 		}
 	}
 
-	public function entityBaseTick(){
+	public function entityBaseTick($tickDiff = 1){
 		Timings::$timerEntityBaseTick->startTiming();
-		parent::entityBaseTick();
+		parent::entityBaseTick($tickDiff);
 
 		if($this->dead !== true and $this->isInsideOfSolid()){
-			$this->server->getPluginManager()->callEvent($ev = new EntityDamageEvent($this, EntityDamageEvent::CAUSE_SUFFOCATION, 1));
-			if(!$ev->isCancelled()){
-				$this->attack($ev->getFinalDamage(), $ev);
-			}
+			$ev = new EntityDamageEvent($this, EntityDamageEvent::CAUSE_SUFFOCATION, 1);
+			$this->attack($ev->getFinalDamage(), $ev);
 		}
 
 		if($this->dead !== true and $this->isInsideOfWater()){
-			--$this->airTicks;
+			$this->airTicks -= $tickDiff;
 			if($this->airTicks <= -20){
 				$this->airTicks = 0;
 
-				$this->server->getPluginManager()->callEvent($ev = new EntityDamageEvent($this, EntityDamageEvent::CAUSE_DROWNING, 2));
-				if(!$ev->isCancelled()){
-					$this->attack($ev->getFinalDamage(), $ev);
-				}
+				$ev = new EntityDamageEvent($this, EntityDamageEvent::CAUSE_DROWNING, 2);
+				$this->attack($ev->getFinalDamage(), $ev);
 			}
-
-			$this->extinguish();
 		}else{
 			$this->airTicks = 300;
 		}
 
 		if($this->attackTime > 0){
-			--$this->attackTime;
+			$this->attackTime -= $tickDiff;
 		}
 
 		Timings::$timerEntityBaseTick->stopTiming();
 	}
 
 	/**
-	 * @return Item[]
+	 * @return ItemItem[]
 	 */
 	public function getDrops(){
 		return [];
 	}
+
+	/**
+	 * @param int   $maxDistance
+	 * @param int   $maxLength
+	 * @param array $transparent
+	 *
+	 * @return Block[]
+	 */
+	public function getLineOfSight($maxDistance, $maxLength = 0, array $transparent = []){
+		if($maxDistance > 120){
+			$maxDistance = 120;
+		}
+
+		if(count($transparent) === 0){
+			$transparent = null;
+		}
+
+		$blocks = [];
+		$nextIndex = 0;
+
+		$itr = new BlockIterator($this->level, $this->getPosition(), $this->getDirectionVector(), $this->getEyeHeight(), $maxDistance);
+
+		while($itr->valid()){
+			$itr->next();
+			$block = $itr->current();
+			$blocks[$nextIndex++] = $block;
+
+			if($maxLength !== 0 and count($blocks) > $maxLength){
+				array_shift($blocks);
+				--$nextIndex;
+			}
+
+			$id = $block->getID();
+
+			if($transparent === null){
+				if($id !== 0){
+					break;
+				}
+			}else{
+				if(!isset($transparent[$id])){
+					break;
+				}
+			}
+		}
+
+		return $blocks;
+	}
+
+	/**
+	 * @param int   $maxDistance
+	 * @param array $transparent
+	 *
+	 * @return Block
+	 */
+	public function getTargetBlock($maxDistance, array $transparent = []){
+		$block = array_shift($this->getLineOfSight($maxDistance, 1, $transparent));
+		if($block instanceof Block){
+			return $block;
+		}
+
+		return null;
+	}
 }

src/pocketmine/entity/Ozelot.php

@@ -22,10 +22,6 @@
 namespace pocketmine\entity;
 
 
-use pocketmine\nbt\tag\String;
+class Ozelot extends Animal implements Tameable{
 
-class Ocelot extends Animal implements Tameable{
-	protected function initEntity(){
-		$this->namedtag->id = new String("id", "Ozelot");
-	}
 }

src/pocketmine/entity/Painting.php

@@ -22,10 +22,6 @@
 namespace pocketmine\entity;
 
 
-use pocketmine\nbt\tag\String;
-
 class Painting extends Hanging{
-	protected function initEntity(){
-		$this->namedtag->id = new String("id", "Painting");
-	}
+
 }

src/pocketmine/entity/Pig.php

@@ -22,10 +22,6 @@
 namespace pocketmine\entity;
 
 
-use pocketmine\nbt\tag\String;
-
 class Pig extends Animal implements Rideable{
-	protected function initEntity(){
-		$this->namedtag->id = new String("id", "Pig");
-	}
+
 }

src/pocketmine/entity/PigZombie.php

@@ -22,10 +22,6 @@
 namespace pocketmine\entity;
 
 
-use pocketmine\nbt\tag\String;
-
 class PigZombie extends Zombie{
-	protected function initEntity(){
-		$this->namedtag->id = new String("id", "PigZombie");
-	}
+
 }

src/pocketmine/entity/PrimedTNT.php

@@ -22,10 +22,132 @@
 namespace pocketmine\entity;
 
 
-use pocketmine\nbt\tag\String;
+use pocketmine\event\entity\EntityDamageEvent;
+use pocketmine\event\entity\EntityRegainHealthEvent;
+use pocketmine\event\entity\ExplosionPrimeEvent;
+use pocketmine\level\Explosion;
+use pocketmine\nbt\tag\Byte;
+use pocketmine\network\protocol\AddEntityPacket;
+use pocketmine\Player;
 
 class PrimedTNT extends Entity implements Explosive{
+	const NETWORK_ID = 65;
+
+	public $width = 0.98;
+	public $length = 0.98;
+	public $height = 0.98;
+
+	protected $gravity = 0.04;
+	protected $drag = 0.02;
+
+	protected $fuse;
+
+	public $canCollide = false;
+
 	protected function initEntity(){
-		$this->namedtag->id = new String("id", "PrimedTNT");
+		if(isset($this->namedtag->Fuse)){
+			$this->fuse = $this->namedtag["Fuse"];
+		}else{
+			$this->fuse = 80;
+		}
+	}
+
+
+	public function canCollideWith(Entity $entity){
+		return false;
+	}
+
+	public function getData(){
+		return [
+			16 => ["type" => 0, "value" => $this->fuse],
+		];
+	}
+
+	public function saveNBT(){
+		parent::saveNBT();
+		$this->namedtag->Fuse = new Byte("Fuse", $this->fuse);
+	}
+
+	public function onUpdate($currentTick){
+
+		if($this->closed){
+			return false;
+		}
+
+		$this->timings->startTiming();
+
+		$tickDiff = max(1, $currentTick - $this->lastUpdate);
+		$this->lastUpdate = $currentTick;
+
+		$hasUpdate = $this->entityBaseTick($tickDiff);
+
+		if(!$this->dead){
+
+			$this->motionY -= $this->gravity;
+
+			$this->move($this->motionX, $this->motionY, $this->motionZ);
+
+			$friction = 1 - $this->drag;
+
+			$this->motionX *= $friction;
+			$this->motionY *= $friction;
+			$this->motionZ *= $friction;
+
+			$this->updateMovement();
+
+			if($this->onGround){
+				$this->motionY *= -0.5;
+				$this->motionX *= 0.7;
+				$this->motionZ *= 0.7;
+			}
+
+			$this->fuse -= $tickDiff;
+
+			if($this->fuse <= 0){
+				$this->kill();
+				$this->explode();
+			}else{
+				$this->sendMetadata($this->getViewers());
+			}
+
+		}
+
+
+		return $hasUpdate or $this->fuse >= 0 or $this->motionX != 0 or $this->motionY != 0 or $this->motionZ != 0;
+	}
+
+	public function attack($damage, $source = EntityDamageEvent::CAUSE_MAGIC){
+
+	}
+
+	public function heal($amount, $source = EntityRegainHealthEvent::CAUSE_MAGIC){
+
+	}
+
+	public function explode(){
+		$this->server->getPluginManager()->callEvent($ev = new ExplosionPrimeEvent($this, 4));
+
+		if(!$ev->isCancelled()){
+			$explosion = new Explosion($this, $ev->getForce(), $this);
+			if($ev->isBlockBreaking()){
+				$explosion->explodeA();
+			}
+			$explosion->explodeB();
+		}
+	}
+
+	public function spawnTo(Player $player){
+		$pk = new AddEntityPacket();
+		$pk->type = PrimedTNT::NETWORK_ID;
+		$pk->eid = $this->getID();
+		$pk->x = $this->x;
+		$pk->y = $this->y;
+		$pk->z = $this->z;
+		$pk->did = 0;
+		$player->dataPacket($pk);
+
+		$player->addEntityMotion($this->getId(), $this->motionX, $this->motionY, $this->motionZ);
+
+		parent::spawnTo($player);
 	}
 }

src/pocketmine/entity/Projectile.php

@@ -22,6 +22,171 @@
 namespace pocketmine\entity;
 
 
+use pocketmine\event\entity\EntityCombustByEntityEvent;
+use pocketmine\event\entity\EntityDamageByChildEntityEvent;
+use pocketmine\event\entity\EntityDamageByEntityEvent;
+use pocketmine\event\entity\EntityDamageEvent;
+use pocketmine\event\entity\EntityRegainHealthEvent;
+use pocketmine\event\entity\ProjectileHitEvent;
+use pocketmine\level\MovingObjectPosition;
+use pocketmine\math\Vector3;
+use pocketmine\nbt\tag\Short;
+
 abstract class Projectile extends Entity{
+	/** @var Entity */
+	public $shootingEntity = null;
+	protected $damage = 0;
+
+	private $hadCollision = false;
+
+	protected function initEntity(){
+		$this->setMaxHealth(1);
+		$this->setHealth(1);
+		if(isset($this->namedtag->Age)){
+			$this->age = $this->namedtag["Age"];
+		}
+
+	}
+
+	public function canCollideWith(Entity $entity){
+		return $entity instanceof Living and !$this->onGround;
+	}
+
+	public function getData(){
+		$flags = 0;
+		$flags |= $this->fireTicks > 0 ? 1 : 0;
+
+		return [
+			0 => ["type" => 0, "value" => $flags],
+			1 => ["type" => 1, "value" => $this->airTicks],
+			16 => ["type" => 0, "value" => 0] //Is critical
+		];
+	}
+
+	public function saveNBT(){
+		parent::saveNBT();
+		$this->namedtag->Age = new Short("Age", $this->age);
+	}
+
+	public function attack($damage, $source = EntityDamageEvent::CAUSE_MAGIC){
+
+	}
+
+	public function heal($amount, $source = EntityRegainHealthEvent::CAUSE_MAGIC){
+
+	}
+
+	public function onUpdate($currentTick){
+		if($this->closed){
+			return false;
+		}
+
+
+
+		$tickDiff = max(1, $currentTick - $this->lastUpdate);
+		$this->lastUpdate = $currentTick;
+
+		$hasUpdate = $this->entityBaseTick($tickDiff);
+
+		if(!$this->dead){
+
+			$movingObjectPosition = null;
+
+			if(!$this->isCollided){
+				$this->motionY -= $this->gravity;
+			}
+
+			$this->keepMovement = $this->checkObstruction($this->x, ($this->boundingBox->minY + $this->boundingBox->maxY) / 2, $this->z);
+
+			$moveVector = new Vector3($this->x + $this->motionX, $this->y + $this->motionY, $this->z + $this->motionZ);
+
+			$list = $this->getLevel()->getCollidingEntities($this->boundingBox->addCoord($this->motionX, $this->motionY, $this->motionZ)->expand(1, 1, 1), $this);
+
+			$nearDistance = PHP_INT_MAX;
+			$nearEntity = null;
+
+			foreach($list as $entity){
+				if(/*!$entity->canCollideWith($this) or */
+				($entity === $this->shootingEntity and $this->ticksLived < 5)
+				){
+					continue;
+				}
+
+				$axisalignedbb = $entity->boundingBox->grow(0.3, 0.3, 0.3);
+				$ob = $axisalignedbb->calculateIntercept($this, $moveVector);
+
+				if($ob === null){
+					continue;
+				}
+
+				$distance = $this->distance($ob->hitVector);
+
+				if($distance < $nearDistance){
+					$nearDistance = $distance;
+					$nearEntity = $entity;
+				}
+			}
+
+			if($nearEntity !== null){
+				$movingObjectPosition = MovingObjectPosition::fromEntity($nearEntity);
+			}
+
+			if($movingObjectPosition !== null){
+				if($movingObjectPosition->entityHit !== null){
+
+					$this->server->getPluginManager()->callEvent(new ProjectileHitEvent($this));
+
+					$motion = sqrt($this->motionX ** 2 + $this->motionY ** 2 + $this->motionZ ** 2);
+					$damage = ceil($motion * $this->damage);
+
+					if($this->shootingEntity === null){
+						$ev = new EntityDamageByEntityEvent($this, $movingObjectPosition->entityHit, EntityDamageEvent::CAUSE_PROJECTILE, $damage);
+					}else{
+						$ev = new EntityDamageByChildEntityEvent($this->shootingEntity, $this, $movingObjectPosition->entityHit, EntityDamageEvent::CAUSE_PROJECTILE, $damage);
+					}
+
+					$movingObjectPosition->entityHit->attack($ev->getFinalDamage(), $ev);
+
+
+					if($this->fireTicks > 0){
+						$ev = new EntityCombustByEntityEvent($this, $movingObjectPosition->entityHit, 5);
+						$this->server->getPluginManager()->callEvent($ev);
+						if(!$ev->isCancelled()){
+							$movingObjectPosition->entityHit->setOnFire($ev->getDuration());
+						}
+					}
+
+					$this->kill();
+					return true;
+				}
+			}
+
+			$this->move($this->motionX, $this->motionY, $this->motionZ);
+
+			if($this->isCollided and !$this->hadCollision){
+				$this->hadCollision = true;
+
+				$this->motionX = 0;
+				$this->motionY = 0;
+				$this->motionZ = 0;
+
+				$this->server->getPluginManager()->callEvent(new ProjectileHitEvent($this));
+			}elseif(!$this->isCollided and !$this->hadCollision){
+				$this->hadCollision = false;
+			}
+
+			if(!$this->onGround or $this->motionX != 0 or $this->motionY != 0 or $this->motionZ != 0){
+				$f = sqrt(($this->motionX ** 2) + ($this->motionZ ** 2));
+				$this->yaw = (atan2($this->motionX, $this->motionZ) * 180 / M_PI);
+				$this->pitch = (atan2($this->motionY, $f) * 180 / M_PI);
+				$hasUpdate = true;
+			}
+
+			$this->updateMovement();
+
+		}
+
+		return $hasUpdate;
+	}
 
 }

src/pocketmine/entity/Sheep.php

@@ -22,10 +22,6 @@
 namespace pocketmine\entity;
 
 
-use pocketmine\nbt\tag\String;
-
 class Sheep extends Animal implements Colorable{
-	protected function initEntity(){
-		$this->namedtag->id = new String("id", "Sheep");
-	}
+
 }

src/pocketmine/entity/Silverfish.php

@@ -22,10 +22,6 @@
 namespace pocketmine\entity;
 
 
-use pocketmine\nbt\tag\String;
-
 class Silverfish extends Monster{
-	protected function initEntity(){
-		$this->namedtag->id = new String("id", "Silverfish");
-	}
+
 }