Max chunk rate: 172kB/s => 256kB/s

This reverts commit e1e804ffe3.

.travis.yml

@@ -5,11 +5,10 @@ php:
   
 before_script:
  - pecl install channel://pecl.php.net/pthreads-0.0.44
- - git clone --depth=100 --quiet --branch=tests git://github.com/PocketMine/PocketMine-MP.git $(pwd)/tests/
 
 script:
- - phpunit tests/
+ - php src/tests/ServerSuiteTest.php
  
 notifications:
  email: false
- webhooks: http://n.tkte.ch/h/214/wsNvmG43-ncxUVRrFPwSM-r0
+ webhooks: http://n.tkte.ch/h/214/wsNvmG43-ncxUVRrFPwSM-r0

CONTRIBUTING.md

@@ -0,0 +1,27 @@
+![](http://www.pocketmine.net/favicon.png)
+
+# PocketMine-MP Contribution Gidelines
+
+Before contributing to PocketMine-MP, please read this.
+
+
+## I've a question
+* For questions, please refer to the _#mcpedevs_ IRC
+ channel on Freenode. There is a [WebIRC](http://webchat.freenode.net?channels=mcpedevs&uio=d4) if you want.
+* You can ask directly to _[@PocketMine](https://twitter.com/PocketMine)_ in Twitter.
+
+## I want to create an issue
+* First, use the [Issue Search](https://github.com/PocketMine/PocketMine-MP/search?ref=cmdform&type=Issues) to check if anyone has reported it.
+* Is your issue related to a Plugin? If so, please contact their original author instead of reporting it here.
+ * And no, we won't update a Plugin because you need it.
+* When reporting, give as much info as you can, and if the Issue is a crash, give the Crash Dump.
+* Issues should be written in English.
+
+## I want to contribute code
+* Use the [Pull Request](https://github.com/PocketMine/PocketMine-MP/pull/new) system, your request will be checked and discussed.
+* If you want to be part of PocketMine-MP, we will ask you to.
+* Code using the syntax as in PocketMine-MP.
+* The code must be clear and written in English, comments included.
+
+
+__Thanks for contributing to PocketMine-MP!__

PocketMine-MP.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 

README.md

@@ -23,16 +23,18 @@ The entire server is done in PHP, and has been tested, profiled and optimized to
 
 ### [Homepage](http://www.pocketmine.net/)
 
-### [Plugin Repository](http://plugins.pocketmine.net/)
+### [Forums](http://forums.pocketmine.net/)
+
+### [Wiki](https://github.com/PocketMine/PocketMine-MP/wiki/)
 
 ### [FAQ: Frequently Asked Questions](https://github.com/PocketMine/PocketMine-MP/wiki/Frequently-Asked-Questions)
 
-### [Help Page](http://www.pocketmine.net/help.php)
+
 
 ### [Twitter @PocketMine](https://twitter.com/PocketMine)
 
-## IRC #mcpedevs @ irc.freenode.net
-* [WebIRC](http://webchat.freenode.net?channels=mcpedevs&uio=d4)
+## IRC #pocketmine (or #mcpedevs) @ irc.freenode.net
+* [WebIRC](http://webchat.freenode.net?channels=pocketmine,mcpedevs&uio=d4)
 
 
 ## Third-party Libraries/Protocols Used
@@ -40,7 +42,6 @@ The entire server is done in PHP, and has been tested, profiled and optimized to
 * __[PHP SQLite3](http://php.net/manual/en/book.sqlite3.php)__
 * __[PHP BCMath](http://php.net/manual/en/book.bc.php)__
 * __[PHP pthreads](https://github.com/krakjoe/pthreads)__ by _[krakjoe](https://github.com/krakjoe)_: Threading for PHP - Share Nothing, Do Everything.
-* __[PHP NBT](https://github.com/TheFrozenFire/PHP-NBT-Decoder-Encoder/blob/master/nbt.class.php)__ by _[TheFrozenFire](https://github.com/TheFrozenFire)_: Class for reading in NBT-format files (modified to handle Little-Endian files).
 * __[Spyc](https://github.com/mustangostang/spyc/blob/master/Spyc.php)__ by _[Vlad Andersen](https://github.com/mustangostang)_: A simple YAML loader/dumper class for PHP.
 * __[ANSICON](https://github.com/adoxa/ansicon)__ by _[Jason Hood](https://github.com/adoxa)_: Process ANSI escape sequences for Windows console programs.
 * __[cURL](http://curl.haxx.se/)__: cURL is a command line tool for transferring data with URL syntax

src/API/BanAPI.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class BanAPI{

src/API/BlockAPI.php

@@ -1,33 +1,28 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class BlockAPI{
 	private $server;
 	private $scheduledUpdates = array();
+	private $randomUpdates = array();
 	public static $creative = array(
 		array(COBBLESTONE, 0),
 		array(STONE_BRICKS, 0),
@@ -63,6 +58,7 @@ class BlockAPI{
 		array(SLAB, 3),
 		array(SLAB, 4),
 		array(SLAB, 5),
+		array(SLAB, 6),
 		array(QUARTZ_BLOCK, 0),
 		array(QUARTZ_BLOCK, 1),
 		array(QUARTZ_BLOCK, 2),
@@ -226,6 +222,10 @@ class BlockAPI{
 						$output .= "Player is in creative mode.\n";
 						break;
 					}
+					if($item->getID() == 0) {
+						$output .= "You cannot give an air block to a player.\n";
+						break;
+					}
 					$player->addItem($item->getID(), $item->getMetadata(), $item->count);
 					$output .= "Giving ".$item->count." of ".$item->getName()." (".$item->getID().":".$item->getMetadata().") to ".$player->username."\n";
 				}else{
@@ -266,11 +266,13 @@ class BlockAPI{
 		$player->lastBreak = microtime(true);
 		
 		if($this->server->api->dhandle("player.block.break", array("player" => $player, "target" => $target, "item" => $item)) !== false){
+			$drops = $target->getDrops($item, $player);
 			if($target->onBreak($item, $player) === false){
 				return $this->cancelAction($target, $player, false);
 			}
-			$item->useOn($target);
-			$drops = $target->getDrops($item, $player);
+			if($item->useOn($target) and ($player->gamemode & 0x01) === 0 and $item->getMetadata() >= $item->getMaxDurability()){
+				$player->setSlot($player->slot, new Item(AIR, 0, 0), false);
+			}
 		}else{
 			return $this->cancelAction($target, $player, false);
 		}
@@ -310,7 +312,7 @@ class BlockAPI{
 		}
 		
 		if(($player->gamemode & 0x02) === 0x02){ //Adventure mode!!
-			return $this->cancelAction($block, $player);
+			return $this->cancelAction($block, $player, false);
 		}
 
 		if($block->y > 127 or $block->y < 0){
@@ -328,7 +330,7 @@ class BlockAPI{
 			$hand = $item->getBlock();
 			$hand->position($block);
 		}elseif($block->getID() === FIRE){
-			$player->level->setBlock($block, new AirBlock());
+			$player->level->setBlock($block, new AirBlock(), true, false, true);
 			return false;
 		}else{
 			return $this->cancelAction($block, $player, false);
@@ -345,7 +347,7 @@ class BlockAPI{
 		if($this->server->api->dhandle("player.block.place", array("player" => $player, "block" => $block, "target" => $target, "item" => $item)) === false){
 			return $this->cancelAction($block, $player);
 		}elseif($hand->place($item, $player, $block, $target, $face, $fx, $fy, $fz) === false){
-			return $this->cancelAction($block, $player);
+			return $this->cancelAction($block, $player, false);
 		}
 		if($hand->getID() === SIGN_POST or $hand->getID() === WALL_SIGN){
 			$t = $this->server->api->tile->addSign($player->level, $block->x, $block->y, $block->z);
@@ -751,9 +753,9 @@ class BlockAPI{
 		$level = $block->onUpdate($type);
 		if($level === BLOCK_UPDATE_NORMAL){
 			$this->blockUpdateAround($block, $level);
-			$this->server->api->entity->updateRadius($pos, 3);
+			$this->server->api->entity->updateRadius($pos, 1);
 		}elseif($level === BLOCK_UPDATE_RANDOM){
-			$this->scheduleBlockUpdate($pos, Utils::getRandomUpdateTicks(), BLOCK_UPDATE_RANDOM);
+			$this->nextRandomUpdate($pos);
 		}
 		return $level;
 	}
@@ -774,21 +776,49 @@ class BlockAPI{
 		return false;
 	}
 	
+	public function nextRandomUpdate(Position $pos){
+		if(!isset($this->scheduledUpdates[$pos->x.".".$pos->y.".".$pos->z.".".$pos->level->getName().".".BLOCK_UPDATE_RANDOM])){
+			$X = (($pos->x >> 4) << 4);
+			$Y = (($pos->y >> 4) << 4);
+			$Z = (($pos->z >> 4) << 4);
+			$time = microtime(true);
+			$i = 0;
+			$offset = 0;
+			while(true){
+				$t = $offset + Utils::getRandomUpdateTicks() * 0.05;
+				$update = $this->server->query("SELECT COUNT(*) FROM blockUpdates WHERE level = '".$pos->level->getName()."' AND type = ".BLOCK_UPDATE_RANDOM." AND delay >= ".($time + $t - 1)." AND delay <= ".($time + $t + 1).";");
+				if($update instanceof SQLite3Result){
+					$update = $update->fetchArray(SQLITE3_NUM);
+					if($update[0] < 3){
+						break;
+					}
+				}else{
+					break;
+				}
+				$offset += mt_rand(25, 75);
+			}
+			$this->scheduleBlockUpdate($pos, $t / 0.05, BLOCK_UPDATE_RANDOM);
+		}
+	}
+	
 	public function blockUpdateTick(){
 		$time = microtime(true);
 		if(count($this->scheduledUpdates) > 0){
 			$update = $this->server->query("SELECT x,y,z,level,type FROM blockUpdates WHERE delay <= ".$time.";");
-			if($update !== false and $update !== true){
+			if($update instanceof SQLite3Result){
+				$upp = array();
 				while(($up = $update->fetchArray(SQLITE3_ASSOC)) !== false){
 					$index = $up["x"].".".$up["y"].".".$up["z"].".".$up["level"].".".$up["type"];
 					if(isset($this->scheduledUpdates[$index])){
-						$upp = $this->scheduledUpdates[$index];
+						$upp[] = array((int) $up["type"], $this->scheduledUpdates[$index]);
 						unset($this->scheduledUpdates[$index]);
-						$this->blockUpdate($upp, (int) $up["type"]);
 					}
 				}
+				$this->server->query("DELETE FROM blockUpdates WHERE delay <= ".$time.";");
+				foreach($upp as $b){
+					$this->blockUpdate($b[1], $b[0]);
+				}
 			}
-			$this->server->query("DELETE FROM blockUpdates WHERE delay <= ".$time.";");
 		}
 	}
 

src/API/ChatAPI.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class ChatAPI{
@@ -103,18 +97,27 @@ class ChatAPI{
 	}
 	
 	public function send($owner, $text, $whitelist = false, $blacklist = false){
-		$message = "";
+		$message = array(
+			"player" => $owner,
+			"message" => $text,
+		);
 		if($owner !== false){
 			if($owner instanceof Player){
-				$message = "<".$owner->username."> ";
+				if($whitelist === false){
+					console("[INFO] <".$owner->username."> ".$text);
+				}
 			}else{
-				$message = "<".$owner."> ";
+				if($whitelist === false){
+					console("[INFO] <".$owner."> ".$text);
+				}
 			}
+		}else{
+			if($whitelist === false){
+				console("[INFO] $text");
+			}
+			$message["player"] = "";
 		}
-		$message .= $text;
-		if($whitelist === false){
-			console("[INFO] ".$message);
-		}
+
 		$this->server->handle("server.chat", new Container($message, $whitelist, $blacklist));
 	}
 }

src/API/ConsoleAPI.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class ConsoleAPI{
@@ -37,7 +31,9 @@ class ConsoleAPI{
 
 	public function init(){
 		$this->server->schedule(2, array($this, "handle"), array(), true);
-		$this->loop = new ConsoleLoop();
+		if(!defined("NO_THREADS")){
+			$this->loop = new ConsoleLoop();
+		}
 		$this->register("help", "[page|command name]", array($this, "defaultCommands"));
 		$this->register("status", "", array($this, "defaultCommands"));
 		$this->register("difficulty", "<0|1|2|3>", array($this, "defaultCommands"));
@@ -48,9 +44,11 @@ class ConsoleAPI{
 
 	function __destruct(){
 		$this->server->deleteEvent($this->event);
-		$this->loop->stop();
-		$this->loop->notify();
-		//$this->loop->join();
+		if(!defined("NO_THREADS")){
+			$this->loop->stop();
+			$this->loop->notify();
+			//$this->loop->join();
+		}
 	}
 
 	public function defaultCommands($cmd, $params, $issuer, $alias){
@@ -97,7 +95,7 @@ class ConsoleAPI{
 						break;
 					case "difficulty":
 						$s = trim(array_shift($params));
-						if($s == "" or (((int) $s) !== 0 and ((int) $s) !== 1)){
+						if($s === "" or (((int) $s) > 3 and ((int) $s) < 0)){
 							$output .= "Usage: /difficulty <0|1|2|3>\n";
 							break;
 						}
@@ -113,8 +111,7 @@ class ConsoleAPI{
 							$c = trim(strtolower($params[0]));
 							if(isset($this->help[$c]) or isset($this->alias[$c])){
 								$c = isset($this->help[$c]) ? $c : $this->alias[$c];
-								if($this->server->api->dhandle("console.command.".$c, array("cmd" => $c, "parameters" => array(), "issuer" => $issuer, "alias" => false)) === false
-								or $this->server->api->dhandle("console.command", array("cmd" => $c, "parameters" => array(), "issuer" => $issuer, "alias" => false)) === false){
+								if($this->server->api->dhandle("console.command.".$c, array("cmd" => $c, "parameters" => array(), "issuer" => $issuer, "alias" => false)) === false or $this->server->api->dhandle("console.command", array("cmd" => $c, "parameters" => array(), "issuer" => $issuer, "alias" => false)) === false){
 									break;
 								}
 								$output .= "Usage: /$c ".$this->help[$c]."\n";
@@ -123,8 +120,7 @@ class ConsoleAPI{
 						}
 						$cmds = array();
 						foreach($this->help as $c => $h){
-							if($this->server->api->dhandle("console.command.".$c, array("cmd" => $c, "parameters" => array(), "issuer" => $issuer, "alias" => false)) === false
-							or $this->server->api->dhandle("console.command", array("cmd" => $c, "parameters" => array(), "issuer" => $issuer, "alias" => false)) === false){
+							if($this->server->api->dhandle("console.command.".$c, array("cmd" => $c, "parameters" => array(), "issuer" => $issuer, "alias" => false)) === false or $this->server->api->dhandle("console.command", array("cmd" => $c, "parameters" => array(), "issuer" => $issuer, "alias" => false)) === false){
 								continue;
 							}
 							$cmds[$c] = $h;
@@ -168,6 +164,7 @@ class ConsoleAPI{
 	
 	public function run($line = "", $issuer = "console", $alias = false){
 		if($line != ""){
+			$output = "";
 			$end = strpos($line, " ");
 			if($end === false){
 				$end = strlen($line);
@@ -245,9 +242,8 @@ class ConsoleAPI{
 				}elseif($this->server->api->dhandle("console.command.unknown", array("cmd" => $cmd, "params" => $params, "issuer" => $issuer, "alias" => $alias)) !== false){
 					$output = $this->defaultCommands($cmd, $params, $issuer, $alias);
 				}
-			}else{
-				$output = "";
 			}
+				
 			if($output != "" and ($issuer instanceof Player)){
 				$issuer->sendChat(trim($output));
 			}
@@ -256,6 +252,9 @@ class ConsoleAPI{
 	}
 
 	public function handle($time){
+		if(defined("NO_THREADS")){
+			return;
+		}
 		if($this->loop->line !== false){
 			$line = trim($this->loop->line);
 			$this->loop->line = false;
@@ -289,33 +288,32 @@ class ConsoleLoop extends Thread{
 		$this->stop = true;
 	}
 
-   private function readLine(){
-      if( $this->fp ){
-         $line = trim( fgets( $this->fp ) );
-      } else {
-         $line = trim( readline( "" ) );
-         if( $line != "" ){
-            readline_add_history( $line );
-         }
-      }
-
-      return $line;
-   }
+	private function readLine(){
+		if($this->fp){
+			$line = trim(fgets($this->fp));
+		}else{
+			$line = trim(readline(""));
+			if($line != ""){
+				readline_add_history( $line );
+			}
+		}
+		return $line;
+	}
 
 	public function run(){
-      if( ! extension_loaded( 'readline' ) ){
-         $this->fp = fopen( "php://stdin", "r" );
-      }
-
-		while( $this->stop === false ) {
-         $this->line = $this->readLine();
-         $this->wait();
-         $this->line = false;
+		if(!extension_loaded("readline")){
+			$this->fp = fopen( "php://stdin", "r" );
 		}
 
-      if( ! $this->haveReadline ) {
-         @fclose($fp);
-      }
+		while($this->stop === false){
+			$this->line = $this->readLine();
+			$this->wait();
+			$this->line = false;
+		}
+
+		if(!$this->haveReadline){
+			@fclose($fp);
+		}
 		exit(0);
 	}
 }

src/API/EntityAPI.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class EntityAPI{
@@ -116,7 +110,7 @@ class EntityAPI{
 
 	public function spawnToAll(Entity $e){
 		foreach($this->server->api->player->getAll($e->level) as $player){
-			if($player->eid !== false and $player->eid !== $e->eid){
+			if($player->eid !== false and $player->eid !== $e->eid and $e->class !== ENTITY_PLAYER){
 				$e->spawn($player);
 			}
 		}
@@ -127,9 +121,9 @@ class EntityAPI{
 			return;
 		}
 		$data = array(
-			"x" => $pos->x,
+			"x" => $pos->x + mt_rand(-10, 10) / 50,
 			"y" => $pos->y + 0.19,
-			"z" => $pos->z,
+			"z" => $pos->z + mt_rand(-10, 10) / 50,
 			//"speedX" => mt_rand(-3, 3) / 8,
 			"speedY" => mt_rand(5, 8) / 2,
 			//"speedZ" => mt_rand(-3, 3) / 8,
@@ -148,7 +142,9 @@ class EntityAPI{
 
 	public function spawnAll(Player $player){
 		foreach($this->getAll($player->level) as $e){
-			$e->spawn($player);
+			if($e->class !== ENTITY_PLAYER){
+				$e->spawn($player);
+			}
 		}
 	}
 
@@ -159,6 +155,16 @@ class EntityAPI{
 			unset($this->entities[$eid]);
 			$entity->closed = true;
 			$this->server->query("DELETE FROM entities WHERE EID = ".$eid.";");
+			if($entity->class === ENTITY_PLAYER){
+				$this->server->api->player->broadcastPacket($this->server->api->player->getAll(), MC_REMOVE_PLAYER, array(
+					"clientID" => 0,
+					"eid" => $entity->eid,
+				));
+			}else{
+				$this->server->api->player->broadcastPacket($this->server->api->player->getAll($entity->level), MC_REMOVE_ENTITY, array(
+					"eid" => $entity->eid,
+				));
+			}
 			$this->server->api->dhandle("entity.remove", $entity);
 			$entity = null;
 			unset($entity);			

src/API/LevelAPI.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class LevelAPI{
@@ -53,7 +47,7 @@ class LevelAPI{
 			$this->generateLevel($this->default, $this->server->seed);
 			$this->loadLevel($this->default);
 		}
-		$this->server->spawn = $this->getDefault()->getSpawn();
+		$this->server->spawn = $this->getDefault()->getSafeSpawn();
 	}
 	
 	public function commandHandler($cmd, $params, $issuer, $alias){
@@ -185,7 +179,7 @@ class LevelAPI{
 			}elseif($entity["id"] === OBJECT_PAINTING or $entity["id"] === OBJECT_ARROW){ //Painting
 				$e = $this->server->api->entity->add($this->levels[$name], ENTITY_OBJECT, $entity["id"], $entity);
 				$e->setPosition(new Vector3($entity["Pos"][0], $entity["Pos"][1], $entity["Pos"][2]), $entity["Rotation"][0], $entity["Rotation"][1]);
-				$e->setHealth($entity["Health"]);
+				$e->setHealth(1);
 			}else{
 				$e = $this->server->api->entity->add($this->levels[$name], ENTITY_MOB, $entity["id"], $entity);
 				$e->setPosition(new Vector3($entity["Pos"][0], $entity["Pos"][1], $entity["Pos"][2]), $entity["Rotation"][0], $entity["Rotation"][1]);

src/API/MobAPI.php

@@ -1,37 +0,0 @@
-<?php
-
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
-*/
-
-class MobAPI{
-	private $server;
-	function __construct(){
-		$this->server = ServerAPI::request();
-	}
-	
-	public function init(){
-		
-	}
-}

src/API/PlayerAPI.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class PlayerAPI{
@@ -153,8 +147,7 @@ class PlayerAPI{
 					$output .= "Please run this command in-game.\n";
 					break;
 				}
-				$spawn = $issuer->getSpawn();
-				$issuer->teleport($spawn);
+				$issuer->teleport($this->server->spawn);
 				break;
 			case "ping":
 				if(!($issuer instanceof Player)){					
@@ -269,7 +262,7 @@ class PlayerAPI{
 				$origin = $this->get($name);
 				if($origin instanceof Player){
 					$name = $origin->username;
-					return $origin->teleport($lv->getSpawn());
+					return $origin->teleport($lv->getSafeSpawn());
 				}
 			}else{
 				return false;
@@ -375,11 +368,46 @@ class PlayerAPI{
 			$this->server->query("INSERT OR REPLACE INTO players (CID, ip, port, name) VALUES (".$player->CID.", '".$player->ip."', ".$player->port.", '".strtolower($player->username)."');");
 		}
 	}
+	
+	public function spawnAllPlayers(Player $player){
+		foreach($this->getAll() as $p){
+			if($p !== $player and ($p->entity instanceof Entity)){
+				$p->entity->spawn($player);
+				if($p->level !== $player->level){
+					$player->dataPacket(MC_MOVE_ENTITY_POSROT, array(
+						"eid" => $p->entity->eid,
+						"x" => -256,
+						"y" => 128,
+						"z" => -256,
+						"yaw" => 0,
+						"pitch" => 0,
+					));
+				}
+			}
+		}
+	}
+	
+	public function spawnToAllPlayers(Player $player){
+		foreach($this->getAll() as $p){
+			if($p !== $player and ($p->entity instanceof Entity)){
+				$player->entity->spawn($p);
+				if($p->level !== $player->level){
+					$p->dataPacket(MC_MOVE_ENTITY_POSROT, array(
+						"eid" => $player->entity->eid,
+						"x" => -256,
+						"y" => 128,
+						"z" => -256,
+						"yaw" => 0,
+						"pitch" => 0,
+					));
+				}
+			}
+		}
+	}
 
 	public function remove($CID){
 		if(isset($this->server->clients[$CID])){
 			$player = $this->server->clients[$CID];
-			$this->server->clients[$CID] = null;
 			unset($this->server->clients[$CID]);
 			$player->close();
 			if($player->username != "" and ($player->data instanceof Config)){
@@ -387,8 +415,8 @@ class PlayerAPI{
 			}
 			$this->server->query("DELETE FROM players WHERE name = '".$player->username."';");
 			if($player->entity instanceof Entity){
-				$player->entity->player = null;
-				$player->entity = null;
+				unset($player->entity->player);
+				unset($player->entity);
 			}
 			$this->server->api->entity->remove($player->eid);
 			$player = null;
@@ -413,7 +441,7 @@ class PlayerAPI{
 				"z" => $this->server->spawn->z,
 			),
 			"inventory" => array_fill(0, PLAYER_SURVIVAL_SLOTS, array(AIR, 0, 0)),
-			"armor" => array_fill(0, 4, array(AIR, 0, 0)),
+			"armor" => array_fill(0, 4, array(AIR, 0)),
 			"gamemode" => $this->server->gamemode,
 			"health" => 20,
 			"lastIP" => "",
@@ -428,7 +456,7 @@ class PlayerAPI{
 			$data = new Config(DATA_PATH."players/".$iname.".yml", CONFIG_YAML, $default);
 		}
 
-		if(($this->server->gamemode & 0x01) === 0x01){
+		if(($data->get("gamemode") & 0x01) === 1){
 			$data->set("health", 20);
 		}
 		$this->server->handle("player.offline.get", $data);

src/API/PluginAPI.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class PluginAPI extends stdClass{

src/API/ServerAPI.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class ServerAPI{
@@ -53,8 +47,9 @@ class ServerAPI{
 		@mkdir(DATA_PATH."players/", 0755);
 		@mkdir(DATA_PATH."worlds/", 0755);
 		@mkdir(DATA_PATH."plugins/", 0755);
-		console("[INFO] \x1b[33;1mPocketMine-MP ".MAJOR_VERSION." API #".CURRENT_API_VERSION.", LGPL License", true, true, 0);
-
+		$version = new VersionString();
+		console("[INFO] Starting Minecraft PE server version \x1b[36;1m".CURRENT_MINECRAFT_VERSION);
+		
 		console("[INFO] Loading properties...");
 		$this->config = new Config(DATA_PATH . "server.properties", CONFIG_PROPERTIES, array(
 			"server-name" => "Minecraft: PE Server",
@@ -84,6 +79,7 @@ class ServerAPI{
 			"enable-rcon" => false,
 			"rcon.password" => substr(base64_encode(Utils::getRandomBytes(20, false)), 3, 10),
 			"send-usage" => true,
+			"auto-save" => true,
 		));
 		
 		$this->parseProperties();
@@ -96,7 +92,9 @@ class ServerAPI{
 		$this->server = new PocketMinecraftServer($this->getProperty("server-name"), $this->getProperty("gamemode"), ($seed = $this->getProperty("level-seed")) != "" ? (int) $seed:false, $this->getProperty("server-port"), ($ip = $this->getProperty("server-ip")) != "" ? $ip:"0.0.0.0");
 		$this->server->api = $this;
 		self::$serverRequest = $this->server;
-		
+		console("[INFO] This server is running PocketMine-MP version ".($version->isDev() ? "\x1b[31;1m":"").MAJOR_VERSION."\x1b[0m (MCPE: ".CURRENT_MINECRAFT_VERSION.") (API ".CURRENT_API_VERSION.")", true, true, 0);
+		console("[INFO] PocketMine-MP is distibuted under the LGPL License", true, true, 0);
+
 		if($this->getProperty("upnp-forwarding") === true){
 			console("[INFO] [UPnP] Trying to port forward...");
 			UPnP_PortForward($this->getProperty("server-port"));
@@ -154,7 +152,6 @@ class ServerAPI{
 		$this->loadAPI("tile", "TileAPI");
 		$this->loadAPI("player", "PlayerAPI");
 		$this->loadAPI("time", "TimeAPI");
-		$this->loadAPI("mob", "MobAPI");
 		
 		foreach($this->apiList as $ob){
 			if(is_callable(array($ob, "init"))){
@@ -179,6 +176,10 @@ class ServerAPI{
 		unset($this->asyncCalls[$id]);
 		return $ob;
 	}
+	public function autoSave(){
+		console("[DEBUG] Saving....", true, true, 2);
+		$this->server->api->level->saveAll();
+	}
 		
 	public function sendUsage(){
 		console("[DEBUG] Sending usage data...", true, true, 2);
@@ -276,12 +277,13 @@ class ServerAPI{
 
 	public function init(){
 		if($this->getProperty("send-usage") !== false){
-			$this->server->schedule(36000, array($this, "sendUsage"), array(), true); //Send usage data every 30 minutes
-			$this->server->schedule(6000, array($this, "sendUsage")); //Send the info after 5 minutes have passed
+			$this->server->schedule(6000, array($this, "sendUsage"), array(), true); //Send the info after 5 minutes have passed
 			$this->sendUsage();
 		}
-
-		if($this->getProperty("enable-rcon") === true){
+		if($this->getProperty("auto-save") === true){
+			$this->server->schedule(18000, array($this, "autoSave"), array(), true);	
+		}
+		if(!defined("NO_THREADS") and $this->getProperty("enable-rcon") === true){
 			$this->rcon = new RCON($this->getProperty("rcon.password", ""), $this->getProperty("rcon.port", $this->getProperty("server-port")), ($ip = $this->getProperty("server-ip")) != "" ? $ip:"0.0.0.0", $this->getProperty("rcon.threads", 1), $this->getProperty("rcon.clients-per-thread", 50));
 		}
 

src/API/TileAPI.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class TileAPI{

src/API/TimeAPI.php

@@ -1,32 +1,26 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class TimeAPI{
-	var $phases = array(
+	public static $phases = array(
 		"day" => 0,
 		"sunset" => 9500,
 		"night" => 10900,
@@ -109,11 +103,11 @@ class TimeAPI{
 
 	public function getPhase($time = false){
 		$time = !is_integer($time) ? $this->get(false, $time):$time;
-		if($time < $this->phase["sunset"]){
+		if($time < TimeAPI::$phases["sunset"]){
 			$time = "day";
-		}elseif($time < $this->phase["night"]){
+		}elseif($time < TimeAPI::$phases["night"]){
 			$time = "sunset";
-		}elseif($time < $this->phase["sunrise"]){
+		}elseif($time < TimeAPI::$phases["sunrise"]){
 			$time = "night";
 		}else{
 			$time = "sunrise";
@@ -125,8 +119,8 @@ class TimeAPI{
 		if(!($level instanceof Level)){
 			$level = $this->server->api->level->getDefault();
 		}
-		if(is_string($time) and isset($this->phases[$time])){
-			$level->setTime($this->phases[$time]);
+		if(is_string($time) and isset(TimeAPI::$phases[$time])){
+			$level->setTime(TimeAPI::$phases[$time]);
 		}else{
 			$level->setTime((int) $time);
 		}

src/Data.php

@@ -1,262 +0,0 @@
-<?php
-
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
-*/
-
-class BlockFace{
-	const BOTTOM = 0;
-	const TOP = 1;
-	const DOWN = 0;
-	const UP = 1;
-	const SOUTH = 3;
-	const EAST = 5;
-	const NORTH = 2;
-	const WEST = 4;
-	public static function setPosition(&$data, $face){
-		switch((int) $face){
-			case 0:
-				--$data["y"];
-				break;
-			case 1:
-				++$data["y"];
-				break;
-			case 2:
-				--$data["z"];
-				break;
-			case 3:
-				++$data["z"];
-				break;
-			case 4:
-				--$data["x"];
-				break;
-			case 5:
-				++$data["x"];
-				break;
-			default:
-				return false;
-		}
-		return true;
-	}
-}
-
-class Material{
-	static $flowable = array(
-		0 => true,
-		6 => true,
-		30 => true,
-		31 => true,
-		32 => true,
-		37 => true,
-		38 => true,
-		39 => true,
-		40 => true,
-		50 => true,
-		51 => true,
-		55 => true,
-		59 => true,
-		78 => true,
-		105 => true,
-	);
-	static $unbreakable = array(
-		0 => true,
-		7 => true,
-		8 => true,
-		9 => true,
-		10 => true,
-		11 => true,
-	);
-	static $transparent = array(
-		0 => true,
-		6 => true,
-		8 => true,
-		9 => true,
-		10 => true,
-		11 => true,
-		18 => true,
-		20 => true,
-		26 => true,
-		30 => true,
-		31 => true,
-		32 => true,
-		37 => true,
-		38 => true,
-		39 => true,
-		40 => true,
-		44 => true,
-		46 => true,
-		50 => true,
-		51 => true,
-		53 => true,
-		59 => true,
-		63 => true,
-		64 => true,
-		65 => true,
-		67 => true,
-		68 => true,
-		71 => true,
-		78 => true,
-		79 => true,
-		83 => true,
-		85 => true,
-		89 => true,
-		96 => true,
-		102 => true,
-		105 => true,
-		107 => true,
-		108 => true,
-		109 => true,
-		114 => true,
-		128 => true,
-		156 => true,
-	);
-	static $replaceable = array(
-		0 => true,
-		8 => true,
-		9 => true,
-		10 => true,
-		11 => true,
-		31 => true,
-		51 => true,
-		78 => true,
-	);
-	static $activable = array(
-		2 => true,
-		3 => true,
-		6 => true,
-		26 => true,
-		31 => true,
-		//46 => true,
-		51 => true,
-		54 => true,
-		58 => true,
-		59 => true,
-		61 => true,
-		62 => true,
-		64 => true,
-		71 => true,
-		78 => true,
-		96 => true,
-		105 => true,
-		107 => true,
-		245 => true,
-		247 => true,
-	);
-	static $placeable = array(
-		1 => true,
-		2 => true,
-		3 => true,
-		4 => true,
-		5 => true,
-		6 => true,
-		//7 => true,
-		8 => true,
-		9 => true,
-		10 => true,
-		11 => true,
-		12 => true,
-		13 => true,
-		14 => true,
-		15 => true,
-		16 => true,
-		17 => true,
-		18 => true,
-		19 => true,
-		20 => true,
-		21 => true,
-		22 => true,
-		24 => true,
-		355 => 26,
-		30 => true,
-		35 => true,
-		37 => true,
-		38 => true,
-		39 => true,
-		40 => true,
-		41 => true,
-		42 => true,
-		43 => true,
-		44 => true,
-		45 => true,
-		46 => true,
-		47 => true,
-		48 => true,
-		49 => true,
-		50 => true,
-		53 => true,
-		54 => true,
-		56 => true,
-		59 => true,
-		57 => true,
-		58 => true,
-		295 => 59,
-		61 => true,
-		324 => 64,
-		65 => true,
-		67 => true,
-		330 => 71,
-		73 => true,
-		79 => true,
-		80 => true,
-		81 => true,
-		82 => true,
-		83 => true,
-		85 => true,
-		86 => true,
-		87 => true,
-		88 => true,
-		89 => true,
-		91 => true,
-		96 => true,
-		98 => true,
-		102 => true,
-		103 => true,
-		362 => 105,
-		107 => true,
-		108 => true,
-		109 => true,
-		112 => true,
-		114 => true,
-		128 => true,
-		155 => true,
-		156 => true,
-		245 => true,
-		246 => true,
-		247 => true,
-		323 => true, //Special case of signs
-		338 => 83,
-	);
-	static $blocks = array(
-		0 => "Air",
-		1 => "Stone",
-		2 => "Grass",
-		3 => "Dirt",
-		4 => "Cobblestone",
-		5 => "Wooden Planks",
-		6 => "Sapling",
-		7 => "Bedrock",
-	);
-
-
-}

src/Deprecation.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 

src/Player.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 
@@ -37,6 +31,7 @@ class Player{
 	private $nextBuffer = 0;
 	private $evid = array();
 	private $lastMovement = 0;
+	private $forceMovement = false;
 	private $timeout;
 	private $connected = true;
 	private $clientID;
@@ -47,6 +42,7 @@ class Player{
 	private $iusername;
 	private $eid = false;
 	private $startAction = false;
+	private $isSleeping = false;
 	public $data;
 	public $entity = false;
 	public $auth = false;
@@ -71,6 +67,7 @@ class Player{
 	private $lagStat = 0;
 	private $spawnPosition;
 	private $packetLoss = 0;
+	private $lastChunk = false;
 	public $lastCorrect;
 	private $bigCnt;
 	private $packetStats;
@@ -78,6 +75,8 @@ class Player{
 	public $toCraft = array();
 	public $lastCraft = 0;
 	private $chunkCount = array();
+	private $received = array();
+	public $realmsData = array();
 	
 	public function __get($name){
 		if(isset($this->{$name})){
@@ -103,7 +102,8 @@ class Player{
 		$this->level = $this->server->api->level->getDefault();
 		$this->slot = 0;
 		$this->packetStats = array(0,0);
-		$this->server->schedule(1, array($this, "handlePacketQueues"), array(), true);
+		$this->server->schedule(2, array($this, "handlePacketQueues"), array(), true);
+		$this->server->schedule(20 * 60, array($this, "clearQueue"), array(), true);
 		$this->evid[] = $this->server->event("server.close", array($this, "close"));
 		console("[DEBUG] New Session started with ".$ip.":".$port.". MTU ".$this->MTU.", Client ID ".$this->clientID, true, true, 2);
 	}
@@ -161,6 +161,19 @@ class Player{
 				unset($this->chunkCount[$count]);
 			}
 		}
+		
+		if(is_array($this->lastChunk)){
+			$tiles = $this->server->query("SELECT ID FROM tiles WHERE spawnable = 1 AND level = '".$this->level->getName()."' AND x >= ".($this->lastChunk[0] - 1)." AND x < ".($this->lastChunk[0] + 17)." AND z >= ".($this->lastChunk[1] - 1)." AND z < ".($this->lastChunk[1] + 17).";");
+			$this->lastChunk = false;
+			if($tiles !== false and $tiles !== true){
+				while(($tile = $tiles->fetchArray(SQLITE3_ASSOC)) !== false){
+					$tile = $this->server->api->tile->getByID($tile["ID"]);
+					if($tile instanceof Tile){
+						$tile->spawn($this);
+					}
+				}
+			}			
+		}
 
 		$c = key($this->chunksOrder);
 		$d = @$this->chunksOrder[$c];
@@ -195,21 +208,8 @@ class Player{
 		foreach($cnt as $i => $count){
 			$this->chunkCount[$count] = true;
 		}
-		/*$this->chunkCount = $this->dataPacket(MC_CHUNK_DATA, array(
-			"x" => $X,
-			"z" => $Z,
-			"data" => $this->level->getOrderedMiniChunk($X, $Z, $Y),
-		));*/
 		
-		$tiles = $this->server->query("SELECT ID FROM tiles WHERE spawnable = 1 AND level = '".$this->level->getName()."' AND x >= ".($x - 1)." AND x < ".($x + 17)." AND z >= ".($z - 1)." AND z < ".($z + 17).";");
-		if($tiles !== false and $tiles !== true){
-			while(($tile = $tiles->fetchArray(SQLITE3_ASSOC)) !== false){
-				$tile = $this->server->api->tile->getByID($tile["ID"]);
-				if($tile instanceof Tile){
-					$tile->spawn($this);
-				}
-			}
-		}
+		$this->lastChunk = array($x, $z);
 		
 		$this->server->schedule(MAX_CHUNK_RATE, array($this, "getNextChunk"));
 	}
@@ -230,17 +230,24 @@ class Player{
 			));
 			$inv = array();			
 			foreach($this->inventory as $slot => $item){
-				if($slot < (($this->gamemode & 0x01) === 0 ? PLAYER_SURVIVAL_SLOTS:PLAYER_CREATIVE_SLOTS)){
-					$inv[$slot] = array($item->getID(), $item->getMetadata(), $item->count);
+				if($item instanceof Item){
+					if($slot < (($this->gamemode & 0x01) === 0 ? PLAYER_SURVIVAL_SLOTS:PLAYER_CREATIVE_SLOTS)){
+						$inv[$slot] = array($item->getID(), $item->getMetadata(), $item->count);
+					}
 				}
 			}
 			$this->data->set("inventory", $inv);
 			
 			$armor = array();
 			foreach($this->armor as $slot => $item){
-				$armor[$slot] = array($item->getID(), $item->getMetadata());
+				if($item instanceof Item){
+					$armor[$slot] = array($item->getID(), $item->getMetadata());
+				}
 			}
 			$this->data->set("armor", $armor);
+			if($this->entity instanceof Entity){
+				$this->data->set("health", $this->entity->getHealth());
+			}
 			$this->data->set("gamemode", $this->gamemode);
 		}
 	}
@@ -260,17 +267,69 @@ class Player{
 			$this->directDataPacket(MC_DISCONNECT);
 			$this->connected = false;
 			$this->level->freeAllChunks($this);
+			$this->spawned = false;
+			$this->loggedIn = false;
 			$this->buffer = null;
 			unset($this->buffer);
 			$this->recoveryQueue = array();
 			$this->receiveQueue = array();
 			$this->resendQueue = array();
+			$this->ackQueue = array();
 			$this->server->interface->stopChunked($this->CID);
+			$this->server->api->player->remove($this->CID);
 			if($msg === true and $this->username != ""){
 				$this->server->api->chat->broadcast($this->username." left the game");
 			}
 			console("[INFO] \x1b[33m".$this->username."\x1b[0m[/".$this->ip.":".$this->port."] logged out due to ".$reason);
-			$this->server->api->player->remove($this->CID);
+			$this->windows = array();
+			$this->armor = array();
+			$this->inventory = array();
+			$this->chunksLoaded = array();
+			$this->chunksOrder = array();
+			$this->chunkCount = array();
+			$this->cratingItems = array();
+			$this->received = array();
+		}
+	}
+	
+	public function sleepOn(Vector3 $pos){
+		foreach($this->server->api->player->getAll($this->level) as $p){
+			if($p->isSleeping instanceof Vector3){
+				if($p->distance($pos) <= 0.1){
+					return false;
+				}
+			}
+		}
+		$this->isSleeping = $pos;
+		$this->teleport(new Position($pos->x, $pos->y, $pos->z, $this->level));
+		if($this->entity instanceof Entity){
+			$this->entity->updateMetadata();
+		}
+		$this->setSpawn($pos);
+		$this->server->schedule(60, array($this, "checkSleep"));
+		return true;
+	}
+	
+	public function stopSleep(){
+		$this->isSleeping = false;
+		if($this->entity instanceof Entity){
+			$this->entity->updateMetadata();
+		}
+	}
+	
+	public function checkSleep(){
+		if($this->isSleeping !== false){
+			if($this->server->api->time->getPhase($this->level) === "night"){
+				foreach($this->server->api->player->getAll($this->level) as $p){
+					if($p->isSleeping === false){
+						return false;
+					}
+				}
+				$this->server->api->time->set("day", $this->level);
+				foreach($this->server->api->player->getAll($this->level) as $p){
+					$p->stopSleep();
+				}
+			}
 		}
 	}
 	
@@ -280,11 +339,11 @@ class Player{
 			$add = 0;
 			foreach($inv as $s => $item){
 				if($item->getID() === AIR){
-					$add = min(64, $count);
+					$add = min($item->getMaxStackSize(), $count);
 					$inv[$s] = BlockAPI::getItem($type, $damage, $add);
 					break;
 				}elseif($item->getID() === $type and $item->getMetadata() === $damage){
-					$add = min(64 - $item->count, $count);
+					$add = min($item->getMaxStackSize() - $item->count, $count);
 					if($add <= 0){
 						continue;
 					}
@@ -305,14 +364,14 @@ class Player{
 			$add = 0;
 			foreach($this->inventory as $s => $item){
 				if($item->getID() === AIR){
-					$add = min(64, $count);
+					$add = min($item->getMaxStackSize(), $count);
 					$this->inventory[$s] = BlockAPI::getItem($type, $damage, $add);
 					if($send === true){
 						$this->sendInventorySlot($s);
 					}
 					break;
 				}elseif($item->getID() === $type and $item->getMetadata() === $damage){
-					$add = min(64 - $item->count, $count);
+					$add = min($item->getMaxStackSize() - $item->count, $count);
 					if($add <= 0){
 						continue;
 					}
@@ -397,6 +456,22 @@ class Player{
 		return true;
 	}
 	
+	public function setArmor($slot, Item $armor, $send = true){
+		$this->armor[(int) $slot] = $armor;
+		if($send === true){
+			$this->sendArmor($this);
+		}
+		return true;
+	}
+	
+	public function getArmor($slot){
+		if(isset($this->armor[(int) $slot])){
+			return $this->armor[(int) $slot];
+		}else{
+			return BlockAPI::getItem(AIR, 0, 0);
+		}
+	}
+	
 	public function hasItem($type, $damage = false){
 		foreach($this->inventory as $s => $item){
 			if($item->getID() === $type and ($item->getMetadata() === $damage or $damage === false) and $item->count > 0){
@@ -425,8 +500,6 @@ class Player{
 								));
 							}
 						}
-					}elseif($data->class === TILE_SIGN){
-						$data->spawn($this);
 					}
 				}
 				break;
@@ -436,7 +509,7 @@ class Player{
 						if($w === $data["tile"]){
 							$this->dataPacket(MC_CONTAINER_SET_SLOT, array(
 								"windowid" => $id,
-								"slot" => $data["slot"],
+								"slot" => $data["slot"] + (isset($data["offset"]) ? $data["offset"]:0),
 								"block" => $data["slotdata"]->getID(),
 								"stack" => $data["slotdata"]->count,
 								"meta" => $data["slotdata"]->getMetadata(),
@@ -448,7 +521,8 @@ class Player{
 			case "player.armor":
 				if($data["player"]->level === $this->level){
 					if($data["eid"] === $this->eid){
-						$data["eid"] = 0;
+						$this->sendArmor($this);
+						break;
 					}
 					$this->dataPacket(MC_PLAYER_ARMOR_EQUIPMENT, $data);
 				}
@@ -483,14 +557,6 @@ class Player{
 					"speedZ" => (int) ($data->speedZ * 400),
 				));
 				break;
-			case "entity.remove":
-				if($data->eid === $this->eid or $data->level !== $this->level){
-					break;
-				}
-				$this->dataPacket(MC_REMOVE_ENTITY, array(
-					"eid" => $data->eid,
-				));
-				break;
 			case "entity.animate":
 				if($data["eid"] === $this->eid or $data["entity"]->level !== $this->level){
 					break;
@@ -532,16 +598,17 @@ class Player{
 						return;
 					}else{
 						$message = $data->get();
+						$this->sendChat(preg_replace('/\x1b\[[0-9;]*m/', "", $message["message"]), $message["player"]); //Remove ANSI codes from chat
 					}
 				}else{
 					$message = (string) $data;
+					$this->sendChat(preg_replace('/\x1b\[[0-9;]*m/', "", (string) $data)); //Remove ANSI codes from chat
 				}
-				$this->sendChat(preg_replace('/\x1b\[[0-9;]*m/', "", $message)); //Remove ANSI codes from chat
 				break;
 		}
 	}
 	
-	public function sendChat($message){
+	public function sendChat($message, $author = ""){
 		$mes = explode("\n", $message);
 		foreach($mes as $m){
 			if(preg_match_all('#@([@A-Za-z_]{1,})#', $m, $matches, PREG_OFFSET_CAPTURE) > 0){
@@ -563,7 +630,8 @@ class Player{
 			}
 			
 			if($m !== ""){			
-				$this->dataPacket(MC_CHAT, array(				
+				$this->dataPacket(MC_CHAT, array(
+					"player" => ($author instanceof Player) ? $author->username:$author,
 					"message" => $m,
 				));
 			}
@@ -677,7 +745,7 @@ class Player{
 		return $res;
 	}
 	
-	public function teleport(Vector3 $pos, $yaw = false, $pitch = false, $terrain = true){
+	public function teleport(Vector3 $pos, $yaw = false, $pitch = false, $terrain = true, $force = true){
 		if($this->entity instanceof Entity){
 			$this->entity->check = false;
 			if($yaw === false){
@@ -696,18 +764,35 @@ class Player{
 					$this->entity->check = true;
 					return false;
 				}
+
 				foreach($this->server->api->entity->getAll($this->level) as $e){
 					if($e !== $this->entity){
 						if($e->player instanceof Player){
-							$e->player->dataPacket(MC_REMOVE_ENTITY, array(
-								"eid" => $this->eid,
+							$e->player->dataPacket(MC_MOVE_ENTITY_POSROT, array(
+								"eid" => $this->entity->eid,
+								"x" => -256,
+								"y" => 128,
+								"z" => -256,
+								"yaw" => 0,
+								"pitch" => 0,
+							));
+							$this->dataPacket(MC_MOVE_ENTITY_POSROT, array(
+								"eid" => $e->eid,
+								"x" => -256,
+								"y" => 128,
+								"z" => -256,
+								"yaw" => 0,
+								"pitch" => 0,
+							));
+						}else{
+							$this->dataPacket(MC_REMOVE_ENTITY, array(
+								"eid" => $e->eid,
 							));
 						}
-						$this->dataPacket(MC_REMOVE_ENTITY, array(
-							"eid" => $e->eid,
-						));
 					}
 				}
+				
+
 				$this->level->freeAllChunks($this);
 				$this->level = $pos->level;
 				$this->chunksLoaded = array();
@@ -717,7 +802,35 @@ class Player{
 					"time" => $this->level->getTime(),
 				));
 				$terrain = true;
+				
+				foreach($this->server->api->player->getAll($this->level) as $player){
+					if($player !== $this and $player->entity instanceof Entity){
+						$this->dataPacket(MC_MOVE_ENTITY_POSROT, array(
+							"eid" => $player->entity->eid,
+							"x" => $player->entity->x,
+							"y" => $player->entity->y,
+							"z" => $player->entity->z,
+							"yaw" => $player->entity->yaw,
+							"pitch" => $player->entity->pitch,
+						));
+						$player->dataPacket(MC_PLAYER_EQUIPMENT, array(
+							"eid" => $this->eid,
+							"block" => $this->getSlot($this->slot)->getID(),
+							"meta" => $this->getSlot($this->slot)->getMetadata(),
+							"slot" => 0,
+						));
+						$this->sendArmor($player);
+						$this->dataPacket(MC_PLAYER_EQUIPMENT, array(
+							"eid" => $player->eid,
+							"block" => $player->getSlot($player->slot)->getID(),
+							"meta" => $player->getSlot($player->slot)->getMetadata(),
+							"slot" => 0,
+						));
+						$player->sendArmor($this);
+					}
+				}
 			}
+
 			$this->lastCorrect = $pos;
 			$this->entity->fallY = false;
 			$this->entity->fallStart = false;
@@ -730,6 +843,9 @@ class Player{
 				$this->getNextChunk();
 			}
 			$this->entity->check = true;
+			if($force === true){
+				$this->forceMovement = $pos;
+			}
 		}
 		$this->dataPacket(MC_MOVE_PLAYER, array(
 			"eid" => 0,
@@ -823,6 +939,22 @@ class Player{
 	public function getBandwidth(){
 		return array_sum($this->bandwidthStats) / max(1, count($this->bandwidthStats));
 	}
+
+	public function clearQueue(){
+		if($this->connected === false){
+			return false;
+		}
+		ksort($this->received);
+		if(($cnt = count($this->received)) > PLAYER_MAX_QUEUE){
+			foreach($this->received as $c => $t){
+				unset($this->received[$c]);
+				--$cnt;
+				if($cnt <= PLAYER_MAX_QUEUE){
+					break;
+				}
+			}
+		}
+	}
 	
 	public function handlePacketQueues(){
 		if($this->connected === false){
@@ -860,7 +992,7 @@ class Player{
 						if($p["counter"] > $this->receiveCount){
 							$this->receiveCount = $p["counter"];
 						}elseif($p["counter"] !== 0){
-							if(($p["counter"] - $this->receiveCount) > 16){
+							if(isset($this->received[$p["counter"]])){
 								continue;
 							}
 							switch($p["id"]){
@@ -874,6 +1006,7 @@ class Player{
 									continue;
 							}
 						}
+						$this->received[$p["counter"]] = true;
 					}
 					$this->handleDataPacket($p["id"], $p);
 				}
@@ -995,7 +1128,8 @@ class Player{
 				if($this->loggedIn === true){
 					break;
 				}
-				if(count($this->server->clients) >= $this->server->maxClients){
+				$this->realmsData = array("clientId" => $data["clientId"], "realms_data" => $data["realms_data"]);
+				if(count($this->server->clients) > $this->server->maxClients){
 					$this->close("server is full!", false);
 					return;
 				}
@@ -1012,7 +1146,7 @@ class Player{
 					$this->close("Incorrect protocol #".$data["protocol1"], false);
 					break;
 				}
-				if(preg_match('#[^a-zA-Z0-9_]#', $data["username"]) == 0){
+				if(preg_match('#[^a-zA-Z0-9_]#', $data["username"]) == 0 and $data["username"] != ""){
 					$this->username = $data["username"];
 					$this->iusername = strtolower($this->username);
 				}else{
@@ -1076,7 +1210,7 @@ class Player{
 
 				$this->armor = array();
 				foreach($this->data->get("armor") as $slot => $item){
-					$this->armor[$slot] = BlockAPI::getItem($item[0], $item[1], 1);
+					$this->armor[$slot] = BlockAPI::getItem($item[0], $item[1], $item[0] === 0 ? 0:1);
 				}
 				
 				$this->data->set("lastIP", $this->ip);
@@ -1093,7 +1227,7 @@ class Player{
 					"x" => $this->data->get("position")["x"],
 					"y" => $this->data->get("position")["y"],
 					"z" => $this->data->get("position")["z"],
-					"unknown1" => 0,
+					"generator" => 0,
 					"gamemode" => ($this->gamemode & 0x01),
 					"eid" => 0,
 				));
@@ -1108,11 +1242,18 @@ class Player{
 				$this->entity->x = $this->data->get("position")["x"];
 				$this->entity->y = $this->data->get("position")["y"];
 				$this->entity->z = $this->data->get("position")["z"];
+				if(($level = $this->server->api->level->get($this->data->get("spawn")["level"])) !== false){
+					$this->spawnPosition = new Position($this->data->get("spawn")["x"], $this->data->get("spawn")["y"], $this->data->get("spawn")["z"], $level);
+					$this->dataPacket(MC_SET_SPAWN_POSITION, array(
+						"x" => (int) $this->spawnPosition->x,
+						"y" => (int) $this->spawnPosition->y,
+						"z" => (int) $this->spawnPosition->z,
+					));
+				}
 				$this->entity->check = false;
 				$this->entity->setName($this->username);
 				$this->entity->data["CID"] = $this->CID;
 				$this->evid[] = $this->server->event("server.chat", array($this, "eventHandler"));
-				$this->evid[] = $this->server->event("entity.remove", array($this, "eventHandler"));
 				$this->evid[] = $this->server->event("entity.motion", array($this, "eventHandler"));
 				$this->evid[] = $this->server->event("entity.animate", array($this, "eventHandler"));
 				$this->evid[] = $this->server->event("entity.event", array($this, "eventHandler"));
@@ -1135,9 +1276,13 @@ class Player{
 						if($this->spawned !== false){
 							break;
 						}
+						$this->entity->setHealth($this->data->get("health"));
 						$this->spawned = true;	
+						$this->server->api->player->spawnAllPlayers($this);
+						$this->server->api->player->spawnToAllPlayers($this);
 						$this->server->api->entity->spawnAll($this);
 						$this->server->api->entity->spawnToAll($this->entity);
+						
 						$this->server->schedule(5, array($this->entity, "update"), array(), true);
 						$this->sendArmor();
 						$this->sendChat($this->server->motd."\n");
@@ -1153,6 +1298,9 @@ class Player{
 							"time" => $this->level->getTime(),
 						));
 						$this->teleport(new Position($this->data->get("position")["x"], $this->data->get("position")["y"], $this->data->get("position")["z"], $this->level));
+						$this->server->schedule(10, array($this, "teleport"), new Position($this->data->get("position")["x"], $this->data->get("position")["y"], $this->data->get("position")["z"], $this->level));
+						$this->server->schedule(20, array($this, "teleport"), new Position($this->data->get("position")["x"], $this->data->get("position")["y"], $this->data->get("position")["z"], $this->level));
+						$this->server->schedule(30, array($this, "teleport"), new Position($this->data->get("position")["x"], $this->data->get("position")["y"], $this->data->get("position")["z"], $this->level));
 						$this->server->handle("player.spawn", $this);
 						break;
 					case 2://Chunk loaded?
@@ -1165,6 +1313,13 @@ class Player{
 				}
 				if(($this->entity instanceof Entity) and $data["counter"] > $this->lastMovement){
 					$this->lastMovement = $data["counter"];
+					if($this->forceMovement instanceof Vector3){
+						if($this->forceMovement->distance(new Vector3($data["x"], $data["y"], $data["z"])) <= 0.7){
+							$this->forceMovement = false;
+						}else{
+							$this->teleport($this->forceMovement, $this->entity->yaw, $this->entity->pitch, false);
+						}
+					}
 					$speed = $this->entity->getSpeedMeasure();
 					if($this->blocked === true or ($this->server->api->getProperty("allow-flight") !== true and (($speed > 7 and ($this->gamemode & 0x01) === 0x00) or $speed > 15)) or $this->server->api->handle("player.move", $this->entity) === false){
 						if($this->lastCorrect instanceof Vector3){
@@ -1182,6 +1337,7 @@ class Player{
 				if($this->spawned === false){
 					break;
 				}
+
 				$data["eid"] = $this->eid;
 				$data["player"] = $this;
 				
@@ -1215,7 +1371,10 @@ class Player{
 			case MC_REQUEST_CHUNK:
 				break;
 			case MC_USE_ITEM:
-				if($this->spawned === false or $this->blocked === true){
+				if(!($this->entity instanceof Entity)){
+					break;
+				}
+				if(($this->spawned === false or $this->blocked === true) and $data["face"] >= 0 and $data["face"] <= 5){
 					$target = $this->level->getBlock(new Vector3($data["x"], $data["y"], $data["z"]));
 					$block = $target->getSide($data["face"]);
 					$this->dataPacket(MC_UPDATE_BLOCK, array(
@@ -1278,10 +1437,11 @@ class Player{
 					break;
 				}
 				$this->craftingItems = array();
-				$this->toCraft = array();
-				if($this->entity->inAction === true){
-					switch($data["action"]){
-						case 5: //Shot arrow
+				$this->toCraft = array();				
+				
+				switch($data["action"]){
+					case 5: //Shot arrow
+						if($this->entity->inAction === true){
 							if($this->getSlot($this->slot)->getID() === BOW){
 								if($this->startAction !== false){
 									$time = microtime(true) - $this->startAction;
@@ -1294,12 +1454,14 @@ class Player{
 									$this->server->api->entity->spawnToAll($e);
 								}
 							}
-							break;
-					}
+						}
+						$this->startAction = false;
+						$this->entity->inAction = false;
+						$this->entity->updateMetadata();
+						break;
+					case 6: //get out of the bed
+						$this->stopSleep();
 				}
-				$this->startAction = false;
-				$this->entity->inAction = false;
-				$this->entity->updateMetadata();
 				break;
 			case MC_REMOVE_BLOCK:
 				if($this->spawned === false or $this->blocked === true or $this->entity->distance(new Vector3($data["x"], $data["y"], $data["z"])) > 8){
@@ -1323,48 +1485,52 @@ class Player{
 				}
 				$this->craftingItems = array();
 				$this->toCraft = array();
+
 				$data["eid"] = $this->eid;
 				$data["player"] = $this;
 				for($i = 0; $i < 4; ++$i){
 					$s = $data["slot$i"];
-					if($s === 0){
+					if($s === 0 or $s === 255){
 						$s = BlockAPI::getItem(AIR, 0, 0);
 					}else{
 						$s = BlockAPI::getItem($s + 256, 0, 1);
 					}
 					$slot = $this->armor[$i];
 					if($slot->getID() !== AIR and $s->getID() === AIR){
-						$this->addItem($slot->getID(), $slot->getMetadata(), 1);
+						$this->addItem($slot->getID(), $slot->getMetadata(), 1, false);
 						$this->armor[$i] = BlockAPI::getItem(AIR, 0, 0);
+						$data["slot$i"] = 255;
 					}elseif($s->getID() !== AIR and $slot->getID() === AIR and ($sl = $this->hasItem($s->getID())) !== false){
 						$this->armor[$i] = $this->getSlot($sl);
 						$this->setSlot($sl, BlockAPI::getItem(AIR, 0, 0), false);
+					}elseif($s->getID() !== AIR and $slot->getID() !== AIR and ($slot->getID() !== $s->getID() or $slot->getMetadata() !== $s->getMetadata()) and ($sl = $this->hasItem($s->getID())) !== false){
+						$item = $this->armor[$i];
+						$this->armor[$i] = $this->getSlot($sl);
+						$this->setSlot($sl, $item, false);
 					}else{
-						$data["slot$i"] = 0;
+						$data["slot$i"] = 255;
 					}
-					
+
 				}		
-				$this->server->handle("player.armor", $data);
+				$this->sendArmor();
 				if($this->entity->inAction === true){
 					$this->entity->inAction = false;
 					$this->entity->updateMetadata();
 				}
 				break;
 			case MC_INTERACT:
-				if($this->spawned === false or $this->blocked === true){
+				if($this->spawned === false){
 					break;
 				}
 				$this->craftingItems = array();
 				$this->toCraft = array();
 				$target = $this->server->api->entity->get($data["target"]);
-				if($this->gamemode !== VIEW and $this->blocked === false and ($target instanceof Entity) and $this->entity->distance($target) <= 8){
+				if($target instanceof Entity and $this->entity instanceof Entity and $this->gamemode !== VIEW and $this->blocked === false and ($target instanceof Entity) and $this->entity->distance($target) <= 8){
 					$data["targetentity"] = $target;
 					$data["entity"] = $this->entity;
-					if(!($target instanceof Entity)){
-						break;
-					}elseif($target->class === ENTITY_PLAYER and ($this->server->api->getProperty("pvp") == false or $this->server->difficulty <= 0 or ($target->player->gamemode & 0x01) === 0x01)){
-						break;
-					}elseif($this->server->handle("player.interact", $data) !== false){
+				if($target->class === ENTITY_PLAYER and ($this->server->api->getProperty("pvp") == false or $this->server->difficulty <= 0 or ($target->player->gamemode & 0x01) === 0x01)){
+					break;
+				}elseif($this->server->handle("player.interact", $data) !== false){
 						$slot = $this->getSlot($this->slot);
 						switch($slot->getID()){
 							case WOODEN_SWORD:
@@ -1428,10 +1594,13 @@ class Player{
 						}
 						$target->harm($damage, $this->eid);
 						if($slot->isTool() === true and ($this->gamemode & 0x01) === 0){
-							$slot->useOn($target);
+							if($slot->useOn($target) and $slot->getMetadata() >= $slot->getMaxDurability()){
+								$this->setSlot($this->slot, new Item(AIR, 0, 0), false);
+							}
 						}
 					}
 				}
+				
 				break;
 			case MC_ANIMATE:
 				if($this->spawned === false){
@@ -1448,10 +1617,14 @@ class Player{
 				}
 				$this->craftingItems = array();
 				$this->toCraft = array();
-				$this->entity->fire = 0;
-				$this->entity->air = 300;
-				$this->entity->setHealth(20, "respawn");
-				$this->entity->updateMetadata();
+				if($this->entity instanceof Entity){
+					$this->entity->fire = 0;
+					$this->entity->air = 300;
+					$this->entity->setHealth(20, "respawn");
+					$this->entity->updateMetadata();
+				} else {
+					break;
+				}
 				$this->sendInventory();
 				$this->teleport($this->spawnPosition);
 				$this->blocked = false;
@@ -1484,9 +1657,9 @@ class Player{
 							RAW_CHICKEN => 2,
 							MELON_SLICE => 2,
 							GOLDEN_APPLE => 10,
-							COOKIE => 2,
-							COOKED_FISH => 5,
-							RAW_FISH => 2,
+							//COOKIE => 2,
+							//COOKED_FISH => 5,
+							//RAW_FISH => 2,
 						);
 						$slot = $this->getSlot($this->slot);
 						if($this->entity->getHealth() < 20 and isset($items[$slot->getID()])){
@@ -1519,29 +1692,14 @@ class Player{
 					$this->entity->updateMetadata();
 				}
 				break;
-			case MC_SIGN_UPDATE:
-				if($this->spawned === false or $this->blocked === true){
-					break;
-				}
-				$this->craftingItems = array();
-				$this->toCraft = array();
-				$t = $this->server->api->tile->get(new Position($data["x"], $data["y"], $data["z"], $this->level));
-				if(($t instanceof Tile) and $t->class === TILE_SIGN){
-					if($t->data["creator"] !== $this->username){
-						$t->spawn($this);
-					}else{
-						$t->setText($data["line0"], $data["line1"], $data["line2"], $data["line3"]);
-					}
-				}
-				break;
 			case MC_CHAT:
 				if($this->spawned === false){
 					break;
 				}
 				$this->craftingItems = array();
 				$this->toCraft = array();
-				$message = preg_replace('#^<.*> #', "", $data["message"]);
-				if(trim($data["message"]) != "" and strlen($data["message"]) <= 100 and preg_match('#[^\\x20-\\xff]#', $message) == 0){
+				if(trim($data["message"]) != "" and strlen($data["message"]) <= 255){
+					$message = $data["message"];
 					if($message{0} === "/"){ //Command
 						$this->server->api->console->run(substr($message, 1), $this);
 					}else{
@@ -1557,7 +1715,30 @@ class Player{
 				}
 				$this->craftingItems = array();
 				$this->toCraft = array();
+				if(isset($this->windows[$data["windowid"]])){
+					if(is_array($this->windows[$data["windowid"]])){
+						$all = $this->server->api->player->getAll($this->level);
+						foreach($this->windows[$data["windowid"]] as $ob){
+							$this->server->api->player->broadcastPacket($all, MC_TILE_EVENT, array(
+								"x" => $ob->x,
+								"y" => $ob->y,
+								"z" => $ob->z,
+								"case1" => 1,
+								"case2" => 0,
+							));
+						}
+					}elseif($this->windows[$data["windowid"]]->class === TILE_CHEST){
+						$this->server->api->player->broadcastPacket($this->server->api->player->getAll($this->level), MC_TILE_EVENT, array(
+							"x" => $this->windows[$data["windowid"]]->x,
+							"y" => $this->windows[$data["windowid"]]->y,
+							"z" => $this->windows[$data["windowid"]]->z,
+							"case1" => 1,
+							"case2" => 0,
+						));
+					}
+				}
 				unset($this->windows[$data["windowid"]]);
+
 				$this->dataPacket(MC_CONTAINER_CLOSE, array(
 					"windowid" => $data["windowid"],
 				));
@@ -1566,7 +1747,7 @@ class Player{
 				if($this->spawned === false or $this->blocked === true){
 					break;
 				}
-				
+
 				if($this->lastCraft <= (microtime(true) - 1)){
 					if(isset($this->toCraft[-1])){
 						$this->toCraft = array(-1 => $this->toCraft[-1]);
@@ -1590,7 +1771,7 @@ class Player{
 						}
 						$this->toCraft[$data["slot"]] = $craftItem;
 						$craft = true;
-					}elseif(((count($this->toCraft) === 1 and isset($this->toCraft[-1])) or count($this->toCraft) === 0) and $slot->count > 0 and $slot->getID() !== AIR and ($slot->getID() !== $data["block"] or $slot->getMetadata() !== $data["meta"])){ //Crafting final
+					}elseif(((count($this->toCraft) === 1 and isset($this->toCraft[-1])) or count($this->toCraft) === 0) and $slot->count > 0 and $slot->getID() > AIR and ($slot->getID() !== $data["block"] or $slot->getMetadata() !== $data["meta"])){ //Crafting final
 						$craftItem = BlockAPI::getItem($data["block"], $data["meta"], $data["stack"]);
 						if(count($this->toCraft) === 0){
 							$this->toCraft[-1] = 0;
@@ -1600,7 +1781,6 @@ class Player{
 						$this->toCraft[$data["slot"]] = $craftItem;
 						$craft = true;
 					}
-					
 			
 					if($craft === true){
 						$this->lastCraft = microtime(true);
@@ -1622,52 +1802,124 @@ class Player{
 				if(!isset($this->windows[$data["windowid"]])){
 					break;
 				}
-				$tile = $this->windows[$data["windowid"]];
-				if(($tile->class !== TILE_CHEST and $tile->class !== TILE_FURNACE) or $data["slot"] < 0 or ($tile->class === TILE_CHEST and $data["slot"] >= CHEST_SLOTS) or ($tile->class === TILE_FURNACE and $data["slot"] >= FURNACE_SLOTS)){
-					break;
-				}
-				$done = false;
-				$item = BlockAPI::getItem($data["block"], $data["meta"], $data["stack"]);
-				
-				$slot = $tile->getSlot($data["slot"]);
-				$done = true;
-				if($this->server->api->dhandle("player.container.slot", array(
-					"tile" => $tile,
-					"slot" => $data["slot"],
-					"slotdata" => $slot,
-					"itemdata" => $item,
-					"player" => $this,
-				)) === false){
-					$this->dataPacket(MC_CONTAINER_SET_SLOT, array(
-						"windowid" => $data["windowid"],
-						"slot" => $data["slot"],
-						"block" => $slot->getID(),
-						"stack" => $slot->count,
-						"meta" => $slot->getMetadata(),
-					));
-					break;
-				}
-				if($item->getID() !== AIR and $slot->getID() == $item->getID()){
-					if($slot->count < $item->count){
-						if($this->removeItem($item->getID(), $item->getMetadata(), $item->count - $slot->count, false) === false){
-							break;
-						}
-					}elseif($slot->count > $item->count){
-						$this->addItem($item->getID(), $item->getMetadata(), $slot->count - $item->count, false);
-					}
-				}else{
-					if($this->removeItem($item->getID(), $item->getMetadata(), $item->count, false) === false){
+
+				if(is_array($this->windows[$data["windowid"]])){
+					$tiles = $this->windows[$data["windowid"]];
+					if($data["slot"] >= 0 and $data["slot"] < CHEST_SLOTS){
+						$tile = $tiles[0];
+						$slotn = $data["slot"];
+						$offset = 0;
+					}elseif($data["slot"] >= CHEST_SLOTS and $data["slot"] <= (CHEST_SLOTS << 1)){
+						$tile = $tiles[1];
+						$slotn = $data["slot"] - CHEST_SLOTS;
+						$offset = CHEST_SLOTS;
+					}else{
 						break;
 					}
-					$this->addItem($slot->getID(), $slot->getMetadata(), $slot->count, false);
+
+					$item = BlockAPI::getItem($data["block"], $data["meta"], $data["stack"]);
+					
+					$slot = $tile->getSlot($slotn);
+					if($this->server->api->dhandle("player.container.slot", array(
+						"tile" => $tile,
+						"slot" => $data["slot"],
+						"offset" => $offset,
+						"slotdata" => $slot,
+						"itemdata" => $item,
+						"player" => $this,
+					)) === false){
+						$this->dataPacket(MC_CONTAINER_SET_SLOT, array(
+							"windowid" => $data["windowid"],
+							"slot" => $data["slot"],
+							"block" => $slot->getID(),
+							"stack" => $slot->count,
+							"meta" => $slot->getMetadata(),
+						));
+						break;
+					}
+					if($item->getID() !== AIR and $slot->getID() == $item->getID()){
+						if($slot->count < $item->count){
+							if($this->removeItem($item->getID(), $item->getMetadata(), $item->count - $slot->count, false) === false){
+								break;
+							}
+						}elseif($slot->count > $item->count){
+							$this->addItem($item->getID(), $item->getMetadata(), $slot->count - $item->count, false);
+						}
+					}else{
+						if($this->removeItem($item->getID(), $item->getMetadata(), $item->count, false) === false){
+							break;
+						}
+						$this->addItem($slot->getID(), $slot->getMetadata(), $slot->count, false);
+					}
+					$tile->setSlot($slotn, $item, true, $offset);
+				}else{
+					$tile = $this->windows[$data["windowid"]];
+					if(($tile->class !== TILE_CHEST and $tile->class !== TILE_FURNACE) or $data["slot"] < 0 or ($tile->class === TILE_CHEST and $data["slot"] >= CHEST_SLOTS) or ($tile->class === TILE_FURNACE and $data["slot"] >= FURNACE_SLOTS)){
+						break;
+					}
+					$item = BlockAPI::getItem($data["block"], $data["meta"], $data["stack"]);
+					
+					$slot = $tile->getSlot($data["slot"]);
+					if($this->server->api->dhandle("player.container.slot", array(
+						"tile" => $tile,
+						"slot" => $data["slot"],
+						"slotdata" => $slot,
+						"itemdata" => $item,
+						"player" => $this,
+					)) === false){
+						$this->dataPacket(MC_CONTAINER_SET_SLOT, array(
+							"windowid" => $data["windowid"],
+							"slot" => $data["slot"],
+							"block" => $slot->getID(),
+							"stack" => $slot->count,
+							"meta" => $slot->getMetadata(),
+						));
+						break;
+					}
+					if($item->getID() !== AIR and $slot->getID() == $item->getID()){
+						if($slot->count < $item->count){
+							if($this->removeItem($item->getID(), $item->getMetadata(), $item->count - $slot->count, false) === false){
+								break;
+							}
+						}elseif($slot->count > $item->count){
+							$this->addItem($item->getID(), $item->getMetadata(), $slot->count - $item->count, false);
+						}
+					}else{
+						if($this->removeItem($item->getID(), $item->getMetadata(), $item->count, false) === false){
+							break;
+						}
+						$this->addItem($slot->getID(), $slot->getMetadata(), $slot->count, false);
+					}
+					$tile->setSlot($data["slot"], $item);
 				}
-				$tile->setSlot($data["slot"], $item);
 				break;
 			case MC_SEND_INVENTORY: //TODO, Mojang, enable this ´^_^`
 				if($this->spawned === false){
 					break;
 				}
 				break;
+			case MC_ENTITY_DATA:
+				if($this->spawned === false or $this->blocked === true){
+					break;
+				}
+				$this->craftingItems = array();
+				$this->toCraft = array();
+				$t = $this->server->api->tile->get(new Position($data["x"], $data["y"], $data["z"], $this->level));
+				if(($t instanceof Tile) and $t->class === TILE_SIGN){
+					if($t->data["creator"] !== $this->username){
+						$t->spawn($this);
+					}else{
+						$nbt = new NBT();
+						$nbt->load($data["namedtag"]);
+						$d = array_shift($nbt->tree);
+						if($d["id"] !== TILE_SIGN){
+							$t->spawn($this);
+						}else{
+							$t->setText($d["Text1"], $d["Text2"], $d["Text3"], $d["Text4"]);
+						}
+					}
+				}
+				break;
 			default:
 				console("[DEBUG] Unhandled 0x".dechex($pid)." Data Packet for Client ID ".$this->clientID.": ".print_r($data, true), true, true, 2);
 				break;
@@ -1679,16 +1931,26 @@ class Player{
 			"player" => $this,
 			"eid" => $this->eid
 		);
+		$armor = array();
 		for($i = 0; $i < 4; ++$i){
-			if($this->armor[$i] instanceof Item){
+			if(isset($this->armor[$i]) and ($this->armor[$i] instanceof Item) and $this->armor[$i]->getID() > AIR){
 				$data["slot$i"] = $this->armor[$i]->getID() !== AIR ? $this->armor[$i]->getID() - 256:0;
 			}else{
 				$this->armor[$i] = BlockAPI::getItem(AIR, 0, 0);
-				$data["slot$i"] = 0;
+				$data["slot$i"] = 255;
 			}
+			$armor[] = $this->armor[$i];
 		}
 		if($player instanceof Player){
-			$player->dataPacket(MC_PLAYER_ARMOR_EQUIPMENT, $data);
+			if($player === $this){
+				$this->dataPacket(MC_CONTAINER_SET_CONTENT, array(
+					"windowid" => 0x78,
+					"count" => 4,
+					"slots" => $armor,
+				));
+			}else{
+				$player->dataPacket(MC_PLAYER_ARMOR_EQUIPMENT, $data);
+			}
 		}else{
 			$this->server->api->dhandle("player.armor", $data);
 		}

src/PocketMinecraftServer.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class PocketMinecraftServer{
@@ -32,14 +26,10 @@ class PocketMinecraftServer{
 	
 	private function load(){
 		$this->version = new VersionString();
-		@cli_set_process_title("PocketMine-MP ".MAJOR_VERSION);
-		if($this->version->isDev()){
-			console("[INFO] \x1b[31;1mThis is a Development version");
-		}
-		console("[INFO] Starting \x1b[36;1m".CURRENT_MINECRAFT_VERSION."\x1b[0m #".CURRENT_PROTOCOL." Minecraft PE Server at ".$this->serverip.":".$this->port);
-		if($this->port < 19132 or $this->port > 19135){ //Mojang =(
-			console("[WARNING] You've selected a not-standard port. Normal port range is from 19132 to 19135 included");
+		if(defined("DEBUG") and DEBUG >= 0){
+			@cli_set_process_title("PocketMine-MP ".MAJOR_VERSION);
 		}
+		console("[INFO] Starting Minecraft PE server on ".($this->serverip === "0.0.0.0" ? "*":$this->serverip).":".$this->port);
 		define("BOOTUP_RANDOM", Utils::getRandomBytes(16));
 		$this->serverID = $this->serverID === false ? Utils::readLong(Utils::getRandomBytes(8, false)):$this->serverID;
 		$this->seed = $this->seed === false ? Utils::readInt(Utils::getRandomBytes(4, false)):$this->seed;
@@ -73,11 +63,13 @@ class PocketMinecraftServer{
 		$this->reloadConfig();
 		$this->stop = false;
 		$this->ticks = 0;
-		$this->asyncThread = new AsyncMultipleQueue();
+		if(!defined("NO_THREADS")){
+			$this->asyncThread = new AsyncMultipleQueue();
+		}
 	}
 
 	function __construct($name, $gamemode = SURVIVAL, $seed = false, $port = 19132, $serverip = "0.0.0.0"){
-		$this->port = (int) $port; //19132 - 19135
+		$this->port = (int) $port;
 		$this->doTick = true;
 		$this->gamemode = (int) $gamemode;
 		$this->name = $name;
@@ -96,7 +88,7 @@ class PocketMinecraftServer{
 	
 	public function titleTick(){
 		$time = microtime(true);
-		if(ENABLE_ANSI === true){
+		if(defined("DEBUG") and DEBUG >= 0 and ENABLE_ANSI === true){
 			echo "\x1b]0;PocketMine-MP ".MAJOR_VERSION." | Online ". count($this->clients)."/".$this->maxClients." | RAM ".round((memory_get_usage() / 1024) / 1024, 2)."MB | U ".round(($this->interface->bandwidth[1] / max(1, $time - $this->interface->bandwidth[2])) / 1024, 2)." D ".round(($this->interface->bandwidth[0] / max(1, $time - $this->interface->bandwidth[2])) / 1024, 2)." kB/s | TPS ".$this->getTPS()."\x07";
 		}
 		$this->interface->bandwidth = array(0, 0, $time);
@@ -107,7 +99,7 @@ class PocketMinecraftServer{
 			$this->schedule(30, array($this, "titleTick"), array(), true);
 		}
 		$this->schedule(20 * 15, array($this, "checkTicks"), array(), true);
-		$this->schedule(20 * 60 * 10, array($this, "checkMemory"), array(), true);
+		$this->schedule(20 * 60, array($this, "checkMemory"), array(), true);
 		$this->schedule(20, array($this, "asyncOperationChecker"), array(), true);
 	}
 	
@@ -121,13 +113,14 @@ class PocketMinecraftServer{
 		$info = $this->debugInfo();
 		$data = $info["memory_usage"].",".$info["players"].",".$info["entities"];
 		$i = count($this->memoryStats) - 1;
-		if($i === -1 or $this->memoryStats[$i] !== $data){
+		if($i < 0 or $this->memoryStats[$i] !== $data){
 			$this->memoryStats[] = $data;
 		}
 	}
 
 	public function startDatabase(){
 		$this->preparedSQL = new stdClass();
+		$this->preparedSQL->entity = new stdClass();
 		$this->database = new SQLite3(":memory:");
 		$this->query("PRAGMA journal_mode = OFF;");
 		$this->query("PRAGMA encoding = \"UTF-8\";");
@@ -143,6 +136,8 @@ class PocketMinecraftServer{
 		$this->preparedSQL->selectHandlers = $this->database->prepare("SELECT DISTINCT ID FROM handlers WHERE name = :name ORDER BY priority DESC;");
 		$this->preparedSQL->selectActions = $this->database->prepare("SELECT ID,code,repeat FROM actions WHERE last <= (:time - interval);");
 		$this->preparedSQL->updateAction = $this->database->prepare("UPDATE actions SET last = :time WHERE ID = :id;");
+		$this->preparedSQL->entity->setPosition = $this->database->prepare("UPDATE entities SET x = :x, y = :y, z = :z, pitch = :pitch, yaw = :yaw WHERE EID = :eid ;");
+		$this->preparedSQL->entity->setLevel = $this->database->prepare("UPDATE entities SET level = :level WHERE EID = :eid ;");
 	}
 
 	public function query($sql, $fetch = false){
@@ -192,7 +187,10 @@ class PocketMinecraftServer{
 			$this->stop = true;
 			$this->trigger("server.close", $reason);
 			$this->interface->close();
-			@$this->asyncThread->stop = true;
+			
+			if(!defined("NO_THREADS")){
+				@$this->asyncThread->stop = true;
+			}
 		}
 	}
 
@@ -210,6 +208,9 @@ class PocketMinecraftServer{
 	}
 	
 	public function asyncOperation($type, array $data, callable $callable = null){
+		if(defined("NO_THREADS")){
+			return false;
+		}
 		$d = "";
 		$type = (int) $type;
 		switch($type){
@@ -233,6 +234,9 @@ class PocketMinecraftServer{
 	}
 	
 	public function asyncOperationChecker(){
+		if(defined("NO_THREADS")){
+			return false;
+		}
 		if(isset($this->asyncThread->output{5})){
 			$offset = 0;
 			$ID = Utils::readInt(substr($this->asyncThread->output, $offset, 4));
@@ -244,7 +248,7 @@ class PocketMinecraftServer{
 				case ASYNC_CURL_GET:
 				case ASYNC_CURL_POST:
 					$len = Utils::readInt(substr($this->asyncThread->output, $offset, 4));
-					$offset += 2;
+					$offset += 4;
 					$data["result"] = substr($this->asyncThread->output, $offset, $len);
 					$offset += $len;
 					break;
@@ -347,7 +351,7 @@ class PocketMinecraftServer{
 
 	public function init(){		
 		register_tick_function(array($this, "tick"));
-		console("[INFO] Starting internal ticker calculation");
+		console("[DEBUG] Starting internal ticker calculation", true, true, 2);
 		$t = 0;
 		while(true){
 			switch($t){
@@ -413,7 +417,7 @@ class PocketMinecraftServer{
 		$dump .= "Code: \r\n";
 		$file = @file($er["file"], FILE_IGNORE_NEW_LINES);
 		for($l = max(0, $er["line"] - 10); $l < $er["line"] + 10; ++$l){
-			$dump .= "[".($l + 1)."] ".$file[$l]."\r\n";
+			$dump .= "[".($l + 1)."] ".@$file[$l]."\r\n";
 		}
 		$dump .= "\r\n\r\n";
 		$version = new VersionString();
@@ -476,6 +480,7 @@ class PocketMinecraftServer{
 				return;
 			}
 			switch($packet["pid"]){
+				case 0x01:
 				case 0x02:
 					if($this->invisible === true){
 						$this->send(0x1c, array(
@@ -549,12 +554,23 @@ class PocketMinecraftServer{
 	}
 
 	public function process(){
+		$lastLoop = 0;
 		while($this->stop === false){
 			$packet = $this->interface->readPacket();
 			if($packet !== false){
 				$this->packetHandler($packet);
+				$lastLoop = 0;
 			}else{
-				usleep(1);
+				++$lastLoop;
+				if($lastLoop < 16){
+					usleep(1);
+				}elseif($lastLoop < 128){
+					usleep(100);
+				}elseif($lastLoop < 256){
+					usleep(512);
+				}else{
+					usleep(10000);
+				}
 			}
 		}
 	}
@@ -609,10 +625,10 @@ class PocketMinecraftServer{
 				if(!is_callable($schedule[0])){
 					$return = false;
 				}else{
-					$return = call_user_func($schedule[0],$schedule[1],$schedule[2]);
+					$return = call_user_func($schedule[0], $schedule[1], $schedule[2]);
 				}
 
-				if($action["repeat"] === 0 or $return === false){
+				if($action["repeat"] == 0 or $return === false){
 					$this->query("DELETE FROM actions WHERE ID = ".$action["ID"].";");
 					$this->schedule[$cid] = null;
 					unset($this->schedule[$cid]);

src/build/compile.sh

@@ -1,13 +1,13 @@
 #!/bin/bash
-COMPILER_VERSION="0.12"
+COMPILER_VERSION="0.13"
 
-PHP_VERSION="5.4.15"
+PHP_VERSION="5.5.3"
 ZEND_VM="GOTO"
 
 LIBEDIT_VERSION="0.3"
 ZLIB_VERSION="1.2.8"
 PTHREADS_VERSION="0.0.44"
-CURL_VERSION="curl-7_30_0"
+CURL_VERSION="curl-7_32_0"
 
 echo "[PocketMine] PHP installer and compiler for Linux & Mac"
 DIR="$(pwd)"
@@ -23,6 +23,7 @@ type wget >> "$DIR/install.log" 2>&1 || { echo >&2 "[ERROR] Please install \"wge
 
 export CC="gcc"
 COMPILE_FOR_ANDROID=no
+RANLIB=ranlib
 if [ "$1" == "rpi" ]; then
 	[ -z "$march" ] && march=armv6zk;
 	[ -z "$mtune" ] && mtune=arm1176jzf-s;
@@ -45,8 +46,8 @@ elif [ "$1" == "crosscompile" ]; then
 		echo "[INFO] Cross-compiling for Android ARMv6"
 	elif [ "$2" == "android-armv7" ]; then
 		COMPILE_FOR_ANDROID=yes
-		[ -z "$march" ] && march=armv7;
-		[ -z "$mtune" ] && mtune=generic;
+		[ -z "$march" ] && march=armv7a;
+		[ -z "$mtune" ] && mtune=generic-armv7-a;
 		TOOLCHAIN_PREFIX="arm-none-linux-gnueabi"
 		export CC="$TOOLCHAIN_PREFIX-gcc"
 		CONFIGURE_FLAGS="--host=$TOOLCHAIN_PREFIX"
@@ -61,8 +62,18 @@ elif [ "$1" == "crosscompile" ]; then
 		CONFIGURE_FLAGS="--host=$TOOLCHAIN_PREFIX"
 		[ -z "$CFLAGS" ] && CFLAGS="-uclibc";
 		echo "[INFO] Cross-compiling for Raspberry Pi ARMv6zk hard float"
+	elif [ "$2" == "mac" ]; then
+		[ -z "$march" ] && march=prescott;
+		[ -z "$mtune" ] && mtune=generic;
+		[ -z "$CFLAGS" ] && CFLAGS="-fomit-frame-pointer";
+		TOOLCHAIN_PREFIX="i686-apple-darwin10"
+		export CC="$TOOLCHAIN_PREFIX-gcc"
+		CONFIGURE_FLAGS="--host=$TOOLCHAIN_PREFIX"
+		#zlib doesn't use the correct ranlib
+		RANLIB=$TOOLCHAIN_PREFIX-ranlib
+		echo "[INFO] Cross-compiling for Intel MacOS"
 	else
-		echo "Please supply a proper platform [android android-armv6 android-armv7 rpi] to cross-compile"
+		echo "Please supply a proper platform [android android-armv6 android-armv7 rpi mac] to cross-compile"
 		exit 1
 	fi
 else
@@ -135,7 +146,7 @@ wget http://zlib.net/zlib-$ZLIB_VERSION.tar.gz -q -O - | tar -zx >> "$DIR/instal
 mv zlib-$ZLIB_VERSION zlib
 echo -n " checking..."
 cd zlib
-./configure --prefix="$DIR/install_data/php/ext/zlib" \
+RANLIB=$RANLIB ./configure --prefix="$DIR/install_data/php/ext/zlib" \
 --static >> "$DIR/install.log" 2>&1
 echo -n " compiling..."
 make -j $THREADS >> "$DIR/install.log" 2>&1
@@ -146,7 +157,7 @@ cd ..
 rm -r -f ./zlib
 echo " done!"
 
-if [ "$(uname -s)" == "Darwin" ] && [ "$1" != "crosscompile" ]; then
+if [ "$(uname -s)" == "Darwin" ] && [ "$1" != "crosscompile" ] && [ "$2" != "curl" ]; then
    HAVE_CURL="shared,/usr/local"
 else
 	#curl
@@ -193,9 +204,9 @@ echo " done!"
 echo -n "[PHP]"
 set +e
 if which free >/dev/null; then
-    MAX_MEMORY=$(free -m | awk '/^Mem:/{print $2}')
+	MAX_MEMORY=$(free -m | awk '/^Mem:/{print $2}')
 else
-    MAX_MEMORY=$(top -l 1 | grep PhysMem: | awk '{print $10}' | tr -d 'a-zA-Z')
+	MAX_MEMORY=$(top -l 1 | grep PhysMem: | awk '{print $10}' | tr -d 'a-zA-Z')
 fi
 if [ $MAX_MEMORY -gt 512 ] && [ "$1" != "crosscompile" ]; then
 	echo -n " enabling optimizations..."
@@ -213,6 +224,8 @@ rm -f ./configure >> "$DIR/install.log" 2>&1
 if [ "$1" == "crosscompile" ]; then
 	sed -i 's/pthreads_working=no/pthreads_working=yes/' ./configure
 	export LIBS="-lpthread -ldl"
+	CONFIGURE_FLAGS="$CONFIGURE_FLAGS --enable-opcache=no"
+
 fi
 ./configure $OPTIMIZATION--prefix="$DIR/php5" \
 --exec-prefix="$DIR/php5" \
@@ -244,12 +257,12 @@ $HAVE_LIBEDIT \
 --enable-cli \
 --without-pear \
 --without-iconv \
---without-pdo \
+--disable-pdo \
 --without-pdo-sqlite \
 --with-zend-vm=$ZEND_VM \
 $CONFIGURE_FLAGS >> "$DIR/install.log" 2>&1
 echo -n " compiling..."
-if [ COMPILE_FOR_ANDROID == "yes" ]; then
+if [ $COMPILE_FOR_ANDROID == "yes" ]; then
 	sed -i 's/-export-dynamic/-all-static/g' Makefile
 fi
 make -j $THREADS >> "$DIR/install.log" 2>&1

src/config.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 set_time_limit(0);
@@ -65,9 +59,9 @@ set_include_path(get_include_path() . PATH_SEPARATOR . FILE_PATH);
 ini_set("memory_limit", "128M"); //Default
 define("LOG", true);
 define("START_TIME", microtime(true));
-define("MAJOR_VERSION", "Alpha_1.3.1");
-define("CURRENT_MINECRAFT_VERSION", "0.7.1 alpha");
-define("CURRENT_API_VERSION", 9);
+define("MAJOR_VERSION", "Alpha_1.3.8");
+define("CURRENT_MINECRAFT_VERSION", "0.7.5 alpha");
+define("CURRENT_API_VERSION", 10);
 define("CURRENT_PHP_VERSION", "5.5");
 $gitsha1 = false;
 if(file_exists(FILE_PATH.".git/refs/heads/master")){ //Found Git information!

src/constants/BlockIDs.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 define("AIR", 0);

src/constants/GeneralConstants.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 
@@ -37,11 +31,11 @@ define("VIEWER", 3);
 
 
 //Players
-define("MAX_CHUNK_RATE", 20 / arg("max-chunks-per-second", 3.5)); //Default rate ~172 kB/s
-define("PLAYER_MAX_RECOVERY_BUFFER", 1024);
+define("MAX_CHUNK_RATE", 20 / arg("max-chunks-per-second", 4)); //Default rate ~256 kB/s
+define("PLAYER_MAX_QUEUE", 1024);
 
 define("PLAYER_SURVIVAL_SLOTS", 36);
-define("PLAYER_CREATIVE_SLOTS", 111);
+define("PLAYER_CREATIVE_SLOTS", 112);
 
 
 //Block Updates

src/constants/ItemIDs.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 define("IRON_SHOVEL", 256);//Implemented
@@ -123,8 +117,8 @@ define("EGG", 344);
 define("COMPASS", 345);
 
 define("GLOWSTONE_DUST", 348);
-define("RAW_FISH", 349);
-define("COOKED_FISH", 350);
+//define("RAW_FISH", 349);
+//define("COOKED_FISH", 350);
 define("DYE", 351);
 define("BONE", 352);
 define("SUGAR", 353);
@@ -132,7 +126,7 @@ define("CAKE", 354);
 define("BED", 355);
 
 
-define("COOKIE", 357);
+//define("COOKIE", 357);
 
 
 define("SHEARS", 359);

src/dependencies.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 /***REM_START***/

src/functions.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 if(!function_exists("cli_set_process_title")){
@@ -128,32 +122,6 @@ function hard_unset(&$var){
 	}
 }
 
-
-function parseNBTData($data){
-	$x = array();
-	if(isset($data["value"])){
-		return parseNBTData($data["value"]);
-	}
-	foreach($data as $d){
-		if(!isset($d["value"]) and is_array($d) and count($d) == 1){
-			return parseNBTData(array_pop($d));
-		}elseif(!isset($d["value"]) and is_array($d)){
-			$x[] = parseNBTData($d);
-		}elseif(is_array($d["value"]) and isset($d["name"])){
-			$x[$d["name"]] = parseNBTData($d["value"]);
-		}elseif(is_array($d["value"]) and $d["type"] == 10){
-			return parseNBTData($d["value"]);
-		}elseif($d["name"] != ""){
-			$x[$d["name"]] = $d["value"];
-		}
-	}
-	if(count($x) == 0){
-		$x = $data;
-	}
-	return $x;
-}
-
-
 function arg($name, $default = false){
 	global $arguments, $argv;
 	if(!isset($arguments)){
@@ -217,7 +185,7 @@ function console($message, $EOL = true, $log = true, $level = 1){
 		$time = (ENABLE_ANSI === true ? "\x1b[36m".date("H:i:s")."\x1b[0m":date("H:i:s")) . " ";
 		$replaced = preg_replace('/\x1b\[[0-9;]*m/', "", $time . $message);
 		if($log === true and (!defined("LOG") or LOG === true)){
-			logg($replaced, "console", false, $level);
+			logg(date("Y-m-d")." ".$replaced, "console", false, $level);
 		}
 		if(ENABLE_ANSI === true){
 			$add = "";

src/inventory/Window.php

@@ -1,33 +1,28 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 define("WINDOW_CHEST", 0);
 define("WINDOW_WORKBENCH", 1);
 define("WINDOW_FURNACE", 2);
+define("WINDOW_STONECUTTER", 3);
 
 class Window{
 	private $server;

src/material/Block.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 abstract class Block extends Position{
@@ -156,7 +150,7 @@ abstract class Block extends Position{
 		$this->id = (int) $id;
 		$this->meta = (int) $meta;
 		$this->name = $name;
-		$this->breakTime = 0.25;
+		$this->breakTime = 0.20;
 	}
 	
 	final public function getName(){
@@ -190,7 +184,7 @@ abstract class Block extends Position{
 	
 	public function getBreakTime(Item $item, Player $player){
 		if(($player->gamemode & 0x01) === 0x01){
-			return 0.20;
+			return 0.15;
 		}
 		return $this->breakTime;
 	}

src/material/Item.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class Item{
@@ -135,14 +129,50 @@ class Item{
 		
 	}
 	
-	public function useOn($object){
-		if($this->isTool()){
-			$this->meta++;
+	public function useOn($object, $force = false){
+		if($this->isTool() or $force === true){
+			if(($object instanceof Entity) and !$this->isSword()){
+				$this->meta += 2;
+			}else{
+				$this->meta++;
+			}
+			return true;
 		}
+		return false;
 	}
 	
 	final public function isTool(){
-		return ($this->id === FLINT_STEEL or $this->id === SHEARS or $this->isPickaxe() !== false or $this->isAxe() !== false or $this->isShovel() !== false or $this->isSword() !== false or $this->isHoe() !== false);
+		return ($this->id === FLINT_STEEL or $this->id === SHEARS or $this->isPickaxe() !== false or $this->isAxe() !== false or $this->isShovel() !== false or $this->isSword() !== false);
+	}
+	
+	final public function getMaxDurability(){
+		if(!$this->isTool() and $this->isHoe() === false and $this->id !== BOW){
+			return false;
+		}
+		
+		$levels = array(
+			2 => 33,
+			1 => 60,
+			3 => 132,
+			4 => 251,
+			5 => 1562,
+			FLINT_STEEL => 65,
+			SHEARS => 239,
+			BOW => 385,
+		);
+
+		if(($type = $this->isPickaxe()) === false){			
+			if(($type = $this->isAxe()) === false){			
+				if(($type = $this->isSword()) === false){				
+					if(($type = $this->isShovel()) === false){					
+						if(($type = $this->isHoe()) === false){
+							$type = $this->id;
+						}
+					}	
+				}
+			}
+		}
+		return $levels[$type];
 	}
 	
 	final public function isPickaxe(){ //Returns false or level of the pickaxe
@@ -225,6 +255,10 @@ class Item{
 				return false;
 		}
 	}
+
+	public function isShears(){
+		return ($this->id === SHEARS);
+	}
 	
 	final public function __toString(){
 		return "Item ". $this->name ." (".$this->id.":".$this->meta.")";

src/material/block/DoorBlock.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class DoorBlock extends TransparentBlock{
@@ -31,6 +25,19 @@ class DoorBlock extends TransparentBlock{
 		$this->isSolid = false;
 	}
 
+	public function onUpdate($type){
+		if($type === BLOCK_UPDATE_NORMAL){
+			if($this->getSide(0)->getID() === AIR){ //Replace with common break method
+				$this->level->setBlock($this, new AirBlock(), false);
+				if($this->getSide(1) instanceof DoorBlock){
+					$this->level->setBlock($this->getSide(1), new AirBlock(), false);
+				}
+				return BLOCK_UPDATE_NORMAL;
+			}
+		}
+		return false;
+	}
+
 	public function place(Item $item, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){
 		if($face === 1){
 			$blockUp = $this->getSide(1);
@@ -51,10 +58,10 @@ class DoorBlock extends TransparentBlock{
 			if($next->getID() === $this->id or ($next2->isTransparent === false and $next->isTransparent === true)){ //Door hinge
 				$metaUp |= 0x01;
 			}
-			$this->level->setBlock($blockUp, BlockAPI::get($this->id, $metaUp)); //Top
+			$this->level->setBlock($blockUp, BlockAPI::get($this->id, $metaUp), true, false, true); //Top
 			
 			$this->meta = $direction & 0x03;
-			$this->level->setBlock($block, $this); //Bottom
+			$this->level->setBlock($block, $this, true, false, true); //Bottom
 			return true;			
 		}
 		return false;
@@ -64,15 +71,15 @@ class DoorBlock extends TransparentBlock{
 		if(($this->meta & 0x08) === 0x08){
 			$down = $this->getSide(0);
 			if($down->getID() === $this->id){
-				$this->level->setBlock($down, new AirBlock());
+				$this->level->setBlock($down, new AirBlock(), true, false, true);
 			}
 		}else{
 			$up = $this->getSide(1);
 			if($up->getID() === $this->id){
-				$this->level->setBlock($up, new AirBlock());
+				$this->level->setBlock($up, new AirBlock(), true, false, true);
 			}
 		}
-		$this->level->setBlock($this, new AirBlock());
+		$this->level->setBlock($this, new AirBlock(), true, false, true);
 		return true;
 	}
 	
@@ -81,13 +88,13 @@ class DoorBlock extends TransparentBlock{
 			$down = $this->getSide(0);
 			if($down->getID() === $this->id){
 				$meta = $down->getMetadata() ^ 0x04;
-				$this->level->setBlock($down, BlockAPI::get($this->id, $meta));
+				$this->level->setBlock($down, BlockAPI::get($this->id, $meta), true, false, true);
 				return true;
 			}
 			return false;
 		}else{
 			$this->meta ^= 0x04;
-			$this->level->setBlock($this, $this);
+			$this->level->setBlock($this, $this, true, false, true);
 		}
 		return true;
 	}

src/material/block/FallableBlock.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class FallableBlock extends SolidBlock{

src/material/block/FlowableBlock.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class FlowableBlock extends TransparentBlock{

src/material/block/GenericBlock.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 

src/material/block/LiquidBlock.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class LiquidBlock extends TransparentBlock{

src/material/block/SolidBlock.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class SolidBlock extends GenericBlock{

src/material/block/StairBlock.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class StairBlock extends TransparentBlock{
@@ -46,7 +40,7 @@ class StairBlock extends TransparentBlock{
 		if(($fy > 0.5 and $face !== 1) or $face === 0){
 			$this->meta |= 0x04; //Upside-down stairs
 		}
-		$this->level->setBlock($block, $this);
+		$this->level->setBlock($block, $this, true, false, true);
 		return true;
 	}
 	

src/material/block/TransparentBlock.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class TransparentBlock extends GenericBlock{

src/material/block/attachable/Ladder.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class LadderBlock extends TransparentBlock{
@@ -41,7 +35,7 @@ class LadderBlock extends TransparentBlock{
 				);
 			if(isset($faces[$face])){
 				$this->meta = $faces[$face];
-				$this->level->setBlock($block, $this);
+				$this->level->setBlock($block, $this, true, false, true);
 				return true;
 			}
 		}

src/material/block/attachable/SignPost.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class SignPostBlock extends TransparentBlock{
@@ -42,11 +36,11 @@ class SignPostBlock extends TransparentBlock{
 			);
 			if(!isset($faces[$face])){
 				$this->meta = floor((($player->entity->yaw + 180) * 16 / 360) + 0.5) & 0x0F;
-				$this->level->setBlock($block, BlockAPI::get(SIGN_POST, $this->meta));
+				$this->level->setBlock($block, BlockAPI::get(SIGN_POST, $this->meta), true, false, true);
 				return true;
 			}else{
 				$this->meta = $faces[$face];
-				$this->level->setBlock($block, BlockAPI::get(WALL_SIGN, $this->meta));
+				$this->level->setBlock($block, BlockAPI::get(WALL_SIGN, $this->meta, true, false, true));
 				return true;
 			}
 		}
@@ -55,9 +49,9 @@ class SignPostBlock extends TransparentBlock{
 	
 	public function onUpdate($type){
 		if($type === BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->getID() === AIR){ //Replace wit common break method
+			if($this->getSide(0)->getID() === AIR){ //Replace with common break method
 				ServerAPI::request()->api->entity->drop($this, BlockAPI::getItem(SIGN, 0, 1));
-				$this->level->setBlock($this, new AirBlock(), false);
+				$this->level->setBlock($this, new AirBlock(), true, true, true);
 				return BLOCK_UPDATE_NORMAL;
 			}
 		}
@@ -65,7 +59,7 @@ class SignPostBlock extends TransparentBlock{
 	}
 	
 	public function onBreak(Item $item, Player $player){
-		$this->level->setBlock($this, new AirBlock(), true, true);
+		$this->level->setBlock($this, new AirBlock(), true, true, true);
 		return true;
 	}
 

src/material/block/attachable/Torch.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class TorchBlock extends FlowableBlock{
@@ -43,9 +37,9 @@ class TorchBlock extends FlowableBlock{
 					0 => 0,
 			);
 
-			if($this->getSide($faces[$side])->isTransparent === true and !($side === 0 and $this->getSide(0)->getID() === FENCE)){ //Replace wit common break method
+			if($this->getSide($faces[$side])->isTransparent === true and !($side === 0 and $this->getSide(0)->getID() === FENCE)){ //Replace with common break method
 				ServerAPI::request()->api->entity->drop($this, BlockAPI::getItem($this->id, 0, 1));
-				$this->level->setBlock($this, new AirBlock(), false);
+				$this->level->setBlock($this, new AirBlock(), true, false, true);
 				return BLOCK_UPDATE_NORMAL;
 			}
 		}
@@ -62,11 +56,11 @@ class TorchBlock extends FlowableBlock{
 				5 => 1,
 			);
 			$this->meta = $faces[$face];
-			$this->level->setBlock($block, $this);
+			$this->level->setBlock($block, $this, true, false, true);
 			return true;
 		}elseif($this->getSide(0)->isTransparent === false or $this->getSide(0)->getID() === FENCE){
 			$this->meta = 0;
-			$this->level->setBlock($block, $this);
+			$this->level->setBlock($block, $this, true, false, true);
 			return true;
 		}
 		return false;

src/material/block/attachable/Trapdoor.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class TrapdoorBlock extends TransparentBlock{
@@ -47,7 +41,7 @@ class TrapdoorBlock extends TransparentBlock{
 				if($fy > 0.5){
 					$this->meta |= 0x08;
 				}
-				$this->level->setBlock($block, $this);
+				$this->level->setBlock($block, $this, true, false, true);
 				return true;
 			}
 	}
@@ -58,7 +52,7 @@ class TrapdoorBlock extends TransparentBlock{
 	}
 	public function onActivate(Item $item, Player $player){
 		$this->meta ^= 0x04;
-		$this->level->setBlock($this, $this);
+		$this->level->setBlock($this, $this, true, false, true);
 		return true;
 	}
 }

src/material/block/attachable/WallSign.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 /***REM_START***/

src/material/block/liquid/Lava.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class LavaBlock extends LiquidBlock{

src/material/block/liquid/StillLava.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class StillLavaBlock extends LiquidBlock{

src/material/block/liquid/StillWater.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 

src/material/block/liquid/Water.php

@@ -1,55 +1,112 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class WaterBlock extends LiquidBlock{
 	public function __construct($meta = 0){
 		parent::__construct(WATER, $meta, "Water");
-	}
+	}	
 	
+	public function place(Item $item, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){
+		$ret = $this->level->setBlock($this, $this, true, false, true);
+		ServerAPI::request()->api->block->scheduleBlockUpdate(clone $this, 10, BLOCK_UPDATE_NORMAL);
+		return $ret;
+	}
+
 	public function onUpdate($type){
 		return false;
-		$level = $this->meta & 0x03;
-		if($type !== BLOCK_UPDATE_NORMAL or $level === 0){
+		$newId = $this->id;
+		$level = $this->meta & 0x07;
+		if($type !== BLOCK_UPDATE_NORMAL){
 			return false;
 		}
 		
 		$falling = $this->meta >> 3;
 		$down = $this->getSide(0);
+		
+		if($falling === 0){
+			$countSources = 0;
+			$maxLevel = $level;
+			$hasPath = false;
+			for($side = 2; $side <= 5; ++$side){
+				$b = $this->getSide($side);
+				if($b->isFlowable === true and $level < 0x07){
+					$d = $b->getSide(0);
+					$this->level->setBlock($b, new WaterBlock($level + 1), false, false, true);
+					ServerAPI::request()->api->block->scheduleBlockUpdate(new Position($b, 0, 0, $this->level), 10, BLOCK_UPDATE_NORMAL);
+				}elseif($b instanceof WaterBlock){
+					$oLevel = $b->getMetadata();
+					$oFalling = $oLevel >> 3;
+					$oLevel &= 0x07;
+					if($oFalling === 0){
+						if($oLevel === 0){
+							++$countSources;
+							$maxLevel = 1;
+							$hasPath = true;
+						}elseif($oLevel < 0x07 and ($oLevel + 1) <= $maxLevel){
+							$maxLevel = $oLevel + 1;
+							$hasPath = true;
+						}elseif(($level + 1) < $oLevel){
+							$this->level->setBlock($b, new WaterBlock($level + 1), false, false, true);
+							ServerAPI::request()->api->block->scheduleBlockUpdate(new Position($b, 0, 0, $this->level), 10, BLOCK_UPDATE_NORMAL);
+						}elseif($level === $oLevel){
+							ServerAPI::request()->api->block->scheduleBlockUpdate(new Position($b, 0, 0, $this->level), 10, BLOCK_UPDATE_NORMAL);
+						}
+					}
+				}
+			}
+			if($countSources >= 2){
+				$level = 0; //Source block
+			}elseif($maxLevel < $level){
+				$level = $maxLevel;
+			}elseif($maxLevel === $level and $level > 0 and $hasPath === false){
+				if($level < 0x07){
+					++$level;
+				}else{
+					$newId = AIR;
+					$level = 0;
+				}
+			}
+		}
+
 		if($down->isFlowable){
-			$this->level->setBlock($down, new WaterBlock(9), true); //1001
-			return;
-		}elseif($down instanceof WaterBlock and $down->getMetadata() === 9){
-			$level = 1;
+			$this->level->setBlock($down, new WaterBlock(0b1001), false, false, true);
+			ServerAPI::request()->api->block->scheduleBlockUpdate(new Position($down, 0, 0, $this->level), 5, BLOCK_UPDATE_NORMAL);
+			return false;
+		}elseif($down instanceof LiquidBlock){
+			if($down instanceof WaterBlock and ($down->getMetadata() >> 3) === 0){
+				$this->level->setBlock($down, new WaterBlock(0b1000 & min($down->getMetadata(), 1)), false, false, true);
+				ServerAPI::request()->api->block->scheduleBlockUpdate(new Position($down, 0, 0, $this->level), 5, BLOCK_UPDATE_NORMAL);
+			}
+		}else{
+			$falling = 0;
 		}
 		
-		$up = $this->getSide(1);
-		if($up instanceof WaterBlock){
-			
+		$newMeta = ($falling << 0x03) | $level;
+		if($newMeta !== $this->meta or $newId !== $this->id){
+			$this->id = $newId;
+			$this->meta = $newMeta;
+			$this->level->setBlock($this, $this, false, false, true);
+			ServerAPI::request()->api->block->scheduleBlockUpdate(new Position($this, 0, 0, $this->level), 10, BLOCK_UPDATE_NORMAL);
+			return false;
 		}
-	}
-	
+		return false;
+	}	
 }

src/material/block/misc/Air.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class AirBlock extends TransparentBlock{

src/material/block/misc/Bed.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class BedBlock extends TransparentBlock{
@@ -33,9 +27,17 @@ class BedBlock extends TransparentBlock{
 	}
 	
 	public function onActivate(Item $item, Player $player){
-		$player->dataPacket(MC_CLIENT_MESSAGE, array(
-			"message" => "This bed has been corrupted by your hands!"
-		));
+		if(ServerAPI::request()->api->time->getPhase($player->level) !== "night"){
+			$player->dataPacket(MC_CLIENT_MESSAGE, array(
+				"message" => "You can only sleep at night"
+			));
+			return true;
+		}
+		if($player->sleepOn($this) === false){
+			$player->dataPacket(MC_CLIENT_MESSAGE, array(
+				"message" => "This bed is occupied"
+			));
+		}
 		return true;
 	}
 	
@@ -53,8 +55,8 @@ class BedBlock extends TransparentBlock{
 				$downNext = $this->getSide(0);
 				if($next->isReplaceable === true and $downNext->isTransparent === false){
 					$meta = (($d + 3) % 4) & 0x03;
-					$this->level->setBlock($block, BlockAPI::get($this->id, $meta));
-					$this->level->setBlock($next, BlockAPI::get($this->id, $meta | 0x08));
+					$this->level->setBlock($block, BlockAPI::get($this->id, $meta), true, false, true);
+					$this->level->setBlock($next, BlockAPI::get($this->id, $meta | 0x08), true, false, true);
 					return true;
 				}
 			}
@@ -69,26 +71,26 @@ class BedBlock extends TransparentBlock{
 			
 			if(($this->meta & 0x08) === 0x08){ //This is the Top part of bed			
 				if($blockNorth->getID() === $this->id and $blockNorth->meta !== 0x08){ //Checks if the block ID and meta are right
-					$this->level->setBlock($blockNorth, new AirBlock());
+					$this->level->setBlock($blockNorth, new AirBlock(), true, false, true);
 				}elseif($blockSouth->getID() === $this->id and $blockSouth->meta !== 0x08){
-					$this->level->setBlock($blockSouth, new AirBlock());
+					$this->level->setBlock($blockSouth, new AirBlock(), true, false, true);
 				}elseif($blockEast->getID() === $this->id and $blockEast->meta !== 0x08){
-					$this->level->setBlock($blockEast, new AirBlock());
+					$this->level->setBlock($blockEast, new AirBlock(), true, false, true);
 				}elseif($blockWest->getID() === $this->id and $blockWest->meta !== 0x08){
-					$this->level->setBlock($blockWest, new AirBlock());
+					$this->level->setBlock($blockWest, new AirBlock(), true, false, true);
 				}
 			}else{ //Bottom Part of Bed
 				if($blockNorth->getID() === $this->id and ($blockNorth->meta & 0x08) === 0x08){
-					$this->level->setBlock($blockNorth, new AirBlock());
+					$this->level->setBlock($blockNorth, new AirBlock(), true, false, true);
 				}elseif($blockSouth->getID() === $this->id and ($blockSouth->meta & 0x08) === 0x08){
-					$this->level->setBlock($blockSouth, new AirBlock());
+					$this->level->setBlock($blockSouth, new AirBlock(), true, false, true);
 				}elseif($blockEast->getID() === $this->id and ($blockEast->meta & 0x08) === 0x08){
-					$this->level->setBlock($blockEast, new AirBlock());
+					$this->level->setBlock($blockEast, new AirBlock(), true, false, true);
 				}elseif($blockWest->getID() === $this->id and ($blockWest->meta & 0x08) === 0x08){
-					$this->level->setBlock($blockWest, new AirBlock());
+					$this->level->setBlock($blockWest, new AirBlock(), true, false, true);
 				}				
 			}
-			$this->level->setBlock($this, new AirBlock());
+			$this->level->setBlock($this, new AirBlock(), true, false, true);
 			return true;
 	}
 	

src/material/block/misc/Fire.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class FireBlock extends FlowableBlock{
@@ -45,11 +39,11 @@ class FireBlock extends FlowableBlock{
 					return false;
 				}
 			}
-			$this->level->setBlock($this, new AirBlock(), false);
+			$this->level->setBlock($this, new AirBlock(), true, false, true);
 			return BLOCK_UPDATE_NORMAL;
 		}elseif($type === BLOCK_UPDATE_RANDOM){
 			if($this->getSide(0)->getID() !== NETHERRACK){
-				$this->level->setBlock($this, new AirBlock(), false);
+				$this->level->setBlock($this, new AirBlock(), true, false, true);
 				return BLOCK_UPDATE_NORMAL;
 			}
 		}

src/material/block/misc/NetherReactor.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class NetherReactorBlock extends SolidBlock{

src/material/block/misc/TNT.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class TNTBlock extends SolidBlock{

src/material/block/nonfull/Cake.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class CakeBlock extends TransparentBlock{
@@ -33,6 +27,16 @@ class CakeBlock extends TransparentBlock{
 		$this->meta = $meta & 0x07;
 	}
 	
+	public function onUpdate($type){
+		if($type === BLOCK_UPDATE_NORMAL){
+			if($this->getSide(0)->getID() === AIR){ //Replace with common break method
+				$this->level->setBlock($this, new AirBlock(), true, false, true);
+				return BLOCK_UPDATE_NORMAL;
+			}
+		}
+		return false;
+	}
+	
 	public function getDrops(Item $item, Player $player){
 		return array();
 	}
@@ -42,9 +46,9 @@ class CakeBlock extends TransparentBlock{
 			++$this->meta;
 			$player->entity->heal(3, "cake");
 			if($this->meta >= 0x06){
-				$this->level->setBlock($this, new AirBlock());
+				$this->level->setBlock($this, new AirBlock(), true, false, true);
 			}else{
-				$this->level->setBlock($this, $this);
+				$this->level->setBlock($this, $this, true, false, true);
 			}
 			return true;
 		}

src/material/block/nonfull/Cobweb.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class CobwebBlock extends FlowableBlock{

src/material/block/nonfull/Fence.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class FenceBlock extends TransparentBlock{

src/material/block/nonfull/FenceGate.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class FenceGateBlock extends TransparentBlock{
@@ -43,7 +37,7 @@ class FenceGateBlock extends TransparentBlock{
 			3 => 2,
 		);
 		$this->meta = $faces[$player->entity->getDirection()] & 0x03;
-		$this->level->setBlock($block, $this);
+		$this->level->setBlock($block, $this, true, false, true);
 		return true;
 	}
 	public function getDrops(Item $item, Player $player){
@@ -59,7 +53,12 @@ class FenceGateBlock extends TransparentBlock{
 			3 => 2,
 		);
 		$this->meta = ($faces[$player->entity->getDirection()] & 0x03) | ((~$this->meta) & 0x04);
-		$this->level->setBlock($this, $this);
+		if(($this->meta & 0x04) === 0x04){
+			$this->isFullBlock = true;
+		}else{
+			$this->isFullBlock = false;
+		}
+		$this->level->setBlock($this, $this, true, false, true);
 		return true;
 	}	
 }

src/material/block/nonfull/GlassPane.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class GlassPaneBlock extends TransparentBlock{

src/material/block/nonfull/IronDoor.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class IronDoorBlock extends DoorBlock{

src/material/block/nonfull/Slab.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class SlabBlock extends TransparentBlock{
@@ -35,8 +29,8 @@ class SlabBlock extends TransparentBlock{
 			3 => "Cobblestone",
 			4 => "Brick",
 			5 => "Stone Brick",
-			6 => "Nether Brick",
-			7 => "Quartz",
+			//6 => "Nether Brick",
+			6 => "Quartz",
 		);
 		$this->name = (($this->meta & 0x08) === 0x08 ? "Upper ":"") . $names[$this->meta & 0x07] . " Slab";	
 		if(($this->meta & 0x08) === 0x08){
@@ -50,20 +44,20 @@ class SlabBlock extends TransparentBlock{
 			$this->meta &= 0x07;
 			if($face === 0){
 				if($target->getID() === SLAB and ($target->getMetadata() & 0x08) === 0x08 and ($target->getMetadata() & 0x07) === ($this->meta & 0x07)){
-					$this->level->setBlock($target, BlockAPI::get(DOUBLE_SLAB, $this->meta));
+					$this->level->setBlock($target, BlockAPI::get(DOUBLE_SLAB, $this->meta), true, false, true);
 					return true;
 				}else{
 					$this->meta |= 0x08;
 				}
 			}elseif($face === 1){
 				if($target->getID() === SLAB and ($target->getMetadata() & 0x08) === 0 and ($target->getMetadata() & 0x07) === ($this->meta & 0x07)){
-					$this->level->setBlock($target, BlockAPI::get(DOUBLE_SLAB, $this->meta));
+					$this->level->setBlock($target, BlockAPI::get(DOUBLE_SLAB, $this->meta), true, false, true);
 					return true;
 				}
 			}elseif(!$player->entity->inBlock($block)){
 				if($block->getID() === SLAB){
 					if(($block->getMetadata() & 0x07) === ($this->meta & 0x07)){
-						$this->level->setBlock($block, BlockAPI::get(DOUBLE_SLAB, $this->meta));
+						$this->level->setBlock($block, BlockAPI::get(DOUBLE_SLAB, $this->meta), true, false, true);
 						return true;
 					}
 					return false;
@@ -78,7 +72,7 @@ class SlabBlock extends TransparentBlock{
 			if($block->getID() === SLAB and ($target->getMetadata() & 0x07) !== ($this->meta & 0x07)){
 				return false;
 			}
-			$this->level->setBlock($block, $this);
+			$this->level->setBlock($block, $this, true, false, true);
 			return true;
 	}
 

src/material/block/nonfull/SnowLayer.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class SnowLayerBlock extends FlowableBlock{
@@ -35,8 +29,8 @@ class SnowLayerBlock extends FlowableBlock{
 	
 	public function onUpdate($type){
 		if($type === BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->getID() === AIR){ //Replace wit common break method
-				$this->level->setBlock($this, new AirBlock(), false);
+			if($this->getSide(0)->getID() === AIR){ //Replace with common break method
+				$this->level->setBlock($this, new AirBlock(), true, false, true);
 				return BLOCK_UPDATE_NORMAL;
 			}
 		}

src/material/block/nonfull/WoodDoor.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class WoodDoorBlock extends DoorBlock{

src/material/block/nonfull/stairs/BrickStairs.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class BrickStairsBlock extends StairBlock{

src/material/block/nonfull/stairs/CobblestoneStairs.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class CobblestoneStairsBlock extends StairBlock{

src/material/block/nonfull/stairs/NetherBricksStairs.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class NetherBricksStairsBlock extends StairBlock{

src/material/block/nonfull/stairs/QuartzStairs.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class QuartzStairsBlock extends StairBlock{

src/material/block/nonfull/stairs/SandstoneStairs.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class SandstoneStairsBlock extends StairBlock{

src/material/block/nonfull/stairs/StoneBrickStairs.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class StoneBrickStairsBlock extends StairBlock{

src/material/block/nonfull/stairs/WoodStairs.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class WoodStairsBlock extends StairBlock{

src/material/block/ore/CoalOre.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class CoalOreBlock extends SolidBlock{

src/material/block/ore/DiamondOre.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class DiamondOreBlock extends SolidBlock{

src/material/block/ore/GlowingRedstoneOre.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class GlowingRedstoneOreBlock extends SolidBlock{
@@ -32,7 +26,7 @@ class GlowingRedstoneOreBlock extends SolidBlock{
 
 	public function onUpdate($type){
 		if($type === BLOCK_UPDATE_SCHEDULED or $type === BLOCK_UPDATE_RANDOM){
-			$this->level->setBlock($this, BlockAPI::get(REDSTONE_ORE, $this->meta), false);			
+			$this->level->setBlock($this, BlockAPI::get(REDSTONE_ORE, $this->meta), false, false, true);			
 			return BLOCK_UPDATE_WEAK;
 		}else{
 			$this->level->scheduleBlockUpdate(new Position($this, 0, 0, $this->level), Utils::getRandomUpdateTicks(), BLOCK_UPDATE_RANDOM);

src/material/block/ore/GoldOre.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class GoldOreBlock extends SolidBlock{

src/material/block/ore/IronOre.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class IronOreBlock extends SolidBlock{

src/material/block/ore/LapisOre.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class LapisOreBlock extends SolidBlock{

src/material/block/ore/RedstoneOre.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class RedstoneOreBlock extends SolidBlock{
@@ -32,7 +26,7 @@ class RedstoneOreBlock extends SolidBlock{
 	
 	public function onUpdate($type){
 		if($type === BLOCK_UPDATE_NORMAL or $type === BLOCK_UPDATE_TOUCH){
-			$this->level->setBlock($this, BlockAPI::get(GLOWING_REDSTONE_ORE, $this->meta), false);
+			$this->level->setBlock($this, BlockAPI::get(GLOWING_REDSTONE_ORE, $this->meta), false, false, true);
 			$this->level->scheduleBlockUpdate(new Position($this, 0, 0, $this->level), Utils::getRandomUpdateTicks(), BLOCK_UPDATE_RANDOM);
 			return BLOCK_UPDATE_WEAK;
 		}

src/material/block/plant/BrownMushroom.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class BrownMushroomBlock extends FlowableBlock{
@@ -32,9 +26,9 @@ class BrownMushroomBlock extends FlowableBlock{
 
 	public function onUpdate($type){
 		if($type === BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->isTransparent === true){ //Replace wit common break method
+			if($this->getSide(0)->isTransparent === true){ //Replace with common break method
 				ServerAPI::request()->api->entity->drop($this, BlockAPI::getItem($this->id));
-				$this->level->setBlock($this, new AirBlock(), false);
+				$this->level->setBlock($this, new AirBlock(), false, false, true);
 				return BLOCK_UPDATE_NORMAL;
 			}
 		}
@@ -44,7 +38,7 @@ class BrownMushroomBlock extends FlowableBlock{
 	public function place(Item $item, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){
 			$down = $this->getSide(0);
 			if($down->isTransparent === false){
-				$this->level->setBlock($block, $this);
+				$this->level->setBlock($block, $this, true, false, true);
 				return true;
 			}
 		return false;

src/material/block/plant/Cactus.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class CactusBlock extends TransparentBlock{
@@ -34,7 +28,7 @@ class CactusBlock extends TransparentBlock{
 	public function onUpdate($type){
 		if($type === BLOCK_UPDATE_NORMAL){
 			$down = $this->getSide(0);
-			if($down->getID() !== SAND and $down->getID() !== CACTUS){ //Replace wit common break method
+			if($down->getID() !== SAND and $down->getID() !== CACTUS){ //Replace with common break method
 				$this->level->setBlock($this, new AirBlock(), false);
 				ServerAPI::request()->api->entity->drop($this, BlockAPI::getItem($this->id));
 				return BLOCK_UPDATE_NORMAL;
@@ -45,15 +39,15 @@ class CactusBlock extends TransparentBlock{
 					for($y = 1; $y < 3; ++$y){
 						$b = $this->level->getBlock(new Vector3($this->x, $this->y + $y, $this->z));
 						if($b->getID() === AIR){
-							$this->level->setBlock($b, new CactusBlock());							
+							$this->level->setBlock($b, new CactusBlock(), true, false, true);							
 							break;
 						}
 					}
 					$this->meta = 0;
-					$this->level->setBlock($this, $this);
+					$this->level->setBlock($this, $this, false);
 				}else{
 					++$this->meta;
-					$this->level->setBlock($this, $this);
+					$this->level->setBlock($this, $this, false);
 				}
 				return BLOCK_UPDATE_RANDOM;
 			}
@@ -69,7 +63,7 @@ class CactusBlock extends TransparentBlock{
 			$block2 = $this->getSide(4);
 			$block3 = $this->getSide(5);
 			if($block0->isTransparent === true and $block1->isTransparent === true and $block2->isTransparent === true and $block3->isTransparent === true){
-				$this->level->setBlock($this, $this);
+				$this->level->setBlock($this, $this, true, false, true);
 				$this->level->scheduleBlockUpdate(new Position($this, 0, 0, $this->level), Utils::getRandomUpdateTicks(), BLOCK_UPDATE_RANDOM);
 				return true;
 			}

src/material/block/plant/CyanFlower.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class CyanFlowerBlock extends FlowableBlock{
@@ -33,7 +27,7 @@ class CyanFlowerBlock extends FlowableBlock{
 	public function place(Item $item, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){
 			$down = $this->getSide(0);
 			if($down->getID() === 2 or $down->getID() === 3 or $down->getID() === 60){
-				$this->level->setBlock($block, $this);
+				$this->level->setBlock($block, $this, true, false, true);
 				return true;
 			}
 		return false;
@@ -41,9 +35,9 @@ class CyanFlowerBlock extends FlowableBlock{
 
 	public function onUpdate($type){
 		if($type === BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->isTransparent === true){ //Replace wit common break method
+			if($this->getSide(0)->isTransparent === true){ //Replace with common break method
 				ServerAPI::request()->api->entity->drop($this, BlockAPI::getItem($this->id));
-				$this->level->setBlock($this, new AirBlock(), false);
+				$this->level->setBlock($this, new AirBlock(), false, false, true);
 				return BLOCK_UPDATE_NORMAL;
 			}
 		}

src/material/block/plant/Dandelion.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class DandelionBlock extends FlowableBlock{
@@ -33,7 +27,7 @@ class DandelionBlock extends FlowableBlock{
 	public function place(Item $item, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){
 			$down = $this->getSide(0);
 			if($down->getID() === 2 or $down->getID() === 3 or $down->getID() === 60){
-				$this->level->setBlock($block, $this);
+				$this->level->setBlock($block, $this, true, false, true);
 				return true;
 			}
 		return false;
@@ -41,9 +35,9 @@ class DandelionBlock extends FlowableBlock{
 
 	public function onUpdate($type){
 		if($type === BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->isTransparent === true){ //Replace wit common break method
+			if($this->getSide(0)->isTransparent === true){ //Replace with common break method
 				ServerAPI::request()->api->entity->drop($this, BlockAPI::getItem($this->id));
-				$this->level->setBlock($this, new AirBlock(), false);
+				$this->level->setBlock($this, new AirBlock(), false, false, true);
 				return BLOCK_UPDATE_NORMAL;
 			}
 		}

src/material/block/plant/DeadBush.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class DeadBushBlock extends FlowableBlock{
@@ -33,8 +27,8 @@ class DeadBushBlock extends FlowableBlock{
 
 	public function onUpdate($type){
 		if($type === BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->isTransparent === true){ //Replace wit common break method
-				$this->level->setBlock($this, new AirBlock(), false);
+			if($this->getSide(0)->isTransparent === true){ //Replace with common break method
+				$this->level->setBlock($this, new AirBlock(), false, false, true);
 				return BLOCK_UPDATE_NORMAL;
 			}
 		}

src/material/block/plant/MelonStem.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class MelonStemBlock extends FlowableBlock{
@@ -33,7 +27,7 @@ class MelonStemBlock extends FlowableBlock{
 	public function place(Item $item, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){
 			$down = $this->getSide(0);
 			if($down->getID() === FARMLAND){
-				$this->level->setBlock($block, $this);
+				$this->level->setBlock($block, $this, true, false, true);
 				$this->level->scheduleBlockUpdate(new Position($this, 0, 0, $this->level), Utils::getRandomUpdateTicks(), BLOCK_UPDATE_RANDOM);
 				return true;
 			}
@@ -42,16 +36,16 @@ class MelonStemBlock extends FlowableBlock{
 
 	public function onUpdate($type){
 		if($type === BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->isTransparent === true){ //Replace wit common break method
+			if($this->getSide(0)->isTransparent === true){ //Replace with common break method
 				ServerAPI::request()->api->entity->drop($this, BlockAPI::getItem(MELON_SEEDS, 0, mt_rand(0, 2)));
-				$this->level->setBlock($this, new AirBlock(), false);
+				$this->level->setBlock($this, new AirBlock(), false, false, true);
 				return BLOCK_UPDATE_NORMAL;
 			}
 		}elseif($type === BLOCK_UPDATE_RANDOM){
 			if(mt_rand(0, 2) == 1){
 				if($this->meta < 0x07){
 					++$this->meta;
-					$this->level->setBlock($this, $this);
+					$this->level->setBlock($this, $this, true, false, true);
 					return BLOCK_UPDATE_RANDOM;
 				}else{
 					for($side = 2; $side <= 5; ++$side){
@@ -63,7 +57,7 @@ class MelonStemBlock extends FlowableBlock{
 					$side = $this->getSide(mt_rand(2,5));
 					$d = $side->getSide(0);
 					if($side->getID() === AIR and ($d->getID() === FARMLAND or $d->getID() === GRASS or $d->getID() === DIRT)){
-						$this->level->setBlock($side, new MelonBlock());
+						$this->level->setBlock($side, new MelonBlock(), true, false, true);
 					}
 				}
 			}
@@ -75,7 +69,7 @@ class MelonStemBlock extends FlowableBlock{
 	public function onActivate(Item $item, Player $player){
 		if($item->getID() === DYE and $item->getMetadata() === 0x0F){ //Bonemeal
 			$this->meta = 0x07;
-			$this->level->setBlock($this, $this);
+			$this->level->setBlock($this, $this, true, false, true);
 			if(($player->gamemode & 0x01) === 0){
 				$item->count--;
 			}

src/material/block/plant/RedMushroom.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class RedMushroomBlock extends FlowableBlock{
@@ -32,7 +26,7 @@ class RedMushroomBlock extends FlowableBlock{
 
 	public function onUpdate($type){
 		if($type === BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->isTransparent === true){ //Replace wit common break method
+			if($this->getSide(0)->isTransparent === true){ //Replace with common break method
 				ServerAPI::request()->api->entity->drop($this, BlockAPI::getItem($this->id));
 				$this->level->setBlock($this, new AirBlock(), false);
 				return BLOCK_UPDATE_NORMAL;
@@ -44,7 +38,7 @@ class RedMushroomBlock extends FlowableBlock{
 	public function place(Item $item, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){
 		$down = $this->getSide(0);
 		if($down->isTransparent === false){
-			$this->level->setBlock($block, $this);
+			$this->level->setBlock($block, $this, true, false, true);
 			return true;
 		}
 		return false;

src/material/block/plant/Sapling.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class SaplingBlock extends FlowableBlock{
@@ -45,7 +39,7 @@ class SaplingBlock extends FlowableBlock{
 	public function place(Item $item, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){
 		$down = $this->getSide(0);
 		if($down->getID() === GRASS or $down->getID() === DIRT or $down->getID() === FARMLAND){
-			$this->level->setBlock($block, $this);
+			$this->level->setBlock($block, $this, true, false, true);
 			$this->level->scheduleBlockUpdate(new Position($this, 0, 0, $this->level), Utils::getRandomUpdateTicks(), BLOCK_UPDATE_RANDOM);
 			return true;
 		}
@@ -64,9 +58,9 @@ class SaplingBlock extends FlowableBlock{
 	}
 	public function onUpdate($type){
 		if($type === BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->isTransparent === true){ //Replace wit common break method
+			if($this->getSide(0)->isTransparent === true){ //Replace with common break method
 				ServerAPI::request()->api->entity->drop($this, BlockAPI::getItem($this->id));
-				$this->level->setBlock($this, new AirBlock(), false);
+				$this->level->setBlock($this, new AirBlock(), false, false, true);
 				return BLOCK_UPDATE_NORMAL;
 			}
 		}elseif($type === BLOCK_UPDATE_RANDOM){ //Growth
@@ -75,13 +69,12 @@ class SaplingBlock extends FlowableBlock{
 					TreeObject::growTree($this->level, $this, new Random(), $this->meta & 0x03);
 				}else{
 					$this->meta |= 0x08;
-					$this->level->setBlock($this, $this);
+					$this->level->setBlock($this, $this, true, false, true);
 					return BLOCK_UPDATE_RANDOM;
 				}
 			}else{
 				return BLOCK_UPDATE_RANDOM;
 			}
-			return true;
 		}
 		return false;
 	}

src/material/block/plant/Sugarcane.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class SugarcaneBlock extends FlowableBlock{
@@ -39,9 +33,9 @@ class SugarcaneBlock extends FlowableBlock{
 	public function onUpdate($type){
 		if($type === BLOCK_UPDATE_NORMAL){
 			$down = $this->getSide(0);
-			if($down->isTransparent === true and $down->getID() !== SUGARCANE_BLOCK){ //Replace wit common break method
+			if($down->isTransparent === true and $down->getID() !== SUGARCANE_BLOCK){ //Replace with common break method
 				ServerAPI::request()->api->entity->drop($this, BlockAPI::getItem(SUGARCANE));
-				$this->level->setBlock($this, new AirBlock(), false);
+				$this->level->setBlock($this, new AirBlock(), false, false, true);
 				return BLOCK_UPDATE_NORMAL;
 			}
 		}elseif($type === BLOCK_UPDATE_RANDOM){
@@ -50,15 +44,15 @@ class SugarcaneBlock extends FlowableBlock{
 					for($y = 1; $y < 3; ++$y){
 						$b = $this->level->getBlock(new Vector3($this->x, $this->y + $y, $this->z));
 						if($b->getID() === AIR){
-							$this->level->setBlock($b, new SugarcaneBlock());							
+							$this->level->setBlock($b, new SugarcaneBlock(), true, false, true);							
 							break;
 						}
 					}
 					$this->meta = 0;
-					$this->level->setBlock($this, $this);
+					$this->level->setBlock($this, $this, true, false, true);
 				}else{
 					++$this->meta;
-					$this->level->setBlock($this, $this);
+					$this->level->setBlock($this, $this, true, false, true);
 				}
 				return BLOCK_UPDATE_RANDOM;
 			}
@@ -69,18 +63,15 @@ class SugarcaneBlock extends FlowableBlock{
 	public function place(Item $item, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){
 			$down = $this->getSide(0);
 			if($down->getID() === SUGARCANE_BLOCK){
-				$this->level->setBlock($block, new SugarcaneBlock());
+				$this->level->setBlock($block, new SugarcaneBlock(), true, false, true);
 				return true;
 			}elseif($down->getID() === GRASS or $down->getID() === DIRT or $down->getID() === SAND){
 				$block0 = $down->getSide(2);
 				$block1 = $down->getSide(3);
 				$block2 = $down->getSide(4);
 				$block3 = $down->getSide(5);
-				if(($block0 instanceof WaterBlock)
-				or ($block1 instanceof WaterBlock)
-				or ($block2 instanceof WaterBlock)
-				or ($block3 instanceof WaterBlock)){
-					$this->level->setBlock($block, new SugarcaneBlock());
+				if(($block0 instanceof WaterBlock) or ($block1 instanceof WaterBlock) or ($block2 instanceof WaterBlock) or ($block3 instanceof WaterBlock)){
+					$this->level->setBlock($block, new SugarcaneBlock(), true, false, true);
 					$this->level->scheduleBlockUpdate(new Position($this, 0, 0, $this->level), Utils::getRandomUpdateTicks(), BLOCK_UPDATE_RANDOM);
 					return true;
 				}

src/material/block/plant/TallGrass.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class TallGrassBlock extends FlowableBlock{
@@ -39,8 +33,8 @@ class TallGrassBlock extends FlowableBlock{
 
 	public function onUpdate($type){
 		if($type === BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->isTransparent === true){ //Replace wit common break method
-				$this->level->setBlock($this, new AirBlock(), false);
+			if($this->getSide(0)->isTransparent === true){ //Replace with common break method
+				$this->level->setBlock($this, new AirBlock(), false, false, true);
 				return BLOCK_UPDATE_NORMAL;
 			}
 		}

src/material/block/plant/Wheat.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class WheatBlock extends FlowableBlock{
@@ -34,7 +28,7 @@ class WheatBlock extends FlowableBlock{
 	public function place(Item $item, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){
 		$down = $this->getSide(0);
 		if($down->getID() === FARMLAND){
-			$this->level->setBlock($block, $this);
+			$this->level->setBlock($block, $this, true, false, true);
 			$this->level->scheduleBlockUpdate(new Position($this, 0, 0, $this->level), Utils::getRandomUpdateTicks(), BLOCK_UPDATE_RANDOM);
 			return true;
 		}
@@ -44,7 +38,7 @@ class WheatBlock extends FlowableBlock{
 	public function onActivate(Item $item, Player $player){
 		if($item->getID() === DYE and $item->getMetadata() === 0x0F){ //Bonemeal
 			$this->meta = 0x07;
-			$this->level->setBlock($this, $this);
+			$this->level->setBlock($this, $this, true, false, true);
 			if(($player->gamemode & 0x01) === 0){
 				$item->count--;
 			}
@@ -55,16 +49,16 @@ class WheatBlock extends FlowableBlock{
 
 	public function onUpdate($type){
 		if($type === BLOCK_UPDATE_NORMAL){
-			if($this->getSide(0)->isTransparent === true){ //Replace wit common break method
+			if($this->getSide(0)->isTransparent === true){ //Replace with common break method
 				ServerAPI::request()->api->entity->drop($this, BlockAPI::getItem(WHEAT_SEEDS, 0, 1));
-				$this->level->setBlock($this, new AirBlock(), false);
+				$this->level->setBlock($this, new AirBlock(), false, false, true);
 				return BLOCK_UPDATE_NORMAL;
 			}
 		}elseif($type === BLOCK_UPDATE_RANDOM){
 			if(mt_rand(0, 2) == 1){
 				if($this->meta < 0x07){
 					++$this->meta;
-					$this->level->setBlock($this, $this);
+					$this->level->setBlock($this, $this, true, false, true);
 					return BLOCK_UPDATE_RANDOM;
 				}
 			}else{

src/material/block/solid/Bedrock.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class BedrockBlock extends SolidBlock{

src/material/block/solid/Bookshelf.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class BookshelfBlock extends SolidBlock{

src/material/block/solid/Bricks.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class BricksBlock extends SolidBlock{

src/material/block/solid/BurningFurnace.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class BurningFurnaceBlock extends SolidBlock{
@@ -39,13 +33,12 @@ class BurningFurnaceBlock extends SolidBlock{
 			3 => 3,
 		);
 		$this->meta = $faces[$player->entity->getDirection()];
-		$this->level->setBlock($block, $this);
+		$this->level->setBlock($block, $this, true, false, true);
 		return true;
 	}
 	
 	public function onBreak(Item $item, Player $player){
-		$server = ServerAPI::request();
-		$this->level->setBlock($this, new AirBlock(), true, true);
+		$this->level->setBlock($this, new AirBlock(), true, true, true);
 		return true;
 	}
 
@@ -66,32 +59,11 @@ class BurningFurnaceBlock extends SolidBlock{
 			));
 		}
 		
-		if($furnace->class !== TILE_FURNACE or ($player->gamemode & 0x01) === 0x01){
+		if(($player->gamemode & 0x01) === 0x01){
 			return true;
 		}
-		$player->windowCnt++;
-		$player->windowCnt = $id = max(2, $player->windowCnt % 255);
-		$player->windows[$id] = $furnace;
-		$player->dataPacket(MC_CONTAINER_OPEN, array(
-			"windowid" => $id,
-			"type" => WINDOW_FURNACE,
-			"slots" => FURNACE_SLOTS,
-			"title" => "Furnace",
-		));
-		$slots = array();
-		for($s = 0; $s < FURNACE_SLOTS; ++$s){
-			$slot = $furnace->getSlot($s);
-			if($slot->getID() > 0 and $slot->count > 0){
-				$slots[] = $slot;
-			}else{
-				$slots[] = BlockAPI::getItem(AIR, 0, 0);
-			}
-		}
-		$player->dataPacket(MC_CONTAINER_SET_CONTENT, array(
-			"windowid" => $id,
-			"count" => count($slots),
-			"slots" => $slots
-		));
+		
+		$furnace->openInventory($player);
 		return true;
 	}
 	

src/material/block/solid/Chest.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class ChestBlock extends TransparentBlock{
@@ -31,36 +25,55 @@ class ChestBlock extends TransparentBlock{
 		$this->isActivable = true;
 	}
 	public function place(Item $item, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){
-			$block0 = $this->getSide(2);
-			$block1 = $this->getSide(3);
-			$block2 = $this->getSide(4);
-			$block3 = $this->getSide(5);
-			if($block0->getID() !== CHEST and $block1->getID() !== CHEST and $block2->getID() !== CHEST and $block3->getID() !== CHEST){
-				$faces = array(
-					0 => 4,
-					1 => 2,
-					2 => 5,
-					3 => 3,
-				);
-				$this->meta = $faces[$player->entity->getDirection()];
-				$this->level->setBlock($block, $this);
-				$server = ServerAPI::request();
-				$server->api->tile->add($this->level, TILE_CHEST, $this->x, $this->y, $this->z, array(
-					"Items" => array(),
-					"id" => TILE_CHEST,
-					"x" => $this->x,
-					"y" => $this->y,
-					"z" => $this->z
-				));
-				return true;
+		$server = ServerAPI::request();
+		$faces = array(
+			0 => 4,
+			1 => 2,
+			2 => 5,
+			3 => 3,
+		);
+
+		$chest = false;
+		$this->meta = $faces[$player->entity->getDirection()];
+		
+		for($side = 2; $side <= 5; ++$side){
+			if(($this->meta === 4 or $this->meta === 5) and ($side === 4 or $side === 5)){
+				continue;
+			}elseif(($this->meta === 3 or $this->meta === 2) and ($side === 2 or $side === 3)){
+				continue;
 			}
-		return false;
+			$c = $this->getSide($side);
+			if(($c instanceof ChestBlock) and $c->getMetadata() === $this->meta){
+				if((($tile = $server->api->tile->get($c)) instanceof Tile) and !$tile->isPaired()){
+					$chest = $tile;
+					break;
+				}
+			}
+		}
+
+		$this->level->setBlock($block, $this, true, false, true);
+		$tile = $server->api->tile->add($this->level, TILE_CHEST, $this->x, $this->y, $this->z, array(
+			"Items" => array(),
+			"id" => TILE_CHEST,
+			"x" => $this->x,
+			"y" => $this->y,
+			"z" => $this->z
+		));
+
+		if($chest instanceof Tile){
+			$chest->pairWith($tile);
+			$tile->pairWith($chest);
+		}
+		return true;
 	}
 	
 	public function onBreak(Item $item, Player $player){
-			$server = ServerAPI::request();
-			$this->level->setBlock($this, new AirBlock(), true, true);
-			return true;
+		$t = ServerAPI::request()->api->tile->get($this);
+		if($t !== false){
+			$t->unpair();
+		}
+		$this->level->setBlock($this, new AirBlock(), true, true, true);
+		return true;
 	}
 	
 	public function onActivate(Item $item, Player $player){
@@ -84,33 +97,13 @@ class ChestBlock extends TransparentBlock{
 			));
 		}
 		
-		if($chest->class !== TILE_CHEST or ($player->gamemode & 0x01) === 0x01){
+		
+		
+		if(($player->gamemode & 0x01) === 0x01){
 			return true;
 		}
-		$player->windowCnt++;
-		$player->windowCnt = $id = max(2, $player->windowCnt % 255);
-		$player->windows[$id] = $chest;
-		$player->dataPacket(MC_CONTAINER_OPEN, array(
-			"windowid" => $id,
-			"type" => WINDOW_CHEST,
-			"slots" => CHEST_SLOTS,
-			"title" => "Chest",
-		));
-		$slots = array();
-		for($s = 0; $s < CHEST_SLOTS; ++$s){
-			$slot = $chest->getSlot($s);
-			if($slot->getID() > AIR and $slot->count > 0){
-				$slots[] = $slot;
-			}else{
-				$slots[] = BlockAPI::getItem(AIR, 0, 0);
-			}
-		}
-		$player->dataPacket(MC_CONTAINER_SET_CONTENT, array(
-			"windowid" => $id,
-			"count" => count($slots),
-			"slots" => $slots
-		));
 		
+		$chest->openInventory($player);		
 		return true;
 	}
 

src/material/block/solid/Clay.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class ClayBlock extends SolidBlock{

src/material/block/solid/Cobblestone.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class CobblestoneBlock extends SolidBlock{

src/material/block/solid/Diamond.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class DiamondBlock extends SolidBlock{

src/material/block/solid/Dirt.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class DirtBlock extends SolidBlock{
@@ -36,7 +30,7 @@ class DirtBlock extends SolidBlock{
 			if(($player->gamemode & 0x01) === 0){
 				$item->useOn($this);
 			}
-			$this->level->setBlock($this, BlockAPI::get(FARMLAND, 0));
+			$this->level->setBlock($this, BlockAPI::get(FARMLAND, 0), true, false, true);
 			return true;
 		}
 		return false;

src/material/block/solid/DoubleSlab.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class DoubleSlabBlock extends SolidBlock{

src/material/block/solid/Farmland.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class FarmlandBlock extends SolidBlock{

src/material/block/solid/Furnace.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 /***REM_START***/

src/material/block/solid/Glass.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class GlassBlock extends TransparentBlock{

src/material/block/solid/GlowingObsidian.php

@@ -1,28 +1,22 @@
 <?php
 
-/*
-
-           -
-         /   \
-      /         \
-   /   PocketMine  \
-/          MP         \
-|\     @shoghicp     /|
-|.   \           /   .|
-| ..     \   /     .. |
-|    ..    |    ..    |
-|       .. | ..       |
-\          |          /
-   \       |       /
-      \    |    /
-         \ | /
-
-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.
-
-
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * 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/
+ * 
+ *
 */
 
 class GlowingObsidianBlock extends SolidBlock{