Stable Alpha_1.3.7

Reduced random range
Get block drops before breaking [fixes tile drops]
2025-09-09 19:24:12 +00:00 · 2013-08-30 17:51:33 +02:00 · 2013-08-30 17:51:12 +02:00 · 2013-08-30 17:48:46 +02:00 · 2013-08-30 17:47:54 +02:00 · 2013-08-30 17:37:16 +02:00
243 changed files with 20008 additions and 10326 deletions
--- a/.gitignore
+++ b/.gitignore
@ -2,128 +2,11 @@ players/*
 worlds/*
 plugins/*
 logs/*
+bin/*
 *.log
+*.pmf
+*.txt
 server.properties
-white-list.txt
-banned-ips.txt
-banned.txt
-
-#################
-## Eclipse
-#################
-
-*.pydevproject
-.project
-.metadata
-bin/
-tmp/
-*.tmp
-*.bak
-*.swp
-*~.nib
-local.properties
-.classpath
-.settings/
-.loadpath
-
-# External tool builders
-.externalToolBuilders/
-
-# Locally stored "Eclipse launch configurations"
-*.launch
-
-# CDT-specific
-.cproject
-
-# PDT-specific
-.buildpath
-
-
-#################
-## Visual Studio
-#################
-
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-
-# User-specific files
-*.suo
-*.user
-*.sln.docstates
-
-# Build results
-[Dd]ebug/
-[Rr]elease/
-*_i.c
-*_p.c
-*.ilk
-*.meta
-*.obj
-*.pch
-*.pdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.vspscc
-.builds
-*.dotCover
-
-## TODO: If you have NuGet Package Restore enabled, uncomment this
-#packages/
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opensdf
-*.sdf
-
-# Visual Studio profiler
-*.psess
-*.vsp
-
-# ReSharper is a .NET coding add-in
-_ReSharper*
-
-# Installshield output folder
-[Ee]xpress
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish
-
-# Others
-[Bb]in
-[Oo]bj
-sql
-TestResults
-*.Cache
-ClientBin
-stylecop.*
-~$*
-*.dbmdl
-Generated_Code #added for RIA/Silverlight projects
-
-# Backup & report files from converting an old project file to a newer
-# Visual Studio version. Backup files are not needed, because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-


 ############
@ -136,38 +19,5 @@ Thumbs.db
 # Folder config file
 Desktop.ini

-
-#############
-## Python
-#############
-
-*.py[co]
-
-# Packages
-*.egg
-*.egg-info
-dist
-build
-eggs
-parts
-bin
-var
-sdist
-develop-eggs
-.installed.cfg
-
-# Installer logs
-pip-log.txt
-
-# Unit test / coverage reports
-.coverage
-.tox
-
-#Translations
-*.mo
-
-#Mr Developer
-.mr.developer.cfg
-
 # Mac crap
 .DS_Store
--- a/.travis.yml
+++ b/.travis.yml
@ -0,0 +1,14 @@
+language: php
+
+php:
+ - 5.4
+  
+before_script:
+ - pecl install channel://pecl.php.net/pthreads-0.0.44
+
+script:
+ - php src/tests/ServerSuiteTest.php
+ 
+notifications:
+ email: false
+ webhooks: http://n.tkte.ch/h/214/wsNvmG43-ncxUVRrFPwSM-r0
--- a/CONTRIBUTING.md
+++ b/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!__
--- a/PocketMine-MP.php
+++ b/PocketMine-MP.php
@ -1,35 +1,33 @@
 <?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/
+ * 
+ *
 */

-require_once(dirname(__FILE__)."/src/common/dependencies.php");
-require_once("API/ServerAPI.php");
+
+/***REM_START***/
+require_once(dirname(__FILE__)."/src/config.php");
+require_once(FILE_PATH."/src/functions.php");
+require_once(FILE_PATH."/src/dependencies.php");
+/***REM_END***/

 $server = new ServerAPI();
-$server->run();//$server->start();
-//$server->join();
+$server->start();

-kill(getmypid()); //Fix for segfault
+kill(getmypid()); //Fix for ConsoleAPI being blocked
+exit(0);
--- a/README.md
+++ b/README.md
@ -1,6 +1,6 @@
-![](http://shoghicp.github.com/PocketMine-MP/favicon.png)
+![](http://www.pocketmine.net/favicon.png)

-# PocketMine-MP
+# PocketMine-MP [![Build Status](https://travis-ci.org/PocketMine/PocketMine-MP.png?branch=master)](https://travis-ci.org/PocketMine/PocketMine-MP)

 ```
 This program is free software: you can redistribute it and/or modify
@ -17,31 +17,34 @@ You should have received a copy of the GNU Lesser General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ```	

-__PocketMine-MP is a Server for Minecraft Pocket Edition done in PHP__. It has a Plugin API that enables a developer to extend it and add new features, or change default ones.
+__PocketMine-MP is a sofware for creating Minecraft Pocket Edition servers__. It has a Plugin API that enables a developer to extend it and add new features, or change default ones.

 The entire server is done in PHP, and has been tested, profiled and optimized to run smoothly.

-### [Homepage](http://shoghicp.github.com/PocketMine-MP/)
+### [Homepage](http://www.pocketmine.net/)

-### [Go to Wiki for more information](https://github.com/shoghicp/PocketMine-MP/wiki)
+### [Forums](http://forums.pocketmine.net/)

-### [FAQ: Frequently Asked Questions](https://github.com/shoghicp/PocketMine-MP/wiki/Frequently-Asked-Questions)
+### [Wiki](https://github.com/PocketMine/PocketMine-MP/wiki/)

-### [@PocketMine](https://twitter.com/PocketMine)
-
-### [Mailing List](https://groups.google.com/forum/#!forum/pocketmine-development) pocketmine-development@googlegroups.com
+### [FAQ: Frequently Asked Questions](https://github.com/PocketMine/PocketMine-MP/wiki/Frequently-Asked-Questions)


-## Third-party Libraries Used
-* __[PHP cURL](http://php.net/manual/en/book.curl.php)__
+
+### [Twitter @PocketMine](https://twitter.com/PocketMine)
+
+## IRC #pocketmine (or #mcpedevs) @ irc.freenode.net
+* [WebIRC](http://webchat.freenode.net?channels=pocketmine,mcpedevs&uio=d4)
+
+
+## Third-party Libraries/Protocols Used
 * __[PHP Sockets](http://php.net/manual/en/book.sockets.php)__
 * __[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).
-* __[Math_BigInteger](http://phpseclib.sourceforge.net/math/intro.html)__ by _[phpseclib](http://phpseclib.sourceforge.net/)_: Pure-PHP arbitrary precission integer arithmetic library
 * __[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.
-
-
-## IRC #mcpedevs @ irc.freenode.net
-* [WebIRC](http://webchat.freenode.net?channels=mcpedevs&uio=d4)
+* __[cURL](http://curl.haxx.se/)__: cURL is a command line tool for transferring data with URL syntax
+* __[Zlib](http://www.zlib.net/)__: A Massively Spiffy Yet Delicately Unobtrusive Compression Library
+* __[Source RCON Protocol](https://developer.valvesoftware.com/wiki/Source_RCON_Protocol)__
+* __[UT3 Query Protocol](http://wiki.unrealadmin.org/UT3_query_protocol)__
--- a/compile_php.sh
+++ b/compile_php.sh
@ -1,156 +0,0 @@
-#!/bin/bash
-echo "[PocketMine] PHP installer and compiler for Linux - by @shoghicp v0.3"
-DIR=`pwd`
-date > $DIR/install.log 2>&1
-uname -a >> $DIR/install.log 2>&1
-echo "[INFO] Checking dependecies"
-type make >> $DIR/install.log 2>&1 || { echo >&2 "[ERROR] Please install \"make\""; exit 1; }
-type autoconf >> $DIR/install.log 2>&1 || { echo >&2 "[ERROR] Please install \"autoconf\""; exit 1; }
-type automake >> $DIR/install.log 2>&1 || { echo >&2 "[ERROR] Please install \"automake\""; exit 1; }
-type gcc >> $DIR/install.log 2>&1 || { echo >&2 "[ERROR] Please install \"gcc\""; exit 1; }
-type m4 >> $DIR/install.log 2>&1 || { echo >&2 "[ERROR] Please install \"m4\""; exit 1; }
-rm -r -f install_data/ >> $DIR/install.log 2>&1
-rm -r -f php5/ >> $DIR/install.log 2>&1
-mkdir -m 0777 install_data >> $DIR/install.log 2>&1
-mkdir -m 0777 php5 >> $DIR/install.log 2>&1
-cd install_data
-
-#PHP 5
-echo -n "[PHP5] downloading..."
-wget http://php.net/get/php-5.4.11.tar.gz/from/this/mirror -O php-5.4.11.tar.gz >> $DIR/install.log 2>&1
-echo -n " extracting..."
-tar -zxvf php-5.4.11.tar.gz >> $DIR/install.log 2>&1
-rm -f php-5.4.11.tar.gz >> $DIR/install.log 2>&1
-mv php-5.4.11 php
-echo " done!"
-
-#zlib
-echo -n "[zlib] downloading..."
-wget http://zlib.net/zlib-1.2.7.tar.gz -O zlib-1.2.7.tar.gz >> $DIR/install.log 2>&1
-echo -n " extracting..."
-tar -zxvf zlib-1.2.7.tar.gz >> $DIR/install.log 2>&1
-rm -f zlib-1.2.7.tar.gz >> $DIR/install.log 2>&1
-mv zlib-1.2.7 zlib
-echo -n " checking..."
-cd zlib
-./configure --prefix=$DIR/install_data/php/ext/zlib \
--static >> $DIR/install.log 2>&1
-echo -n " compiling..."
-make >> $DIR/install.log 2>&1
-echo -n " installing..."
-make install >> $DIR/install.log 2>&1
-echo -n " cleaning..."
-cd ..
-rm -r -f ./zlib
-echo " done!"
-
-#OpenSSL
-#echo -n "[OpenSSL] downloading..."
-#wget ftp://ftp.openssl.org/source/openssl-1.0.1c.tar.gz -O openssl-1.0.1c.tar.gz >> $DIR/install.log 2>&1
-#echo -n " extracting..."
-#tar -zxvf openssl-1.0.1c.tar.gz >> $DIR/install.log 2>&1
-#rm -f openssl-1.0.1c.tar.gz >> $DIR/install.log 2>&1
-#mv openssl-1.0.1c openssl
-#echo -n " checking..."
-#cd openssl
-#./config --prefix=$DIR/install_data/php/ext/openssl >> $DIR/install.log 2>&1
-#echo -n " compiling..."
-#make >> $DIR/install.log 2>&1
-#echo -n " installing..."
-#make install >> $DIR/install.log 2>&1
-#echo -n " cleaning..."
-#cd ..
-#rm -r -f ./openssl
-#echo " done!"
-
-#GMP
-echo -n "[GMP] downloading..."
-wget ftp://ftp.gmplib.org/pub/gmp-5.1.0/gmp-5.1.0.tar.bz2 -O gmp-5.1.0.tar.bz2 >> $DIR/install.log 2>&1
-echo -n " extracting..."
-tar -jxvf gmp-5.1.0.tar.bz2 >> $DIR/install.log 2>&1
-rm -f gmp-5.1.0.tar.bz2 >> $DIR/install.log 2>&1
-mv gmp-5.1.0 gmp
-echo -n " checking..."
-cd gmp
-./configure --prefix=$DIR/install_data/php/ext/gmp \
--disable-shared >> $DIR/install.log 2>&1
-echo -n " compiling..."
-make >> $DIR/install.log 2>&1
-echo -n " installing..."
-make install >> $DIR/install.log 2>&1
-echo -n " cleaning..."
-cd ..
-rm -r -f ./gmp
-echo " done!"
-
-echo -n "[cURL] downloading..."
-wget https://github.com/bagder/curl/archive/master.tar.gz --no-check-certificate -O curl-master.tar.gz >> $DIR/install.log 2>&1
-echo -n " extracting..."
-tar -zxvf curl-master.tar.gz >> $DIR/install.log 2>&1
-rm -f curl-master.tar.gz >> $DIR/install.log 2>&1
-mv curl-master curl
-echo -n " checking..."
-cd curl
-./buildconf >> $DIR/install.log 2>&1
-./configure --prefix=$DIR/install_data/php/ext/curl \
--disable-shared >> $DIR/install.log 2>&1
-echo -n " compiling..."
-make >> $DIR/install.log 2>&1
-echo -n " installing..."
-make install >> $DIR/install.log 2>&1
-echo -n " cleaning..."
-cd ..
-rm -r -f ./curl
-echo " done!"
-
-#pthreads
-echo -n "[PHP pthreads] downloading..."
-wget https://github.com/krakjoe/pthreads/archive/master.tar.gz --no-check-certificate -O pthreads-master.tar.gz >> $DIR/install.log 2>&1
-echo -n " extracting..."
-tar -zxvf pthreads-master.tar.gz >> $DIR/install.log 2>&1
-rm -f pthreads-master.tar.gz >> $DIR/install.log 2>&1
-mv pthreads-master $DIR/install_data/php/ext/pthreads
-echo " done!"
-
-#--with-openssl=$DIR/install_data/php/ext/openssl
-echo -n "[PHP5] checking..."
-cd php
-./buildconf --force >> $DIR/install.log 2>&1
-./configure --prefix=$DIR/php5 \
--exec-prefix=$DIR/php5 \
--enable-embedded-mysqli \
--enable-bcmath \
--with-gmp=$DIR/install_data/php/ext/gmp \
--with-curl=$DIR/install_data/php/ext/curl \
--with-zlib=$DIR/install_data/php/ext/zlib \
--disable-libxml \
--disable-xml \
--disable-dom \
--disable-simplexml \
--disable-xmlreader \
--disable-xmlwriter \
--without-pear \
--disable-cgi \
--disable-session \
--enable-ctype \
--without-iconv \
--without-pdo-sqlite \
--enable-sockets \
--enable-shared=no \
--enable-static=yes \
--enable-pcntl \
--enable-pthreads \
--enable-maintainer-zts \
--enable-cli >> $DIR/install.log 2>&1
-echo -n " compiling..."
-make >> $DIR/install.log 2>&1
-echo -n " installing..."
-make install >> $DIR/install.log 2>&1
-echo " done!"
-cd $DIR
-echo -n "[INFO] Cleaning up..."
-rm -r -f install_data/ >> $DIR/install.log 2>&1
-date >> $DIR/install.log 2>&1
-echo " done!"
-echo "[PocketMine] You should start the server now using \"./start.sh\""
-echo "[PocketMine] If it doesn't works, please send the \"install.log\" file to the Bug Tracker"
--- a/src/API/BanAPI.php
+++ b/src/API/BanAPI.php
@ -1,65 +1,164 @@
 <?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{
 	private $server;
 	private $whitelist;
 	private $banned;
+	private $ops;
 	private $bannedIPs;
-	function __construct(PocketMinecraftServer $server){
-		$this->server = $server;
+	private $cmdWL = array();//Command WhiteList
+	function __construct(){
+		$this->server = ServerAPI::request();
 	}
 	
 	public function init(){
-		console("[INFO] Loading authentication lists...");
-		$this->whitelist = new Config(FILE_PATH."white-list.txt", CONFIG_LIST);
-		$this->bannedIPs = new Config(FILE_PATH."banned-ips.txt", CONFIG_LIST);
-		$this->banned = new Config(FILE_PATH."banned.txt", CONFIG_LIST);
-		$this->server->api->console->register("banip", "Manages IP Banning", array($this, "commandHandler"));
-		$this->server->api->console->register("ban", "Manages Bannning", array($this, "commandHandler"));
-		$this->server->api->console->register("kick", "Kicks a player", array($this, "commandHandler"));
-		$this->server->api->console->register("whitelist", "Manages White-listing", array($this, "commandHandler"));
+		$this->whitelist = new Config(DATA_PATH."white-list.txt", CONFIG_LIST);//Open whitelist list file
+		$this->bannedIPs = new Config(DATA_PATH."banned-ips.txt", CONFIG_LIST);//Open Banned IPs list file
+		$this->banned = new Config(DATA_PATH."banned.txt", CONFIG_LIST);//Open Banned Usernames list file
+		$this->ops = new Config(DATA_PATH."ops.txt", CONFIG_LIST);//Open list of OPs
+		$this->server->api->console->register("banip", "<add|remove|list|reload> [IP|player]", array($this, "commandHandler"));
+		$this->server->api->console->register("ban", "<add|remove|list|reload> [username]", array($this, "commandHandler"));
+		$this->server->api->console->register("kick", "<player> [reason ...]", array($this, "commandHandler"));
+		$this->server->api->console->register("whitelist", "<on|off|list|add|remove|reload> [username]", array($this, "commandHandler"));
+		$this->server->api->console->register("op", "<player>", array($this, "commandHandler"));
+		$this->server->api->console->register("deop", "<player>", array($this, "commandHandler"));
+		$this->server->api->console->register("sudo", "<player>", array($this, "commandHandler"));
+		$this->server->api->console->alias("ban-ip", "banip add");
+		$this->server->api->console->alias("banlist", "ban list");
+		$this->server->api->console->alias("pardon", "ban remove");
+		$this->server->api->console->alias("pardon-ip", "banip remove");
+		$this->server->addHandler("console.command", array($this, "permissionsCheck"), 1);//Event handler when commands are issued. Used to check permissions of commands that go through the server.
+		$this->server->addHandler("player.block.break", array($this, "permissionsCheck"), 1);//Event handler for blocks
+		$this->server->addHandler("player.block.place", array($this, "permissionsCheck"), 1);//Event handler for blocks
+		$this->server->addHandler("player.flying", array($this, "permissionsCheck"), 1);//Flying Event
 	}
 	
-	public function commandHandler($cmd, $params){
+	public function cmdWhitelist($cmd){//Whitelists a CMD so everyone can issue it - Even non OPs.
+		$this->cmdWhitelist[strtolower(trim($cmd))] = true;
+	}
+	
+	public function isOp($username){//Is a player op?
+		$username = strtolower($username);
+		if($this->server->api->dhandle("op.check", $username) === true){
+			return true;
+		}elseif($this->ops->exists($username)){
+			return true;
+		}
+		return false;	
+	}
+	
+	public function permissionsCheck($data, $event){
+		switch($event){
+			case "player.flying"://OPs can fly around the server.
+				if($this->isOp($data->iusername)){
+					return true;
+				}
+				break;
+			case "player.block.break":
+			case "player.block.place"://Spawn protection detection. Allows OPs to place/break blocks in the spawn area.
+				if(!$this->isOp($data["player"]->iusername)){
+					$t = new Vector2($data["target"]->x, $data["target"]->z);
+					$s = new Vector2($this->server->spawn->x, $this->server->spawn->z);
+					if($t->distance($s) <= $this->server->api->getProperty("spawn-protection") and $this->server->api->dhandle($event.".spawn", $data) !== true){
+						return false;
+					}
+				}
+				return;
+				break;
+			case "console.command"://Checks if a command is allowed with the current user permissions.
+				if(isset($this->cmdWhitelist[$data["cmd"]])){
+					return;
+				}
+				
+				if($data["issuer"] instanceof Player){
+					if($this->server->api->handle("console.check", $data) === true or $this->isOp($data["issuer"]->iusername)){
+						return;
+					}
+				}elseif($data["issuer"] === "console" or $data["issuer"] === "rcon"){
+					return;
+				}
+				return false;
+			break;
+		}
+	}
+	
+	public function commandHandler($cmd, $params, $issuer, $alias){
+		$output = "";
 		switch($cmd){
+			case "sudo":
+				$target = strtolower(array_shift($params));
+				$player = $this->server->api->player->get($target);
+				if(!($player instanceof Player)){
+					$output .= "Player not connected.\n";
+					break;
+				}
+				$this->server->api->console->run(implode(" ", $params), $player);
+				$output .= "Command ran as ".$player->username.".\n";
+				break;
+			case "op":
+				$user = strtolower($params[0]);
+				$player = $this->server->api->player->get($user);
+				if(!($player instanceof Player)){
+					$this->ops->set($user);
+					$this->ops->save($user);
+					$output .= $user." is now op\n";
+					break;
+				}
+				$this->ops->set($player->iusername);
+				$this->ops->save();
+				$output .= $player->iusername." is now op\n";
+				$this->server->api->chat->sendTo(false, "You are now op.", $player->iusername);
+				break;
+			case "deop":
+				$user = strtolower($params[0]);
+				$player = $this->server->api->player->get($user);
+				if(!($player instanceof Player)){
+					$this->ops->set($user, false);
+					$this->ops->save($user);
+					$output .= $user." is no longer op\n";
+					break;
+				}
+				$this->ops->remove($player->iusername);
+				$this->ops->save();
+				$output .= $player->iusername." is not longer op\n";
+				$this->server->api->chat->sendTo(false, "You are no longer op.", $player->iusername);
+				break;
 			case "kick":
 				if(!isset($params[0])){
-					console("[INFO] Usage: /kick <playername> [reason]");
+					$output .= "Usage: /kick <player> [reason ...]\n";
 				}else{
-					$name = array_shift($params);
+					$name = strtolower(array_shift($params));
 					$player = $this->server->api->player->get($name);
 					if($player === false){
-						console("[ERROR] Player \"".$name."\" does not exist");
+						$output .= "Player \"".$name."\" does not exist\n";
 					}else{
 						$reason = implode(" ", $params);
 						$reason = $reason == "" ? "No reason":$reason;
 						$player->close("You have been kicked: ".$reason);
-						console("[INFO] Player \"".$player->username."\" has been kicked: $reason");
+						if($issuer instanceof Player){
+							$this->server->api->chat->broadcast($player->username." has been kicked by ".$issuer->username.": $reason\n");
+						}else{
+							$this->server->api->chat->broadcast($player->username." has been kicked: $reason\n");
+						}
 					}
 				}
 				break;
@ -67,37 +166,37 @@ class BanAPI{
 				$p = strtolower(array_shift($params));
 				switch($p){
 					case "remove":
-						$user = trim(implode(" ", $params));
+						$user = strtolower($params[0]);
 						$this->whitelist->remove($user);
 						$this->whitelist->save();
-						console("[INFO] Player \"$user\" removed from white-list");
+						$output .= "Player \"$user\" removed from white-list\n";
 						break;
 					case "add":
-						$user = trim(implode(" ", $params));
+						$user = strtolower($params[0]);
 						$this->whitelist->set($user);
 						$this->whitelist->save();
-						console("[INFO] Player \"$user\" added to white-list");
+						$output .= "Player \"$user\" added to white-list\n";
 						break;
 					case "reload":
-						$this->whitelist = $this->load(FILE_PATH."white-list.txt", CONFIG_LIST);
+						$this->whitelist = new Config(DATA_PATH."white-list.txt", CONFIG_LIST);
 						break;
 					case "list":
-						console("[INFO] White-list: ".implode(", ", $this->whitelist->getAll(true)));
+						$output .= "White-list: ".implode(", ", $this->whitelist->getAll(true))."\n";
 						break;
 					case "on":
 					case "true":
 					case "1":
-						console("[INFO] White-list turned on");
+						$output .= "White-list turned on\n";
 						$this->server->api->setProperty("white-list", true);
 						break;
 					case "off":
 					case "false":
 					case "0":
-						console("[INFO] White-list turned off");
+						$output .= "White-list turned off\n";
 						$this->server->api->setProperty("white-list", false);
 						break;
 					default:
-						console("[INFO] Usage: /whitelist <on | off | add | remove | reload | list> [username]");
+						$output .= "Usage: /whitelist <on|off|list|add|remove|reload> [username]\n";
 						break;
 				}
 				break;
@ -106,26 +205,31 @@ class BanAPI{
 				switch($p){
 					case "pardon":
 					case "remove":
-						$ip = trim(implode($params));
+						$ip = strtolower($params[0]);
 						$this->bannedIPs->remove($ip);
 						$this->bannedIPs->save();
-						console("[INFO] IP \"$ip\" removed from ban list");
+						$output .= "IP \"$ip\" removed from ban list\n";
 						break;
 					case "add":
 					case "ban":
-						$ip = trim(implode($params));
+						$ip = strtolower($params[0]);
+						$player = $this->server->api->player->get($ip);
+						if($player instanceof Player){
+							$ip = $player->ip;
+							$player->close("banned");
+						}
 						$this->bannedIPs->set($ip);
 						$this->bannedIPs->save();
-						console("[INFO] IP \"$ip\" added to ban list");
+						$output .= "IP \"$ip\" added to ban list\n";
 						break;
 					case "reload":
-						$this->bannedIPs = new Config(FILE_PATH."banned-ips.txt", CONFIG_LIST);
+						$this->bannedIPs = new Config(DATA_PATH."banned-ips.txt", CONFIG_LIST);
 						break;
 					case "list":
-						console("[INFO] IP ban list: ".implode(", ", $this->bannedIPs->getAll(true)));
+						$output .= "IP ban list: ".implode(", ", $this->bannedIPs->getAll(true))."\n";
 						break;
 					default:
-						console("[INFO] Usage: /banip <add | remove | list | reload> [IP]");
+						$output .= "Usage: /banip <add|remove|list|reload> [IP|player]\n";
 						break;
 				}
 				break;
@ -134,57 +238,67 @@ class BanAPI{
 				switch($p){
 					case "pardon":
 					case "remove":
-						$user = trim(implode($params));
+						$user = strtolower($params[0]);
 						$this->banned->remove($user);
 						$this->banned->save();
-						console("[INFO] Player \"$user\" removed from ban list");
+						$output .= "Player \"$user\" removed from ban list\n";
 						break;
 					case "add":
 					case "ban":
-						$user = trim(implode($params));
+						$user = strtolower($params[0]);
 						$this->banned->set($user);
 						$this->banned->save();
 						$player = $this->server->api->player->get($user);
 						if($player !== false){
 							$player->close("You have been banned");
 						}
-						$this->server->api->chat->broadcast("$user has been banned");
-						console("[INFO] Player \"$user\" added to ban list");
+						if($issuer instanceof Player){
+							$this->server->api->chat->broadcast($user." has been banned by ".$issuer->username."\n");
+						}else{
+							$this->server->api->chat->broadcast($user." has been banned\n");
+						}
+						$this->kick($user, "Banned");
+						$output .= "Player \"$user\" added to ban list\n";
 						break;
 					case "reload":
-						$this->banned = new Config(FILE_PATH."banned.txt", CONFIG_LIST);
+						$this->banned = new Config(DATA_PATH."banned.txt", CONFIG_LIST);
 						break;
 					case "list":
-						console("[INFO] Ban list: ".implode(", ", $this->banned->getAll(true)));
+						$output .= "Ban list: ".implode(", ", $this->banned->getAll(true))."\n";
 						break;
 					default:
-						console("[INFO] Usage: /ban <add | remove | list | reload> [player]");
+						$output .= "Usage: /ban <add|remove|list|reload> [username]\n";
 						break;
 				}
 				break;
 		}
+		return $output;
 	}
 	
 	public function ban($username){
-		$this->commandHandler("ban", array("add", $username));
+		$this->commandHandler("ban", array("add", $username), "console", "");
 	}
 	
 	public function pardon($username){
-		$this->commandHandler("ban", array("pardon", $username));
+		$this->commandHandler("ban", array("pardon", $username), "console", "");
 	}
 	
 	public function banIP($ip){
-		$this->commandHandler("banip", array("add", $ip));
+		$this->commandHandler("banip", array("add", $ip), "console", "");
 	}
 	
 	public function pardonIP($ip){
-		$this->commandHandler("banip", array("pardon", $ip));
+		$this->commandHandler("banip", array("pardon", $ip), "console", "");
+	}
+	
+	public function kick($username, $reason = "No Reason"){
+		$this->commandHandler("kick", array($username, $reason), "console", "");
 	}
 	
 	public function reload(){
-		$this->commandHandler("ban", array("reload"));
-		$this->commandHandler("banip", array("reload"));
-		$this->commandHandler("whitelist", array("reload"));
+		$this->commandHandler("ban", array("reload"), "console", "");
+		$this->commandHandler("banip", array("reload"), "console", "");
+		$this->commandHandler("whitelist", array("reload"), "console", "");
 	}
 	
 	public function isIPBanned($ip){
@ -197,6 +311,7 @@ class BanAPI{
 	}
 	
 	public function isBanned($username){
+		$username = strtolower($username);
 		if($this->server->api->dhandle("api.ban.check", $username) === false){
 			return true;
 		}elseif($this->banned->exists($username)){
@ -206,11 +321,14 @@ class BanAPI{
 	}
 	
 	public function inWhitelist($username){
-		if($this->server->api->dhandle("api.ban.whitelist.check", $ip) === false){
+		$username = strtolower($username);
+		if($this->isOp($username)){
+			return true;
+		}elseif($this->server->api->dhandle("api.ban.whitelist.check", $username) === false){
 			return true;
 		}elseif($this->whitelist->exists($username)){
 			return true;
 		}
 		return false;	
 	}
-}
+}
--- a/src/API/BlockAPI.php
+++ b/src/API/BlockAPI.php
--- a/src/API/ChatAPI.php
+++ b/src/API/ChatAPI.php
@ -1,51 +1,123 @@
 <?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{
 	private $server;
-	function __construct(PocketMinecraftServer $server){
-		$this->server = $server;
+	function __construct(){
+		$this->server = ServerAPI::request();
 	}
 	
 	public function init(){
-		
+		$this->server->api->console->register("tell", "<player> <private message ...>", array($this, "commandHandler"));
+		$this->server->api->console->register("me", "<action ...>", array($this, "commandHandler"));
+		$this->server->api->console->register("say", "<message ...>", array($this, "commandHandler"));
+		$this->server->api->ban->cmdWhitelist("tell");
+		$this->server->api->ban->cmdWhitelist("me");
+	}
+	
+	public function commandHandler($cmd, $params, $issuer, $alias){
+		$output = "";
+		switch($cmd){
+			case "say":
+				$s = implode(" ", $params);
+				if(trim($s) == ""){
+					$output .= "Usage: /say <message>\n";
+					break;
+				}
+				$sender = ($issuer instanceof Player) ? "Server":ucfirst($issuer);
+				$this->server->api->chat->broadcast("[$sender] ".$s);
+				break;
+			case "me":
+				if(!($issuer instanceof Player)){
+					if($issuer === "rcon"){
+						$sender = "Rcon";
+					}else{
+						$sender = ucfirst($issuer);
+					}
+				}else{
+					$sender = $issuer->username;
+				}
+				$this->broadcast("* $sender ".implode(" ", $params));
+				break;
+			case "tell":
+				if(!isset($params[0]) or !isset($params[1])){
+					$output .= "Usage: /$cmd <player> <message>\n";
+					break;
+				}
+				if(!($issuer instanceof Player)){
+					$sender = ucfirst($issuer);
+				}else{
+					$sender = $issuer->username;
+				}
+				$n = array_shift($params);
+				$target = $this->server->api->player->get($n);
+				if($target instanceof Player){
+					$target = $target->username;
+				}else{
+					$target = strtolower($n);
+					if($t === "server" or $t === "console" or $t === "rcon"){
+						$target = "Console";
+					}
+				}
+				$mes = implode(" ", $params);
+				$output .= "[me -> ".$target."] ".$mes."\n";
+				if($target !== "Console" and $target !== "Rcon"){
+					$this->sendTo(false, "[".$sender." -> me] ".$mes, $target);
+				}
+				console("[INFO] [".$sender." -> ".$target."] ".$mes);
+				break;
+		}
+		return $output;
 	}
 	
 	public function broadcast($message){
 		$this->send(false, $message);
 	}
 	
+	public function sendTo($owner, $text, $player){
+		$this->send($owner, $text, array($player));
+	}
+	
 	public function send($owner, $text, $whitelist = false, $blacklist = false){
-		$message = "";
+		$message = array(
+			"player" => $owner,
+			"message" => $text,
+		);
 		if($owner !== false){
-			$message = "<".$owner."> ";
+			if($owner instanceof Player){
+				if($whitelist === false){
+					console("[INFO] <".$owner->username."> ".$text);
+				}
+			}else{
+				if($whitelist === false){
+					console("[INFO] <".$owner."> ".$text);
+				}
+			}
+		}else{
+			if($whitelist === false){
+				console("[INFO] $text");
+			}
+			$message["player"] = "";
 		}
-		$message .= $text;
-		console("[CHAT] ".$message);
+
 		$this->server->handle("server.chat", new Container($message, $whitelist, $blacklist));
 	}
 }
--- a/src/API/ConsoleAPI.php
+++ b/src/API/ConsoleAPI.php
@ -1,148 +1,154 @@
 <?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{
-	private $loop, $server, $event, $help, $cmds;
-	function __construct(PocketMinecraftServer $server){
+	private $loop, $server, $event, $help, $cmds, $alias;
+	function __construct(){
 		$this->help = array();
 		$this->cmds = array();
-		$this->server = $server;
+		$this->alias = array();
+		$this->server = ServerAPI::request();
 		$this->last = microtime(true);
 	}

 	public function init(){
-		$this->event = $this->server->event("server.tick", array($this, "handle"));
-		$this->loop = new ConsoleLoop;
-		$this->loop->start();
+		$this->server->schedule(2, array($this, "handle"), array(), true);
+		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"));
+		$this->register("stop", "", array($this, "defaultCommands"));
+		$this->register("defaultgamemode", "<mode>", array($this, "defaultCommands"));
+		$this->server->api->ban->cmdWhitelist("help");
 	}

 	function __destruct(){
 		$this->server->deleteEvent($this->event);
-		$this->loop->stop = true;
-		$this->loop->notify();
-		$this->loop->join();
+		if(!defined("NO_THREADS")){
+			$this->loop->stop();
+			$this->loop->notify();
+			//$this->loop->join();
+		}
 	}

-	public function defaultCommands($cmd, $params){
-			switch($cmd){
-				case "crash": //Crashes the server to generate an report
-					$this->callNotDefinedMethodCrash();
-					$this->server->api->server; //Access a private property
-					callNotExistingFunction();
-					break;
-				case "invisible":
-					$p = strtolower(array_shift($params));
-					switch($p){
-						case "on":
-						case "true":
-						case "1":
-							console("[INFO] Server is invisible");
-							$this->server->api->setProperty("invisible", true);
+	public function defaultCommands($cmd, $params, $issuer, $alias){
+			$output = "";
+				switch($cmd){
+					case "defaultgamemode":
+						$gms = array(
+							"0" => SURVIVAL,
+							"survival" => SURVIVAL,
+							"s" => SURVIVAL,
+							"1" => CREATIVE,
+							"creative" => CREATIVE,
+							"c" => CREATIVE,
+							"2" => ADVENTURE,
+							"adventure" => ADVENTURE,
+							"a" => ADVENTURE,
+							"3" => VIEW,
+							"view" => VIEW,
+							"viewer" => VIEW,
+							"spectator" => VIEW,
+							"v" => VIEW,
+						);
+						if(!isset($gms[strtolower($params[0])])){
+							$output .= "Usage: /$cmd <mode>\n";
 							break;
-						case "off":
-						case "false":
-						case "0":
-							console("[INFO] Server is visible");
-							$this->server->api->setProperty("invisible", false);
+						}
+						$this->server->api->setProperty("gamemode", $gms[strtolower($params[0])]);
+						$output .= "Default Gamemode is now ".strtoupper($this->server->getGamemode()).".\n";
+						break;
+					case "status":
+						if(!($issuer instanceof Player) and $issuer === "console"){
+							$this->server->debugInfo(true);
+						}
+						$info = $this->server->debugInfo();
+						$output .= "TPS: ".$info["tps"].", Memory usage: ".$info["memory_usage"]." (Peak ".$info["memory_peak_usage"].")\n";
+						break;
+					case "update-done":
+						$this->server->api->setProperty("last-update", time());
+						break;
+					case "stop":
+						$this->loop->stop = true;
+						$output .= "Stopping the server\n";
+						$this->server->close();
+						break;
+					case "difficulty":
+						$s = trim(array_shift($params));
+						if($s === "" or (((int) $s) > 3 and ((int) $s) < 0)){
+							$output .= "Usage: /difficulty <0|1|2|3>\n";
 							break;
-						default:
-							console("[INFO] Usage: /invisible <on | off>");
+						}
+						$this->server->api->setProperty("difficulty", (int) $s);
+						$output .= "Difficulty changed to ".$this->server->difficulty."\n";
+						break;
+					case "?":
+						if($issuer !== "console" and $issuer !== "rcon"){
 							break;
-					}
-					break;
-				case "status":
-				case "lag":
-					$info = $this->server->debugInfo();
-					console("[INFO] TPS: ".$info["tps"].", Memory usage: ".$info["memory_usage"]." (Peak ".$info["memory_peak_usage"].")");
-					break;
-				case "update-done":
-					$this->server->api->setProperty("last-update", time());
-					break;
-				case "stop":
-					$this->loop->stop = true;
-					console("[INFO] Stopping the server...");
-					$this->server->close();
-					break;
-				case "gamemode":
-					$s = trim(array_shift($params));
-					if($s == "" or (((int) $s) !== 0 and ((int) $s) !== 1)){
-						console("[INFO] Usage: /gamemode <0 | 1>");
+						}
+					case "help":
+						if(isset($params[0]) and !is_numeric($params[0])){
+							$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){
+									break;
+								}
+								$output .= "Usage: /$c ".$this->help[$c]."\n";
+								break;
+							}
+						}
+						$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){
+								continue;
+							}
+							$cmds[$c] = $h;
+						}
+						
+						$max = ceil(count($cmds) / 5);
+						$page = (int) (isset($params[0]) ? min($max, max(1, intval($params[0]))):1);						
+						$output .= "- Showing help page $page of $max (/help <page>) -\n";
+						$current = 1;
+						foreach($cmds as $c => $h){
+							$curpage = (int) ceil($current / 5);
+							if($curpage === $page){
+								$output .= "/$c ".$h."\n";
+							}elseif($curpage > $page){
+								break;
+							}
+							++$current;
+						}
 						break;
-					}
-					$this->server->api->setProperty("gamemode", (int) $s);
-					console("[INFO] Gamemode changed to ".$this->server->gamemode);
-					break;
-				case "difficulty":
-					$s = trim(array_shift($params));
-					if($s == "" or (((int) $s) !== 0 and ((int) $s) !== 1)){
-						console("[INFO] Usage: /difficulty <0 | 1>");
+					default:
+						$output .= "Command doesn't exist! Use /help\n";
 						break;
-					}
-					$this->server->api->setProperty("difficulty", (int) $s);
-					console("[INFO] Difficulty changed to ".$this->server->difficulty);
-					loadConfig(true);
-					break;
-				case "say":
-					$s = implode(" ", $params);
-					if(trim($s) == ""){
-						console("[INFO] Usage: /say <message>");
-						break;
-					}
-					$this->server->api->chat->broadcast($s);
-					break;
-				case "save-all":
-					$this->server->save();
-					break;
-				case "help":
-				case "?":
-					console("[INFO] /help: Show available commands");
-					console("[INFO] /status: Show server TPS and memory usage");
-					console("[INFO] /gamemode: Changes default gamemode");
-					console("[INFO] /difficulty: Changes difficulty");
-					console("[INFO] /invisible: Manages server visibility");
-					console("[INFO] /say: Broadcasts mesages");
-					console("[INFO] /save-all: Saves pending changes");
-					console("[INFO] /stop: Stops the server");
-					//console("[INFO] /restart: Restarts the server");
-					foreach($this->help as $c => $h){
-						console("[INFO] /$c: ".$h);
-					}
-					break;
-				default:
-					console("[ERROR] Command doesn't exist! Use /help");
-					break;
-			}
+				}
+		return $output;
 	}

 	public function alias($alias, $cmd){
-		if(!isset($this->cmds[$cmd])){
-			return false;
-		}
-		$this->cmds[strtolower(trim($alias))] = &$this->cmds[$cmd];
+		$this->alias[strtolower(trim($alias))] = trim($cmd);
 		return true;
 	}

@ -153,26 +159,112 @@ class ConsoleAPI{
 		$cmd = strtolower(trim($cmd));
 		$this->cmds[$cmd] = $callback;
 		$this->help[$cmd] = $help;
+		ksort($this->help, SORT_NATURAL | SORT_FLAG_CASE);
 	}
 	
-	public function run($line = ""){
+	public function run($line = "", $issuer = "console", $alias = false){
 		if($line != ""){
-			$params = explode(" ", $line);
-			$cmd = strtolower(array_shift($params));
-			console("[INFO] Issued server command: /$cmd ".implode(" ", $params));
-			if(isset($this->cmds[$cmd]) and is_callable($this->cmds[$cmd])){
-				call_user_func($this->cmds[$cmd], $cmd, $params);
-			}elseif($this->server->api->dhandle("api.console.command", array("cmd" => $cmd, "params" => $params)) !== false){
-				$this->defaultCommands($cmd, $params);
+			$output = "";
+			$end = strpos($line, " ");
+			if($end === false){
+				$end = strlen($line);
 			}
+			$cmd = strtolower(substr($line, 0, $end));
+			$params = (string) substr($line, $end + 1);
+			if(isset($this->alias[$cmd])){
+				return $this->run($this->alias[$cmd] . ($params !== "" ? " " .$params:""), $issuer, $cmd);
+			}
+			if($issuer instanceof Player){
+				console("[DEBUG] \x1b[33m".$issuer->username."\x1b[0m issued server command: ".ltrim("$alias ")."/$cmd ".$params, true, true, 2);
+			}else{
+				console("[DEBUG] \x1b[33m*".$issuer."\x1b[0m issued server command: ".ltrim("$alias ")."/$cmd ".$params, true, true, 2);
+			}
+			
+			if(preg_match_all('#@([@a-z]{1,})#', $params, $matches, PREG_OFFSET_CAPTURE) > 0){
+				$offsetshift = 0;
+				foreach($matches[1] as $selector){
+					if($selector[0]{0} === "@"){ //Escape!
+						$params = substr_replace($params, $selector[0], $selector[1] + $offsetshift - 1, strlen($selector[0]) + 1);
+						--$offsetshift;
+						continue;
+					}
+					switch(strtolower($selector[0])){
+						case "u":
+						case "player":
+						case "username":
+							$p = ($issuer instanceof Player) ? $issuer->username:$issuer;
+							$params = substr_replace($params, $p, $selector[1] + $offsetshift - 1, strlen($selector[0]) + 1);
+							$offsetshift -= strlen($selector[0]) - strlen($p) + 1;
+							break;
+						case "w":
+						case "world":
+							$p = ($issuer instanceof Player) ? $issuer->level->getName():$this->server->api->level->getDefault()->getName();
+							$params = substr_replace($params, $p, $selector[1] + $offsetshift - 1, strlen($selector[0]) + 1);
+							$offsetshift -= strlen($selector[0]) - strlen($p) + 1;
+							break;
+						case "a":
+						case "all":
+							$output = "";
+							foreach($this->server->api->player->getAll() as $p){
+								$output .= $this->run($cmd . " ". substr_replace($params, $p->username, $selector[1] + $offsetshift - 1, strlen($selector[0]) + 1), $issuer, $alias);
+							}
+							return $output;
+						case "r":
+						case "random":
+							$l = array();
+							foreach($this->server->api->player->getAll() as $p){
+								if($p !== $issuer){
+									$l[] = $p;
+								}
+							}
+							if(count($l) === 0){
+								return;
+							}
+							
+							$p = $l[mt_rand(0, count($l) - 1)]->username;
+							$params = substr_replace($params, $p, $selector[1] + $offsetshift - 1, strlen($selector[0]) + 1);
+							$offsetshift -= strlen($selector[0]) - strlen($p) + 1;
+							break;
+					}
+				}
+			}
+			$params = explode(" ", $params);
+			if(count($params) === 1 and $params[0] === ""){
+				$params = array();
+			}
+			
+			if(($d1 = $this->server->api->dhandle("console.command.".$cmd, array("cmd" => $cmd, "parameters" => $params, "issuer" => $issuer, "alias" => $alias))) === false
+			or ($d2 = $this->server->api->dhandle("console.command", array("cmd" => $cmd, "parameters" => $params, "issuer" => $issuer, "alias" => $alias))) === false){
+				$output = "You don't have permissions to use this command.\n";
+			}elseif($d1 !== true and $d2 !== true){
+				if(isset($this->cmds[$cmd]) and is_callable($this->cmds[$cmd])){
+					$output = @call_user_func($this->cmds[$cmd], $cmd, $params, $issuer, $alias);
+				}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);
+				}
+			}
+				
+			if($output != "" and ($issuer instanceof Player)){
+				$issuer->sendChat(trim($output));
+			}
+			return $output;
 		}
 	}

 	public function handle($time){
+		if(defined("NO_THREADS")){
+			return;
+		}
 		if($this->loop->line !== false){
 			$line = trim($this->loop->line);
 			$this->loop->line = false;
-			$this->run($line);
+			$output = $this->run($line, "console");
+			if($output != ""){
+				$mes = explode("\n", trim($output));
+				foreach($mes as $m){
+					console("[CMD] ".$m);	
+				}
+			}
 		}else{
 			$this->loop->notify();
 		}
@ -181,19 +273,47 @@ class ConsoleAPI{
 }

 class ConsoleLoop extends Thread{
-	public $line, $stop;
+	public $line;
+	public $stop;
+	public $base;
+	public $ev;
+   public $fp;
 	public function __construct(){
 		$this->line = false;
 		$this->stop = false;
+		$this->start();
 	}
-	
+
+	public function stop(){
+		$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;
+	}
+
 	public function run(){
-		$fp = fopen("php://stdin", "r");
-		while($this->stop === false and ($line = fgets($fp)) !== false){
-			$this->line = $line;
+		if(!extension_loaded("readline")){
+			$this->fp = fopen( "php://stdin", "r" );
+		}
+
+		while($this->stop === false){
+			$this->line = $this->readLine();
 			$this->wait();
 			$this->line = false;
 		}
+
+		if(!$this->haveReadline){
+			@fclose($fp);
+		}
 		exit(0);
 	}
-}
+}
--- a/src/API/EntityAPI.php
+++ b/src/API/EntityAPI.php
@ -1,102 +1,172 @@
 <?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{
 	private $server;
-	function __construct(PocketMinecraftServer $server){
-		$this->server = $server;
+	private $entities;
+	private $eCnt = 1;
+
+	function __construct(){
+		$this->entities = array();
+		$this->server = ServerAPI::request();
 	}

 	public function get($eid){
-		if(isset($this->server->entities[$eid])){
-			return $this->server->entities[$eid];
+		if(isset($this->entities[$eid])){
+			return $this->entities[$eid];
 		}
 		return false;
 	}
 	
 	public function init(){
+		$this->server->schedule(25, array($this, "updateEntities"), array(), true);
+	}
 	
+	public function updateEntities(){
+		$l = $this->server->query("SELECT EID FROM entities WHERE hasUpdate = 1;");
+		
+		if($l !== false and $l !== true){
+			while(($e = $l->fetchArray(SQLITE3_ASSOC)) !== false){
+				$e = $this->get($e["EID"]);
+				if($e instanceof Entity){
+					$e->update();
+					$this->server->query("UPDATE entities SET hasUpdate = 0 WHERE EID = ".$e->eid.";");
+				}
+			}
+		}
+	}
+	
+	public function updateRadius(Position $center, $radius = 15, $class = false){
+		$this->server->query("UPDATE entities SET hasUpdate = 1 WHERE level = '".$center->level->getName()."' ".($class !== false ? "AND class = $class ":"")."AND abs(x - {$center->x}) <= $radius AND abs(y - {$center->y}) <= $radius AND abs(z - {$center->z}) <= $radius;");
 	}

-	public function getAll(){
-		return $this->server->entities;
+	public function getRadius(Position $center, $radius = 15, $class = false){
+		$entities = array();
+		$l = $this->server->query("SELECT EID FROM entities WHERE level = '".$center->level->getName()."' ".($class !== false ? "AND class = $class ":"")."AND abs(x - {$center->x}) <= $radius AND abs(y - {$center->y}) <= $radius AND abs(z - {$center->z}) <= $radius;");
+		if($l !== false and $l !== true){
+			while(($e = $l->fetchArray(SQLITE3_ASSOC)) !== false){
+				$e = $this->get($e["EID"]);
+				if($e instanceof Entity){
+					$entities[$e->eid] = $e;
+				}
+			}
+		}
+		return $entities;
+	}
+	
+	public function getAll($level = null){
+		if($level instanceof Level){
+			$entities = array();
+			$l = $this->server->query("SELECT EID FROM entities WHERE level = '".$level->getName()."';");
+			if($l !== false and $l !== true){
+				while(($e = $l->fetchArray(SQLITE3_ASSOC)) !== false){
+					$e = $this->get($e["EID"]);
+					if($e instanceof Entity){
+						$entities[$e->eid] = $e;
+					}
+				}
+			}
+			return $entities;
+		}
+		return $this->entities;
 	}

 	public function heal($eid, $heal = 1, $cause){
 		$this->harm($eid, -$heal, $cause);
 	}

-	public function harm($eid, $attack = 1, $cause){
+	public function harm($eid, $attack = 1, $cause, $force = false){
 		$e = $this->get($eid);
 		if($e === false or $e->dead === true){
 			return false;
 		}
-		$e->setHealth($e->getHealth() - $attack, $cause);
+		$e->setHealth($e->getHealth() - $attack, $cause, $force);
 	}

-	public function add($class, $type = 0, $data = array()){
-		$eid = $this->server->eidCnt++;
-		$this->server->entities[$eid] = new Entity($this->server, $eid, $class, $type, $data);
-		$this->server->handle("entity.add", $this->server->entities[$eid]);
-		return $this->server->entities[$eid];
+	public function add(Level $level, $class, $type = 0, $data = array()){
+		$eid = $this->eCnt++;
+		$this->entities[$eid] = new Entity($level, $eid, $class, $type, $data);
+		$this->server->handle("entity.add", $this->entities[$eid]);
+		return $this->entities[$eid];
 	}

-	public function spawnTo($eid, $player){
-		$e = $this->get($eid);
-		if($e === false){
-			return false;
+	public function spawnToAll(Entity $e){
+		foreach($this->server->api->player->getAll($e->level) as $player){
+			if($player->eid !== false and $player->eid !== $e->eid and $e->class !== ENTITY_PLAYER){
+				$e->spawn($player);
+			}
+		}
+	}
+	
+	public function drop(Position $pos, Item $item){
+		if($item->getID() === AIR or $item->count <= 0){
+			return;
+		}
+		$data = array(
+			"x" => $pos->x + mt_rand(-10, 10) / 50,
+			"y" => $pos->y + 0.19,
+			"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,
+			"item" => $item,
+		);
+		if($this->server->api->handle("item.drop", $data) !== false){
+			for($count = $item->count; $count > 0; ){
+				$item->count = min($item->getMaxStackSize(), $count);
+				$count -= $item->count;
+				$e = $this->add($pos->level, ENTITY_ITEM, $item->getID(), $data);
+				$this->spawnToAll($e);
+				$this->server->api->handle("entity.motion", $e);
+			}
 		}
-		$e->spawn($player);
 	}

-	public function spawnToAll($eid){
-		$e = $this->get($eid);
-		if($e === false){
-			return false;
-		}
-		foreach($this->server->api->player->getAll() as $player){
-			if($player->eid !== false){
+	public function spawnAll(Player $player){
+		foreach($this->getAll($player->level) as $e){
+			if($e->class !== ENTITY_PLAYER){
 				$e->spawn($player);
 			}
 		}
 	}

-	public function spawnAll($player){
-		foreach($this->getAll() as $e){
-			$e->spawn($player);
-		}
-	}
-
 	public function remove($eid){
-		if(isset($this->server->entities[$eid])){
-			$entity = $this->server->entities[$eid];
-			unset($this->server->entities[$eid]);
-			$this->server->query("DELETE FROM entities WHERE EID = ".$entity->eid.";");
+		if(isset($this->entities[$eid])){
+			$entity = $this->entities[$eid];
+			$this->entities[$eid] = null;
+			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);			
 		}
 	}
--- a/src/API/LevelAPI.php
+++ b/src/API/LevelAPI.php
@ -1,134 +1,240 @@
 <?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{
-	private $server, $map;
-	function __construct(PocketMinecraftServer $server){
-		$this->server = $server;
-		$this->map = $this->server->map;
-		$this->heightMap = array_fill(0, 256, array());
+	private $server, $levels, $default;
+	public function __construct(){
+		$this->server = ServerAPI::request();
+		$this->levels = array();
+	}
+	
+	public function get($name){
+		if(isset($this->levels[$name])){
+			return $this->levels[$name];
+		}
+		return false;
+	}
+	
+	public function getDefault(){
+		return $this->levels[$this->default];
 	}

 	public function init(){
-		$this->server->event("player.block.break", array($this, "handle"));
-		$this->server->event("player.block.place", array($this, "handle"));
-		$this->server->event("player.block.update", array($this, "handle"));
+		$this->server->api->console->register("seed", "[world]", array($this, "commandHandler"));
+		$this->server->api->console->register("save-all", "", array($this, "commandHandler"));
+		$this->server->api->console->register("save-on", "", array($this, "commandHandler"));
+		$this->server->api->console->register("save-off", "", array($this, "commandHandler"));
+		$this->default = $this->server->api->getProperty("level-name");
+		if($this->loadLevel($this->default) === false){
+			$this->generateLevel($this->default, $this->server->seed);
+			$this->loadLevel($this->default);
+		}
+		$this->server->spawn = $this->getDefault()->getSafeSpawn();
+	}
+	
+	public function commandHandler($cmd, $params, $issuer, $alias){
+		$output = "";
+		switch($cmd){
+			case "save-all":
+				$save = $this->server->saveEnabled;
+				$this->server->saveEnabled = true;
+				$this->saveAll();
+				$this->server->saveEnabled = $save;
+				break;
+			case "save-on":
+				$this->server->saveEnabled = true;
+				break;
+			case "save-off":
+				$this->server->saveEnabled = false;
+				break;
+			case "seed":
+				if(!isset($params[0]) and ($issuer instanceof Player)){
+					$output .= "Seed: ".$issuer->level->getSeed()."\n";
+				}elseif(isset($params[0])){
+					if(($lv = $this->server->api->level->get(trim(implode(" ", $params)))) !== false){
+						$output .= "Seed: ".$lv->getSeed()."\n";
+					}
+				}else{
+					$output .= "Seed: ".$this->server->api->level->getDefault()->getSeed()."\n";
+				}
+		}
+		return $output;			
+	}
+	
+	public function generateLevel($name, $seed = false, $generator = false){
+		if($this->levelExists($name)){
+			return false;
+		}
+		$options = array();
+		if($this->server->api->getProperty("generator-settings") !== false and trim($this->server->api->getProperty("generator-settings")) != ""){
+			$options["preset"] = $this->server->api->getProperty("generator-settings");
+		}
+
+		if($generator !== false and class_exists($generator)){
+			$generator = new $generator($options);
+		}else{
+			if(strtoupper($this->server->api->getProperty("level-type")) == "FLAT"){
+				$generator = new SuperflatGenerator($options);
+			}else{
+				$generator = new TemporalGenerator($options);
+			}
+		}
+		$gen = new WorldGenerator($generator, $name, $seed === false ? Utils::readInt(Utils::getRandomBytes(4, false)):(int) $seed);
+		$gen->generate();
+		$gen->close();
+		return true;
+	}
+	
+	public function levelExists($name){
+		if($name === ""){
+			return false;
+		}
+		$path = DATA_PATH."worlds/".$name."/";
+		if($this->get($name) === false and !file_exists($path."level.pmf")){
+			$level = new LevelImport($path);
+			if($level->import() === false){
+				return false;
+			}
+		}
+		return true;
+	}
+	
+	public function unloadLevel(Level $level, $force = false){
+		$name = $level->getName();
+		if($name === $this->default and $force !== true){
+			return false;
+		}
+		console("[INFO] Unloading level \"".$name."\"");
+		$level->nextSave = PHP_INT_MAX;
+		$level->save();
+		foreach($this->server->api->player->getAll($level) as $player){
+			$player->teleport($this->server->spawn);
+		}
+		foreach($this->server->api->entity->getAll($level) as $entity){
+			if($entity->class !== ENTITY_PLAYER){
+				$entity->close();
+			}
+		}
+		foreach($this->server->api->tile->getAll($level) as $tile){
+			$tile->close();
+		}
+		$level->close();
+		unset($this->levels[$name]);
+		return true;
+	}
+	
+	public function loadLevel($name){
+		if($this->get($name) !== false){
+			return true;
+		}elseif($this->levelExists($name) === false){
+			console("[NOTICE] Level \"".$name."\" not found");
+			return false;
+		}
+		$path = DATA_PATH."worlds/".$name."/";
+		console("[INFO] Preparing level \"".$name."\"");
+		$level = new PMFLevel($path."level.pmf");
+		$entities = new Config($path."entities.yml", CONFIG_YAML);
+		if(file_exists($path."tileEntities.yml")){
+			@rename($path."tileEntities.yml", $path."tiles.yml");
+		}
+		$tiles = new Config($path."tiles.yml", CONFIG_YAML);
+		$blockUpdates = new Config($path."bupdates.yml", CONFIG_YAML);
+		$this->levels[$name] = new Level($level, $entities, $tiles, $blockUpdates, $name);
+		foreach($entities->getAll() as $entity){
+			if(!isset($entity["id"])){
+				break;
+			}
+			if($entity["id"] === 64){ //Item Drop
+				$e = $this->server->api->entity->add($this->levels[$name], ENTITY_ITEM, $entity["Item"]["id"], array(
+					"meta" => $entity["Item"]["Damage"],
+					"stack" => $entity["Item"]["Count"],
+					"x" => $entity["Pos"][0],
+					"y" => $entity["Pos"][1],
+					"z" => $entity["Pos"][2],
+					"yaw" => $entity["Rotation"][0],
+					"pitch" => $entity["Rotation"][1],
+				));
+			}elseif($entity["id"] === FALLING_SAND){
+				$e = $this->server->api->entity->add($this->levels[$name], ENTITY_FALLING, $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"]);
+			}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(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]);
+				$e->setHealth($entity["Health"]);
+			}
+		}
+			
+		foreach($tiles->getAll() as $tile){
+			if(!isset($tile["id"])){
+				break;
+			}
+			$t = $this->server->api->tile->add($this->levels[$name], $tile["id"], $tile["x"], $tile["y"], $tile["z"], $tile);
+		}
+		
+		$timeu = microtime(true);
+		foreach($blockUpdates->getAll() as $bupdate){
+			$this->server->api->block->scheduleBlockUpdate(new Position((int) $bupdate["x"],(int) $bupdate["y"],(int) $bupdate["z"], $this->levels[$name]), (float) $bupdate["delay"], (int) $bupdate["type"]);
+		}
+		return true;
 	}

 	public function handle($data, $event){
 		switch($event){
-			case "player.block.place":
-			case "player.block.update":
-				console("[DEBUG] EID ".$data["eid"]." placed ".$data["block"].":".$data["meta"]." at X ".$data["x"]." Y ".$data["y"]." Z ".$data["z"], true, true, 2);
-				$this->setBlock($data["x"], $data["y"], $data["z"], $data["block"], $data["meta"]);
-				break;
-			case "player.block.break":
-				$block = $this->getBlock($data["x"], $data["y"], $data["z"]);
-				console("[DEBUG] EID ".$data["eid"]." broke ".$block[0].":".$block[1]." at X ".$data["x"]." Y ".$data["y"]." Z ".$data["z"], true, true, 2);
-				if($block[0] === 0){
-					break;
-				}
-				$this->setBlock($data["x"], $data["y"], $data["z"], 0, 0);
-				break;
+		}
+	}
+	
+	public function saveAll(){
+		foreach($this->levels as $level){
+			$level->save();
+		}
+	}
+	
+	public function __destruct(){
+		$this->saveAll();
+		foreach($this->levels as $level){
+			$this->unloadLevel($level, true);
 		}
 	}

 	public function getSpawn(){
 		return $this->server->spawn;
 	}
-
-	public function getChunk($X, $Z){
-		return $this->map->map[$X][$Z];
-	}
-
-	public function getBlockFace($block, $face){
-		$data = array("x" => $block[2][0], "y" => $block[2][1], "z" => $block[2][2]);
-		BlockFace::setPosition($data, $face);
-		return $this->getBlock($data["x"], $data["y"], $data["z"]);
-	}
-
-	public function getBlock($x, $y, $z){
-		$b = $this->map->getBlock($x, $y, $z);
-		$b[2] = array($x, $y, $z);
-		return $b;
-	}
-
-	public function getFloor($x, $z){
-		if(!isset($this->heightMap[$z][$x])){
-			$this->heightMap[$z][$x] = $this->map->getFloor($x, $z);
-		}
-		return $this->heightMap[$z][$x];
-	}
-
-	public function setBlock($x, $y, $z, $block, $meta = 0, $update = true){
-		if($x < 0 or $y < 0 or $z < 0){
-			return false;
-		}
-		$this->map->setBlock($x, $y, $z, $block, $meta);
-		$this->heightMap[$z][$x] = $this->map->getFloor($x, $z);
-		if($this->server->api->dhandle("block.change", array(
-			"x" => $x,
-			"y" => $y,
-			"z" => $z,
-			"block" => $block,
-			"meta" => $meta,
-		)) !== false){
-			if($update === true){
-				$this->server->api->block->updateBlock($x, $y, $z, BLOCK_UPDATE_NORMAL);
-				$this->server->api->block->updateBlocksAround($x, $y, $z, BLOCK_UPDATE_NORMAL);
+	
+	public function loadMap(){
+		if($this->mapName !== false and trim($this->mapName) !== ""){
+			if(!file_exists($this->mapDir."level.pmf")){
+				$level = new LevelImport($this->mapDir);
+				$level->import();
 			}
+			$this->level = new PMFLevel($this->mapDir."level.pmf");
+			console("[INFO] Preparing level \"".$this->level->getData("name")."\"");
+			$this->time = (int) $this->level->getData("time");
+			$this->seed = (int) $this->level->getData("seed");
+			$this->spawn = $this->level->getSpawn();
 		}
-		return true;
-	}
-
-	public function getOrderedChunk($X, $Z, $columnsPerPacket = 2){
-		$columnsPerPacket = max(1, (int) $columnsPerPacket);
-		$c = $this->getChunk($X, $Z);
-		$ordered = array();
-		$i = 0;
-		$cnt = 0;
-		$ordered[$i] = "";
-		for($z = 0; $z < 16; ++$z){
-			for($x = 0; $x < 16; ++$x){
-				if($cnt >= $columnsPerPacket){
-					++$i;
-					$ordered[$i] = str_repeat("\x00", $i * $columnsPerPacket);
-					$cnt = 0;
-				}
-				$ordered[$i] .= "\xff";
-				$block = $this->map->getChunkColumn($X, $Z, $x, $z, 0);
-				$meta = $this->map->getChunkColumn($X, $Z, $x, $z, 1);
-				for($k = 0; $k < 8; ++$k){
-					$ordered[$i] .= substr($block, $k << 4, 16);
-					$ordered[$i] .= substr($meta, $k << 3, 8);
-				}
-				++$cnt;
-			}
-		}
-		return $ordered;
 	}
+	
 }
--- a/src/API/PlayerAPI.php
+++ b/src/API/PlayerAPI.php
@ -1,179 +1,341 @@
 <?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{
 	private $server;
-	function __construct(PocketMinecraftServer $server){
-		$this->server = $server;
+	function __construct(){
+		$this->server = ServerAPI::request();
 	}

 	public function init(){
-		$this->server->addHandler("server.regeneration", array($this, "handle"));
+		$this->server->schedule(20 * 15, array($this, "handle"), 1, true, "server.regeneration");
 		$this->server->addHandler("player.death", array($this, "handle"), 1);
-		$this->server->api->console->register("list", "Shows connected player list", array($this, "commandHandler"));
-		$this->server->api->console->register("kill", "Kills a player", array($this, "commandHandler"));
-		$this->server->api->console->register("tppos", "Teleports a player to a position", array($this, "commandHandler"));
-		$this->server->api->console->register("tp", "Teleports a player to another player", array($this, "commandHandler"));
+		$this->server->api->console->register("list", "", array($this, "commandHandler"));
+		$this->server->api->console->register("kill", "<player>", array($this, "commandHandler"));
+		$this->server->api->console->register("gamemode", "<mode> [player]", array($this, "commandHandler"));
+		$this->server->api->console->register("tp", "[target player] <destination player|w:world> OR /tp [target player] <x> <y> <z>", array($this, "commandHandler"));
+		$this->server->api->console->register("spawnpoint", "[player] [x] [y] [z]", array($this, "commandHandler"));
+		$this->server->api->console->register("spawn", "", array($this, "commandHandler"));
+		$this->server->api->console->register("ping", "", array($this, "commandHandler"));
+		$this->server->api->console->alias("lag", "ping");
+		$this->server->api->console->alias("suicide", "kill");
+		$this->server->api->console->alias("tppos", "tp");
+		$this->server->api->ban->cmdWhitelist("list");
+		$this->server->api->ban->cmdWhitelist("ping");
+		$this->server->api->ban->cmdWhitelist("spawn");
+		$this->server->preparedSQL->selectPlayersToHeal = $this->server->database->prepare("SELECT EID FROM entities WHERE class = ".ENTITY_PLAYER." AND health < 20;");
 	}

 	public function handle($data, $event){
 		switch($event){
 			case "server.regeneration":
-				$result = $this->server->query("SELECT EID FROM players WHERE EID = (SELECT EID FROM entities WHERE health < 20);");
-				if($result !== true and $result !== false){
-					while(false !== ($player = $result->fetchArray())){
-						if(($player = $this->server->api->player->getByEID($player["EID"])) !== false){
-							$player->entity->setHealth(min(20, $player->entity->getHealth() + $data), "regeneration");
+				if($this->server->difficulty === 0){
+					$result = $this->server->preparedSQL->selectPlayersToHeal->execute();
+					if($result !== false){
+						while(($player = $result->fetchArray()) !== false){
+							if(($player = $this->server->api->entity->get($player["EID"])) !== false){
+								if($player->getHealth() <= 0){
+									continue;
+								}
+								$player->setHealth(min(20, $player->getHealth() + $data), "regeneration");
+							}
 						}
+						return true;
 					}
 				}
 				break;
 			case "player.death":
-				$message = $data["name"];
-				if(is_numeric($data["cause"]) and isset($this->entities[$data["cause"]])){
-					$e = $this->api->entity->get($data["cause"]);
-					switch($e->class){
-						case ENTITY_PLAYER:
-							$message .= " was killed by ".$e->name;
-							break;
-						default:
-							$message .= " was killed";
-							break;
+				if(is_numeric($data["cause"])){
+					$e = $this->server->api->entity->get($data["cause"]);
+					if($e instanceof Entity){
+						switch($e->class){
+							case ENTITY_PLAYER:
+								$message = " was killed by ".$e->name;
+								break;
+							default:
+								$message = " was killed";
+								break;
+						}
 					}
 				}else{
 					switch($data["cause"]){
+						case "cactus":
+							$message = " was pricked to death";
+							break;
+						case "lava":
+							$message = " tried to swim in lava";
+							break;
+						case "fire":
+							$message = " went up in flames";
+							break;
+						case "burning":
+							$message = " burned to death";
+							break;
+						case "suffocation":
+							$message = " suffocated in a wall";
+							break;
+						case "water":
+							$message = " drowned";
+							break;
+						case "void":
+							$message = " fell out of the world";
+							break;
+						case "fall":
+							$message = " hit the ground too hard";
+							break;
 						default:
-							$message .= " was killed";
+							$message = " died";
 							break;
 					}
 				}
-				$this->server->chat(false, $message);
+				$this->server->api->chat->broadcast($data["player"]->username . $message);
+				return true;
 				break;
 		}
 	}

-	public function commandHandler($cmd, $params){
+	public function commandHandler($cmd, $params, $issuer, $alias){
+		$output = "";
 		switch($cmd){
-			case "tp":
-				$name = array_shift($params);
-				$target = array_shift($params);
-				if($name == null or $target == null){
-					console("[INFO] Usage: /tp <player> <target>");
+			case "spawnpoint":
+				if(!($issuer instanceof Player)){					
+					$output .= "Please run this command in-game.\n";
 					break;
 				}
-				if($this->teleport($name, $target)){
-					console("[INFO] \"$name\" teleported to \"$target\"");
+
+				if(count($params) === 1 or count($params) === 4){
+					$target = $this->server->api->player->get(array_shift($params));
 				}else{
-					console("[ERROR] Couldn't teleport");
+					$target = $issuer;
+				}
+				
+				if(!($target instanceof Player)){
+					$output .= "That player cannot be found.\n";
+					break;
+				}
+				
+				if(count($params) === 3){
+					$spawn = new Position(floatval(array_shift($params)), floatval(array_shift($params)), floatval(array_shift($params)), $issuer->level);
+				}else{
+					$spawn = new Position($issuer->entity->x, $issuer->entity->y, $issuer->entity->z, $issuer->entity->level);
+				}
+				
+				$target->setSpawn($spawn);
+				
+				$output .= "Spawnpoint set correctly!\n";
+				break;
+			case "spawn":
+				if(!($issuer instanceof Player)){					
+					$output .= "Please run this command in-game.\n";
+					break;
+				}
+				$spawn = $issuer->getSpawn();
+				$issuer->teleport($spawn);
+				break;
+			case "ping":
+				if(!($issuer instanceof Player)){					
+					$output .= "Please run this command in-game.\n";
+					break;
+				}
+				$output .= "ping ".round($issuer->getLag(), 2)."ms, packet loss ".round($issuer->getPacketLoss() * 100, 2)."%, ".round($issuer->getBandwidth() / 1024, 2)." KB/s\n";
+				break;
+			case "gamemode":
+				$player = false;
+				$gms = array(
+					"0" => SURVIVAL,
+					"survival" => SURVIVAL,
+					"s" => SURVIVAL,
+					"1" => CREATIVE,
+					"creative" => CREATIVE,
+					"c" => CREATIVE,
+					"2" => ADVENTURE,
+					"adventure" => ADVENTURE,
+					"a" => ADVENTURE,
+					"3" => VIEW,
+					"view" => VIEW,
+					"viewer" => VIEW,
+					"spectator" => VIEW,
+					"v" => VIEW,
+				);
+				if($issuer instanceof Player){
+					$player = $issuer;
+				}
+				if(isset($params[1])){
+					$player = $this->server->api->player->get($params[1]);
+				}
+				if(!($player instanceof Player) or !isset($gms[strtolower($params[0])])){
+					$output .= "Usage: /$cmd <mode> [player]\n";
+					break;
+				}
+				if($player->setGamemode($gms[strtolower($params[0])])){
+					$output .= "Gamemode of ".$player->username." changed to ".$player->getGamemode()."\n";
 				}
 				break;
-			case "tppos":
-				$z = array_pop($params);
-				$y = array_pop($params);
-				$x = array_pop($params);
-				$name = implode(" ", $params);
-				if($name == null or $x === null or $y === null or $z === null){
-					console("[INFO] Usage: /tp <player> <x> <y> <z>");
-					break;
-				}
-				if($this->tppos($name, $x, $y, $z)){
-					console("[INFO] \"$name\" teleported to ($x, $y, $z)");
+			case "tp":
+				if(count($params) <= 2 or substr($params[0], 0, 2) === "w:" or substr($params[1], 0, 2) === "w:"){
+					if((!isset($params[1]) or substr($params[0], 0, 2) === "w:") and isset($params[0]) and ($issuer instanceof Player)){
+						$name = $issuer->username;
+						$target = implode(" ", $params);
+					}elseif(isset($params[1]) and isset($params[0])){
+						$name = array_shift($params);
+						$target = implode(" ", $params);
+					}else{
+						$output .= "Usage: /$cmd [target player] <destination player>\n";
+						break;
+					}
+					if($this->teleport($name, $target) !== false){
+						$output .= "\"$name\" teleported to \"$target\"\n";
+					}else{
+						$output .= "Couldn't teleport.\n";
+					}
 				}else{
-					console("[ERROR] Couldn't teleport");
+					if(!isset($params[3]) and isset($params[2]) and isset($params[1]) and isset($params[0]) and ($issuer instanceof Player)){
+						$name = $issuer->username;
+						$x = $params[0];
+						$y = $params[1];
+						$z = $params[2];
+					}elseif(isset($params[3]) and isset($params[2]) and isset($params[1]) and isset($params[0])){
+						$name = $params[0];
+						$x = $params[1];
+						$y = $params[2];
+						$z = $params[3];
+					}else{
+						$output .= "Usage: /$cmd [player] <x> <y> <z>\n";
+						break;
+					}
+					if($this->tppos($name, $x, $y, $z)){
+						$output .= "\"$name\" teleported to ($x, $y, $z)\n";
+					}else{
+						$output .= "Couldn't teleport.\n";
+					}
 				}
 				break;
 			case "kill":
-				$player = $this->get(implode(" ", $params));
-				if($player !== false){
-					$this->server->api->entity->harm($player->eid, 20, "console");
+			case "suicide":
+				if(!isset($params[0]) and ($issuer instanceof Player)){
+					$player = $issuer;
 				}else{
-					console("[INFO] Usage: /kill <player>");
+					$player = $this->get($params[0]);
+				}
+				if($player instanceof Player){
+					$player->entity->harm(1000, "console", true);
+					$player->sendChat("Ouch. That looks like it hurt.\n");
+				}else{
+					$output .= "Usage: /$cmd [player]\n";
 				}
 				break;
 			case "list":
-				console("[INFO] Player list:");
-				foreach($this->server->clients as $c){
-					console("[INFO] ".$c->username." (".$c->ip.":".$c->port."), ClientID ".$c->clientID.", (".round($c->entity->x, 2).", ".round($c->entity->y, 2).", ".round($c->entity->z, 2).")");
+				$output .= "There are ".count($this->server->clients)."/".$this->server->maxClients." players online:\n";
+				if(count($this->server->clients) == 0){
+					break;
 				}
+				foreach($this->server->clients as $c){
+					$output .= $c->username.", ";
+				}
+				$output = substr($output, 0, -2)."\n";
 				break;
 		}
+		return $output;
 	}

-	public function teleport($name, $target){
-		$target = $this->get($target);
-		if($target !== false){
-			return $this->tppos($name, $target->entity->x, $target->entity->y, $target->entity->z);
+	public function teleport(&$name, &$target){
+		if(substr($target, 0, 2) === "w:"){
+			$lv = $this->server->api->level->get(substr($target, 2));
+			if($lv instanceof Level){
+				$origin = $this->get($name);
+				if($origin instanceof Player){
+					$name = $origin->username;
+					return $origin->teleport($lv->getSafeSpawn());
+				}
+			}else{
+				return false;
+			}
+		}
+		$player = $this->get($target);
+		if(($player instanceof Player) and ($player->entity instanceof Entity)){
+			$target = $player->username;
+			$origin = $this->get($name);
+			if($origin instanceof Player){
+				$name = $origin->username;
+				return $origin->teleport($player->entity);
+			}
 		}
 		return false;
 	}

-	public function tppos($name, $x, $y, $z){
+	public function tppos(&$name, &$x, &$y, &$z){
 		$player = $this->get($name);
-		if($player !== false){
-			$player->dataPacket(MC_MOVE_PLAYER, array(
-				"eid" => 0,
-				"x" => $x,
-				"y" => $y,
-				"z" => $z,
-				"yaw" => 0,
-				"pitch" => 0,
-			));
+		if(($player instanceof Player) and ($player->entity instanceof Entity)){
+			$name = $player->username;
+			$x = $x{0} === "~" ? $player->entity->x + floatval(substr($x, 1)):floatval($x);
+			$y = $y{0} === "~" ? $player->entity->y + floatval(substr($y, 1)):floatval($y);
+			$z = $z{0} === "~" ? $player->entity->z + floatval(substr($z, 1)):floatval($z);
+			$player->teleport(new Vector3($x, $y, $z));
 			return true;
 		}
 		return false;
 	}

-	public function get($name){
-		$CID = $this->server->query("SELECT ip,port FROM players WHERE name = '".str_replace("'", "", $name)."';", true);
-		$CID = $this->server->clientID($CID["ip"], $CID["port"]);
+	public function get($name, $alike = true){
+		$name = trim(strtolower($name));
+		if($name === ""){
+			return false;
+		}
+		$CID = $this->server->query("SELECT ip,port FROM players WHERE name ".($alike === true ? "LIKE '%".$name."%'":"= '".$name."'").";", true);
+		$CID = PocketMinecraftServer::clientID($CID["ip"], $CID["port"]);
 		if(isset($this->server->clients[$CID])){
 			return $this->server->clients[$CID];
 		}
 		return false;
 	}

-	public function getAll(){
+	public function getAll($level = null){
+		if($level instanceof Level){
+			$clients = array();
+			$l = $this->server->query("SELECT EID FROM entities WHERE level = '".$level->getName()."' AND class = '".ENTITY_PLAYER."';");
+			if($l !== false and $l !== true){
+				while(($e = $l->fetchArray(SQLITE3_ASSOC)) !== false){
+					$e = $this->getByEID($e["EID"]);
+					if($e instanceof Player){
+						$clients[$e->CID] = $e;
+					}
+				}
+			}
+			return $clients;
+		}
 		return $this->server->clients;
 	}
+	
+	public function broadcastPacket(array $players, $id, $data = array()){
+		$data = new CustomPacketHandler($id, "", $data, true);
+		$packet = array("raw" => chr($id).$data->raw);
+		foreach($players as $p){
+			$p->dataPacket(false, $packet);
+		}
+	}

 	public function getByEID($eid){
 		$eid = (int) $eid;
 		$CID = $this->server->query("SELECT ip,port FROM players WHERE EID = '".$eid."';", true);
-		$CID = $this->server->clientID($CID["ip"], $CID["port"]);
-		if(isset($this->server->clients[$CID])){
-			return $this->server->clients[$CID];
-		}
-		return false;
-	}
-
-	public function getByClientID($clientID){
-		$clientID = (int) $clientID;
-		$CID = $this->server->query("SELECT ip,port FROM players WHERE clientID = '".$clientID."';", true);
-		$CID = $this->server->clientID($CID["ip"], $CID["port"]);
+		$CID = PocketMinecraftServer::clientID($CID["ip"], $CID["port"]);
 		if(isset($this->server->clients[$CID])){
 			return $this->server->clients[$CID];
 		}
@ -193,9 +355,54 @@ class PlayerAPI{
 	public function add($CID){
 		if(isset($this->server->clients[$CID])){
 			$player = $this->server->clients[$CID];
-			console("[INFO] Player \"\x1b[33m".$player->username."\x1b[0m\" connected from \x1b[36m".$player->ip.":".$player->port."\x1b[0m");
 			$player->data = $this->getOffline($player->username);
-			$this->server->query("INSERT OR REPLACE INTO players (clientID, ip, port, name) VALUES (".$player->clientID.", '".$player->ip."', ".$player->port.", '".$player->username."');");
+			$player->gamemode = $player->data->get("gamemode");
+			if(($player->level = $this->server->api->level->get($player->data->get("position")["level"])) === false){
+				$player->level = $this->server->api->level->getDefault();
+				$player->data->set("position", array(
+					"level" => $player->level->getName(),
+					"x" => $player->level->getSpawn()->x,
+					"y" => $player->level->getSpawn()->y,
+					"z" => $player->level->getSpawn()->z,
+				));
+			}
+			$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,
+					));
+				}
+			}
 		}
 	}

@ -204,37 +411,61 @@ class PlayerAPI{
 			$player = $this->server->clients[$CID];
 			unset($this->server->clients[$CID]);
 			$player->close();
-			$this->saveOffline($player->username, $player->data);
+			if($player->username != "" and ($player->data instanceof Config)){
+				$this->saveOffline($player->data);
+			}
 			$this->server->query("DELETE FROM players WHERE name = '".$player->username."';");
+			if($player->entity instanceof Entity){
+				unset($player->entity->player);
+				unset($player->entity);
+			}
 			$this->server->api->entity->remove($player->eid);
+			$player = null;
 			unset($player);
 		}
 	}

 	public function getOffline($name){
-		if(!file_exists(FILE_PATH."players/".$name.".dat")){
-			console("[NOTICE] Player data not found for \"".$name."\", creating new profile");
-			$data = array(
-				"spawn" => array(
-					"x" => $this->server->spawn["x"],
-					"y" => $this->server->spawn["y"],
-					"z" => $this->server->spawn["z"],
-				),
-				"inventory" => array_fill(0, 36, array(0, 0, 0)),
-				"health" => 20,
-				"lastIP" => "",
-				"lastID" => 0,
-			);
-			$this->saveOffline($name, $data);
+		$iname = strtolower($name);
+		$default = array(
+			"caseusername" => $name,
+			"position" => array(
+				"level" => $this->server->spawn->level->getName(),
+				"x" => $this->server->spawn->x,
+				"y" => $this->server->spawn->y,
+				"z" => $this->server->spawn->z,
+			),
+			"spawn" => array(
+				"level" => $this->server->spawn->level->getName(),
+				"x" => $this->server->spawn->x,
+				"y" => $this->server->spawn->y,
+				"z" => $this->server->spawn->z,
+			),
+			"inventory" => array_fill(0, PLAYER_SURVIVAL_SLOTS, array(AIR, 0, 0)),
+			"armor" => array_fill(0, 4, array(AIR, 0)),
+			"gamemode" => $this->server->gamemode,
+			"health" => 20,
+			"lastIP" => "",
+			"lastID" => 0,
+		);
+		
+		if(!file_exists(DATA_PATH."players/".$iname.".yml")){
+			console("[NOTICE] Player data not found for \"".$iname."\", creating new profile");
+			$data = new Config(DATA_PATH."players/".$iname.".yml", CONFIG_YAML, $default);
+			$data->save();
 		}else{
-			$data = unserialize(file_get_contents(FILE_PATH."players/".$name.".dat"));
+			$data = new Config(DATA_PATH."players/".$iname.".yml", CONFIG_YAML, $default);
 		}
-		$this->server->handle("api.player.offline.get", $data);
+
+		if(($data->get("gamemode") & 0x01) === 1){
+			$data->set("health", 20);
+		}
+		$this->server->handle("player.offline.get", $data);
 		return $data;
 	}

-	public function saveOffline($name, $data){
-		$this->server->handle("api.player.offline.save", $data);
-		file_put_contents(FILE_PATH."players/".str_replace("/", "", $name).".dat", serialize($data));
+	public function saveOffline(Config $data){
+		$this->server->handle("player.offline.save", $data);
+		$data->save();
 	}
 }
--- a/src/API/PluginAPI.php
+++ b/src/API/PluginAPI.php
@ -1,35 +1,29 @@
 <?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{
 	private $server;
 	private $plugins = array();
-	public function __construct(PocketMinecraftServer $server){
-		$this->server = $server;
+	public function __construct(){
+		$this->server = ServerAPI::request();
 	}

 	public function getList(){
@ -41,6 +35,7 @@ class PluginAPI extends stdClass{
 	}

 	public function getInfo($className){
+		$className = strtolower($className);
 		if(!isset($this->plugins[$className])){
 			return false;
 		}
@ -49,54 +44,71 @@ class PluginAPI extends stdClass{
 	}

 	public function load($file){
-		$content = file_get_contents($file);
-		$info = strstr($content, "*/", true);
-		$content = substr(strstr($content, "*/"),2);
-		if(preg_match_all('#([a-zA-Z0-9\-_]*)=([^\r\n]*)#u', $info, $matches) == 0){ //false or 0 matches
-			console("[ERROR] [PluginAPI] Failed parsing of ".basename($file));
-			return false;
-		}
-		$info = array();
-		foreach($matches[1] as $k => $i){
-			$v = $matches[2][$k];
-			switch(strtolower($v)){
-				case "on":
-				case "true":
-				case "yes":
-					$v = true;
-					break;
-				case "off":
-				case "false":
-				case "no":
-					$v = false;
-					break;
+		if(strtolower(substr($file, -3)) === "pmf"){
+			$pmf = new PMFPlugin($file);
+			$info = $pmf->getPluginInfo();
+		}else{
+			$content = file_get_contents($file);
+			$info = strstr($content, "*/", true);
+			$content = str_repeat(PHP_EOL, substr_count($info, "\n")).substr(strstr($content, "*/"),2);
+			if(preg_match_all('#([a-zA-Z0-9\-_]*)=([^\r\n]*)#u', $info, $matches) == 0){ //false or 0 matches
+				console("[ERROR] Failed parsing of ".basename($file));
+				return false;
 			}
-			$info[$i] = $v;
+			$info = array();
+			foreach($matches[1] as $k => $i){
+				$v = $matches[2][$k];
+				switch(strtolower($v)){
+					case "on":
+					case "true":
+					case "yes":
+						$v = true;
+						break;
+					case "off":
+					case "false":
+					case "no":
+						$v = false;
+						break;
+				}
+				$info[$i] = $v;
+			}
+			$info["code"] = $content;
+			$info["class"] = trim(strtolower($info["class"]));
 		}
 		if(!isset($info["name"]) or !isset($info["version"]) or !isset($info["class"]) or !isset($info["author"])){
-			console("[ERROR] [PluginAPI] Failed parsing of ".basename($file));
+			console("[ERROR] Failed parsing of ".basename($file));
+			return false;
 		}
-		console("[INFO] [PluginAPI] Loading plugin \"\x1b[32m".$info["name"]."\x1b[0m\" \x1b[35m".$info["version"]."\x1b[0m by \x1b[36m".$info["author"]."\x1b[0m");
-		if(class_exists($info["class"])){
-			console("[ERROR] [PluginAPI] Failed loading plugin: class exists");
+		console("[INFO] Loading plugin \"\x1b[32m".$info["name"]."\x1b[0m\" \x1b[35m".$info["version"]." \x1b[0mby \x1b[36m".$info["author"]."\x1b[0m");
+		if($info["class"] !== "none" and class_exists($info["class"])){
+			console("[ERROR] Failed loading plugin: class already exists");
+			return false;
 		}
-		if(eval($content) === false or !class_exists($info["class"])){
-			console("[ERROR] [PluginAPI] Failed loading plugin: evaluation error");
+		if(eval($info["code"]) === false or ($info["class"] !== "none" and !class_exists($info["class"]))){
+			console("[ERROR] Failed loading plugin: evaluation error");
+			return false;
 		}
-		$className = trim($info["class"]);
-		if(isset($info["api"]) and $info["api"] !== true){
-			console("[NOTICE] [PluginAPI] Plugin \"\x1b[36m".$info["name"]."\x1b[0m\" got raw access to Server methods");
+		
+		$className = $info["class"];
+		$apiversion = array_map("intval", explode(",", (string) $info["apiversion"]));
+		if(!in_array((string) CURRENT_API_VERSION, $apiversion)){
+			console("[WARNING] Plugin \"".$info["name"]."\" may not be compatible with the API (".$info["apiversion"]." != ".CURRENT_API_VERSION.")! It can crash or corrupt the server!");
 		}
-		$object = new $className($this->server->api, ((isset($info["api"]) and $info["api"] !== true) ? $this->server:false));
-		if(!($object instanceof Plugin)){
-			console("[ERROR] [PluginAPI] Plugin \"\x1b[36m".$info["name"]."\x1b[0m\" doesn't use the Plugin Interface");
-			if(method_exists($object, "__destruct")){
-				$object->__destruct();
+		
+		if($info["class"] !== "none"){			
+			$object = new $className($this->server->api, false);
+			if(!($object instanceof Plugin)){
+				console("[ERROR] Plugin \"\x1b[36m".$info["name"]."\x1b[0m\" doesn't use the Plugin Interface");
+				if(method_exists($object, "__destruct")){
+					$object->__destruct();
+				}
+				$object = null;
+				unset($object);
+			}else{
+				$this->plugins[$className] = array($object, $info);
 			}
-			$object = null;
-			unset($object);
 		}else{
-			$this->plugins[$className] = array($object, $info);
+			$this->plugins[md5($info["name"])] = array(new DummyPlugin($this->server->api, false), $info);
 		}
 	}

@ -114,8 +126,9 @@ class PluginAPI extends stdClass{
 		if($p === false){
 			return false;
 		}
-		$path = FILE_PATH."plugins/".$p[1]["name"]."/";
+		$path = DATA_PATH."plugins/".$p[1]["name"]."/";
 		$this->plugins[$p[1]["class"]][1]["path"] = $path;
+		@mkdir($path);
 		return $path;
 	}

@ -124,8 +137,7 @@ class PluginAPI extends stdClass{
 		if($p === false){
 			return false;
 		}
-		$path = FILE_PATH."plugins/".$p[1]["name"]."/";
-		$this->plugins[$p[1]["class"]][1]["path"] = $path;
+		$path = $this->configPath($plugin);
 		$cnf = new Config($path."config.yml", CONFIG_YAML, $default);
 		$cnf->save();
 		return $path;
@ -158,18 +170,19 @@ class PluginAPI extends stdClass{
 	}

 	public function loadAll(){
-		console("[INFO] Loading Plugins...");
-		$dir = dir(FILE_PATH."plugins/");
+		$dir = dir(DATA_PATH."plugins/");
 		while(false !== ($file = $dir->read())){
 			if($file{0} !== "."){
-				if(strtolower(substr($file, -3)) === "php"){
-					$this->load(FILE_PATH."plugins/" . $file);
+				$ext = strtolower(substr($file, -3));
+				if($ext === "php" or $ext === "pmf"){
+					$this->load(DATA_PATH."plugins/" . $file);
 				}
 			}
 		}
 	}
 	
 	public function initAll(){
+		console("[INFO] Starting plugins...");
 		foreach($this->plugins as $p){
 			$p[0]->init(); //ARGHHH!!! Plugin loading randomly fails!!
 		}
@ -181,4 +194,15 @@ interface Plugin{
 	public function __construct(ServerAPI $api, $server = false);
 	public function init();
 	public function __destruct();
+}
+
+class DummyPlugin implements Plugin{
+	public function __construct(ServerAPI $api, $server = false){	
+	}
+	
+	public function init(){
+	}
+	
+	public function __destruct(){
+	}
 }
--- a/src/API/ServerAPI.php
+++ b/src/API/ServerAPI.php
@ -1,35 +1,42 @@
 <?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{
-	var $restart = false;
+	public $restart = false;
+	private static $serverRequest = false;
+	private $asyncCalls = array();
 	private $server;
 	private $config;
 	private $apiList = array();
+	private $asyncCnt = 0;
+	private $rcon;
+	private $query;
+	
+	public static function request(){
+		return self::$serverRequest;
+	}
+	
+	public function start(){
+		return $this->run();
+	}
 	
 	public function run(){
 		$this->load();
@ -37,181 +44,112 @@ class ServerAPI{
 	}
 	
 	public function load(){
-		@mkdir(FILE_PATH."logs/", 0777, true);
-		@mkdir(FILE_PATH."players/", 0777);
-		@mkdir(FILE_PATH."worlds/", 0777);
-		@mkdir(FILE_PATH."plugins/", 0777);
-		console("[INFO] Starting ServerAPI server handler...");
-		file_put_contents(FILE_PATH."logs/packets.log", "");
-		if(!file_exists(FILE_PATH."logs/test.bin.log") or md5_file(FILE_PATH."logs/test.bin.log") !== TEST_MD5){
-			console("[NOTICE] Executing tests...");
-			console("[INFO] OS: ".PHP_OS.", ".Utils::getOS());
-			console("[INFO] uname -a: ".php_uname("a"));
-			console("[INFO] PHP Version: ".phpversion());
-			console("[INFO] Endianness: ".ENDIANNESS);
-			$test = b"";
-			$test .= Utils::writeLong("5567381823242127440");
-			$test .= Utils::writeLong("2338608908624488819");
-			$test .= Utils::writeLong("2333181766244987936");
-			$test .= Utils::writeLong("2334669371112169504");
-			$test .= Utils::writeShort(Utils::readShort("\xff\xff\xff\xff"));
-			$test .= Utils::writeShort(Utils::readShort("\xef\xff\xff\xff"));
-			$test .= Utils::writeInt(Utils::readInt("\xff\xff\xff\xff"));
-			$test .= Utils::writeInt(1);
-			$test .= Utils::writeInt(-1);
-			$test .= Utils::writeFloat(Utils::readfloat("\xff\xff\xff\xff"));
-			$test .= Utils::writeFloat(-1.584563155838E+29);
-			$test .= Utils::writeFloat(1);
-			$test .= Utils::writeLDouble(Utils::readLDouble("\xff\xff\xff\xff\xff\xff\xff\xff"));
-			$test .= Utils::writeLong("-1152921504606846977");
-			$test .= Utils::writeLong("-1152921504606846976");
-			$test .= Utils::writeTriad(16777215);
-			$test .= Utils::writeTriad(16777216);
-			$str = new Java_String("TESTING\x00\n\r\t\xff");
-			$test .= Utils::writeLong($str->hashCode());
-			$test .= Utils::writeDataArray(array("a", "b", "c", "\xff\xff\xff\xff"));
-			$test .= Utils::hexToStr("012334567890");
-			file_put_contents(FILE_PATH."logs/test.bin.log", $test);
-			$md5 = md5($test);
-			console("[INFO] MD5 of test: ".$md5);
-			if($md5 !== TEST_MD5){
-				console("[ERROR] Test error, please send your console.log + test.bin.log to the Github repo");
-				die();
-			}
-		}
+		@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);

-		console("[DEBUG] Loading server.properties...", true, true, 2);
-		$this->config = new Config(FILE_PATH . "server.properties", CONFIG_PROPERTIES, array(
-			"server-name" => "Minecraft Server",
+		console("[INFO] Loading properties...");
+		$this->config = new Config(DATA_PATH . "server.properties", CONFIG_PROPERTIES, array(
+			"server-name" => "Minecraft: PE Server",
 			"description" => "Server made using PocketMine-MP",
-			"motd" => "Welcome @username to this server!",
-			"invisible" => false,
-			"port" => 19132,
-			"memory-limit" => "256M",
-			"last-update" => false,
-			"update-channel" => "stable",
-			"white-list" => false,
-			"debug" => 2,
-			"max-players" => 20,
+			"motd" => "Welcome @player to this server!",
+			"server-ip" => "",
+			"server-port" => 19132,
 			"server-type" => "normal",
-			"time-per-second" => 20,
-			"gamemode" => 1,
+			"memory-limit" => "128M",
+			"last-update" => false,
+			"white-list" => false,
+			"spawn-protection" => 16,
+			"view-distance" => 10,
+			"max-players" => 20,
+			"allow-flight" => false,
+			"spawn-animals" => true,
+			"spawn-mobs" => true,
+			"gamemode" => SURVIVAL,
+			"hardcore" => false,
+			"pvp" => true,
 			"difficulty" => 1,
-			"generator" => "",
 			"generator-settings" => "",
-			"level-name" => false,
-			"server-id" => false,
-			"upnp-forwarding" => false,
+			"level-name" => "world",
+			"level-seed" => "",
+			"level-type" => "DEFAULT",
+			"enable-query" => true,
+			"enable-rcon" => false,
+			"rcon.password" => substr(base64_encode(Utils::getRandomBytes(20, false)), 3, 10),
+			"send-usage" => true,
+			"auto-save" => true,
 		));
+		
 		$this->parseProperties();
-		define("DEBUG", $this->getProperty("debug"));
-		$this->server = new PocketMinecraftServer($this->getProperty("server-name"), $this->getProperty("gamemode"), false, $this->getProperty("port"), $this->getProperty("server-id"));
-		$this->setProperty("server-id", $this->server->serverID);
+		define("DEBUG", $this->getProperty("debug", 1));
+		if($this->getProperty("port") !== false){
+			$this->setProperty("server-port", $this->getProperty("port"));
+			$this->config->remove("port");
+			$this->config->remove("invisible");
+		}
+		$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;
+		
 		if($this->getProperty("upnp-forwarding") === true){
 			console("[INFO] [UPnP] Trying to port forward...");
-			UPnP_PortForward($this->getProperty("port"));
-		}
-		if(($ip = Utils::getIP()) !== false){
-			console("[INFO] External IP: ".$ip);
+			UPnP_PortForward($this->getProperty("server-port"));
 		}
+
 		if($this->getProperty("last-update") === false or ($this->getProperty("last-update") + 3600) < time()){
 			console("[INFO] Checking for new server version");
 			console("[INFO] Last check: \x1b[36m".date("Y-m-d H:i:s", $this->getProperty("last-update"))."\x1b[0m");
-			$channel = "stable";
-			if($this->getProperty("update-channel") == "dev" or $this->getProperty("update-channel") == "development"){
-				$channel = "dev";
-			}
-			$this->setProperty("update-channel", $channel);
-
-			if($channel === "dev"){
-				$info = json_decode(Utils::curl_get("https://api.github.com/repos/shoghicp/PocketMine-MP"), true);
-				if($info === false or !isset($info["updated_at"])){
-					console("[ERROR] GitHub API Error");
+			$info = json_decode(Utils::curl_get("http://www.pocketmine.net/latest"), true);
+			if($this->server->version->isDev()){
+				if($info === false or !isset($info["development"])){
+					console("[ERROR] PocketMine API error");
 				}else{
-					$last = new DateTime($info["updated_at"]);
-					$last = $last->getTimestamp();
-					if($last >= $this->getProperty("last-update") and $this->getProperty("last-update") !== false){
+					$last = $info["development"]["date"];
+					if($last >= $this->getProperty("last-update") and $this->getProperty("last-update") !== false and GIT_COMMIT != $info["development"]["commit"]){
 						console("[NOTICE] \x1b[33mA new DEVELOPMENT version of PocketMine-MP has been released");
-						console("[NOTICE] \x1b[36mIf you want to update, get the latest version at https://github.com/shoghicp/PocketMine-MP/archive/master.zip");
-						console("[NOTICE] This message will dissapear when you issue the command \"/update-done\"");
-						sleep(3);
+						console("[NOTICE] \x1b[33mVersion \"".$info["development"]["version"]."\" [".substr($info["development"]["commit"], 0, 10)."]");
+						console("[NOTICE] \x1b[36mGet it at PocketMine.net or ".$info["development"]["download"]);
+						console("[NOTICE] This message will dissapear after issuing the command \"/update-done\"");
 					}else{
 						$this->setProperty("last-update", time());
 						console("[INFO] \x1b[36mThis is the latest DEVELOPMENT version");
 					}
 				}
 			}else{
-				$info = json_decode(Utils::curl_get("https://api.github.com/repos/shoghicp/PocketMine-MP/tags"), true);
-				if($info === false or !isset($info[0])){
-					console("[ERROR] GitHub API Error");
+				if($info === false or !isset($info["stable"])){
+					console("[ERROR] PocketMine API error");
 				}else{
-
 					$newest = new VersionString(MAJOR_VERSION);
-					$newest = array(-1, $newest->getNumber());
-					foreach($info as $i => $tag){
-						$update = new VersionString($tag["name"]);
-						$update = $update->getNumber();
-						if($update > $newest[1]){
-							$newest = array($i, $update);
-						}
-					}
-
-					if($newest[0] !== -1){
-						$target = $info[$newest[0]];
+					$newestN = $newest->getNumber();
+					$update = new VersionString($info["stable"]["version"]);
+					$updateN = $update->getNumber();
+					if($updateN > $newestN){
 						console("[NOTICE] \x1b[33mA new STABLE version of PocketMine-MP has been released");
-						console("[NOTICE] \x1b[36mVersion \"".(new VersionString($newest[1]))."\" #".$newest[1]." [".substr($target["commit"]["sha"], 0, 10)."]");
-						console("[NOTICE] Download it at ".$target["zipball_url"]);
+						console("[NOTICE] \x1b[36mVersion \"".$info["stable"]["version"]."\" #".$updateN);
+						console("[NOTICE] Get it at PocketMine.net or ".$info["stable"]["download"]);
 						console("[NOTICE] This message will dissapear as soon as you update");
-						sleep(5);
 					}else{
 						$this->setProperty("last-update", time());
 						console("[INFO] \x1b[36mThis is the latest STABLE version");
 					}
 				}
+			}
+		}

-			}
-		}
-		if(file_exists(FILE_PATH."worlds/level.dat")){
-			console("[NOTICE] Detected unimported map data. Importing...");
-			$this->importMap(FILE_PATH."worlds/", true);
-		}
-		$this->server->mapName = $this->getProperty("level-name");
-		$this->server->mapDir = FILE_PATH."worlds/".$this->server->mapName."/";
-		if($this->server->mapName === false or trim($this->server->mapName) === "" or (!file_exists($this->server->mapDir."chunks.dat") and !file_exists($this->server->mapDir."chunks.dat.gz"))){
-			if($this->server->mapName === false or trim($this->server->mapName) === ""){
-				$this->server->mapName = "world";
-			}
-			$this->server->mapDir = FILE_PATH."worlds/".$this->server->mapName."/";
-			$generator = "SuperflatGenerator";
-			if($this->getProperty("generator") !== false and class_exists($this->getProperty("generator"))){
-				$generator = $this->getProperty("generator");
-			}
-			$this->gen = new WorldGenerator($generator, $this->server->seed);
-			if($this->getProperty("generator-settings") !== false and trim($this->getProperty("generator-settings")) != ""){
-				$this->gen->set("preset", $this->getProperty("generator-settings"));
-			}
-			$this->gen->init();
-			$this->gen->generate();
-			$this->gen->save($this->server->mapDir, $this->server->mapName);
-			$this->setProperty("level-name", $this->server->mapName);
-			$this->setProperty("gamemode", 1);
-		}
 		$this->loadProperties();
-		$this->server->loadMap();
-
-		//Autoload all default APIs
-		console("[INFO] Loading default APIs");
-		$dir = dir(FILE_PATH."src/API/");
-		while(false !== ($file = $dir->read())){
-			if($file{0} !== "."){ //Hidden and upwards folders
-				$API = basename($file, ".php");
-				if(strtolower($API) !== "serverapi" and strtolower($API) !== "pluginapi"){
-					$name = strtolower(substr($API, 0, -3));
-					$this->loadAPI($name, $API);
-				}
-			}
-		}
+		
+		
+		$this->loadAPI("console", "ConsoleAPI");
+		$this->loadAPI("level", "LevelAPI");
+		$this->loadAPI("block", "BlockAPI");
+		$this->loadAPI("chat", "ChatAPI");
+		$this->loadAPI("ban", "BanAPI");		
+		$this->loadAPI("entity", "EntityAPI");		
+		$this->loadAPI("tile", "TileAPI");
+		$this->loadAPI("player", "PlayerAPI");
+		$this->loadAPI("time", "TimeAPI");
+		
 		foreach($this->apiList as $ob){
 			if(is_callable(array($ob, "init"))){
 				$ob->init(); //Fails sometimes!!!
@ -219,39 +157,77 @@ class ServerAPI{
 		}
 		$this->loadAPI("plugin", "PluginAPI"); //fix :(
 		$this->plugin->init();
+	}
+	
+	public function async(callable $callable, $params = array(), $remove = false){
+		$cnt = $this->asyncCnt++;
+		$this->asyncCalls[$cnt] = new Async($callable, $params);
+		return $remove === true ? $this->getAsync($cnt):$cnt;
+	}
+	
+	public function getAsync($id){
+		if(!isset($this->asyncCalls[$id])){
+			return false;
+		}
+		$ob = $this->asyncCalls[$id];
+		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);
+		$plist = "";
+		foreach($this->plugin->getList() as $p){
+			$plist .= str_replace(array(";", ":"), "", $p["name"]).":".str_replace(array(";", ":"), "", $p["version"]).";";
+		}
 		
-		$this->server->loadEntities();
+		$this->asyncOperation(ASYNC_CURL_POST, array(
+			"url" => "http://stats.pocketmine.net/usage.php",
+			"data" => array(
+				"serverid" => $this->server->serverID,
+				"port" => $this->server->port,
+				"os" => Utils::getOS(),
+				"memory_total" => $this->getProperty("memory-limit"),
+				"memory_usage" => memory_get_usage(true),
+				"php_version" => PHP_VERSION,
+				"version" => MAJOR_VERSION,
+				"mc_version" => CURRENT_MINECRAFT_VERSION,
+				"protocol" => CURRENT_PROTOCOL,
+				"online" => count($this->server->clients),
+				"max" => $this->server->maxClients,
+				"plugins" => $plist,
+			),
+		), NULL);
 	}

 	public function __destruct(){
-		foreach($this->apiList as $ob){
-			if(is_callable($ob, "__destruct")){
+		foreach($this->apiList as $i => $ob){
+			if(method_exists($ob, "__destruct")){
 				$ob->__destruct();
-				unset($this->apiList[$ob]);
+				unset($this->apiList[$i]);
 			}
 		}
 	}


 	private function loadProperties(){
-		if(($memory = $this->getProperty("memory-limit")) !== false){
+		if(($memory = str_replace("B", "", strtoupper($this->getProperty("memory-limit")))) !== false){
 			$value = array("M" => 1, "G" => 1024);
 			$real = ((int) substr($memory, 0, -1)) * $value[substr($memory, -1)];
 			if($real < 128){
-				console("[ERROR] PocketMine doesn't work right with less than 128MB of RAM", true, true, 0);
+				console("[WARNING] PocketMine-MP may not work right with less than 128MB of RAM", true, true, 0);
 			}
 			@ini_set("memory_limit", $memory);
 		}else{
-			$this->setProperty("memory-limit", "256M");
+			$this->setProperty("memory-limit", "128M");
 		}
-		if(!$this->config->exists("invisible")){
-			$this->config->set("invisible", false);
-		}
-		if(is_object($this->server)){
+
+		if($this->server instanceof PocketMinecraftServer){
 			$this->server->setType($this->getProperty("server-type"));
-			$this->server->timePerSecond = $this->getProperty("time-per-second");
-			$this->server->invisible = $this->getProperty("invisible");
 			$this->server->maxClients = $this->getProperty("max-players");
 			$this->server->description = $this->getProperty("description");
 			$this->server->motd = $this->getProperty("motd");
@ -278,10 +254,9 @@ class ServerAPI{
 					break;
 				case "gamemode":
 				case "max-players":
-				case "port":
+				case "server-port":
 				case "debug":
 				case "difficulty":
-				case "time-per-second":
 					$v = (int) $v;
 					break;
 				case "server-id":
@ -292,22 +267,47 @@ class ServerAPI{
 			}
 			$this->config->set($n, $v);
 		}
+		if($this->getProperty("hardcore") == 1 and $this->getProperty("difficulty") < 3){
+			$this->setProperty("difficulty", 3);
+		}
 	}

 	public function init(){
+		if($this->getProperty("send-usage") !== false){
+			$this->server->schedule(6000, array($this, "sendUsage"), array(), true); //Send the info after 5 minutes have passed
+			$this->sendUsage();
+		}
+		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));
+		}
+
+		if($this->getProperty("enable-query") === true){
+			$this->query = new Query();
+		}
+		CraftingRecipes::init();
 		$this->server->init();
 		unregister_tick_function(array($this->server, "tick"));
+		$this->console->__destruct();
+		if($this->rcon instanceof RCON){
+			$this->rcon->stop();
+		}
 		$this->__destruct();
-		unset($this->server);
 		if($this->getProperty("upnp-forwarding") === true ){
 			console("[INFO] [UPnP] Removing port forward...");
-			UPnP_RemovePortForward($this->getProperty("port"));
+			UPnP_RemovePortForward($this->getProperty("server-port"));
 		}
 		return $this->restart;
 	}

 	/*-------------------------------------------------------------*/

+	public function asyncOperation($t, $d, $c = null){
+		return $this->server->asyncOperation($t, $d, $c);
+	}
+	
 	public function addHandler($e, $c, $p = 5){
 		return $this->server->addHandler($e, $c, $p);
 	}
@ -320,10 +320,6 @@ class ServerAPI{
 		return $this->server->handle($e, $d);
 	}

-	public function action($t, $c, $r = true){
-		return $this->server->action($t, $c, $r);
-	}
-
 	public function schedule($t, $c, $d, $r = false, $e = "server.schedule"){
 		return $this->server->schedule($t, $c, $d, $r, $e);
 	}
@ -339,53 +335,12 @@ class ServerAPI{
 	public function deleteEvent($id){
 		return $this->server->deleteEvent($id);
 	}
-
-	public function importMap($dir, $remove = false){
-		if(file_exists($dir."level.dat")){
-			$nbt = new NBT();
-			$level = parseNBTData($nbt->loadFile($dir."level.dat"));
-			console("[DEBUG] Importing map \"".$level["LevelName"]."\" gamemode ".$level["GameType"]." with seed ".$level["RandomSeed"], true, true, 2);
-			unset($level["Player"]);
-			$lvName = $level["LevelName"]."/";
-			@mkdir(FILE_PATH."worlds/".$lvName, 0777);
-			file_put_contents(FILE_PATH."worlds/".$lvName."level.dat", serialize($level));
-			$entities = parseNBTData($nbt->loadFile($dir."entities.dat"));
-			file_put_contents(FILE_PATH."worlds/".$lvName."entities.dat", serialize($entities["Entities"]));
-			if(!isset($entities["TileEntities"])){
-				$entities["TileEntities"] = array();
-			}
-			file_put_contents(FILE_PATH."worlds/".$lvName."tileEntities.dat", serialize($entities["TileEntities"]));
-			console("[DEBUG] Imported ".count($entities["Entities"])." Entities and ".count($entities["TileEntities"])." TileEntities", true, true, 2);
-
-			if($remove === true){
-				rename($dir."chunks.dat", FILE_PATH."worlds/".$lvName."chunks.dat");
-				unlink($dir."level.dat");
-				@unlink($dir."level.dat_old");
-				@unlink($dir."player.dat");
-				unlink($dir."entities.dat");
-			}else{
-				copy($dir."chunks.dat", FILE_PATH."worlds/".$lvName."chunks.dat");
-			}
-			if($this->getProperty("level-name") === false){
-				console("[INFO] Setting default level to \"".$level["LevelName"]."\"");
-				$this->setProperty("level-name", $level["LevelName"]);
-				$this->setProperty("gamemode", $level["GameType"]);
-				$this->server->seed = $level["RandomSeed"];
-				$this->server->spawn = array("x" => $level["SpawnX"], "y" => $level["SpawnY"], "z" => $level["SpawnZ"]);
-				$this->writeProperties();
-			}
-			console("[INFO] Map \"".$level["LevelName"]."\" importing done!");
-			unset($level, $entities, $nbt);
-			return true;
-		}
-		return false;
-	}
 	
 	public function getProperties(){
 		return $this->config->getAll();
 	}

-	public function getProperty($name){
+	public function getProperty($name, $default = false){
 		if(($v = arg($name)) !== false){ //Allow for command-line arguments
 			switch(strtolower(trim($v))){
 				case "on":
@ -409,7 +364,7 @@ class ServerAPI{
 					break;
 				case "gamemode":
 				case "max-players":
-				case "port":
+				case "server-port":
 				case "debug":
 				case "difficulty":
 				case "time-per-second":
@ -423,7 +378,7 @@ class ServerAPI{
 			}
 			return $v;
 		}
-		return $this->config->get($name);
+		return ($this->config->exists($name) ? $this->config->get($name):$default);
 	}

 	public function setProperty($name, $value){
@ -437,18 +392,26 @@ class ServerAPI{
 	}

 	public function loadAPI($name, $class, $dir = false){
-		if($dir === false){
-			$dir = FILE_PATH."src/API/";
-		}
-		$file = $dir.$class.".php";
-		if(!file_exists($file)){
-			console("[ERROR] API ".$name." [".$class."] in ".$dir." doesn't exist", true, true, 0);
+		if(isset($this->$name)){
 			return false;
+		}elseif(!class_exists($class)){
+			$internal = false;
+			if($dir === false){
+				$internal = true;
+				$dir = FILE_PATH."src/API/";
+			}
+			$file = $dir.$class.".php";
+			if(!file_exists($file)){
+				console("[ERROR] API ".$name." [".$class."] in ".$dir." doesn't exist", true, true, 0);
+				return false;
+			}
+			require_once($file);
+		}else{
+			$internal = true;
 		}
-		require_once($file);
-		$this->$name = new $class($this->server);
+		$this->$name = new $class();
 		$this->apiList[] = $this->$name;
-		console("[INFO] API \x1b[36m".$name."\x1b[0m [\x1b[30;1m".$class."\x1b[0m] loaded");
+		console("[".($internal === true ? "INTERNAL":"DEBUG")."] API \x1b[36m".$name."\x1b[0m [\x1b[30;1m".$class."\x1b[0m] loaded", true, true, ($internal === true ? 3:2));
 	}

-}
+}
--- a/src/API/TileAPI.php
+++ b/src/API/TileAPI.php
@ -0,0 +1,116 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class TileAPI{
+	private $server;
+	private $tiles;
+	private $tCnt = 1;
+	function __construct(){
+		$this->tiles = array();
+		$this->server = ServerAPI::request();
+	}
+	
+	public function get(Position $pos){
+		$tile = $this->server->query("SELECT * FROM tiles WHERE level = '".$pos->level->getName()."' AND x = {$pos->x} AND y = {$pos->y} AND z = {$pos->z};", true);
+		if($tile !== false and $tile !== true and ($tile = $this->getByID($tile["ID"])) !== false){				
+			return $tile;
+		}
+		return false;
+	}
+
+	public function getByID($id){
+		if($id instanceof Tile){
+			return $id;
+		}elseif(isset($this->tiles[$id])){
+			return $this->tiles[$id];
+		}
+		return false;
+	}
+	
+	public function init(){
+	
+	}
+
+	public function getAll($level = null){
+		if($level instanceof Level){
+			$tiles = array();
+			$l = $this->server->query("SELECT ID FROM tiles WHERE level = '".$level->getName()."';");
+			if($l !== false and $l !== true){
+				while(($t = $l->fetchArray(SQLITE3_ASSOC)) !== false){
+					$t = $this->getByID($t["ID"]);
+					if($t instanceof Tile){
+						$tiles[$t->id] = $t;
+					}
+				}
+			}
+			return $tiles;
+		}
+		return $this->tiles;
+	}
+
+	public function add(Level $level, $class, $x, $y, $z, $data = array()){
+		$id = $this->tCnt++;
+		$this->tiles[$id] = new Tile($level, $id, $class, $x, $y, $z, $data);
+		$this->spawnToAll($this->tiles[$id]);
+		return $this->tiles[$id];
+	}
+	
+	public function addSign(Level $level, $x, $y, $z, $lines = array("", "", "", "")){
+		return $this->add($level, TILE_SIGN, $x, $y, $z, $data = array(
+			"id" => "Sign",
+			"x" => $x,
+			"y" => $y,
+			"z" => $z,
+			"Text1" => $lines[0],
+			"Text2" => $lines[1],
+			"Text3" => $lines[2],
+			"Text4" => $lines[3],
+		));
+	}
+
+	public function spawnToAll(Tile $t){
+		foreach($this->server->api->player->getAll($t->level) as $player){
+			if($player->eid !== false){
+				$t->spawn($player);
+			}
+		}
+	}
+
+	public function spawnAll(Player $player){
+		foreach($this->getAll($player->level) as $t){
+			$t->spawn($player);
+		}
+	}
+
+	public function remove($id){
+		if(isset($this->tiles[$id])){
+			$t = $this->tiles[$id];
+			$this->tiles[$id] = null;
+			unset($this->tiles[$id]);
+			$t->closed = true;
+			$t->close();
+			$this->server->query("DELETE FROM tiles WHERE ID = ".$id.";");
+			$this->server->api->dhandle("tile.remove", $t);
+			$t = null;
+			unset($t);			
+		}
+	}
+}
--- a/src/API/TimeAPI.php
+++ b/src/API/TimeAPI.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 TimeAPI{
@ -33,76 +27,82 @@ class TimeAPI{
 		"sunrise" => 17800,
 	);
 	private $server;
-	function __construct(PocketMinecraftServer $server){
-		$this->server = $server;
+	function __construct(){
+		$this->server = ServerAPI::request();
 	}

 	public function init(){
-		$this->server->api->console->register("time", "Manages server time", array($this, "commandHandler"));
+		$this->server->api->console->register("time", "<check|set|add> [time]", array($this, "commandHandler"));
 	}

-	public function commandHandler($cmd, $params){
+	public function commandHandler($cmd, $params, $issuer, $alias){
+		$output = "";
 		switch($cmd){
 			case "time":
+				$level = false;
+				if($issuer instanceof Player){
+					$level = $issuer->level;
+				}
 				$p = strtolower(array_shift($params));
 				switch($p){
 					case "check":
-						console("[INFO] Time: ".$this->getDate().", ".$this->getPhase()." (".$this->get(true).")");
+						$output .= "Time: ".$this->getDate($level).", ".$this->getPhase($level)." (".$this->get(true, $level).")\n";
 						break;
 					case "add":
-						$this->add(array_shift($params));
+						$output .= "Set the time to ".$this->add(array_shift($params), $level)."\n";
 						break;
 					case "set":
-						$this->set(array_shift($params));
+						$output .= "Set the time to ".$this->set(array_shift($params), $level)."\n";
 						break;
 					case "sunrise":
-						$this->sunrise();
-						break;
 					case "day":
-						$this->day();
-						break;
 					case "sunset":
-						$this->sunset();
-						break;
 					case "night":
-						$this->night();
+						$output .= "Set the time to ".$this->set($p, $level)."\n";
 						break;
 					default:
-						console("[INFO] Usage: /time <check | set | add | sunrise | day | sunset | night> [time]");
+						$output .= "Usage: /time <check|set|add> [time]\n";
 						break;
 				}
 				break;
 		}
+		return $output;
 	}

 	public function night(){
-		$this->set("night");
+		return $this->set("night");
 	}
 	public function day(){
-		$this->set("day");
+		return $this->set("day");
 	}
 	public function sunrise(){
-		$this->set("sunrise");
+		return $this->set("sunrise");
 	}
 	public function sunset(){
-		$this->set("sunset");
+		return $this->set("sunset");
 	}

-	public function get($raw = false){
-		return $raw === true ? $this->server->time:abs($this->server->time) % 19200;
+	public function get($raw = false, $level = false){
+		if(!($level instanceof Level)){
+			$level = $this->server->api->level->getDefault();
+		}
+		return $raw === true ? $level->getTime():abs($level->getTime()) % 19200;
 	}

-	public function add($time){
-		$this->server->time += (int) $time;
+	public function add($time, $level = false){
+		if(!($level instanceof Level)){
+			$level = $this->server->api->level->getDefault();
+		}
+		$level->setTime($level->getTime() + (int) $time);
 	}

 	public function getDate($time = false){
-		$time = $time === false ? $this->get():$time;
+		$time = !is_integer($time) ? $this->get(false, $time):$time;
 		return str_pad(strval((floor($time /800) + 6) % 24), 2, "0", STR_PAD_LEFT).":".str_pad(strval(floor(($time % 800) / 13.33)), 2, "0", STR_PAD_LEFT);
 	}

 	public function getPhase($time = false){
-		$time = $time === false ? $this->get():$time;
+		$time = !is_integer($time) ? $this->get(false, $time):$time;
 		if($time < $this->phase["sunset"]){
 			$time = "day";
 		}elseif($time < $this->phase["night"]){
@ -115,13 +115,17 @@ class TimeAPI{
 		return $time;
 	}

-	public function set($time){
-		if(is_string($time) and isset($this->phases[$time])){
-			$this->server->time = $this->phases[$time];
-		}else{
-			$this->server->time = (int) $time;
+	public function set($time, $level = false){
+		if(!($level instanceof Level)){
+			$level = $this->server->api->level->getDefault();
 		}
+		if(is_string($time) and isset($this->phases[$time])){
+			$level->setTime($this->phases[$time]);
+		}else{
+			$level->setTime((int) $time);
+		}
+		return $level->getTime();
 	}


-}
+}
--- a/src/Deprecation.php
+++ b/src/Deprecation.php
@ -0,0 +1,35 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+
+class Deprecation{
+	public static $events = array(
+		"server.tick" => "ServerAPI::schedule()",
+		"server.time" => "time.change",
+		"world.block.change" => "block.change",
+		"block.drop" => "item.drop",
+		"api.op.check" => "op.check",
+		"api.player.offline.get" => "player.offline.get",
+		"api.player.offline.save" => "player.offline.save",
+	);
+
+
+}
--- a/src/Player.php
+++ b/src/Player.php
--- a/src/PocketMinecraftServer.php
+++ b/src/PocketMinecraftServer.php
@ -0,0 +1,676 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class PocketMinecraftServer{
+	public $tCnt;
+	public $serverID, $interface, $database, $version, $invisible, $api, $tickMeasure, $preparedSQL, $seed, $gamemode, $name, $maxClients, $clients, $eidCnt, $custom, $description, $motd, $port, $saveEnabled;
+	private $serverip, $evCnt, $handCnt, $events, $eventsID, $handlers, $serverType, $lastTick, $ticks, $memoryStats, $async = array(), $asyncID = 0;
+	
+	private function load(){
+		$this->version = new VersionString();
+		if(defined("DEBUG") and DEBUG >= 0){
+			@cli_set_process_title("PocketMine-MP ".MAJOR_VERSION);
+		}
+		if($this->version->isDev()){
+			console("[INFO] \x1b[31;1mThis is a Development version");
+		}
+		console("[INFO] Starting server for Minecraft: PE \x1b[36;1m".CURRENT_MINECRAFT_VERSION."\x1b[0m #".CURRENT_PROTOCOL." at ".$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;
+		$this->startDatabase();
+		$this->api = false;
+		$this->tCnt = 1;
+		$this->events = array();
+		$this->eventsID = array();
+		$this->handlers = array();
+		$this->invisible = false;
+		$this->levelData = false;
+		$this->difficulty = 1;
+		$this->tiles = array();
+		$this->entities = array();
+		$this->custom = array();
+		$this->evCnt = 1;
+		$this->handCnt = 1;
+		$this->eidCnt = 1;
+		$this->maxClients = 20;
+		$this->schedule = array();
+		$this->scheduleCnt = 1;
+		$this->description = "";
+		$this->whitelist = false;
+		$this->memoryStats = array();
+		$this->clients = array();
+		$this->spawn = false;
+		$this->saveEnabled = true;
+		$this->tickMeasure = array_fill(0, 40, 0);
+		$this->setType("normal");
+		$this->interface = new MinecraftInterface($this, "255.255.255.255", $this->port, true, false, $this->serverip);
+		$this->reloadConfig();
+		$this->stop = false;
+		$this->ticks = 0;
+		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;
+		$this->doTick = true;
+		$this->gamemode = (int) $gamemode;
+		$this->name = $name;
+		$this->motd = "Welcome to ".$name;
+		$this->serverID = false;
+		$this->seed = $seed;
+		$this->serverip = $serverip;
+		$this->load();
+	}
+
+	public function getTPS(){
+		$v = array_values($this->tickMeasure);
+		$tps = 40 / ($v[39] - $v[0]);
+		return round($tps, 4);
+	}
+	
+	public function titleTick(){
+		$time = microtime(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);
+	}
+
+	public function loadEvents(){
+		if(ENABLE_ANSI === true){
+			$this->schedule(30, array($this, "titleTick"), array(), true);
+		}
+		$this->schedule(20 * 15, array($this, "checkTicks"), array(), true);
+		$this->schedule(20 * 60, array($this, "checkMemory"), array(), true);
+		$this->schedule(20, array($this, "asyncOperationChecker"), array(), true);
+	}
+	
+	public function checkTicks(){
+		if($this->getTPS() < 12){
+			console("[WARNING] Can't keep up! Is the server overloaded?");
+		}
+	}
+	
+	public function checkMemory(){
+		$info = $this->debugInfo();
+		$data = $info["memory_usage"].",".$info["players"].",".$info["entities"];
+		$i = count($this->memoryStats) - 1;
+		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\";");
+		$this->query("PRAGMA secure_delete = OFF;");
+		$this->query("CREATE TABLE players (CID INTEGER PRIMARY KEY, EID NUMERIC, ip TEXT, port NUMERIC, name TEXT UNIQUE COLLATE NOCASE);");
+		$this->query("CREATE TABLE entities (EID INTEGER PRIMARY KEY, level TEXT, type NUMERIC, class NUMERIC, hasUpdate NUMERIC, name TEXT, x NUMERIC, y NUMERIC, z NUMERIC, yaw NUMERIC, pitch NUMERIC, health NUMERIC);");
+		$this->query("CREATE TABLE tiles (ID INTEGER PRIMARY KEY, level TEXT, class TEXT, x NUMERIC, y NUMERIC, z NUMERIC, spawnable NUMERIC);");
+		$this->query("CREATE TABLE actions (ID INTEGER PRIMARY KEY, interval NUMERIC, last NUMERIC, code TEXT, repeat NUMERIC);");
+		$this->query("CREATE TABLE handlers (ID INTEGER PRIMARY KEY, name TEXT, priority NUMERIC);");
+		$this->query("CREATE TABLE blockUpdates (level TEXT, x INTEGER, y INTEGER, z INTEGER, type INTEGER, delay NUMERIC);");
+		$this->query("CREATE TABLE recipes (id INTEGER PRIMARY KEY, type NUMERIC, recipe TEXT);");
+		$this->query("PRAGMA synchronous = OFF;");
+		$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){
+		$result = $this->database->query($sql) or console("[ERROR] [SQL Error] ".$this->database->lastErrorMsg().". Query: ".$sql, true, true, 0);
+		if($fetch === true and ($result instanceof SQLite3Result)){
+			$result = $result->fetchArray(SQLITE3_ASSOC);
+		}
+		return $result;
+	}
+
+	public function reloadConfig(){
+
+	}
+
+	public function debugInfo($console = false){
+		$info = array();
+		$info["tps"] = $this->getTPS();
+		$info["memory_usage"] = round((memory_get_usage() / 1024) / 1024, 2)."MB";
+		$info["memory_peak_usage"] = round((memory_get_peak_usage() / 1024) / 1024, 2)."MB";
+		$info["entities"] = $this->query("SELECT count(EID) as count FROM entities;", true);
+		$info["entities"] = $info["entities"]["count"];
+		$info["players"] = $this->query("SELECT count(CID) as count FROM players;", true);
+		$info["players"] = $info["players"]["count"];
+		$info["events"] = count($this->eventsID);
+		$info["handlers"] = $this->query("SELECT count(ID) as count FROM handlers;", true);
+		$info["handlers"] = $info["handlers"]["count"];
+		$info["actions"] = $this->query("SELECT count(ID) as count FROM actions;", true);
+		$info["actions"] = $info["actions"]["count"];
+		$info["garbage"] = gc_collect_cycles();
+		$this->handle("server.debug", $info);
+		if($console === true){
+			console("[DEBUG] TPS: ".$info["tps"].", Memory usage: ".$info["memory_usage"]." (Peak ".$info["memory_peak_usage"]."), Entities: ".$info["entities"].", Events: ".$info["events"].", Handlers: ".$info["handlers"].", Actions: ".$info["actions"].", Garbage: ".$info["garbage"], true, true, 2);
+		}
+		return $info;
+	}
+
+	public function close($reason = "server stop"){
+		if($this->stop !== true){
+			if(is_int($reason)){
+				$reason = "signal stop";
+			}
+			if(($this->api instanceof ServerAPI) === true){
+				if(($this->api->chat instanceof ChatAPI) === true){
+					$this->api->chat->broadcast("Stopping server...");
+				}
+			}
+			$this->stop = true;
+			$this->trigger("server.close", $reason);
+			$this->interface->close();
+			
+			if(!defined("NO_THREADS")){
+				@$this->asyncThread->stop = true;
+			}
+		}
+	}
+
+	public function setType($type = "normal"){
+		switch(trim(strtolower($type))){
+			case "normal":
+			case "demo":
+				$this->serverType = "MCCPP;Demo;";
+				break;
+			case "minecon":
+				$this->serverType = "MCCPP;MINECON;";
+				break;
+		}
+
+	}
+	
+	public function asyncOperation($type, array $data, callable $callable = null){
+		if(defined("NO_THREADS")){
+			return false;
+		}
+		$d = "";
+		$type = (int) $type;
+		switch($type){
+			case ASYNC_CURL_GET:
+				$d .= Utils::writeShort(strlen($data["url"])).$data["url"].(isset($data["timeout"]) ? Utils::writeShort($data["timeout"]) : Utils::writeShort(10));
+				break;
+			case ASYNC_CURL_POST:
+				$d .= Utils::writeShort(strlen($data["url"])).$data["url"].(isset($data["timeout"]) ? Utils::writeShort($data["timeout"]) : Utils::writeShort(10));
+				$d .= Utils::writeShort(count($data["data"]));
+				foreach($data["data"] as $key => $value){
+					$d .= Utils::writeShort(strlen($key)).$key . Utils::writeInt(strlen($value)).$value;
+				}
+				break;
+			default:
+				return false;
+		}
+		$ID = $this->asyncID++;
+		$this->async[$ID] = $callable;
+		$this->asyncThread->input .= Utils::writeInt($ID).Utils::writeShort($type).$d;
+		return $ID;
+	}
+	
+	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));
+			$offset += 4;
+			$type = Utils::readShort(substr($this->asyncThread->output, $offset, 2));
+			$offset += 2;
+			$data = array();
+			switch($type){
+				case ASYNC_CURL_GET:
+				case ASYNC_CURL_POST:
+					$len = Utils::readInt(substr($this->asyncThread->output, $offset, 4));
+					$offset += 4;
+					$data["result"] = substr($this->asyncThread->output, $offset, $len);
+					$offset += $len;
+					break;
+			}
+			$this->asyncThread->output = substr($this->asyncThread->output, $offset);
+			if(isset($this->async[$ID]) and $this->async[$ID] !== null and is_callable($this->async[$ID])){
+				if(is_array($this->async[$ID])){
+					$method = $this->async[$ID][1];
+					$result = $this->async[$ID][0]->$method($data, $type, $ID);
+				}else{
+					$result = $this->async[$ID]($data, $type, $ID);
+				}
+			}
+			unset($this->async[$ID]);
+		}
+	}
+
+	public function addHandler($event,callable $callable, $priority = 5){
+		if(!is_callable($callable)){
+			return false;
+		}elseif(isset(Deprecation::$events[$event])){
+			$sub = "";
+			if(Deprecation::$events[$event] !== false){
+				$sub = " Substitute \"".Deprecation::$events[$event]."\" found.";
+			}
+			console("[ERROR] Event \"$event\" has been deprecated.$sub [Adding handle to ".(is_array($callable) ? get_class($callable[0])."::".$callable[1]:$callable)."]");
+		}
+		$priority = (int) $priority;
+		$hnid = $this->handCnt++;
+		$this->handlers[$hnid] = $callable;
+		$this->query("INSERT INTO handlers (ID, name, priority) VALUES (".$hnid.", '".str_replace("'", "\\'", $event)."', ".$priority.");");
+		console("[INTERNAL] New handler ".(is_array($callable) ? get_class($callable[0])."::".$callable[1]:$callable)." to special event ".$event." (ID ".$hnid.")", true, true, 3);
+		return $hnid;
+	}
+	
+	public function dhandle($e, $d){
+		return $this->handle($e, $d);
+	}
+
+	public function handle($event, &$data){
+		$this->preparedSQL->selectHandlers->reset();
+		$this->preparedSQL->selectHandlers->clear();
+		$this->preparedSQL->selectHandlers->bindValue(":name", $event, SQLITE3_TEXT);
+		$handlers = $this->preparedSQL->selectHandlers->execute();
+		$result = null;
+		if($handlers instanceof SQLite3Result){
+			$call = array();
+			while(($hn = $handlers->fetchArray(SQLITE3_ASSOC)) !== false){
+				$call[(int) $hn["ID"]] = true;
+			}
+			$handlers->finalize();
+			foreach($call as $hnid => $boolean){
+				if($result !== false and $result !== true){
+					$called[$hnid] = true;
+					$handler = $this->handlers[$hnid];
+					if(is_array($handler)){
+						$method = $handler[1];
+						$result = $handler[0]->$method($data, $event);
+					}else{
+						$result = $handler($data, $event);
+					}
+				}else{
+					break;
+				}
+			}
+		}elseif(isset(Deprecation::$events[$event])){
+			$sub = "";
+			if(Deprecation::$events[$event] !== false){
+				$sub = " Substitute \"".Deprecation::$events[$event]."\" found.";
+			}
+			console("[ERROR] Event \"$event\" has been deprecated.$sub [Handler]");
+		}
+
+		if($result !== false){
+			$this->trigger($event, $data);
+		}
+		return $result;
+	}
+
+	public function eventHandler($data, $event){
+		switch($event){
+
+		}
+	}
+
+	public function getGamemode(){
+		switch($this->gamemode){
+			case SURVIVAL:
+				return "survival";
+			case CREATIVE:
+				return "creative";
+			case ADVENTURE:
+				return "adventure";
+			case VIEW:
+				return "view";
+		}
+	}
+
+
+
+	public function init(){		
+		register_tick_function(array($this, "tick"));
+		console("[INFO] Starting internal ticker calculation");
+		$t = 0;
+		while(true){
+			switch($t){
+				case 0:
+					declare(ticks=100);
+					break;
+				case 1:
+					declare(ticks=60);
+					break;
+				case 2:
+					declare(ticks=40);
+					break;
+				case 3:
+					declare(ticks=30);
+					break;
+				case 4:
+					declare(ticks=20);
+					break;
+				case 5:
+					declare(ticks=15);
+					break;
+				default:
+					declare(ticks=10);
+					break;
+			}
+			if($t > 5){
+				break;
+			}
+			$this->ticks = 0;
+			while($this->ticks < 20){
+				usleep(1);
+			}
+			
+			if($this->getTPS() < 19.5){
+				++$t;
+			}else{
+				break;
+			}
+		}
+
+		$this->loadEvents();
+		register_shutdown_function(array($this, "dumpError"));
+		register_shutdown_function(array($this, "close"));
+		if(function_exists("pcntl_signal")){
+			pcntl_signal(SIGTERM, array($this, "close"));
+			pcntl_signal(SIGINT, array($this, "close"));
+			pcntl_signal(SIGHUP, array($this, "close"));
+		}
+		console("[INFO] Default game type: ".strtoupper($this->getGamemode()));
+		$this->trigger("server.start", microtime(true));
+		console('[INFO] Done ('.round(microtime(true) - START_TIME, 3).'s)! For help, type "help" or "?"');
+		$this->process();
+	}
+
+	public function dumpError(){
+		if($this->stop === true){
+			return;
+		}
+		console("[ERROR] An Unrecovereable has ocurred and the server has Crashed. Creating an Error Dump");
+		$dump = "```\r\n# PocketMine-MP Error Dump ".date("D M j H:i:s T Y")."\r\n";
+		$er = error_get_last();
+		$dump .= "Error: ".var_export($er, true)."\r\n\r\n";
+		$dump .= "Code: \r\n";
+		$file = @file($er["file"], FILE_IGNORE_NEW_LINES);
+		for($l = max(0, $er["line"] - 10); $l < $er["line"] + 10; ++$l){
+			$dump .= "[".($l + 1)."] ".@$file[$l]."\r\n";
+		}
+		$dump .= "\r\n\r\n";
+		$version = new VersionString();
+		$dump .= "PM Version: ".$version." #".$version->getNumber()." [Protocol ".CURRENT_PROTOCOL."]\r\n";
+		$dump .= "Commit: ".GIT_COMMIT."\r\n";
+		$dump .= "uname -a: ".php_uname("a")."\r\n";
+		$dump .= "PHP Version: " .phpversion()."\r\n";
+		$dump .= "Zend version: ".zend_version()."\r\n";
+		$dump .= "OS : " .PHP_OS.", ".Utils::getOS()."\r\n";
+		$dump .= "Debug Info: ".var_export($this->debugInfo(false), true)."\r\n\r\n\r\n";
+		global $arguments;
+		$dump .= "Parameters: ".var_export($arguments, true)."\r\n\r\n\r\n";
+		$p = $this->api->getProperties();
+		if($p["rcon.password"] != ""){
+			$p["rcon.password"] = "******";
+		}
+		$dump .= "server.properties: ".var_export($p, true)."\r\n\r\n\r\n";
+		if($this->api->plugin instanceof PluginAPI){
+			$plist = $this->api->plugin->getList();
+			$dump .= "Loaded plugins:\r\n";
+			foreach($plist as $p){
+				$dump .= $p["name"]." ".$p["version"]." by ".$p["author"]."\r\n";
+			}
+			$dump .= "\r\n\r\n";
+		}
+		$dump .= "Loaded Modules: ".var_export(get_loaded_extensions(), true)."\r\n";
+		$dump .= "Memory Usage Tracking: \r\n".chunk_split(base64_encode(gzdeflate(implode(";", $this->memoryStats), 9)))."\r\n";
+		ob_start();
+		phpinfo();
+		$dump .= "\r\nphpinfo(): \r\n".chunk_split(base64_encode(gzdeflate(ob_get_contents(), 9)))."\r\n";
+		ob_end_clean();
+		$dump .= "\r\n```";
+		$name = "Error_Dump_".date("D_M_j-H.i.s-T_Y");
+		logg($dump, $name, true, 0, true);
+		console("[ERROR] Please submit the \"{$name}.log\" file to the Bug Reporting page. Give as much info as you can.", true, true, 0);
+	}
+
+	public function tick(){
+		$time = microtime(true);
+		if($this->lastTick <= ($time - 0.05)){
+			$this->tickMeasure[] = $this->lastTick = $time;
+			unset($this->tickMeasure[key($this->tickMeasure)]);
+			++$this->ticks;
+			$this->tickerFunction($time);
+		}
+	}
+
+	public static function clientID($ip, $port){
+		//faster than string indexes in PHP
+		return crc32($ip . $port) ^ crc32($port . $ip . BOOTUP_RANDOM);
+	}
+
+	public function packetHandler($packet){
+		$data =& $packet["data"];
+		$CID = PocketMinecraftServer::clientID($packet["ip"], $packet["port"]);
+		if(isset($this->clients[$CID])){
+			$this->clients[$CID]->handlePacket($packet["pid"], $data);
+		}else{
+			if($this->handle("server.noauthpacket", $packet) === false){
+				return;
+			}
+			switch($packet["pid"]){
+				case 0x01:
+				case 0x02:
+					if($this->invisible === true){
+						$this->send(0x1c, array(
+							$data[0],
+							$this->serverID,
+							RAKNET_MAGIC,
+							$this->serverType,
+						), false, $packet["ip"], $packet["port"]);
+						break;
+					}
+					if(!isset($this->custom["times_".$CID])){
+						$this->custom["times_".$CID] = 0;
+					}
+					$ln = 15;
+					if($this->description == "" or substr($this->description, -1) != " "){						
+						$this->description .= " ";
+					}
+					$txt = substr($this->description, $this->custom["times_".$CID], $ln);
+					$txt .= substr($this->description, 0, $ln - strlen($txt));
+					$this->send(0x1c, array(
+						$data[0],
+						$this->serverID,
+						RAKNET_MAGIC,
+						$this->serverType. $this->name . " [".count($this->clients)."/".$this->maxClients."] ".$txt,
+					), false, $packet["ip"], $packet["port"]);
+					$this->custom["times_".$CID] = ($this->custom["times_".$CID] + 1) % strlen($this->description);
+					break;
+				case 0x05:
+					$version = $data[1];
+					$size = strlen($data[2]);
+					if($version !== CURRENT_STRUCTURE){
+						console("[DEBUG] Incorrect structure #$version from ".$packet["ip"].":".$packet["port"], true, true, 2);
+						$this->send(0x1a, array(
+							CURRENT_STRUCTURE,
+							RAKNET_MAGIC,
+							$this->serverID,
+						), false, $packet["ip"], $packet["port"]);
+					}else{
+						$this->send(0x06, array(
+							RAKNET_MAGIC,
+							$this->serverID,
+							0,
+							strlen($packet["raw"]),
+						), false, $packet["ip"], $packet["port"]);
+					}
+					break;
+				case 0x07:
+					if($this->invisible === true){
+						break;
+					}
+					$port = $data[2];
+					$MTU = $data[3];
+					$clientID = $data[4];
+					if(count($this->clients) < $this->maxClients){
+						$this->clients[$CID] = new Player($clientID, $packet["ip"], $packet["port"], $MTU); //New Session!
+						$this->send(0x08, array(
+							RAKNET_MAGIC,
+							$this->serverID,
+							$this->port,
+							$data[3],
+							0,
+						), false, $packet["ip"], $packet["port"]);
+					}
+					break;
+			}
+		}
+	}
+
+	public function send($pid, $data = array(), $raw = false, $dest = false, $port = false){
+		return $this->interface->writePacket($pid, $data, $raw, $dest, $port);
+	}
+
+	public function process(){
+		$lastLoop = 0;
+		while($this->stop === false){
+			$packet = $this->interface->readPacket();
+			if($packet !== false){
+				$this->packetHandler($packet);
+				$lastLoop = 0;
+			}else{
+				++$lastLoop;
+				if($lastLoop < 16){
+					usleep(1);
+				}elseif($lastLoop >= 128){
+					usleep(100);
+				}elseif($lastLoop >= 256){
+					usleep(512);
+				}
+			}
+		}
+	}
+
+	public function trigger($event, $data = ""){
+		if(isset($this->events[$event])){
+			foreach($this->events[$event] as $evid => $ev){
+				if(!is_callable($ev)){
+					$this->deleteEvent($evid);
+					continue;
+				}
+				if(is_array($ev)){
+					$method = $ev[1];
+					$ev[0]->$method($data, $event);
+				}else{
+					$ev($data, $event);
+				}
+			}
+		}elseif(isset(Deprecation::$events[$event])){
+			$sub = "";
+			if(Deprecation::$events[$event] !== false){
+				$sub = " Substitute \"".Deprecation::$events[$event]."\" found.";
+			}
+			console("[ERROR] Event \"$event\" has been deprecated.$sub [Trigger]");
+		}
+	}
+
+	public function schedule($ticks, callable $callback, $data = array(), $repeat = false, $eventName = "server.schedule"){
+		if(!is_callable($callback)){
+			return false;
+		}
+		$chcnt = $this->scheduleCnt++;
+		$this->schedule[$chcnt] = array($callback, $data, $eventName);
+		$this->query("INSERT INTO actions (ID, interval, last, repeat) VALUES(".$chcnt.", ".($ticks / 20).", ".microtime(true).", ".(((bool) $repeat) === true ? 1:0).");");
+		return $chcnt;
+	}
+
+	public function tickerFunction($time){
+		//actions that repeat every x time will go here
+		$this->preparedSQL->selectActions->reset();
+		$this->preparedSQL->selectActions->bindValue(":time", $time, SQLITE3_FLOAT);
+		$actions = $this->preparedSQL->selectActions->execute();
+
+		if($actions instanceof SQLite3Result){
+			while(($action = $actions->fetchArray(SQLITE3_ASSOC)) !== false){
+				$cid = $action["ID"];
+				$this->preparedSQL->updateAction->reset();
+				$this->preparedSQL->updateAction->bindValue(":time", $time, SQLITE3_FLOAT);
+				$this->preparedSQL->updateAction->bindValue(":id", $cid, SQLITE3_INTEGER);
+				$this->preparedSQL->updateAction->execute();
+				$schedule = $this->schedule[$cid];
+				if(!is_callable($schedule[0])){
+					$return = false;
+				}else{
+					$return = call_user_func($schedule[0], $schedule[1], $schedule[2]);
+				}
+
+				if($action["repeat"] == 0 or $return === false){
+					$this->query("DELETE FROM actions WHERE ID = ".$action["ID"].";");
+					$this->schedule[$cid] = null;
+					unset($this->schedule[$cid]);
+				}
+			}
+			$actions->finalize();
+		}
+	}
+
+	public function event($event,callable $func){
+		if(!is_callable($func)){
+			return false;
+		}elseif(isset(Deprecation::$events[$event])){
+			$sub = "";
+			if(Deprecation::$events[$event] !== false){
+				$sub = " Substitute \"".Deprecation::$events[$event]."\" found.";
+			}
+			console("[ERROR] Event \"$event\" has been deprecated.$sub [Attach to ".(is_array($func) ? get_class($func[0])."::".$func[1]:$func)."]");
+		}
+		$evid = $this->evCnt++;
+		if(!isset($this->events[$event])){
+			$this->events[$event] = array();
+		}
+		$this->events[$event][$evid] = $func;
+		$this->eventsID[$evid] = $event;
+		console("[INTERNAL] Attached ".(is_array($func) ? get_class($func[0])."::".$func[1]:$func)." to event ".$event." (ID ".$evid.")", true, true, 3);
+		return $evid;
+	}
+
+	public function deleteEvent($id){
+		$id = (int) $id;
+		if(isset($this->eventsID[$id])){
+			$ev = $this->eventsID[$id];
+			$this->eventsID[$id] = null;
+			unset($this->eventsID[$id]);
+			$this->events[$ev][$id] = null;
+			unset($this->events[$ev][$id]);
+			if(count($this->events[$ev]) === 0){
+				unset($this->events[$ev]);
+			}
+		}
+	}
+
+}
--- a/src/build/compile.sh
+++ b/src/build/compile.sh
@ -0,0 +1,278 @@
+#!/bin/bash
+COMPILER_VERSION="0.13"
+
+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_32_0"
+
+echo "[PocketMine] PHP installer and compiler for Linux & Mac"
+DIR="$(pwd)"
+date > "$DIR/install.log" 2>&1
+uname -a >> "$DIR/install.log" 2>&1
+echo "[INFO] Checking dependecies"
+type make >> "$DIR/install.log" 2>&1 || { echo >&2 "[ERROR] Please install \"make\""; read -p "Press [Enter] to continue..."; exit 1; }
+type autoconf >> "$DIR/install.log" 2>&1 || { echo >&2 "[ERROR] Please install \"autoconf\""; read -p "Press [Enter] to continue..."; exit 1; }
+type automake >> "$DIR/install.log" 2>&1 || { echo >&2 "[ERROR] Please install \"automake\""; read -p "Press [Enter] to continue..."; exit 1; }
+type libtool >> "$DIR/install.log" 2>&1 || { echo >&2 "[ERROR] Please install \"libtool\""; read -p "Press [Enter] to continue..."; exit 1; }
+type m4 >> "$DIR/install.log" 2>&1 || { echo >&2 "[ERROR] Please install \"m4\""; read -p "Press [Enter] to continue..."; exit 1; }
+type wget >> "$DIR/install.log" 2>&1 || { echo >&2 "[ERROR] Please install \"wget\""; read -p "Press [Enter] to continue..."; exit 1; }
+
+export CC="gcc"
+COMPILE_FOR_ANDROID=no
+RANLIB=ranlib
+if [ "$1" == "rpi" ]; then
+	[ -z "$march" ] && march=armv6zk;
+	[ -z "$mtune" ] && mtune=arm1176jzf-s;
+	[ -z "$CFLAGS" ] && CFLAGS="-mfloat-abi=hard -mfpu=vfp";
+	echo "[INFO] Compiling for Raspberry Pi ARMv6zk hard float"
+elif [ "$1" == "mac" ]; then
+	[ -z "$march" ] && march=prescott;
+	[ -z "$mtune" ] && mtune=generic;
+	[ -z "$CFLAGS" ] && CFLAGS="-fomit-frame-pointer";
+	echo "[INFO] Compiling for Intel MacOS"
+elif [ "$1" == "crosscompile" ]; then
+	if [ "$2" == "android" ] || [ "$2" == "android-armv6" ]; then
+		COMPILE_FOR_ANDROID=yes
+		[ -z "$march" ] && march=armv6;
+		[ -z "$mtune" ] && mtune=generic;
+		TOOLCHAIN_PREFIX="arm-none-linux-gnueabi"
+		export CC="$TOOLCHAIN_PREFIX-gcc"
+		CONFIGURE_FLAGS="--host=$TOOLCHAIN_PREFIX"
+		[ -z "$CFLAGS" ] && CFLAGS="-uclibc";
+		echo "[INFO] Cross-compiling for Android ARMv6"
+	elif [ "$2" == "android-armv7" ]; then
+		COMPILE_FOR_ANDROID=yes
+		[ -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"
+		[ -z "$CFLAGS" ] && CFLAGS="-uclibc";
+		echo "[INFO] Cross-compiling for Android ARMv7"
+	elif [ "$2" == "rpi" ]; then
+		TOOLCHAIN_PREFIX="arm-linux-gnueabihf"
+		[ -z "$march" ] && march=armv6zk;
+		[ -z "$mtune" ] && mtune=arm1176jzf-s;
+		[ -z "$CFLAGS" ] && CFLAGS="-mfloat-abi=hard -mfpu=vfp";
+		export CC="$TOOLCHAIN_PREFIX-gcc"
+		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 mac] to cross-compile"
+		exit 1
+	fi
+else
+	echo "[INFO] Compiling for current machine"
+fi
+
+type $CC >> "$DIR/install.log" 2>&1 || { echo >&2 "[ERROR] Please install \"$CC\""; read -p "Press [Enter] to continue..."; exit 1; }
+
+[ -z "$THREADS" ] && THREADS=1;
+[ -z "$march" ] && march=native;
+[ -z "$mtune" ] && mtune=native;
+[ -z "$CFLAGS" ] && CFLAGS="";
+[ -z "$CONFIGURE_FLAGS" ] && CONFIGURE_FLAGS="";
+
+$CC -O3 -march=$march -mtune=$mtune -fno-gcse $CFLAGS -Q --help=target >> "$DIR/install.log" 2>&1
+if [ $? -ne 0 ]; then
+	$CC -O3 -fno-gcse $CFLAGS -Q --help=target >> "$DIR/install.log" 2>&1
+	if [ $? -ne 0 ]; then
+		export CFLAGS="-O3 -fno-gcse "
+	else
+		export CFLAGS="-O3 -fno-gcse $CFLAGS"
+	fi
+else
+	export CFLAGS="-O3 -march=$march -mtune=$mtune -fno-gcse $CFLAGS"
+fi
+
+
+rm -r -f install_data/ >> "$DIR/install.log" 2>&1
+rm -r -f php5/ >> "$DIR/install.log" 2>&1
+rm -r -f bin/ >> "$DIR/install.log" 2>&1
+mkdir -m 0777 install_data >> "$DIR/install.log" 2>&1
+mkdir -m 0777 php5 >> "$DIR/install.log" 2>&1
+mkdir -m 0777 bin >> "$DIR/install.log" 2>&1
+cd install_data
+set -e
+
+#PHP 5
+echo -n "[PHP] downloading $PHP_VERSION..."
+wget http://php.net/get/php-$PHP_VERSION.tar.gz/from/this/mirror -q -O - | tar -zx >> "$DIR/install.log" 2>&1
+mv php-$PHP_VERSION php
+echo " done!"
+
+if [ 1 ] || [ "$1" == "crosscompile" ] || [ "$1" == "rpi" ]; then
+	HAVE_LIBEDIT="--without-libedit"
+else
+	#libedit
+	echo -n "[libedit] downloading $LIBEDIT_VERSION..."
+	wget http://download.sourceforge.net/project/libedit/libedit/libedit-$LIBEDIT_VERSION/libedit-$LIBEDIT_VERSION.tar.gz -q -O - | tar -zx >> "$DIR/install.log" 2>&1
+	echo -n " checking..."
+	cd libedit
+	./configure --prefix="$DIR/install_data/php/ext/libedit" --enable-static >> "$DIR/install.log" 2>&1
+	echo -n " compiling..."
+	if make -j $THREADS >> "$DIR/install.log" 2>&1; then
+		echo -n " installing..."
+		make install >> "$DIR/install.log" 2>&1
+		HAVE_LIBEDIT="--with-libedit=\"$DIR/install_data/php/ext/libedit\""
+	else
+		echo -n " disabling..."
+		HAVE_LIBEDIT="--without-libedit"
+	fi
+	echo -n " cleaning..."
+	cd ..
+	rm -r -f ./libedit
+	echo " done!"
+fi
+
+#zlib
+echo -n "[zlib] downloading $ZLIB_VERSION..."
+wget http://zlib.net/zlib-$ZLIB_VERSION.tar.gz -q -O - | tar -zx >> "$DIR/install.log" 2>&1
+mv zlib-$ZLIB_VERSION zlib
+echo -n " checking..."
+cd 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
+echo -n " installing..."
+make install >> "$DIR/install.log" 2>&1
+echo -n " cleaning..."
+cd ..
+rm -r -f ./zlib
+echo " done!"
+
+if [ "$(uname -s)" == "Darwin" ] && [ "$1" != "crosscompile" ] && [ "$2" != "curl" ]; then
+   HAVE_CURL="shared,/usr/local"
+else
+	#curl
+	echo -n "[cURL] downloading $CURL_VERSION..."
+	wget https://github.com/bagder/curl/archive/$CURL_VERSION.tar.gz --no-check-certificate -q -O - | tar -zx >> "$DIR/install.log" 2>&1
+	mv curl-$CURL_VERSION curl
+	echo -n " checking..."
+	cd curl
+	./buildconf >> "$DIR/install.log" 2>&1
+	./configure --enable-ipv6 \
+	--enable-optimize \
+	--enable-http \
+	--enable-ftp \
+	--disable-dict \
+	--enable-file \
+	--disable-gopher \
+	--disable-imap \
+	--disable-pop3 \
+	--disable-rtsp \
+	--disable-smtp \
+	--disable-telnet \
+	--disable-tftp \
+	--prefix="$DIR/install_data/php/ext/curl" \
+	--disable-shared \
+	$CONFIGURE_FLAGS >> "$DIR/install.log" 2>&1
+	echo -n " compiling..."
+	make -j $THREADS >> "$DIR/install.log" 2>&1
+	echo -n " installing..."
+	make install >> "$DIR/install.log" 2>&1
+	echo -n " cleaning..."
+	cd ..
+	rm -r -f ./curl
+	echo " done!"
+	HAVE_CURL="$DIR/install_data/php/ext/curl"
+fi
+
+#pthreads
+echo -n "[PHP pthreads] downloading $PTHREADS_VERSION..."
+wget http://pecl.php.net/get/pthreads-$PTHREADS_VERSION.tgz --no-check-certificate -q -O - | tar -zx >> "$DIR/install.log" 2>&1
+mv pthreads-$PTHREADS_VERSION "$DIR/install_data/php/ext/pthreads"
+echo " done!"
+
+
+echo -n "[PHP]"
+set +e
+if which free >/dev/null; then
+	MAX_MEMORY=$(free -m | awk '/^Mem:/{print $2}')
+else
+	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..."
+	OPTIMIZATION="--enable-inline-optimization "
+else
+	OPTIMIZATION="--disable-inline-optimization "
+fi
+set -e
+echo -n " checking..."
+cd php
+rm -rf ./aclocal.m4 >> "$DIR/install.log" 2>&1
+rm -rf ./autom4te.cache/ >> "$DIR/install.log" 2>&1
+rm -f ./configure >> "$DIR/install.log" 2>&1
+./buildconf --force >> "$DIR/install.log" 2>&1
+if [ "$1" == "crosscompile" ]; then
+	sed -i 's/pthreads_working=no/pthreads_working=yes/' ./configure
+	export LIBS="-lpthread -ldl"
+fi
+./configure $OPTIMIZATION--prefix="$DIR/php5" \
+--exec-prefix="$DIR/php5" \
+--with-curl="$HAVE_CURL" \
+--with-zlib="$DIR/install_data/php/ext/zlib" \
+$HAVE_LIBEDIT \
+--disable-libxml \
+--disable-xml \
+--disable-dom \
+--disable-simplexml \
+--disable-xmlreader \
+--disable-xmlwriter \
+--disable-cgi \
+--disable-session \
+--disable-zip \
+--disable-debug \
+--disable-phar \
+--enable-ctype \
+--enable-sockets \
+--enable-shared=no \
+--enable-static=yes \
+--enable-shmop \
+--enable-pcntl \
+--enable-pthreads \
+--enable-maintainer-zts \
+--enable-zend-signals \
+--enable-embedded-mysqli \
+--enable-bcmath \
+--enable-cli \
+--without-pear \
+--without-iconv \
+--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
+	sed -i 's/-export-dynamic/-all-static/g' Makefile
+fi
+make -j $THREADS >> "$DIR/install.log" 2>&1
+echo -n " installing..."
+make install >> "$DIR/install.log" 2>&1
+echo " done!"
+cd "$DIR"
+echo -n "[INFO] Cleaning up..."
+rm -r -f install_data/ >> "$DIR/install.log" 2>&1
+mv php5/bin/php bin/php
+rm -r -f php5/ >> "$DIR/install.log" 2>&1
+date >> "$DIR/install.log" 2>&1
+echo " done!"
+echo "[PocketMine] You should start the server now using \"./start.sh\""
+echo "[PocketMine] If it doesn't works, please send the \"install.log\" file to the Bug Tracker"
--- a/src/classes/Async.php
+++ b/src/classes/Async.php
@ -1,71 +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 Async extends Thread {
-	/**
-	* Provide a passthrough to call_user_func_array
-	**/
-	public function __construct($method, $params = array()){
-		$this->method = $method;
-		$this->params = $params;
-		$this->result = null;
-		$this->joined = false;
-	}
-
-	/**
-	* The smallest thread in the world
-	**/
-	public function run(){
-		if(($this->result=call_user_func_array($this->method, $this->params))){
-			return true;
-		}else{
-			return false;
-		}
-	}
-
-	/**
-	* Static method to create your threads from functions ...
-	**/
-	public static function call($method, $params = array()){
-		$thread = new Async($method, $params);
-		if($thread->start()){
-			return $thread;
-		} /** else throw Nastyness **/
-	}
-
-	/**
-	* Do whatever, result stored in $this->result, don't try to join twice
-	**/
-	public function __toString(){
-		if(!$this->joined) {
-			$this->joined = true;
-			$this->join();
-		}
-
-		return $this->result;
-	}
-}
--- a/src/classes/BlockIterator.php
+++ b/src/classes/BlockIterator.php
@ -1,31 +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 BlockIterator implements Iterator{
-
-
-}*/
--- a/src/classes/Data.php
+++ b/src/classes/Data.php
@ -1,243 +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,
-		65 => true,
-		67 => true,
-		78 => true,
-		79 => true,
-		83 => true,
-		89 => true,
-		96 => true,
-		102 => true,
-		105 => true,
-		107 => true,
-		108 => 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,
-		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,
-		246 => true,
-		247 => true,
-	);
-	static $blocks = array(
-		0 => "Air",
-		1 => "Stone",
-		2 => "Grass",
-		3 => "Dirt",
-		4 => "Cobblestone",
-		5 => "Wooden Planks",
-		6 => "Sapling",
-		7 => "Bedrock",
-	);
-
-
-}
--- a/src/classes/Deprecation.php
+++ b/src/classes/Deprecation.php
@ -1,35 +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 Deprecation{
-	public static $events = array(
-		"world.block.change" => "block.change",
-	);
-
-
-}
--- a/src/classes/Player.php
+++ b/src/classes/Player.php
@ -1,565 +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 Player{
-	private $server;
-	private $queue = array();
-	private $buffer = array();
-	private $evid = array();
-	var $timeout;
-	var $connected = true;
-	var $clientID;
-	var $ip;
-	var $port;
-	var $counter = array(0, 0, 0);
-	var $username;
-	var $eid = false;
-	var $data = array();
-	var $entity = false;
-	var $auth = false;
-	var $CID;
-	var $MTU;
-	var $spawned = false;
-	var $inventory;
-	var $equipment = array(1, 0);
-	var $loggedIn = false;
-	function __construct(PocketMinecraftServer $server, $clientID, $ip, $port, $MTU){
-		$this->MTU = $MTU;
-		$this->server = $server;
-		$this->clientID = $clientID;
-		$this->CID = $this->server->clientID($ip, $port);
-		$this->ip = $ip;
-		$this->port = $port;
-		$this->timeout = microtime(true) + 25;
-		$this->inventory = array_fill(0, 36, array(0, 0, 0));
-		$this->evid[] = $this->server->event("server.tick", array($this, "onTick"));
-		$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);
-	}
-
-	public function onTick($time, $event){
-		if($event !== "server.tick"){ //WTF??
-			return;
-		}
-		if($time > $this->timeout){
-			$this->close("timeout");
-		}else{
-			if(!empty($this->queue)){
-				$cnt = 0;
-				while($cnt < 4){
-					$p = array_shift($this->queue);
-					if($p === null){
-						break;
-					}
-					switch($p[0]){
-						case 0:
-							$this->dataPacket($p[1], $p[2], false, $p[3]);
-							break;
-						case 1:
-							eval($p[1]);
-							break;
-					}
-					++$cnt;
-				}
-			}
-		}
-	}
-
-	public function save(){
-		if(is_object($this->entity)){
-			$this->data["spawn"] = array(
-				"x" => $this->entity->x,
-				"y" => $this->entity->y,
-				"z" => $this->entity->z,
-			);
-		}
-	}
-
-	public function close($reason = "", $msg = true){
-		if($this->connected === true){
-			foreach($this->evid as $ev){
-				$this->server->deleteEvent($ev);
-			}
-			$this->server->api->dhandle("player.quit", $this);
-			$reason = $reason == "" ? "server stop":$reason;
-			$this->save();
-			$this->eventHandler(new Container("You have been kicked. Reason: ".$reason), "server.chat");
-			$this->dataPacket(MC_LOGIN_STATUS, array(
-				"status" => 1,
-			));
-			$this->dataPacket(MC_DISCONNECT);
-
-			$this->connected = false;
-			if($msg === true){
-				$this->server->api->chat->broadcast($this->username." left the game");
-			}
-			console("[INFO] Session with \x1b[36m".$this->ip.":".$this->port."\x1b[0m Client ID ".$this->clientID." closed due to ".$reason);
-			$this->server->api->player->remove($this->CID);
-		}
-	}
-
-	public function addItem($type, $damage, $count){
-		while($count > 0){
-			$add = 0;
-			foreach($this->inventory as $s => $data){
-				if($data[0] === 0){
-					$add = min(64, $count);
-					$this->inventory[$s] = array($type, $damage, $add);
-					break;
-				}elseif($data[0] === $type and $data[1] === $damage){
-					$add = min(64 - $data[2], $count);
-					if($add <= 0){
-						continue;
-					}
-					$this->inventory[$s] = array($type, $damage, $data[2] + $add);
-					break;
-				}
-			}
-			if($add === 0){
-				return false;
-			}
-			$count -= $add;
-		}
-		return true;
-	}
-
-	public function removeItem($type, $damage, $count){
-		while($count > 0){
-			$remove = 0;
-			foreach($this->inventory as $s => $data){
-				if($data[0] === $type and $data[1] === $damage){
-					$remove = min($count, $data[2]);
-					if($remove < $data[2]){
-						$this->inventory[$s][2] -= $remove;
-					}else{
-						$this->inventory[$s] = array(0, 0, 0);
-					}
-					break;
-				}
-			}
-			if($remove === 0){
-				return false;
-			}
-			$count -= $remove;
-		}
-		return true;
-	}
-	
-	public function hasItem($type, $damage = false){
-		foreach($this->inventory as $s => $data){
-			if($data[0] === $type and ($data[1] === $damage or $damage === false) and $data[2] > 0){
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	public function eventHandler($data, $event){
-		switch($event){
-			case "player.block.place":
-				if($data["eid"] === $this->eid and $this->server->gamemode === 0){
-					$this->removeItem($data["original"][0], $data["original"][1], 1);
-				}
-				break;
-			case "player.pickup":
-				if($data["eid"] === $this->eid){
-					$data["eid"] = 0;
-					if($this->server->gamemode === 0){
-						$this->addItem($data["entity"]->type, $data["entity"]->meta, $data["entity"]->stack);
-					}
-				}
-				$this->dataPacket(MC_TAKE_ITEM_ENTITY, $data);
-				break;
-			case "player.equipment.change":
-				if($data["eid"] === $this->eid){
-					break;
-				}
-				$this->dataPacket(MC_PLAYER_EQUIPMENT, $data);
-				break;
-			case "block.change":
-				$this->dataPacket(MC_UPDATE_BLOCK, $data);
-				break;
-			case "entity.move":
-				if($data->eid === $this->eid){
-					break;
-				}
-				$this->dataPacket(MC_MOVE_ENTITY_POSROT, array(
-					"eid" => $data->eid,
-					"x" => $data->x,
-					"y" => $data->y,
-					"z" => $data->z,
-					"yaw" => $data->yaw,
-					"pitch" => $data->pitch,
-				));
-				break;
-			case "entity.remove":
-				if($data->eid === $this->eid){
-					break;
-				}
-				$this->dataPacket(MC_REMOVE_ENTITY, array(
-					"eid" => $data->eid,
-				));
-				break;
-			case "server.time":
-				$this->dataPacket(MC_SET_TIME, array(
-					"time" => $data,
-				));
-				break;
-			case "entity.animate":
-				if($data["eid"] === $this->eid){
-					break;
-				}
-				$this->dataPacket(MC_ANIMATE, array(
-						"eid" => $data["eid"],
-						"action" => $data["action"],
-					));
-				break;
-			case "server.chat":
-				if(($data instanceof Container) === true){
-					if(!$data->check($this->username)){
-						return;
-					}else{
-						$message = $data->get();
-					}
-				}else{
-					$message = (string) $data;
-				}
-				$this->dataPacket(MC_CHAT, array(
-					"message" => str_replace("@username", $this->username, $message),
-				));
-				break;
-		}
-	}
-
-	public function handle($pid, $data){
-		if($this->connected === true){
-			$this->timeout = microtime(true) + 25;
-			switch($pid){
-				case 0xa0: //NACK
-					if(isset($this->buffer[$data[2]])){
-						array_unshift($this->queue, array(0, $this->buffer[$data[2]][0], $this->buffer[$data[2]][1], $data[2]));
-					}
-					if(isset($data[3])){
-						if(isset($this->buffer[$data[3]])){
-							array_unshift($this->queue, array(0, $this->buffer[$data[3]][0], $this->buffer[$data[3]][1], $data[3]));
-						}
-					}
-					break;
-				case 0xc0: //ACK
-					$diff = $data[2] - $this->counter[2];
-					if($diff > 8){ //Packet recovery
-						array_unshift($this->queue, array(0, $this->buffer[$data[2]][0], $this->buffer[$data[2]][1], $data[2]));
-					}
-					$this->counter[2] = $data[2];
-					unset($this->buffer[$data[2]]);
-
-					if(isset($data[3])){
-						$diff = $data[3] - $this->counter[2];
-						if($diff > 8){ //Packet recovery
-							array_unshift($this->queue, array(0, $this->buffer[$data[3]][0], $this->buffer[$data[3]][1], $data[3]));
-						}
-						$this->counter[2] = $data[3];
-						unset($this->buffer[$data[3]]);
-					}
-					break;
-				case 0x07:
-					$this->send(0x08, array(
-						MAGIC,
-						$this->server->serverID,
-						$this->port,
-						$data[3],
-						0,
-					));
-					break;
-				case 0x80:
-				case 0x81:
-				case 0x82:
-				case 0x83:
-				case 0x84:
-				case 0x85:
-				case 0x86:
-				case 0x87:
-				case 0x88:
-				case 0x89:
-				case 0x8a:
-				case 0x8b:
-				case 0x8c:
-				case 0x8d:
-				case 0x8e:
-				case 0x8f:
-					if(isset($data[0])){
-						$diff = $data[0] - $this->counter[1];
-						if($diff > 1){ //Packet recovery
-							for($i = $this->counter[1]; $i < $data[0]; ++$i){
-								$this->send(0xa0, array(1, true, $i));
-							}
-							$this->counter[1] = $data[0];
-						}elseif($diff === 1){
-							$this->counter[1] = $data[0];
-						}
-						$this->send(0xc0, array(1, true, $data[0]));
-					}
-					switch($data["id"]){
-
-						case MC_KEEP_ALIVE:
-
-							break;
-						case 0x03:
-
-							break;
-						case MC_DISCONNECT:
-							$this->close("client disconnect");
-							break;
-						case MC_CLIENT_CONNECT:
-							$this->dataPacket(MC_SERVER_HANDSHAKE, array(
-								"port" => $this->port,
-								"session" => $data["session"],
-								"session2" => Utils::readLong("\x00\x00\x00\x00\x04\x44\x0b\xa9"),
-							));
-							break;
-						case MC_CLIENT_HANDSHAKE:
-
-							break;
-						case MC_LOGIN:
-							if($this->loggedIn === true){
-								break;
-							}
-							$this->loggedIn = true;
-							$this->username = str_replace(array("\x00", "/", " ", "\r", "\n"), array("", "-", "_", "", ""), $data["username"]);
-							if($this->username == ""){
-								$this->close("bad username", false);
-								break;
-							}
-							$o = $this->server->api->player->getOffline($this->username);
-							if($this->server->whitelist === true and !$this->server->api->ban->inWhitelist($this->username)){
-								$this->close("\"\x1b[33m".$this->username."\x1b[0m\" not being on white-list", false);
-								break;
-							}elseif($this->server->api->ban->isBanned($this->username) or $this->server->api->ban->isIPBanned($this->ip)){
-								$this->close("\"\x1b[33m".$this->username."\x1b[0m\" is banned!", false);
-							}
-							$u = $this->server->api->player->get($this->username);
-							$c = $this->server->api->player->getByClientID($this->clientID);
-							if($u !== false){
-								$u->close("logged in from another location");
-							}
-							if($c !== false){
-								$c->close("logged in from another location");
-							}
-							if($this->server->api->dhandle("player.join", $this) === false){
-								$this->close();
-								return;
-							}
-							$this->server->api->player->add($this->CID);
-							$this->auth = true;
-							if(!isset($this->data["inventory"]) or $this->server->gamemode === 1){
-								$this->data["inventory"] = $this->inventory;
-							}
-							$this->inventory = &$this->data["inventory"];
-							
-							$this->data["lastIP"] = $this->ip;
-							$this->data["lastID"] = $this->clientID;
-							$this->server->api->player->saveOffline($this->username, $this->data);
-							$this->dataPacket(MC_LOGIN_STATUS, array(
-								"status" => 0,
-							));
-							$this->dataPacket(MC_START_GAME, array(
-								"seed" => $this->server->seed,
-								"x" => $this->data["spawn"]["x"],
-								"y" => $this->data["spawn"]["y"],
-								"z" => $this->data["spawn"]["z"],
-								"unknown1" => 0,
-								"gamemode" => $this->server->gamemode,
-								"eid" => 0,
-							));
-							break;
-						case MC_READY:
-							switch($data["status"]){
-								case 1:
-									if($this->spawned !== false){
-										break;
-									}
-									$this->spawned = true;
-									$this->entity = $this->server->api->entity->add(ENTITY_PLAYER, 0, array("player" => $this));
-									$this->eid = $this->entity->eid;
-									$this->server->query("UPDATE players SET EID = ".$this->eid." WHERE clientID = ".$this->clientID.";");
-									$this->entity->x = $this->data["spawn"]["x"];
-									$this->entity->y = $this->data["spawn"]["y"];
-									$this->entity->z = $this->data["spawn"]["z"];
-									$this->entity->setName($this->username);
-									$this->entity->data["clientID"] = $this->clientID;
-									$this->server->api->entity->spawnAll($this);
-									$this->server->api->entity->spawnToAll($this->eid);
-									$this->evid[] = $this->server->event("server.time", array($this, "eventHandler"));  
-									$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.move", array($this, "eventHandler"));
-									$this->evid[] = $this->server->event("entity.animate", array($this, "eventHandler"));
-									$this->evid[] = $this->server->event("player.equipment.change", array($this, "eventHandler"));
-									$this->evid[] = $this->server->event("player.pickup", array($this, "eventHandler"));
-									$this->evid[] = $this->server->event("block.change", array($this, "eventHandler"));
-									$this->evid[] = $this->server->event("player.block.place", array($this, "eventHandler"));
-									console("[DEBUG] Player \"".$this->username."\" EID ".$this->eid." spawned at X ".$this->entity->x." Y ".$this->entity->y." Z ".$this->entity->z, true, true, 2);
-									$this->eventHandler(new Container($this->server->motd), "server.chat");
-									if($this->MTU <= 548){
-										$this->eventHandler("Your connection is bad, you may experience lag and slow map loading.", "server.chat");
-									}
-									foreach($this->inventory as $s => $data){
-										if($data[0] <= 0 or $data[2] <= 0){
-											$this->inventory[$s] = array(0, 0, 0);
-											continue;
-										}
-										$e = $this->server->api->entity->add(ENTITY_ITEM, $data[0], array(
-											"x" => $this->entity->x + 0.5,
-											"y" => $this->entity->y + 0.19,
-											"z" => $this->entity->z + 0.5,
-											"meta" => $data[1],
-											"stack" => $data[2],
-										));
-										$this->server->api->entity->spawnTo($e->eid, $this);
-									}
-									break;
-								case 2://Chunk loaded?
-									break;
-							}
-							break;
-						case MC_MOVE_PLAYER:
-							if(is_object($this->entity)){
-								$this->entity->setPosition($data["x"], $data["y"], $data["z"], $data["yaw"], $data["pitch"]);
-								$this->server->api->dhandle("player.move", $this->entity);
-							}
-							break;
-						case MC_PLAYER_EQUIPMENT:
-							$data["eid"] = $this->eid;
-							if($this->server->handle("player.equipment.change", $data) !== false){
-								$this->equipment[0] = $data["block"];
-								$this->equipment[1] = $data["meta"];
-								console("[DEBUG] EID ".$this->eid." has now ".$data["block"].":".$data["meta"]." in their hands!", true, true, 2);
-							}
-							break;
-						case MC_REQUEST_CHUNK:
-							$this->actionQueue('
-							$max = max(1, floor(($this->MTU - 16 - 255) / 192));
-							$chunk = $this->server->api->level->getOrderedChunk('.$data["x"].', '.$data["z"].', $max);
-							foreach($chunk as $d){
-								$this->dataPacket(MC_CHUNK_DATA, array(
-									"x" => '.$data["x"].',
-									"z" => '.$data["z"].',
-									"data" => $d,
-								), true);
-							}
-							');
-							console("[INTERNAL] Chunk X ".$data["x"]." Z ".$data["z"]." requested", true, true, 3);
-							break;
-						case MC_USE_ITEM:
-							$data["eid"] = $this->eid;
-							if(Utils::distance($this->entity->position, $data) > 10){
-								break;
-							}elseif($this->server->gamemode === 0 and !$this->hasItem($data["block"], $data["meta"])){
-								console("[DEBUG] Player \"".$this->username."\" tried to place not got block (or crafted block)", true, true, 2);
-								//break;
-							}
-							$this->server->handle("player.block.action", $data);
-							break;
-						case MC_REMOVE_BLOCK:
-							$data["eid"] = $this->eid;
-							if(Utils::distance($this->entity->position, $data) > 8){
-								break;
-							}
-							$this->server->handle("player.block.break", $data);
-							break;
-						case MC_INTERACT:
-							if(isset($this->server->entities[$data["target"]]) and Utils::distance($this->entity->position, $this->server->entities[$data["target"]]->position) <= 8){
-								if($this->handle("player.interact", $data) !== false){
-									console("[DEBUG] EID ".$this->eid." attacked EID ".$data["target"], true, true, 2);
-									if($this->server->gamemode !== 1 and $this->server->difficulty > 0){
-										$this->server->api->entity->harm($data["target"], $this->server->difficulty, $this->eid);
-									}
-								}
-							}
-							break;
-						case MC_ANIMATE:
-							$this->server->api->dhandle("entity.animate", array("eid" => $this->eid, "action" => $data["action"]));
-							break;
-						case MC_RESPAWN:
-							$this->entity->invincible = true;
-							$this->entity->setHealth(20, "respawn");
-							$this->entity->setPosition($data["x"], $data["y"], $data["z"], 0, 0);
-							$this->entity->invincible = false;
-							break;
-						case MC_SET_HEALTH:
-							if($this->server->gamemode === 1){
-								break;
-							}
-							//$this->entity->setHealth($data["health"], "client");
-							break;
-						case MC_DROP_ITEM:
-							if($this->server->handle("player.drop", $data) !== false){
-								$this->server->api->block->drop($this->entity->x, $this->entity->y, $this->entity->z, $data["block"], $data["meta"], $data["stack"]);
-							}
-							break;
-						default:
-							console("[DEBUG] Unhandled 0x".dechex($data["id"])." Data Packet for Client ID ".$this->clientID.": ".print_r($data, true), true, true, 2);
-							break;
-					}
-					break;
-			}
-		}
-	}
-
-	public function send($pid, $data = array(), $raw = false){
-		if($this->connected === true){
-			$this->server->send($pid, $data, $raw, $this->ip, $this->port);
-		}
-	}
-
-	public function actionQueue($code){
-		$this->queue[] = array(1, $code);
-	}
-
-	public function dataPacket($id, $data = array(), $queue = false, $count = false){
-		if($queue === true){
-			$this->queue[] = array(0, $id, $data, $count);
-		}else{
-			if($count === false){
-				$count = $this->counter[0];
-				++$this->counter[0];
-				if(count($this->buffer) >= 512){
-					array_shift($this->buffer);
-				}
-				$this->buffer[$count] = array($id, $data);
-			}
-			$data["id"] = $id;
-			$this->send(0x80, array(
-				$count,
-				0x00,
-				$data,
-			));
-		}
-	}
-
-}
--- a/src/classes/PocketMinecraftServer.php
+++ b/src/classes/PocketMinecraftServer.php
@ -1,643 +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 PocketMinecraftServer{
-	var $version, $invisible, $api, $tickMeasure, $preparedSQL, $seed, $gamemode, $name, $maxClients, $clients, $eidCnt, $custom, $description, $motd, $timePerSecond, $spawn, $entities, $mapDir, $mapName, $map, $levelData, $tileEntities;
-	private $database, $interface, $evCnt, $handCnt, $events, $handlers, $serverType, $lastTick, $ticker;
-	
-	private function load(){
-		$this->version = new VersionString();
-		console("[INFO] \x1b[33;1mPocketMine-MP ".MAJOR_VERSION." #".$this->version->getNumber()." by @shoghicp, LGPL License", true, true, 0);
-		console("[INFO] Target Minecraft PE: \x1b[36;1m".CURRENT_MINECRAFT_VERSION."\x1b[0m, protocol #".CURRENT_PROTOCOL, true, true, 0);
-		if($this->version->isDev()){
-			console("[INFO] \x1b[31;1mThis is a Development version");
-		}
-		console("[INFO] Starting Minecraft PE Server at *:".$this->port);
-		if($this->port < 19132 or $this->port > 19135){
-			console("[WARNING] You've selected a not-standard port. Normal port range is from 19132 to 19135 included");
-		}
-		$this->serverID = $this->serverID === false ? Utils::readLong(Utils::getRandomBytes(8)):$this->serverID;
-		$this->seed = $this->seed === false ? Utils::readInt(Utils::getRandomBytes(4)):$this->seed;
-		console("[INFO] Loading database...");
-		$this->startDatabase();
-		$this->doTick = false;
-		$this->api = false;		
-		$this->mapDir = false;
-		$this->mapName = false;
-		$this->events = array();
-		$this->handlers = array();
-		$this->map = false;
-		$this->invisible = false;
-		$this->levelData = false;
-		$this->difficulty = 1;
-		$this->tileEntities = array();
-		$this->entities = array();
-		$this->custom = array();
-		$this->evCnt = 0;
-		$this->handCnt = 0;
-		$this->eidCnt = 1;
-		$this->maxClients = 20;
-		$this->schedule = array();
-		$this->scheduleCnt = 0;
-		$this->description = "";
-		$this->whitelist = false;
-		$this->clients = array();
-		$this->spawn = array("x" => 128.5,"y" => 100,"z" =>  128.5);
-		$this->time = 0;
-		$this->timePerSecond = 10;
-		$this->tickMeasure = array_fill(0, 40, 0);
-		$this->setType("normal");
-		$this->interface = new MinecraftInterface("255.255.255.255", $this->port, true, false);
-		$this->reloadConfig();
-		console("[INFO] Server Name: \x1b[36m".$this->name."\x1b[0m");
-		console("[DEBUG] Server ID: ".$this->serverID, true, true, 2);
-		$this->stop = false;	
-	}
-	
-	function __construct($name, $gamemode = 1, $seed = false, $port = 19132, $serverID = false){
-		$this->port = (int) $port; //19132 - 19135
-		$this->gamemode = (int) $gamemode;
-		$this->name = $name;
-		$this->motd = "Welcome to ".$name;
-		$this->serverID = $serverID;
-		$this->seed = $seed;
-		$this->load();
-	}
-
-	public function getTPS(){
-		$v = array_values($this->tickMeasure);
-		$tps = 40 / ($v[39] - $v[0]);
-		return round($tps, 4);
-	}
-
-	public function loadEvents(){
-		$this->action(500000, '$this->time += (int) ($this->timePerSecond / 2);$this->api->dhandle("server.time", $this->time);');
-		$this->action(5000000, 'if($this->difficulty < 2){$this->api->dhandle("server.regeneration", 1);}');
-		$this->action(1000000 * 60, '$this->reloadConfig();');
-		$this->action(1000000 * 60 * 10, '$this->custom = array();');
-		if($this->api !== false){
-			$this->action(1000000 * 80, '$cnt = count($this->clients); if($cnt > 1){$this->api->chat->broadcast("Online (".$cnt."): ".implode(", ",$this->api->player->online()));}');
-		}
-		$this->action(1000000 * 120, '$this->debugInfo(true);');
-	}
-
-	public function startDatabase(){
-		$this->preparedSQL = new stdClass();
-		$this->database = new SQLite3(":memory:");
-		//$this->query("PRAGMA journal_mode = OFF;");
-		//$this->query("PRAGMA encoding = \"UTF-8\";");
-		//$this->query("PRAGMA secure_delete = OFF;");
-		$this->query("CREATE TABLE players (clientID INTEGER PRIMARY KEY, EID NUMERIC, ip TEXT, port NUMERIC, name TEXT UNIQUE);");
-		$this->query("CREATE TABLE entities (EID INTEGER PRIMARY KEY, type NUMERIC, class NUMERIC, name TEXT, x NUMERIC, y NUMERIC, z NUMERIC, yaw NUMERIC, pitch NUMERIC, health NUMERIC);");
-		$this->query("CREATE TABLE metadata (EID INTEGER PRIMARY KEY, name TEXT, value TEXT);");
-		$this->query("CREATE TABLE actions (ID INTEGER PRIMARY KEY, interval NUMERIC, last NUMERIC, code TEXT, repeat NUMERIC);");
-		$this->query("CREATE TABLE events (ID INTEGER PRIMARY KEY, name TEXT);");
-		$this->query("CREATE TABLE handlers (ID INTEGER PRIMARY KEY, name TEXT, priority NUMERIC);");
-		//$this->query("PRAGMA synchronous = OFF;");
-		$this->preparedSQL->selectHandlers = $this->database->prepare("SELECT DISTINCT ID FROM handlers WHERE name = :name ORDER BY priority DESC;");
-		$this->preparedSQL->selectEvents = $this->database->prepare("SELECT DISTINCT ID FROM events WHERE name = :name;");
-		$this->preparedSQL->selectActions = $this->database->prepare("SELECT ID,code,repeat FROM actions WHERE last <= (:time - interval);");
-		$this->preparedSQL->updateActions = $this->database->prepare("UPDATE actions SET last = :time WHERE last <= (:time - interval);");
-	}
-
-	public function query($sql, $fetch = false){
-		console("[INTERNAL] [SQL] ".$sql, true, true, 3);
-		$result = $this->database->query($sql) or console("[ERROR] [SQL Error] ".$this->database->lastErrorMsg().". Query: ".$sql, true, true, 0);
-		if($fetch === true and ($result !== false and $result !== true)){
-			$result = $result->fetchArray(SQLITE3_ASSOC);
-		}
-		return $result;
-	}
-
-	public function reloadConfig(){
-
-	}
-
-	public function debugInfo($console = false){
-		$info = array();
-		$info["tps"] = $this->getTPS();
-		$info["memory_usage"] = round((memory_get_usage(true) / 1024) / 1024, 2)."MB";
-		$info["memory_peak_usage"] = round((memory_get_peak_usage(true) / 1024) / 1024, 2)."MB";
-		$info["entities"] = $this->query("SELECT count(EID) as count FROM entities;", true);
-		$info["entities"] = $info["entities"]["count"];
-		$info["events"] = $this->query("SELECT count(ID) as count FROM events;", true);
-		$info["events"] = $info["events"]["count"];
-		$info["handlers"] = $this->query("SELECT count(ID) as count FROM handlers;", true);
-		$info["handlers"] = $info["handlers"]["count"];
-		$info["actions"] = $this->query("SELECT count(ID) as count FROM actions;", true);
-		$info["actions"] = $info["actions"]["count"];
-		$info["garbage"] = gc_collect_cycles();
-		$this->handle("server.debug", $info);
-		if($console === true){
-			console("[DEBUG] TPS: ".$info["tps"].", Memory usage: ".$info["memory_usage"]." (Peak ".$info["memory_peak_usage"]."), Entities: ".$info["entities"].", Events: ".$info["events"].", Handlers: ".$info["handlers"].", Actions: ".$info["actions"].", Garbage: ".$info["garbage"], true, true, 2);
-		}
-		return $info;
-	}
-
-	public function close($reason = "stop"){
-		if($this->stop !== true){
-			if(is_int($reason)){
-				$reason = "signal stop";
-			}
-			if(($this->api instanceof ServerAPI) === true){
-				if(($this->api->chat instanceof ChatAPI) === true){
-					$this->api->chat->send(false, "Stopping server...");
-				}
-			}
-			//$this->ticker->stop = true;
-			$this->save(true);
-			$this->stop = true;
-			$this->trigger("server.close", $reason);
-			$this->interface->close();
-		}
-	}
-
-	public function chat($owner, $text, $target = false){
-		$this->api->chat->send($owner, $text, $target);
-	}
-
-	public function setType($type = "normal"){
-		switch($type){
-			case "normal":
-				$this->serverType = "MCCPP;Demo;";
-				break;
-			case "minecon":
-				$this->serverType = "MCCPP;MINECON;";
-				break;
-		}
-
-	}
-
-	public function addHandler($event, $callable, $priority = 5){
-		if(!is_callable($callable)){
-			return false;
-		}elseif(isset(Deprecation::$events[$event])){
-			$sub = "";
-			if(Deprecation::$events[$event] !== false){
-				$sub = " Substitute \"".Deprecation::$events[$event]."\" found.";
-			}
-			console("[ERROR] Event \"$event\" has been deprecated.$sub [Adding handle to ".(is_array($callable) ? get_class($callable[0])."::".$callable[1]:$callable)."]");
-		}
-		$priority = (int) $priority;
-		$hnid = $this->handCnt++;
-		$this->handlers[$hnid] = $callable;
-		$this->query("INSERT INTO handlers (ID, name, priority) VALUES (".$hnid.", '".str_replace("'", "\\'", $event)."', ".$priority.");");
-		console("[INTERNAL] New handler ".(is_array($callable) ? get_class($callable[0])."::".$callable[1]:$callable)." to special event ".$event." (ID ".$hnid.")", true, true, 3);
-		return $hnid;
-	}
-
-	public function handle($event, &$data){
-		$this->preparedSQL->selectHandlers->reset();
-		$this->preparedSQL->selectHandlers->clear();
-		$this->preparedSQL->selectHandlers->bindValue(":name", $event, SQLITE3_TEXT);
-		$handlers = $this->preparedSQL->selectHandlers->execute();
-		$result = true;
-		if($handlers !== false and $handlers !== true){
-			console("[INTERNAL] Handling ".$event, true, true, 3);
-			$call = array();
-			while(($hn = $handlers->fetchArray(SQLITE3_ASSOC)) !== false){
-				$call[(int) $hn["ID"]] = true;
-			}
-			$handlers->finalize();
-			foreach($call as $hnid => $boolean){
-				if($result !== false){
-					$called[$hnid] = true;
-					$handler = $this->handlers[$hnid];
-					if(is_array($handler)){
-						$method = $handler[1];
-						$result = $handler[0]->$method($data, $event);
-					}else{
-						$result = $handler($data, $event);
-					}
-				}else{
-					break;
-				}
-			}
-		}elseif(isset(Deprecation::$events[$event])){
-			$sub = "";
-			if(Deprecation::$events[$event] !== false){
-				$sub = " Substitute \"".Deprecation::$events[$event]."\" found.";
-			}
-			console("[ERROR] Event \"$event\" has been deprecated.$sub [Handler]");
-		}
-		
-		if($result !== false){
-			$this->trigger($event, $data);
-		}
-		return $result;
-	}
-
-	public function eventHandler($data, $event){
-		switch($event){
-
-		}
-	}
-
-	public function loadMap(){
-		if($this->mapName !== false and trim($this->mapName) !== ""){
-			$this->levelData = unserialize(file_get_contents($this->mapDir."level.dat"));
-			if($this->levelData === false){
-				console("[ERROR] Invalid world data for \"".$this->mapDir."\. Please import the world correctly");
-				$this->close("invalid world data");
-			}
-			console("[INFO] Map: ".$this->levelData["LevelName"]);
-			$this->time = (int) $this->levelData["Time"];
-			$this->seed = (int) $this->levelData["RandomSeed"];
-			if(isset($this->levelData["SpawnX"])){
-				$this->spawn = array("x" => $this->levelData["SpawnX"], "y" => $this->levelData["SpawnY"], "z" => $this->levelData["SpawnZ"]);
-			}else{
-				$this->levelData["SpawnX"] = $this->spawn["x"];
-				$this->levelData["SpawnY"] = $this->spawn["y"];
-				$this->levelData["SpawnZ"] = $this->spawn["z"];
-			}
-			$this->levelData["Time"] = $this->time;
-			console("[INFO] Spawn: X \x1b[36m".$this->levelData["SpawnX"]."\x1b[0m Y \x1b[36m".$this->levelData["SpawnY"]."\x1b[0m Z \x1b[36m".$this->levelData["SpawnZ"]."\x1b[0m");
-			console("[INFO] Time: \x1b[36m".$this->time."\x1b[0m");
-			console("[INFO] Seed: \x1b[36m".$this->seed."\x1b[0m");
-			console("[INFO] Gamemode: \x1b[36m".($this->gamemode === 0 ? "survival":"creative")."\x1b[0m");
-			$d = array(0 => "peaceful", 1 => "easy", 2 => "normal", 3 => "hard");
-			console("[INFO] Difficulty: \x1b[36m".$d[$this->difficulty]."\x1b[0m");
-			console("[INFO] Loading map...");
-			$this->map = new ChunkParser();
-			if(!$this->map->loadFile($this->mapDir."chunks.dat")){
-				console("[ERROR] Couldn't load the map \"\x1b[32m".$this->levelData["LevelName"]."\x1b[0m\"!", true, true, 0);
-				$this->map = false;
-			}else{
-				$this->map->loadMap();
-			}
-		}else{
-			console("[INFO] Time: \x1b[36m".$this->time."\x1b[0m");
-			console("[INFO] Seed: \x1b[36m".$this->seed."\x1b[0m");
-			console("[INFO] Gamemode: \x1b[36m".($this->gamemode === 0 ? "survival":"creative")."\x1b[0m");
-		}
-	}
-
-	public function loadEntities(){
-		if($this->map !== false){
-			console("[INFO] Loading entities...");
-			$entities = unserialize(file_get_contents($this->mapDir."entities.dat"));
-			if($entities === false or !is_array($entities)){
-				console("[ERROR] Invalid world data for \"".$this->mapDir."\. Please import the world correctly");
-				$this->close("invalid world data");
-			}
-			foreach($entities as $entity){
-				if(!isset($entity["id"])){
-					break;
-				}
-				if(isset($this->api) and $this->api !== false){
-					if($entity["id"] === 64){ //Item Drop
-						$e = $this->api->entity->add(ENTITY_ITEM, $entity["Item"]["id"], array(
-							"meta" => $entity["Item"]["Damage"],
-							"stack" => $entity["Item"]["Count"],
-							"x" => $entity["Pos"][0],
-							"y" => $entity["Pos"][1],
-							"z" => $entity["Pos"][2],
-							"yaw" => $entity["Rotation"][0],
-							"pitch" => $entity["Rotation"][1],
-						));
-					}else{
-						$e = $this->api->entity->add(ENTITY_MOB, $entity["id"]);
-						$e->setPosition($entity["Pos"][0], $entity["Pos"][1], $entity["Pos"][2], $entity["Rotation"][0], $entity["Rotation"][1]);
-						$e->setHealth($entity["Health"]);
-
-					}
-				}
-			}
-			console("[DEBUG] Loaded ".count($this->entities)." Entities", true, true, 2);
-			$this->action(1000000 * 60 * 15, '$this->api->chat->broadcast("Forcing save...");$this->save();');
-		}
-	}
-
-	public function save($final = false){
-		if($this->mapName !== false){
-			$this->levelData["Time"] = $this->time;
-			file_put_contents($this->mapDir."level.dat", serialize($this->levelData));
-			$this->map->saveMap($final);
-			console("[INFO] Saving entities...");
-			foreach($this->entities as $entity){
-
-			}
-			$this->trigger("server.save", $final);
-		}
-	}
-
-	public function init(){
-		if($this->mapName !== false and $this->map === false){
-			$this->loadMap();
-			$this->loadEntities();
-		}
-		console("[INFO] Loading events...");
-		$this->loadEvents();
-		//$this->ticker = new TickLoop($this);
-		//$this->ticker->start();
-		declare(ticks=15);
-		register_tick_function(array($this, "tick"));
-		register_shutdown_function(array($this, "dumpError"));
-		register_shutdown_function(array($this, "close"));
-		if(function_exists("pcntl_signal")){
-			pcntl_signal(SIGTERM, array($this, "close"));
-			pcntl_signal(SIGINT, array($this, "close"));
-			pcntl_signal(SIGHUP, array($this, "close"));
-		}
-		$this->trigger("server.start", microtime(true));
-		console("[INFO] Server started!");
-		$this->process();
-	}
-	
-	public function dumpError(){
-		console("[ERROR] An Unrecovereable has ocurred and the server has Crashed. Creating an Error Dump");
-		$dump = "# PocketMine-MP Error Dump ".date("D M j H:i:s T Y")."\r\n";
-		$dump .= "Error: ".var_export(error_get_last(), true)."\r\n\r\n";
-		$version = new VersionString();
-		$dump .= "PM Version: ".$version." #".$version->getNumber()." [Protocol ".CURRENT_PROTOCOL."]\r\n";
-		$dump .= "uname -a: ".php_uname("a")."\r\n";
-		$dump .= "PHP Version: " .phpversion()."\r\n";
-		$dump .= "Zend version: ".zend_version()."\r\n";
-		$dump .= "OS : " .PHP_OS.", ".Utils::getOS()."\r\n";
-		$dump .= "Debug Info: ".var_export($this->debugInfo(false), true)."\r\n\r\n\r\n";
-		global $arguments;
-		$dump .= "Parameters: ".var_export($arguments, true)."\r\n\r\n\r\n";
-		$dump .= "server.properties: ".var_export($this->api->getProperties(), true)."\r\n\r\n\r\n";
-		global $lasttrace;
-		$dump .= "Last Backtrace: ".$lasttrace."\r\n\r\n\r\n";
-		$dump .= "Loaded Modules: ".var_export(get_loaded_extensions(), true)."\r\n\r\n";
-		$name = "error_dump_".time();
-		logg($dump, $name, true, 0, true);
-		console("[ERROR] Please submit the \"logs/{$name}.log\" file to the Bug Reporting page. Give as much info as you can.", true, true, 0);
-	}
-
-	public function tick(){
-		/*if($this->ticker->tick === true and $this->ticker->isWaiting() === true){
-			$this->ticker->tick = false;
-			$time = microtime(true);
-			array_shift($this->tickMeasure);
-			$this->tickMeasure[] = $this->lastTick = $time;
-			$this->tickerFunction($time);
-			$this->trigger("server.tick", $time);
-			$this->ticker->notify();
-		}*/
-		$time = microtime(true);
-		if($this->lastTick <= ($time - 0.05)){
-			array_shift($this->tickMeasure);
-			$this->tickMeasure[] = $this->lastTick = $time;
-			$this->tickerFunction($time);
-			$this->trigger("server.tick", $time);
-		}
-	}
-
-	public function clientID($ip, $port){
-		return md5($ip . $port, true);
-	}
-
-	public function packetHandler($packet){
-		$data =& $packet["data"];
-		$CID = $this->clientID($packet["ip"], $packet["port"]);
-		if(isset($this->clients[$CID])){
-			$this->clients[$CID]->handle($packet["pid"], $data);
-		}else{
-			if($this->handle("server.noauthpacket", $packet) === false){
-				return;
-			}
-			switch($packet["pid"]){
-				case 0x02:
-					if($this->invisible === true){
-						$this->send(0x1c, array(
-							$data[0],
-							$this->serverID,
-							MAGIC,
-							$this->serverType,
-						), false, $packet["ip"], $packet["port"]);
-						break;
-					}
-					if($this->api->ban->isIPBanned($packet["ip"])){
-						$this->send(0x1c, array(
-							$data[0],
-							$this->serverID,
-							MAGIC,
-							$this->serverType. $this->name . " [You're banned]",
-						), false, $packet["ip"], $packet["port"]);
-						break;
-					}
-					if(!isset($this->custom["times_".$CID])){
-						$this->custom["times_".$CID] = 0;
-					}
-					$ln = 15;
-					$this->description .= " ";
-					$txt = substr($this->description, $this->custom["times_".$CID], $ln);
-					$txt .= substr($this->description, 0, $ln - strlen($txt));
-					$this->send(0x1c, array(
-						$data[0],
-						$this->serverID,
-						MAGIC,
-						$this->serverType. $this->name . " [".($this->gamemode === 1 ? "C":"S").($this->whitelist !== false ? "W":"")." ".count($this->clients)."/".$this->maxClients."] ".$txt,
-					), false, $packet["ip"], $packet["port"]);
-					$this->custom["times_".$CID] = ($this->custom["times_".$CID] + 1) % strlen($this->description);
-					break;
-				case 0x05:
-					if($this->api->ban->isIPBanned($packet["ip"]) or count($this->clients) >= $this->maxClients){
-						$this->send(0x80, array(
-							0,
-							0x00,
-							array(
-								"id" => MC_LOGIN_STATUS,
-								"status" => 1,
-							),
-						), false, $packet["ip"], $packet["port"]);
-						$this->send(0x80, array(
-							1,
-							0x00,
-							array(
-								"id" => MC_DISCONNECT,
-							),
-						), false, $packet["ip"], $packet["port"]);
-						break;
-					}
-					$version = $data[1];
-					$size = strlen($data[2]);
-					if($version !== CURRENT_PROTOCOL){
-						$this->send(0x1a, array(
-							CURRENT_PROTOCOL,
-							MAGIC,
-							$this->serverID,
-						), false, $packet["ip"], $packet["port"]);
-					}else{
-						$this->send(0x06, array(
-							MAGIC,
-							$this->serverID,
-							0,
-							strlen($packet["raw"]),
-						), false, $packet["ip"], $packet["port"]);
-					}
-					break;
-				case 0x07:
-					if($this->api->ban->isIPBanned($packet["ip"]) or count($this->clients) >= $this->maxClients){
-						$this->send(0x80, array(
-							0,
-							0x00,
-							array(
-								"id" => MC_LOGIN_STATUS,
-								"status" => 1,
-							),
-						), false, $packet["ip"], $packet["port"]);
-						$this->send(0x80, array(
-							1,
-							0x00,
-							array(
-								"id" => MC_DISCONNECT,
-							),
-						), false, $packet["ip"], $packet["port"]);
-						break;
-					}
-					$port = $data[2];
-					$MTU = $data[3];
-					$clientID = $data[4];
-					$this->clients[$CID] = new Player($this, $clientID, $packet["ip"], $packet["port"], $MTU); //New Session!
-					$this->clients[$CID]->handle(0x07, $data);
-					break;
-			}
-		}
-	}
-
-	public function send($pid, $data = array(), $raw = false, $dest = false, $port = false){
-		$this->interface->writePacket($pid, $data, $raw, $dest, $port);
-	}
-
-	public function process(){
-		while($this->stop === false){
-			$packet = $this->interface->readPacket();
-			if($packet !== false){
-				$this->packetHandler($packet);
-			}else{
-				usleep(1);
-			}
-		}
-	}
-
-	public function trigger($event, $data = ""){
-		$this->preparedSQL->selectEvents->reset();
-		$this->preparedSQL->selectEvents->clear();
-		$this->preparedSQL->selectEvents->bindValue(":name", $event, SQLITE3_TEXT);
-		$events = $this->preparedSQL->selectEvents->execute();
-		if($events === false or $events === true){
-			return;
-		}
-		$call = array();
-		while(($evn = $events->fetchArray(SQLITE3_ASSOC)) !== false){
-			$call[(int) $evn["ID"]] = true;
-		}
-		$events->finalize();
-		if(count($call) > 0){
-			foreach($call as $evid => $boolean){
-				$ev = $this->events[$evid];
-				if(!is_callable($ev)){
-					$this->deleteEvent($evid);
-					continue;
-				}
-				if(is_array($ev)){
-					$method = $ev[1];
-					$ev[0]->$method($data, $event);
-				}else{
-					$ev($data, $event);
-				}
-			}
-		}elseif(isset(Deprecation::$events[$event])){
-			$sub = "";
-			if(Deprecation::$events[$event] !== false){
-				$sub = " Substitute \"".Deprecation::$events[$event]."\" found.";
-			}
-			console("[ERROR] Event \"$event\" has been deprecated.$sub [Trigger]");
-		}
-		
-		return true;
-	}
-
-	public function schedule($ticks, $callback, $data = array(), $repeat = false, $eventName = "server.schedule"){
-		if(!is_callable($callback)){
-			return false;
-		}
-		$add = "";
-		$chcnt = $this->scheduleCnt++;
-		if($repeat === false){
-			$add = ' unset($this->schedule['.$chcnt.']);';
-		}
-		$this->schedule[$chcnt] = array($callback, $data, $eventName);
-		$this->action(50000 * $ticks, '$schedule = $this->schedule['.$chcnt.'];'.$add.'if(!is_callable($schedule[0])){unset($this->schedule['.$chcnt.']);return false;} call_user_func($schedule[0], $schedule[1], $schedule[2]);', (bool) $repeat);
-		return $chcnt;
-	}
-
-	public function action($microseconds, $code, $repeat = true){ 
-		$this->query("INSERT INTO actions (interval, last, code, repeat) VALUES(".($microseconds / 1000000).", ".microtime(true).", '".base64_encode($code)."', ".($repeat === true ? 1:0).");");
-		console("[INTERNAL] Attached to action ".$microseconds, true, true, 3);
-	}
-
-	public function tickerFunction($time){
-		//actions that repeat every x time will go here
-		$this->preparedSQL->selectActions->reset();
-		$this->preparedSQL->selectActions->clear();
-		$this->preparedSQL->selectActions->bindValue(":time", $time, SQLITE3_FLOAT);
-		$actions = $this->preparedSQL->selectActions->execute();
-
-		if($actions === false or $actions === true){
-			return;
-		}
-		while(($action = $actions->fetchArray(SQLITE3_ASSOC)) !== false){
-			$return = eval(base64_decode($action["code"]));
-			if($action["repeat"] === 0 or $return === false){
-				$this->query("DELETE FROM actions WHERE ID = ".$action["ID"].";");
-			}
-		}
-		$actions->finalize();
-		$this->preparedSQL->updateActions->reset();
-		$this->preparedSQL->updateActions->clear();
-		$this->preparedSQL->updateActions->bindValue(":time", $time, SQLITE3_FLOAT);
-		$this->preparedSQL->updateActions->execute();
-	}
-
-	public function event($event, $func){
-		if(!is_callable($func)){
-			return false;
-		}elseif(isset(Deprecation::$events[$event])){
-			$sub = "";
-			if(Deprecation::$events[$event] !== false){
-				$sub = " Substitute \"".Deprecation::$events[$event]."\" found.";
-			}
-			console("[ERROR] Event \"$event\" has been deprecated.$sub [Attach to ".(is_array($func) ? get_class($func[0])."::".$func[1]:$func)."]");
-		}
-		$evid = $this->evCnt++;
-		$this->events[$evid] = $func;
-		$this->query("INSERT INTO events (ID, name) VALUES (".$evid.", '".str_replace("'", "\\'", $event)."');");
-		console("[INTERNAL] Attached ".(is_array($func) ? get_class($func[0])."::".$func[1]:$func)." to event ".$event." (ID ".$evid.")", true, true, 3);
-		return $evid;
-	}
-
-	public function deleteEvent($id){
-		$id = (int) $id;
-		unset($this->events[$id]);
-		$this->query("DELETE FROM events WHERE ID = ".$id.";");
-	}
-
-}
--- a/src/classes/block/plant/Sapling.php
+++ b/src/classes/block/plant/Sapling.php
@ -1,38 +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 Sapling{
-	const OAK = 0;
-	const SPRUCE = 1;
-	const BIRCH = 2;
-	const BURN_TIME = 5;
-
-	public static function growTree(LevelAPI $level, $block, $type){
-		$type = $type & 0x03;
-		TreeObject::growTree($level, $block, $type);
-	}
-}
--- a/src/classes/inventory/Item.php
+++ b/src/classes/inventory/Item.php
@ -1,49 +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 Item{
-	public $id;
-	protected $maxStackSize = 64;
-	private $durability = 0;
-	private $name = "Unknown";
-	public function __construct($id){
-		$this->id = (int) $id;
-	}
-	
-	public function setMaxStackSize($size = 64){
-		$this->maxStackSize = (int) $size;
-	}
-	
-	public function getDestroySpeed(Item $item, Entity $entity){
-		return 1;
-	}
-	
-	public function getMaxStackSize(){
-		return $this->maxStackSize;
-	}
-	
-}
--- a/src/classes/inventory/Window.php
+++ b/src/classes/inventory/Window.php
@ -1,39 +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.
-
-
-*/
-
-define("WINDOW_CHEST", 0);
-define("WINDOW_WORKBENCH", 1);
-define("WINDOW_FURNACE", 2);
-
-class Window{
-	private $server;
-	public function __construct(PocketMinecraftServer $server){
-
-	}
-}
-
-?>
--- a/src/classes/network/MinecraftInterface.php
+++ b/src/classes/network/MinecraftInterface.php
@ -1,136 +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 MinecraftInterface{
-	var $pstruct;
-	var $name;
-	var $client;
-	var $dataName;
-	private $socket;
-	private $data;
-	function __construct($server, $port = 25565, $listen = false, $client = true){
-		$this->socket = new UDPSocket($server, $port, (bool) $listen);
-		require("protocol/RakNet.php");
-		require("protocol/packetName.php");
-		require("protocol/current.php");
-		require("protocol/dataName.php");
-		$this->pstruct = $pstruct;
-		$this->name = $packetName;
-		$this->dataName = $dataName;
-		$this->client = (bool) $client;
-		$this->start = microtime(true);
-	}
-
-	public function close(){
-		return $this->socket->close(false);
-	}
-
-	protected function getStruct($pid){
-		if(isset($this->pstruct[$pid])){
-			return $this->pstruct[$pid];
-		}
-		return false;
-	}
-
-	protected function writeDump($pid, $raw, $data, $origin = "client", $ip = "", $port = 0){
-		if(LOG === true and DEBUG >= 3){
-			$p = "[".(microtime(true) - $this->start)."] [".((($origin === "client" and $this->client === true) or ($origin === "server" and $this->client === false)) ? "CLIENT->SERVER":"SERVER->CLIENT")." ".$ip.":".$port."]: ".(isset($data["id"]) ? "MC Packet ".$this->dataName[$pid]:$this->name[$pid])." (0x".Utils::strTohex(chr($pid)).") [length ".strlen($raw)."]".PHP_EOL;
-			$p .= Utils::hexdump($raw);
-			if(is_array($data)){
-				foreach($data as $i => $d){
-					$p .= $i ." => ".(!is_array($d) ? $this->pstruct[$pid][$i]."(".(($this->pstruct[$pid][$i] === "magic" or substr($this->pstruct[$pid][$i], 0, 7) === "special" or is_int($this->pstruct[$pid][$i])) ? Utils::strToHex($d):Utils::printable($d)).")":$this->pstruct[$pid][$i]."(\"".serialize(array_map("Utils::printable", $d))."\")").PHP_EOL;
-				}
-			}
-			$p .= PHP_EOL;
-			logg($p, "packets", false);
-		}
-
-	}
-
-	public function readPacket(){
-		$p = $this->popPacket();
-		if($p !== false){
-			return $p;
-		}
-		if($this->socket->connected === false){
-			return false;
-		}
-		$data = $this->socket->read();
-		if($data[3] === false){
-			return false;
-		}
-		$pid = ord($data[0]);
-		$struct = $this->getStruct($pid);
-		if($struct === false){
-			console("[ERROR] Unknown Packet ID 0x".Utils::strToHex(chr($pid)), true, true, 0);
-			$p = "[".(microtime(true) - $this->start)."] [".((($origin === "client" and $this->client === true) or ($origin === "server" and $this->client === false)) ? "CLIENT->SERVER":"SERVER->CLIENT")." ".$ip.":".$port."]: Error, bad packet id 0x".Utils::strTohex(chr($pid))." [length ".strlen($raw)."]".PHP_EOL;
-			$p .= Utils::hexdump($data[0]);
-			$p .= PHP_EOL;
-			logg($p, "packets", true, 2);
-			return false;
-		}
-
-		$packet = new Packet($pid, $struct, $data[0]);
-		@$packet->parse();
-		$this->data[] = array($pid, $packet->data, $data[0], $data[1], $data[2]);
-		return $this->popPacket();
-	}
-
-	public function popPacket(){
-		if(count($this->data) > 0){
-			$p = array_shift($this->data);
-			if(isset($p[1]["packets"]) and is_array($p[1]["packets"])){
-				foreach($p[1]["packets"] as $d){
-					$this->data[] = array($p[0], $d[1], $d[2], $p[3], $p[4]);
-				}
-			}
-			$c = (isset($p[1]["id"]) ? true:false);
-			$p[2] = $c ? chr($p[1]["id"]).$p[2]:$p[2];
-			$this->writeDump(($c ? $p[1]["id"]:$p[0]), $p[2], $p[1], "server", $p[3], $p[4]);
-			return array("pid" => $p[0], "data" => $p[1], "raw" => $p[2], "ip" => $p[3], "port" => $p[4]);
-		}
-		return false;
-	}
-
-	public function writePacket($pid, $data = array(), $raw = false, $dest = false, $port = false){
-		$struct = $this->getStruct($pid);
-		if($raw === false){
-			$packet = new Packet($pid, $struct);
-			$packet->data = $data;
-			@$packet->create();
-			$write = $this->socket->write($packet->raw, $dest, $port);
-			$this->writeDump($pid, $packet->raw, $data, "client", $dest, $port);
-		}else{
-			$write = $this->socket->write($data, $dest, $port);
-			$this->writeDump($pid, $data, false, "client", $dest, $port);
-		}
-		return true;
-	}
-
-}
-
-?>
--- a/src/classes/network/Packet.php
+++ b/src/classes/network/Packet.php
@ -1,238 +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 Packet{
-	private $struct, $sock;
-	protected $pid, $packet;
-	public $data, $raw;
-
-	function __construct($pid, $struct, $data = ""){
-		$this->pid = $pid;
-		$this->offset = 1;
-		$this->raw = $data;
-		$this->data = array();
-		if($data === ""){
-			$this->addRaw(chr($pid));
-		}
-		$this->struct = $struct;
-		$this->sock = $sock;
-	}
-
-	public function create($raw = false){
-		foreach($this->struct as $field => $type){
-			if(!isset($this->data[$field])){
-				$this->data[$field] = "";
-			}
-			if($raw === true){
-				$this->addRaw($this->data[$field]);
-				continue;
-			}
-			if(is_int($type)){
-				$this->addRaw($this->data[$field]);
-				continue;
-			}
-			switch($type){
-				case "special1":
-					switch($this->pid){
-						case 0xc0:
-						case 0xa0:
-							if($this->data[1] === false){
-								$this->addRaw($this->data[$field]);
-							}
-							break;
-						case 0x05:
-							$this->addRaw($this->data[$field]);
-							break;
-					}
-					break;
-				case "customData":
-					switch($this->data[1]){
-						case 0x40:
-							$reply = new CustomPacketHandler($this->data[$field]["id"], "", $this->data[$field], true);
-							$this->addRaw(Utils::writeShort((strlen($reply->raw) + 1) << 3));
-							$this->addRaw(Utils::writeTriad(strrev($this->data[$field]["count"])));
-							$this->addRaw(chr($this->data[$field]["id"]));
-							$this->addRaw($reply->raw);
-							break;
-						case 0x00:
-							$reply = new CustomPacketHandler($this->data[$field]["id"], "", $this->data[$field], true);
-							$this->addRaw(Utils::writeShort((strlen($reply->raw) + 1) << 3));
-							$this->addRaw(chr($this->data[$field]["id"]));
-							$this->addRaw($reply->raw);
-							break;
-					}
-					break;
-				case "magic":
-					$this->addRaw(MAGIC);
-					break;
-				case "float":
-					$this->addRaw(Utils::writeFloat($this->data[$field]));
-					break;
-				case "triad":
-					$this->addRaw(Utils::writeTriad($this->data[$field]));
-					break;
-				case "itriad":
-					$this->addRaw(strrev(Utils::writeTriad($this->data[$field])));
-					break;
-				case "int":
-					$this->addRaw(Utils::writeInt($this->data[$field]));
-					break;
-				case "double":
-					$this->addRaw(Utils::writeDouble($this->data[$field]));
-					break;
-				case "long":
-					$this->addRaw(Utils::writeLong($this->data[$field]));
-					break;
-				case "bool":
-				case "boolean":
-					$this->addRaw(Utils::writeBool($this->data[$field]));
-					break;
-				case "ubyte":
-				case "byte":
-					$this->addRaw(Utils::writeByte($this->data[$field]));
-					break;
-				case "short":
-					$this->addRaw(Utils::writeShort($this->data[$field]));
-					break;
-				case "byteArray":
-					$this->addRaw($this->data[$field]);
-					break;
-				case "string":
-					$this->addRaw(Utils::writeShort(strlen($this->data[$field])));
-					$this->addRaw($this->data[$field]);
-					break;
-				case "slotData":
-					$this->addRaw(Utils::writeShort($this->data[$field][0]));
-					if($this->data[$field][0]!=-1){
-						$this->addRaw(Utils::writeByte($this->data[$field][1]));
-						$this->addRaw(Utils::writeShort($this->data[$field][2]));
-					}
-					break;
-				default:
-					$this->addRaw(Utils::writeByte($this->data[$field]));
-					break;
-			}
-		}
-	}
-
-	private function get($len = true){
-		if($len === true){
-			$data = substr($this->raw, $this->offset);
-			$this->offset = strlen($this->raw);
-			return $data;
-		}
-		$data = substr($this->raw, $this->offset, $len);
-		$this->offset += $len;
-		return $data;
-	}
-
-	protected function addRaw($str){
-		$this->raw .= $str;
-		return $str;
-	}
-
-	public function parse(){
-		$continue = true;
-		foreach($this->struct as $field => $type){
-			if(is_int($type)){
-				$this->data[] = $this->get($type);
-				continue;
-			}
-			switch($type){
-				case "special1":
-					switch($this->pid){
-						case 0xc0:
-						case 0xa0:
-							if($this->data[1] === false){
-								$this->data[] = $this->get(3);
-							}
-							break;
-						case 0x05:
-							$this->data[] = $this->get(true);
-							break;
-					}
-					break;
-				case "customData":
-					$d = new SerializedPacketHandler($this->data[1], $this->get(true));
-					if(isset($d->data["packets"])){
-						$this->data["packets"] = $d->data["packets"];
-					}else{
-						$this->data[] = $d->data;
-					}
-					break;
-				case "magic":
-					$this->data[] = $this->get(16);
-					break;
-				case "triad":
-					$this->data[] = Utils::readTriad($this->get(3));
-					break;
-				case "itriad":
-					$this->data[] = Utils::readTriad(strrev($this->get(3)));
-					break;
-				case "int":
-					$this->data[] = Utils::readInt($this->get(4));
-					break;
-				case "string":
-					$this->data[] = $this->get(Utils::readShort($this->get(2)));
-					break;
-				case "long":
-					$this->data[] = Utils::readLong($this->get(8));
-					break;
-				case "byte":
-					$this->data[] = Utils::readByte($this->get(1));
-					break;
-				case "ubyte":
-					$this->data[] = ord($this->get(1));
-					break;
-				case "float":
-					$this->data[] = Utils::readFloat($this->get(4));
-					break;
-				case "double":
-					$this->data[] = Utils::readDouble($this->get(8));
-					break;
-				case "ushort":
-					$this->data[] = Utils::readShort($this->get(2), false);
-					break;
-				case "short":
-					$this->data[] = Utils::readShort($this->get(2));
-					break;
-				case "bool":
-				case "boolean":
-					$this->data[] = Utils::readBool($this->get(1));
-					break;
-			}
-			if($continue === false){
-				break;
-			}
-		}
-	}
-
-
-
-
-}
--- a/src/classes/network/SerializedPacketHandler.php
+++ b/src/classes/network/SerializedPacketHandler.php
@ -1,87 +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 SerializedPacketHandler{
-	var $offset, $raw, $c, $data, $name = "";
-
-	private function get($len = true, $check = true){
-		if($len === true){
-			$data = substr($this->raw, $this->offset);
-			if($check === true){
-				$this->offset = strlen($this->raw);
-			}
-			return $data;
-		}
-		$data = substr($this->raw, $this->offset, $len);
-		if($check === true){
-			$this->offset += $len;
-		}
-		return $data;
-	}
-
-	public function __construct($pid, $raw = "", $data = array(), $create = false){
-		$this->raw = $raw;
-		$this->data = $data;
-		$this->offset = 0;
-		$this->c = (bool) $create;
-		switch($pid){
-			case 0x60:
-			case 0x40:
-			case 0x00:
-				if($this->c === false){
-					$this->data["packets"] = array();
-					$i = 0;
-					while($this->offset < strlen($this->raw)){
-						if($i > 0){
-							$pid = ord($this->get(1));
-						}
-
-						$len = ceil(Utils::readShort($this->get(2), false) / 8); //Utils::readShort($this->get(2), false) >> 3;
-						if($pid !== 0x00){
-							$c = Utils::readTriad(strrev($this->get(3)));
-						}
-						if($pid === 0x60 and $i === 0){
-							$this->data["unknown1"] = $this->get(4);
-						}
-						$id = ord($this->get(1));
-						$raw = $this->get($len - 1);
-						$pk = new CustomPacketHandler($id, $raw);
-						$pk->data["length"] = $len;
-						$pk->data["id"] = $id;
-						if($pid !== 0x00){
-							$pk->data["counter"] = $c;
-						}
-						$pk->data["packetName"] = $pk->name;
-						$this->data["packets"][] = array($pid, $pk->data, $raw);
-						++$i;
-					}
-				}
-				break;
-		}
-	}
-
-}
--- a/src/classes/network/UDPSocket.php
+++ b/src/classes/network/UDPSocket.php
@ -1,92 +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 UDPSocket{
-	private $encrypt;
-	var $buffer, $connected, $errors, $sock, $server;
-	function __construct($server, $port, $listen = false){
-		$this->errors = array_fill(88,(125 - 88) + 1, true);
-		$this->server = $server;
-		$this->port = $port;
-		$this->sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
-		socket_set_option($this->sock, SOL_SOCKET, SO_BROADCAST, 1); //Allow sending broadcast messages
-		if($listen !== true){
-			$this->connected = true;
-			$this->buffer = array();
-			$this->unblock();
-		}else{
-			if(socket_bind($this->sock, "0.0.0.0", $port) === true){
-				$this->unblock();
-			}else{
-				console("[ERROR] Couldn't bind to 0.0.0.0:".$port, true, true, 0);
-				die();
-			}
-		}
-	}
-
-	public function listenSocket(){
-		$sock = @socket_accept($this->sock);
-		if($sock !== false){
-			$sock = new Socket(false, false, false, $sock);
-			$sock->unblock();
-			return $sock;
-		}
-		return false;
-	}
-
-	public function close($error = 125){
-		$this->connected = false;
-		if($error !== false){
-			console("[ERROR] [Socket] Socket closed, Error $error: ".socket_strerror($error));
-		}
-		return @socket_close($this->sock);
-	}
-
-	public function block(){
-		socket_set_block($this->sock);
-	}
-
-	public function unblock(){
-		socket_set_nonblock($this->sock);
-	}
-
-	public function read(){
-		$source = false;
-		$port = 1;
-		$len = @socket_recvfrom($this->sock, $buf, 65536, 0, $source, $port);
-		return array($buf, $source, $port, $len);
-	}
-
-	public function write($data, $dest = false, $port = false){
-		return @socket_sendto($this->sock, $data, strlen($data), 0, ($dest === false ? $this->server:$dest), ($port === false ? $this->port:$port));
-	}
-
-}
-
-?>
--- a/src/classes/utils/BigInteger.php
+++ b/src/classes/utils/BigInteger.php
--- a/src/classes/utils/NBT.php
+++ b/src/classes/utils/NBT.php
@ -1,102 +0,0 @@
-<?php
-/**
- * Class for reading in NBT-format files.
- *
- * @author  Justin Martin <frozenfire@thefrozenfire.com>
- * @version 1.0
- * MODIFIED BY @shoghicp
- *
- * Dependencies:
- *  PHP 4.3+ (5.3+ recommended)
- */
-
-class NBT {
-	public $root = array();
-
-	const TAG_END = 0;
-	const TAG_BYTE = 1;
-	const TAG_SHORT = 2;
-	const TAG_INT = 3;
-	const TAG_LONG = 4;
-	const TAG_FLOAT = 5;
-	const TAG_DOUBLE = 6;
-	const TAG_BYTE_ARRAY = 7;
-	const TAG_STRING = 8;
-	const TAG_LIST = 9;
-	const TAG_COMPOUND = 10;
-
-	public function loadFile($filename) {
-		if(is_file($filename)) {
-			$fp = fopen($filename, "rb");
-		}else{
-			trigger_error("First parameter must be a filename", E_USER_WARNING);
-			return false;
-		}
-		switch(basename($filename, ".dat")){
-			case "level":
-				$version = Utils::readLInt(fread($fp, 4));
-				$lenght = Utils::readLInt(fread($fp, 4));
-				break;
-			case "entities":
-				fread($fp, 12);
-				break;
-		}
-		$this->traverseTag($fp, $this->root);
-		return end($this->root);
-	}
-
-	public function traverseTag($fp, &$tree) {
-		if(feof($fp)) {
-			return false;
-		}
-		$tagType = $this->readType($fp, self::TAG_BYTE); // Read type byte.
-		if($tagType == self::TAG_END) {
-			return false;
-		} else {
-			$tagName = $this->readType($fp, self::TAG_STRING);
-			$tagData = $this->readType($fp, $tagType);
-			$tree[] = array("type"=>$tagType, "name"=>$tagName, "value"=>$tagData);
-			return true;
-		}
-	}
-
-	public function readType($fp, $tagType) {
-		switch($tagType) {
-			case self::TAG_BYTE: // Signed byte (8 bit)
-				return Utils::readByte(fread($fp, 1));
-			case self::TAG_SHORT: // Signed short (16 bit, big endian)
-				return Utils::readLShort(fread($fp, 2));
-			case self::TAG_INT: // Signed integer (32 bit, big endian)
-				return Utils::readLInt(fread($fp, 4));
-			case self::TAG_LONG: // Signed long (64 bit, big endian)
-				return Utils::readLLong(fread($fp, 8));
-			case self::TAG_FLOAT: // Floating point value (32 bit, big endian, IEEE 754-2008)
-				return Utils::readLFloat(fread($fp, 4));
-			case self::TAG_DOUBLE: // Double value (64 bit, big endian, IEEE 754-2008)
-				return Utils::readLDouble(fread($fp, 8));
-			case self::TAG_BYTE_ARRAY: // Byte array
-				$arrayLength = $this->readType($fp, self::TAG_INT);
-				$array = array();
-				for($i = 0; $i < $arrayLength; $i++) $array[] = $this->readType($fp, self::TAG_BYTE);
-				return $array;
-			case self::TAG_STRING: // String
-				if(!$stringLength = $this->readType($fp, self::TAG_SHORT)) return "";
-				$string = fread($fp, $stringLength); // Read in number of bytes specified by string length, and decode from utf8.
-				return $string;
-			case self::TAG_LIST: // List
-				$tagID = $this->readType($fp, self::TAG_BYTE);
-				$listLength = $this->readType($fp, self::TAG_INT);
-				$list = array("type"=>$tagID, "value"=>array());
-				for($i = 0; $i < $listLength; $i++) {
-					if(feof($fp)) break;
-					$list["value"][] = $this->readType($fp, $tagID);
-				}
-				return $list;
-			case self::TAG_COMPOUND: // Compound
-				$tree = array();
-				while($this->traverseTag($fp, $tree));
-				return $tree;
-		}
-	}
-}
-?>
--- a/src/classes/utils/TickLoop.php
+++ b/src/classes/utils/TickLoop.php
@ -1,49 +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 TickLoop extends Thread{
-	public $tick, $stop, $lastTic;
-	private $server;
-	public function __construct(PocketMinecraftServer $server){
-		$this->tick = false;
-		$this->lastTick = 0;
-		$this->server = $server;
-	}
-	public function run(){
-		while($this->stop !== true){
-			usleep(1);
-			$time = microtime(true);
-			if($this->lastTick <= ($time - 0.05)){
-				$this->lastTick = $time;
-				$this->tick = true;
-				$this->wait();
-				$this->tick = false;
-			}
-		}
-		exit(0);
-	}
-}
--- a/src/classes/world/Entity.php
+++ b/src/classes/world/Entity.php
@ -1,284 +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.
-
-
-*/
-
-
-define("ENTITY_PLAYER", 0);
-define("ENTITY_MOB", 1);
-define("ENTITY_OBJECT", 2);
-define("ENTITY_ITEM", 3);
-define("ENTITY_PAINTING", 4);
-
-class Entity extends stdClass{
-	var $invincible = false, $eid, $type, $name, $x, $y, $z, $speedX, $speedY, $speedZ, $speed, $last = array(0, 0, 0, 0), $yaw, $pitch, $dead, $data, $class, $attach, $metadata, $closed, $player, $onTick;
-	private $server;
-	function __construct($server, $eid, $class, $type = 0, $data = array()){
-		$this->server = $server;
-		$this->eid = (int) $eid;
-		$this->type = (int) $type;
-		$this->class = (int) $class;
-		$this->player = false;
-		$this->attach = false;
-		$this->data = $data;
-		$this->status = 0;
-		$this->health = 20;
-		$this->dead = false;
-		$this->closed = false;
-		$this->name = "";
-		$this->server->query("INSERT OR REPLACE INTO entities (EID, type, class, health) VALUES (".$this->eid.", ".$this->type.", ".$this->class.", ".$this->health.");");
-		$this->server->schedule(4, array($this, "update"), array(), true);
-		$this->metadata = array();
-		$this->x = isset($this->data["x"]) ? $this->data["x"]:0;
-		$this->y = isset($this->data["y"]) ? $this->data["y"]:0;
-		$this->z = isset($this->data["z"]) ? $this->data["z"]:0;
-		$this->speedX = isset($this->data["speedX"]) ? $this->data["speedX"]:0;
-		$this->speedY = isset($this->data["speedY"]) ? $this->data["speedY"]:0;
-		$this->speedZ = isset($this->data["speedZ"]) ? $this->data["speedZ"]:0;
-		$this->speed = 0;
-		$this->yaw = isset($this->data["yaw"]) ? $this->data["yaw"]:0;
-		$this->pitch = isset($this->data["pitch"]) ? $this->data["pitch"]:0;
-		$this->position = array("x" => &$this->x, "y" => &$this->y, "z" => &$this->z, "yaw" => &$this->yaw, "pitch" => &$this->pitch);
-		switch($this->class){
-			case ENTITY_PLAYER:
-				$this->player = $this->data["player"];
-				$this->health = &$this->player->data["health"];
-				break;
-			case ENTITY_ITEM:
-				$this->meta = (int) $this->data["meta"];
-				$this->stack = (int) $this->data["stack"];
-				break;
-			case ENTITY_MOB:
-				//$this->setName((isset($mobs[$this->type]) ? $mobs[$this->type]:$this->type));
-				break;
-			case ENTITY_OBJECT:
-				//$this->setName((isset($objects[$this->type]) ? $objects[$this->type]:$this->type));
-				break;
-		}
-	}
-
-	public function update(){
-		$this->calculateVelocity();
-		$this->server->api->dhandle("entity.move", $this);
-		if($this->class === ENTITY_ITEM and $this->closed === false and $this->server->gamemode === 0){
-			$player = $this->server->query("SELECT EID FROM entities WHERE class == ".ENTITY_PLAYER." AND abs(x - {$this->x}) <= 1.5 AND abs(y - {$this->y}) <= 1.5 AND abs(z - {$this->z}) <= 1.5 LIMIT 1;", true);
-			if($player !== true and $player !== false){
-				if($this->server->api->dhandle("player.pickup", array(
-					"eid" => $player["EID"],
-					"entity" => $this,
-					"block" => $this->type,
-					"meta" => $this->meta,
-					"target" => $this->eid
-				)) !== false){
-					$this->close();
-				}
-			}
-		}
-	}
-
-	public function getDirection(){
-		$rotation = ($this->yaw - 90) % 360;
-		if ($rotation < 0) {
-			$rotation += 360.0;
-		}
-		if(0 <= $rotation && $rotation < 45) {
-			return 2;
-		}elseif(45 <= $rotation && $rotation < 135) {
-			return 3;
-		}elseif(135 <= $rotation && $rotation < 225) {
-			return 0;
-		}elseif(225 <= $rotation && $rotation < 315) {
-			return 1;
-		}elseif(315 <= $rotation && $rotation < 360) {
-			return 2;
-		}else{
-			return null;
-		}
-	}
-
-	public function spawn($player){
-		if(!is_object($player)){
-			$player = $this->server->api->player->get($player);
-		}
-		if($player->eid === $this->eid){
-			return false;
-		}
-		switch($this->class){
-			case ENTITY_PLAYER:
-				$player->dataPacket(MC_ADD_PLAYER, array(
-					"clientID" => $this->player->clientID,
-					"username" => $this->player->username,
-					"eid" => $this->eid,
-					"x" => $this->x,
-					"y" => $this->y,
-					"z" => $this->z,
-				));
-				$player->dataPacket(MC_PLAYER_EQUIPMENT, array(
-					"eid" => $this->eid,
-					"block" => $this->player->equipment[0],
-					"meta" => $this->player->equipment[1],
-				));
-				break;
-			case ENTITY_ITEM:
-				$player->dataPacket(MC_ADD_ITEM_ENTITY, array(
-					"eid" => $this->eid,
-					"x" => $this->x,
-					"y" => $this->y,
-					"z" => $this->z,
-					"block" => $this->type,
-					"meta" => $this->meta,
-					"stack" => $this->stack,
-				));
-				break;
-			case ENTITY_MOB:
-				$player->dataPacket(MC_ADD_MOB, array(
-					"type" => $this->type,
-					"eid" => $this->eid,
-					"x" => $this->x,
-					"y" => $this->y,
-					"z" => $this->z,
-				));
-				break;
-			case ENTITY_OBJECT:
-				//$this->setName((isset($objects[$this->type]) ? $objects[$this->type]:$this->type));
-				break;
-		}
-	}
-
-	public function close(){
-		if($this->closed === false){
-			$this->server->api->entity->remove($this->eid);
-			$this->closed = true;
-		}
-	}
-
-	public function __destruct(){
-		$this->close();
-	}
-
-	public function getEID(){
-		return $this->eid;
-	}
-
-	public function getName(){
-		return $this->name;
-	}
-
-	public function setName($name){
-		$this->name = $name;
-		$this->server->query("UPDATE entities SET name = '".str_replace("'", "", $this->name)."' WHERE EID = ".$this->eid.";");
-	}
-
-	public function look($pos2){
-		$pos = $this->getPosition();
-		$angle = Utils::angle3D($pos2, $pos);
-		$this->yaw = $angle["yaw"];
-		$this->pitch = $angle["pitch"];
-		$this->server->query("UPDATE entities SET pitch = ".$this->pitch.", yaw = ".$this->yaw." WHERE EID = ".$this->eid.";");
-	}
-
-	public function setCoords($x, $y, $z){
-		$this->x = $x;
-		$this->y = $y;
-		$this->z = $z;
-		$this->server->query("UPDATE entities SET x = ".$this->x.", y = ".$this->y.", z = ".$this->z." WHERE EID = ".$this->eid.";");
-	}
-
-	public function move($x, $y, $z, $yaw = 0, $pitch = 0){
-		$this->x += $x;
-		$this->y += $y;
-		$this->z += $z;
-		$this->yaw += $yaw;
-		$this->yaw %= 360;
-		$this->pitch += $pitch;
-		$this->pitch %= 90;
-		$this->server->query("UPDATE entities SET x = ".$this->x.", y = ".$this->y.", z = ".$this->z.", pitch = ".$this->pitch.", yaw = ".$this->yaw." WHERE EID = ".$this->eid.";");
-	}
-
-	public function setPosition($x, $y, $z, $yaw, $pitch){
-		$this->x = $x;
-		$this->y = $y;
-		$this->z = $z;
-		$this->yaw = $yaw;
-		$this->pitch = $pitch;
-		$this->server->query("UPDATE entities SET x = ".$this->x.", y = ".$this->y.", z = ".$this->z.", pitch = ".$this->pitch.", yaw = ".$this->yaw." WHERE EID = ".$this->eid.";");
-	}
-	
-	public function inBlock($x, $y, $z){
-		$block = new Vector3($x + 0.5, $y, $z + 0.5);
-		$me = new Vector3($this->x, $this->y, $this->z);
-		if(($y == ((int) $this->y) or $y == (((int) $this->y) + 1)) and $block->maxPlainDistance($me) < 0.8){
-			return true;
-		}
-		return false;
-	}
-	
-	public function calculateVelocity(){
-		$diffTime = microtime(true) - $this->last[3];
-		$this->last[3] = microtime(true);
-		$origin = new Vector3($this->last[0], $this->last[1], $this->last[2]);
-		$final = new Vector3($this->x, $this->y, $this->z);
-		$speedX = abs($this->x - $this->last[0]) / $diffTime;
-		$this->last[0] = $this->x;
-		$speedY = ($this->y - $this->last[1]) / $diffTime;
-		$this->last[1] = $this->y;
-		$speedZ = abs($this->z - $this->last[2]) / $diffTime;
-		$this->last[2] = $this->z;
-		$this->speedX = $speedX;
-		$this->speedY = $speedY;
-		$this->speedZ = $speedZ;		
-		$this->speed = $origin->distance($final) / $diffTime;
-	}
-
-	public function getPosition($round = false){
-		return !isset($this->position) ? false:($round === true ? array_map("floor", $this->position):$this->position);
-	}
-
-	public function setHealth($health, $cause = ""){
-		$this->health = (int) $health;
-		$this->server->query("UPDATE entities SET health = ".$this->health." WHERE EID = ".$this->eid.";");
-		$this->server->api->dhandle("entity.health.change", array("eid" => $this->eid, "health" => $health, "cause" => $cause));
-		if($this->player !== false){
-			$this->player->dataPacket(MC_SET_HEALTH, array(
-				"health" => $this->health,
-			));
-		}
-		if($this->health <= 0 and $this->dead === false){
-			$this->dead = true;
-			if($this->player !== false){
-				$this->server->api->dhandle("player.death", array("name" => $this->name, "cause" => $cause));
-			}
-		}elseif($this->health > 0){
-			$this->dead = false;
-		}
-	}
-
-	public function getHealth(){
-		return $this->health;
-	}
-
-}
-
-?>
--- a/src/classes/world/TileEntity.php
+++ b/src/classes/world/TileEntity.php
@ -1,36 +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 TileEntity extends stdClass{
-	private $server;
-	function __construct(PocketMinecraftServer $server){
-
-	}
-
-}
-
-?>
--- a/src/classes/world/generator/Generator.class.php
+++ b/src/classes/world/generator/Generator.class.php
@ -1,357 +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 WorldGenerator{
-	private $gen, $seed, $genName, $raw;
-	public function __construct($genName, $seed){
-		$this->seed = (int) $seed;
-		$this->raw = b"";
-		$this->genName = $genName;
-		$this->gen = new $genName($this->seed);
-	}
-
-	public function getSpawn(){
-		return $this->gen->getSpawn();
-	}
-
-	public function set($name, $value){
-		$this->gen->set($name, $value);
-	}
-
-	public function init(){
-		$this->raw = "\x15\x01\x00\x00\x15\x16\x00\x00\x15\x2b\x00\x00\x15\x40\x00\x00". //Location Header
-		"\x15\x55\x00\x00\x15\x6a\x00\x00\x15\x7f\x00\x00\x15\x94\x00\x00".
-		"\x15\xa9\x00\x00\x15\xbe\x00\x00\x15\xd3\x00\x00\x15\xe8\x00\x00".
-		"\x15\xfd\x00\x00\x15\x12\x01\x00\x15\x27\x01\x00\x15\x3c\x01\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x15\x51\x01\x00\x15\x66\x01\x00\x15\x7b\x01\x00\x15\x90\x01\x00".
-		"\x15\xa5\x01\x00\x15\xba\x01\x00\x15\xcf\x01\x00\x15\xe4\x01\x00".
-		"\x15\xf9\x01\x00\x15\x0e\x02\x00\x15\x23\x02\x00\x15\x38\x02\x00".
-		"\x15\x4d\x02\x00\x15\x62\x02\x00\x15\x77\x02\x00\x15\x8c\x02\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x15\xa1\x02\x00\x15\xb6\x02\x00\x15\xcb\x02\x00\x15\xe0\x02\x00".
-		"\x15\xf5\x02\x00\x15\x0a\x03\x00\x15\x1f\x03\x00\x15\x34\x03\x00".
-		"\x15\x49\x03\x00\x15\x5e\x03\x00\x15\x73\x03\x00\x15\x88\x03\x00".
-		"\x15\x9d\x03\x00\x15\xb2\x03\x00\x15\xc7\x03\x00\x15\xdc\x03\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x15\xf1\x03\x00\x15\x06\x04\x00\x15\x1b\x04\x00\x15\x30\x04\x00".
-		"\x15\x45\x04\x00\x15\x5a\x04\x00\x15\x6f\x04\x00\x15\x84\x04\x00".
-		"\x15\x99\x04\x00\x15\xae\x04\x00\x15\xc3\x04\x00\x15\xd8\x04\x00".
-		"\x15\xed\x04\x00\x15\x02\x05\x00\x15\x17\x05\x00\x15\x2c\x05\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x15\x41\x05\x00\x15\x56\x05\x00\x15\x6b\x05\x00\x15\x80\x05\x00".
-		"\x15\x95\x05\x00\x15\xaa\x05\x00\x15\xbf\x05\x00\x15\xd4\x05\x00".
-		"\x15\xe9\x05\x00\x15\xfe\x05\x00\x15\x13\x06\x00\x15\x28\x06\x00".
-		"\x15\x3d\x06\x00\x15\x52\x06\x00\x15\x67\x06\x00\x15\x7c\x06\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x15\x91\x06\x00\x15\xa6\x06\x00\x15\xbb\x06\x00\x15\xd0\x06\x00".
-		"\x15\xe5\x06\x00\x15\xfa\x06\x00\x15\x0f\x07\x00\x15\x24\x07\x00".
-		"\x15\x39\x07\x00\x15\x4e\x07\x00\x15\x63\x07\x00\x15\x78\x07\x00".
-		"\x15\x8d\x07\x00\x15\xa2\x07\x00\x15\xb7\x07\x00\x15\xcc\x07\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x15\xe1\x07\x00\x15\xf6\x07\x00\x15\x0b\x08\x00\x15\x20\x08\x00".
-		"\x15\x35\x08\x00\x15\x4a\x08\x00\x15\x5f\x08\x00\x15\x74\x08\x00".
-		"\x15\x89\x08\x00\x15\x9e\x08\x00\x15\xb3\x08\x00\x15\xc8\x08\x00".
-		"\x15\xdd\x08\x00\x15\xf2\x08\x00\x15\x07\x09\x00\x15\x1c\x09\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x15\x31\x09\x00\x15\x46\x09\x00\x15\x5b\x09\x00\x15\x70\x09\x00".
-		"\x15\x85\x09\x00\x15\x9a\x09\x00\x15\xaf\x09\x00\x15\xc4\x09\x00".
-		"\x15\xd9\x09\x00\x15\xee\x09\x00\x15\x03\x0a\x00\x15\x18\x0a\x00".
-		"\x15\x2d\x0a\x00\x15\x42\x0a\x00\x15\x57\x0a\x00\x15\x6c\x0a\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x15\x81\x0a\x00\x15\x96\x0a\x00\x15\xab\x0a\x00\x15\xc0\x0a\x00".
-		"\x15\xd5\x0a\x00\x15\xea\x0a\x00\x15\xff\x0a\x00\x15\x14\x0b\x00".
-		"\x15\x29\x0b\x00\x15\x3e\x0b\x00\x15\x53\x0b\x00\x15\x68\x0b\x00".
-		"\x15\x7d\x0b\x00\x15\x92\x0b\x00\x15\xa7\x0b\x00\x15\xbc\x0b\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x15\xd1\x0b\x00\x15\xe6\x0b\x00\x15\xfb\x0b\x00\x15\x10\x0c\x00".
-		"\x15\x25\x0c\x00\x15\x3a\x0c\x00\x15\x4f\x0c\x00\x15\x64\x0c\x00".
-		"\x15\x79\x0c\x00\x15\x8e\x0c\x00\x15\xa3\x0c\x00\x15\xb8\x0c\x00".
-		"\x15\xcd\x0c\x00\x15\xe2\x0c\x00\x15\xf7\x0c\x00\x15\x0c\x0d\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x15\x21\x0d\x00\x15\x36\x0d\x00\x15\x4b\x0d\x00\x15\x60\x0d\x00".
-		"\x15\x75\x0d\x00\x15\x8a\x0d\x00\x15\x9f\x0d\x00\x15\xb4\x0d\x00".
-		"\x15\xc9\x0d\x00\x15\xde\x0d\x00\x15\xf3\x0d\x00\x15\x08\x0e\x00".
-		"\x15\x1d\x0e\x00\x15\x32\x0e\x00\x15\x47\x0e\x00\x15\x5c\x0e\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x15\x71\x0e\x00\x15\x86\x0e\x00\x15\x9b\x0e\x00\x15\xb0\x0e\x00".
-		"\x15\xc5\x0e\x00\x15\xda\x0e\x00\x15\xef\x0e\x00\x15\x04\x0f\x00".
-		"\x15\x19\x0f\x00\x15\x2e\x0f\x00\x15\x43\x0f\x00\x15\x58\x0f\x00".
-		"\x15\x6d\x0f\x00\x15\x82\x0f\x00\x15\x97\x0f\x00\x15\xac\x0f\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x15\xc1\x0f\x00\x15\xd6\x0f\x00\x15\xeb\x0f\x00\x15\x00\x10\x00".
-		"\x15\x15\x10\x00\x15\x2a\x10\x00\x15\x3f\x10\x00\x15\x54\x10\x00".
-		"\x15\x69\x10\x00\x15\x7e\x10\x00\x15\x93\x10\x00\x15\xa8\x10\x00".
-		"\x15\xbd\x10\x00\x15\xd2\x10\x00\x15\xe7\x10\x00\x15\xfc\x10\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x15\x11\x11\x00\x15\x26\x11\x00\x15\x3b\x11\x00\x15\x50\x11\x00".
-		"\x15\x65\x11\x00\x15\x7a\x11\x00\x15\x8f\x11\x00\x15\xa4\x11\x00".
-		"\x15\xb9\x11\x00\x15\xce\x11\x00\x15\xe3\x11\x00\x15\xf8\x11\x00".
-		"\x15\x0d\x12\x00\x15\x22\x12\x00\x15\x37\x12\x00\x15\x4c\x12\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x15\x61\x12\x00\x15\x76\x12\x00\x15\x8b\x12\x00\x15\xa0\x12\x00".
-		"\x15\xb5\x12\x00\x15\xca\x12\x00\x15\xdf\x12\x00\x15\xf4\x12\x00".
-		"\x15\x09\x13\x00\x15\x1e\x13\x00\x15\x33\x13\x00\x15\x48\x13\x00".
-		"\x15\x5d\x13\x00\x15\x72\x13\x00\x15\x87\x13\x00\x15\x9c\x13\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x15\xb1\x13\x00\x15\xc6\x13\x00\x15\xdb\x13\x00\x15\xf0\x13\x00".
-		"\x15\x05\x14\x00\x15\x1a\x14\x00\x15\x2f\x14\x00\x15\x44\x14\x00".
-		"\x15\x59\x14\x00\x15\x6e\x14\x00\x15\x83\x14\x00\x15\x98\x14\x00".
-		"\x15\xad\x14\x00\x15\xc2\x14\x00\x15\xd7\x14\x00\x15\xec\x14\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00".
-		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00";
-		$this->gen->init();
-	}
-
-	public function generate(){
-		for($Z = 0; $Z < 16; ++$Z){
-			for($X = 0; $X < 16; ++$X){
-				$chunk = str_pad($this->getChunk($X, $Z), 86012, "\x00", STR_PAD_RIGHT);
-				$this->raw .= Utils::writeLInt(strlen($chunk)) . $chunk;
-			}
-			console("[DEBUG] Generating level ".ceil(($Z + 1)/0.16)."%", true, true, 2);
-		}
-		return true;
-	}
-
-	private function getChunk($X, $Z){
-		$chunk = b"";
-		$columns = array();
-		$X *= 16;
-		$Z *= 16;
-		for($x = 0; $x < 16; ++$x){
-			for($z = 0; $z < 16; ++$z){
-				$columns[$x * 16 + $z] = $this->gen->getColumn($X + $x, $Z + $z);
-			}
-		}
-		for($i = 0; $i < 4; ++$i){
-			for($x = 0; $x < 16; ++$x){
-				for($z = 0; $z < 16; ++$z){
-					$chunk .= $columns[$x * 16 + $z][$i];
-				}
-			}
-		}
-		unset($columns);
-		return $chunk;
-	}
-
-	public function save($dir, $name){
-		@mkdir($dir, 0777, true);
-		file_put_contents($dir."chunks.dat", $this->raw);
-		$s = $this->getSpawn();
-		$array = array();
-		file_put_contents($dir."entities.dat", serialize($array));
-		file_put_contents($dir."tileEntities.dat", serialize($array));
-		$level = array(
-			"LevelName" => $name,
-			"Time" => 0,
-			"Gamemode" => 1,
-			"RandomSeed" => $this->seed,
-			"Generator" => $this->genName,
-			"SpawnX" => $s[0],
-			"SpawnY" => $s[1],
-			"SpawnZ" => $s[2],
-		);
-		file_put_contents($dir."level.dat", serialize($level));
-	}
-
-}
--- a/src/classes/world/generator/NormalGenerator.class.php
+++ b/src/classes/world/generator/NormalGenerator.class.php
@ -1,66 +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 NormalGenerator{
-	private $config, $spawn, $structure;
-	public function __construct($seed){
-		$this->config = array(
-			"seed" => (int) $seed,
-		);
-	}
-
-	public function set($name, $value){
-		$this->config[$name] = $value;
-	}
-
-	public function init(){
-		$this->spawn = array(128, 128, 128);
-	}
-
-	public function getSpawn(){
-		return $this->spawn;
-	}
-
-	public function getColumn($x, $z){
-		$x = (int) $x;
-		$z = (int) $z;
-		$column = $this->structure;
-		if(floor(sqrt(pow($x - $this->spawn[0], 2) + pow($z - $this->spawn[2], 2))) <= $this->config["spawn-radius"]){
-			$column[0]{strlen($column[0])-1} = chr($this->config["spawn-surface"]);
-		}
-		if(($x % 8) === 0 and ($z % 8) === 0 and $this->config["torches"] == "1"){
-			$column[0] .= chr(50);
-		}
-		$column[0] .= str_repeat(chr(0), 128 - strlen($column[0]));
-		$column[1] .= str_repeat(chr(0), 64 - strlen($column[1]));
-		$column[2] .= str_repeat(chr(0), 64 - strlen($column[2]));
-		$column[3] .= str_repeat(chr(0), 64 - strlen($column[3]));
-		return $column;
-	}
-
-}
--- a/src/classes/world/generator/SuperflatGenerator.class.php
+++ b/src/classes/world/generator/SuperflatGenerator.class.php
@ -1,107 +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 SuperflatGenerator{
-	private $config, $spawn, $structure;
-	public function __construct($seed){
-		$this->config = array(
-			"preset" => "7;20x1;3x3;2",
-			"spawn-surface" => 24,
-			"spawn-radius" => 10,
-			"torches" => 0,
-			"seed" => (int) $seed,
-		);
-		$this->parsePreset();
-	}
-
-	public function set($name, $value){
-		$this->config[$name] = $value;
-		if($name === "preset"){
-			$this->parsePreset();
-		}
-	}
-
-	private function parsePreset(){
-		$this->structure = array(
-			0 => "",
-			1 => "",
-			2 => str_repeat("\x00", 64),
-			3 => str_repeat("\x00", 64),
-		);
-		$preset = explode(";", trim($this->config["preset"]));
-		foreach($preset as $i => $data){
-			$num = 1;
-			if(preg_match('#([a-zA-Z\-_]*)\((.*)\)#', $data, $matches) > 0){ //Property
-				$this->config[$matches[1]] = $matches[2];
-				continue;
-			}elseif(preg_match('#([0-9]*)x([0-9:]*)#', $data, $matches) > 0){
-				$num = (int) $matches[1];
-				$d = explode(":", $matches[2]);
-			}else{
-				$d = explode(":", $data);
-			}
-			$block = (int) array_shift($d);
-			$meta = (int) @array_shift($d);
-			for($j = 0; $j < $num; ++$j){
-				$this->structure[0] .= chr($block & 0xFF);
-				$this->structure[1] .= substr(dechex($meta & 0x0F), -1);
-			}
-		}
-		$this->structure[1] = pack("h*", str_pad($this->structure[1], (strlen($this->structure[1])&0xFE) + 2, "0", STR_PAD_RIGHT)); //invert nibbles
-		$this->structure[0] = substr($this->structure[0], 0, 128);
-		$this->structure[1] = substr($this->structure[1], 0, 64);
-		$this->structure[2] = substr($this->structure[2], 0, 64);
-		$this->structure[3] = substr($this->structure[3], 0, 64);
-	}
-
-	public function init(){
-		$this->spawn = array(128, strlen($this->structure[0]), 128);
-	}
-
-	public function getSpawn(){
-		return $this->spawn;
-	}
-
-	public function getColumn($x, $z){
-		$x = (int) $x;
-		$z = (int) $z;
-		$column = $this->structure;
-		if(floor(sqrt(pow($x - $this->spawn[0], 2) + pow($z - $this->spawn[2], 2))) <= $this->config["spawn-radius"]){
-			$column[0]{strlen($column[0])-1} = chr($this->config["spawn-surface"]);
-		}
-		if(($x % 8) === 0 and ($z % 8) === 0 and $this->config["torches"] == "1"){
-			$column[0] .= chr(50);
-		}
-		$column[0] .= str_repeat(chr(0), 128 - strlen($column[0]));
-		$column[1] .= str_repeat(chr(0), 64 - strlen($column[1]));
-		$column[2] .= str_repeat(chr(0), 64 - strlen($column[2]));
-		$column[3] .= str_repeat(chr(0), 64 - strlen($column[3]));
-		return $column;
-	}
-
-}
--- a/src/classes/world/generator/object/tree/PineTreeObject.php
+++ b/src/classes/world/generator/object/tree/PineTreeObject.php
@ -1,97 +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.
-
-
-*/
-
-
-require_once("classes/world/generator/object/tree/TreeObject.php");
-
-class PineTreeObject extends TreeObject{
-	var $type = 1;
-	private $totalHeight = 8;
-	private $leavesSizeY = -1;
-	private $leavesAbsoluteMaxRadius = -1;
-
-	public function canPlaceObject(LevelAPI $level, $x, $y, $z){
-		$this->findRandomLeavesSize();
-		$checkRadius = 0;
-		for($yy = 0; $yy < $this->totalHeight; ++$yy) {
-			if($yy === $this->leavesSizeY) {
-				$checkRadius = $this->leavesAbsoluteMaxRadius;
-			}
-			for($xx = -$checkRadius; $xx < ($checkRadius + 1); ++$xx){
-				for($zz = -$checkRadius; $zz < ($checkRadius + 1); ++$zz){
-					$block = $level->getBlock($x + $xx, $y + $yy, $z + $zz);
-					if(!isset($this->overridable[$block[0]])){
-						return false;
-					}
-				}
-			}
-		}
-		return true;
-	}
-
-	private function findRandomLeavesSize(){
-		$this->totalHeight += mt_rand(-1, 2);
-		$this->leavesSizeY = 1 + mt_rand(0,2);
-		$this->leavesAbsoluteMaxRadius = 2 + mt_rand(0, 2);
-	}
-
-	public function placeObject(LevelAPI $level, $x, $y, $z){
-		if($this->leavesSizeY === -1 or $this->leavesAbsoluteMaxRadius === -1) {
-			$this->findRandomLeavesSize();
-		}
-		$level->setBlock($x, $y - 1, $z, 3, 0);
-		$leavesRadius = mt_rand(0,2);
-		$leavesMaxRadius = 1;
-		$leavesBottomY = $this->totalHeight - $this->leavesSizeY;
-		$firstMaxedRadius = false;
-		for($leavesY = 0; $leavesY < ($leavesBottomY + 1); ++$leavesY) {
-			$yy = $this->totalHeight - $leavesY;
-			for ($xx = -$leavesRadius; $xx < ($leavesRadius + 1); ++$xx) {
-				for ($zz = -$leavesRadius; $zz < ($leavesRadius + 1); ++$zz) {
-					if (abs($xx) != $leavesRadius or abs($zz) != $leavesRadius or $leavesRadius <= 0) {
-						$level->setBlock($x + $xx, $y + $yy, $z + $zz, 18, $this->type);
-					}
-				}
-			}
-			if ($leavesRadius >= $leavesMaxRadius) {
-				$leavesRadius = $firstMaxedRadius ? 1 : 0;
-				$firstMaxedRadius = true;
-				if (++$leavesMaxRadius > $this->leavesAbsoluteMaxRadius) {
-					$leavesMaxRadius = $this->leavesAbsoluteMaxRadius;
-				}
-			}else{
-				++$leavesRadius;
-			}
-		}
-		$trunkHeightReducer = mt_rand(0,3);
-		for($yy = 0; $yy < ($this->totalHeight - $trunkHeightReducer); ++$yy){
-			$level->setBlock($x, $y + $yy, $z, 17, $this->type);
-		}
-	}
-
-
-}
--- a/src/classes/world/generator/object/tree/SmallTreeObject.php
+++ b/src/classes/world/generator/object/tree/SmallTreeObject.php
@ -1,79 +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.
-
-
-*/
-
-
-require_once("classes/world/generator/object/tree/TreeObject.php");
-
-class SmallTreeObject extends TreeObject{
-	var $type = 0;
-	private $totalHeight = 6;
-	private $leavesHeight = 3;
-	protected $radiusIncrease = 0;
-	private $addLeavesVines = false;
-	private $addLogVines = false;
-	private $addCocoaPlants = false;
-
-	public function canPlaceObject(LevelAPI $level, $x, $y, $z){
-		$radiusToCheck = $this->radiusIncrease;
-		for ($yy = 0; $yy < $this->totalHeight + 2; ++$yy) {
-			if ($yy == 1 or $yy === $this->totalHeight - 1) {
-				++$radiusToCheck;
-			}
-			for($xx = -$radiusToCheck; $xx < ($radiusToCheck + 1); ++$xx){
-				for($zz = -$radiusToCheck; $zz < ($radiusToCheck + 1); ++$zz){
-					$block = $level->getBlock($x + $xx, $y + $yy, $z + $zz);
-					if(!isset($this->overridable[$block[0]])){
-						return false;
-					}
-				}
-			}
-		}
-		return true;
-	}
-
-	public function placeObject(LevelAPI $level, $x, $y, $z){
-		$level->setBlock($x, $y - 1, $z, 3, 0);
-		$this->totalHeight += mt_rand(-1, 3);
-		$this->leavesHeight += mt_rand(0, 1);
-		for($yy = ($this->totalHeight - $this->leavesHeight); $yy < ($this->totalHeight + 1); ++$yy){
-			$yRadius = ($yy - $this->totalHeight);
-			$xzRadius = (int) (($this->radiusIncrease + 1) - $yRadius / 2);
-			for($xx = -$xzRadius; $xx < ($xzRadius + 1); ++$xx){
-				for($zz = -$xzRadius; $zz < ($xzRadius + 1); ++$zz){
-					if((abs($xx) != $xzRadius or abs($zz) != $xzRadius) and $yRadius != 0){
-						$level->setBlock($x + $xx, $y + $yy, $z + $zz, 18, $this->type);
-					}
-				}
-			}
-		}
-		for($yy = 0; $yy < ($this->totalHeight - 1); ++$yy){
-			$level->setBlock($x, $y + $yy, $z, 17, $this->type);
-		}
-	}
-
-
-}
--- a/src/classes/world/generator/object/tree/SpruceTreeObject.php
+++ b/src/classes/world/generator/object/tree/SpruceTreeObject.php
@ -1,88 +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.
-
-
-*/
-
-
-require_once("classes/world/generator/object/tree/TreeObject.php");
-
-class SpruceTreeObject extends TreeObject{
-	var $type = 1;
-	private $totalHeight = 8;
-	private $leavesBottomY = -1;
-	private $leavesMaxRadius = -1;
-
-	public function canPlaceObject(LevelAPI $level, $x, $y, $z){
-		$this->findRandomLeavesSize();
-		$checkRadius = 0;
-		for($yy = 0; $yy < $this->totalHeight + 2; ++$yy) {
-			if($yy === $this->leavesBottomY) {
-				$checkRadius = $this->leavesMaxRadius;
-			}
-			for($xx = -$checkRadius; $xx < ($checkRadius + 1); ++$xx){
-				for($zz = -$checkRadius; $zz < ($checkRadius + 1); ++$zz){
-					$block = $level->getBlock($x + $xx, $y + $yy, $z + $zz);
-					if(!isset($this->overridable[$block[0]])){
-						return false;
-					}
-				}
-			}
-		}
-		return true;
-	}
-
-	private function findRandomLeavesSize(){
-		$this->totalHeight += mt_rand(-1, 2);
-		$this->leavesBottomY = (int) ($this->totalHeight - mt_rand(1,2) - 3);
-		$this->leavesMaxRadius = 1 + mt_rand(0, 1);
-	}
-
-	public function placeObject(LevelAPI $level, $x, $y, $z){
-		if($this->leavesBottomY === -1 or $this->leavesMaxRadius === -1) {
-			$this->findRandomLeavesSize();
-		}
-		$level->setBlock($x, $y - 1, $z, 3, 0);
-		$leavesRadius = 0;
-		for($yy = $this->totalHeight; $yy >= $this->leavesBottomY; --$yy){
-			for ($xx = -$leavesRadius; $xx < ($leavesRadius + 1); ++$xx) {
-				for ($zz = -$leavesRadius; $zz < ($leavesRadius + 1); ++$zz) {
-					if (abs($xx) != $leavesRadius or abs($zz) != $leavesRadius or $leavesRadius <= 0) {
-						$level->setBlock($x + $xx, $y + $yy, $z + $zz, 18, $this->type);
-					}
-				}
-			}
-			if ($leavesRadius > 0 and $yy === ($y + $this->leavesBottomY + 1)) {
-				--$leavesRadius;
-			}elseif($leavesRadius < $this->leavesMaxRadius){
-				++$leavesRadius;
-			}
-		}
-		for($yy = 0; $yy < ($this->totalHeight - 1); ++$yy){
-			$level->setBlock($x, $y + $yy, $z, 17, $this->type);
-		}
-	}
-
-
-}
--- a/src/classes/world/generator/object/tree/TreeObject.php
+++ b/src/classes/world/generator/object/tree/TreeObject.php
@ -1,62 +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 TreeObject{
-	var $overridable = array(
-		0 => true,
-		6 => true,
-		17 => true,
-		18 => true,
-	);
-	public static function growTree(LevelAPI $level, $block, $type){
-		switch($type){
-			case Sapling::SPRUCE:
-				if(mt_rand(0,1) == 1){
-					$tree = new SpruceTreeObject();
-				}else{
-					$tree = new PineTreeObject();
-				}
-				break;
-			case Sapling::BIRCH:
-				$tree = new SmallTreeObject();
-				$tree->type = Sapling::BIRCH;
-				break;
-			default:
-			case Sapling::OAK:
-				if(mt_rand(0,9) === 0){
-					$tree = new BigTreeObject();
-				}else{
-					$tree = new SmallTreeObject();
-				}
-				break;
-		}
-		if($tree->canPlaceObject($level, $block[2][0], $block[2][1], $block[2][2])){
-			$tree->placeObject($level, $block[2][0], $block[2][1], $block[2][2]);
-		}
-	}
-}
--- a/src/common/config.php
+++ b/src/common/config.php
@ -1,43 +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.
-
-
-*/
-
-set_time_limit(0);
-date_default_timezone_set(@date_default_timezone_get());
-gc_enable();
-error_reporting(E_ALL ^ E_NOTICE);
-ini_set("allow_url_fopen", 1);
-ini_set("display_errors", 1);
-ini_set('default_charset', 'utf-8');
-define("FILE_PATH", dirname(__FILE__)."/../../");
-set_include_path(get_include_path() . PATH_SEPARATOR . FILE_PATH . PATH_SEPARATOR . FILE_PATH . "/src/" . PATH_SEPARATOR . FILE_PATH . "/src/classes/");
-ini_set("memory_limit", "256M");
-define("LOG", true);
-define("MAGIC", "\x00\xff\xff\x00\xfe\xfe\xfe\xfe\xfd\xfd\xfd\xfd\x12\x34\x56\x78");
-define("TEST_MD5", "d0ca3786e53b615bb4fb9f5094d5c9a7");
-define("MAJOR_VERSION", "Alpha_1.0.7");
-define("CURRENT_PROTOCOL", 5);
-define("CURRENT_MINECRAFT_VERSION", "v0.5.0 alpha");
--- a/src/common/dependencies.php
+++ b/src/common/dependencies.php
@ -1,92 +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.
-
-
-*/
-
-require_once(dirname(__FILE__)."/config.php");
-require_once("common/functions.php");
-if(strpos(strtoupper(php_uname("s")), "WIN") === false or arg("enable-ansi", false) === true){
-	define("ENABLE_ANSI", true);
-}else{
-	define("ENABLE_ANSI", false);
-}
-set_error_handler("fatal_handler", E_ERROR | E_PARSE | E_CORE_ERROR | E_COMPILE_ERROR | E_RECOVERABLE_ERROR | E_DEPRECATED);
-
-$errors = 0;
-
-if(version_compare("5.3.3", PHP_VERSION) > 0){
-	console("[ERROR] Use PHP >= 5.3.3", true, true, 0);
-	++$errors;
-}elseif(version_compare("5.5.0", PHP_VERSION) <= 0){
-	console("[NOTICE] PocketMine-MP hasn't been tested with PHP >= 5.5", true, true, 0);
-	++$errors;
-}
-
-if(version_compare("5.4.0", PHP_VERSION) > 0){
-	console("[NOTICE] Use PHP >= 5.4.0 to increase performance", true, true, 0);
-	define("HEX2BIN", false);
-}else{
-	define("HEX2BIN", true);
-}
-
-if(php_sapi_name() !== "cli"){
-	console("[ERROR] Use PHP-CLI to execute the library or create your own", true, true, 0);
-	++$errors;
-}
-
-if(!extension_loaded("sockets") and @dl((PHP_SHLIB_SUFFIX === "dll" ? "php_":"") . "sockets." . PHP_SHLIB_SUFFIX) === false){
-	console("[ERROR] Unable to find Socket extension", true, true, 0);
-	++$errors;
-}
-
-if(!extension_loaded("pthreads") and @dl((PHP_SHLIB_SUFFIX === "dll" ? "php_":"") . "pthreads." . PHP_SHLIB_SUFFIX) === false){
-	console("[ERROR] Unable to find pthreads extension. Use the Installer available in the Homepage", true, true, 0);
-	++$errors;
-}
-
-if(!extension_loaded("curl") and @dl((PHP_SHLIB_SUFFIX === "dll" ? "php_":"") . "curl." . PHP_SHLIB_SUFFIX) === false){
-	console("[ERROR] Unable to find cURL extension", true, true, 0);
-	++$errors;
-}
-
-if(!extension_loaded("sqlite3") and @dl((PHP_SHLIB_SUFFIX === "dll" ? "php_":"") . "sqlite3." . PHP_SHLIB_SUFFIX) === false){
-	console("[ERROR] Unable to find SQLite3 extension", true, true, 0);
-	++$errors;
-}
-
-if(!extension_loaded("zlib") and @dl((PHP_SHLIB_SUFFIX === "dll" ? "php_":"") . "zlib." . PHP_SHLIB_SUFFIX) === false){
-	console("[ERROR] Unable to find Zlib extension. Compressed worlds won't be loaded", true, true, 0);
-	define("ZLIB_EXTENSION", false);
-}else{
-	define("ZLIB_EXTENSION", true);
-}
-
-if($errors > 0){
-	die();
-}
-
-require_all(FILE_PATH . "src/classes/");
-
-?>
--- a/src/config.php
+++ b/src/config.php
@ -0,0 +1,71 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+set_time_limit(0);
+
+date_default_timezone_set("GMT");
+if(strpos(" ".strtoupper(php_uname("s")), " WIN") !== false){
+	$time = time();
+	$time -= $time % 60;
+	exec("time.exe /T", $hour);
+	$i = array_map("intval", explode(":", trim($hour[0])));
+	exec("date.exe /T", $date);
+	$j = array_map("intval", explode("/", trim($date[0])));
+	$offset = round((mktime($i[0], $i[1], 0, $j[1], $j[0], $j[2]) - $time) / 60) * 60;
+}else{
+	exec("date +%s", $t);
+	$offset = round((intval(trim($t[0])) - time()) / 60) * 60;
+}
+
+$daylight = (int) date("I");
+
+if($daylight === 0){
+	$offset -= 3600;
+}
+
+date_default_timezone_set(timezone_name_from_abbr("", $offset, $daylight));
+
+gc_enable();
+error_reporting(E_ALL ^ E_NOTICE);
+ini_set("allow_url_fopen", 1);
+ini_set("display_errors", 1);
+ini_set("display_startup_errors", 1);
+ini_set("default_charset", "utf-8");
+if(defined("POCKETMINE_COMPILE") and POCKETMINE_COMPILE === true){
+	define("FILE_PATH", realpath(dirname(__FILE__))."/");
+}else{
+	define("FILE_PATH", realpath(dirname(__FILE__)."/../")."/");
+}
+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.7");
+define("CURRENT_MINECRAFT_VERSION", "0.7.4 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!
+	define(GIT_COMMIT, strtolower(trim(file_get_contents(FILE_PATH.".git/refs/heads/master"))));
+}else{ //Unknown :(
+	define(GIT_COMMIT, str_repeat("00", 20));
+}
--- a/src/constants/BlockIDs.php
+++ b/src/constants/BlockIDs.php
@ -0,0 +1,158 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+define("AIR", 0);
+define("STONE", 1);
+define("GRASS", 2);
+define("DIRT", 3);
+define("COBBLESTONE", 4);
+define("COBBLE", 4);
+define("PLANK", 5);
+define("PLANKS", 5);
+define("WOODEN_PLANK", 5);
+define("WOODEN_PLANKS", 5);
+define("SAPLING", 6);
+define("SAPLINGS", 6);
+define("BEDROCK", 7);
+define("WATER", 8);
+define("STILL_WATER", 9);
+define("LAVA", 10);
+define("STILL_LAVA", 11);
+define("SAND", 12);
+define("GRAVEL", 13);
+define("GOLD_ORE", 14);
+define("IRON_ORE", 15);
+define("COAL_ORE", 16);
+define("WOOD", 17);
+define("TRUNK", 17);
+define("LEAVES", 18);
+define("LEAVE", 18);
+
+define("GLASS", 20);
+define("LAPIS_ORE", 21);
+define("LAPIS_BLOCK", 22);
+
+define("SANDSTONE", 24);
+
+define("BED_BLOCK", 26);
+
+
+define("COBWEB", 30);
+define("TALL_GRASS", 31);
+define("BUSH", 32);
+define("DEAD_BUSH", 32);
+define("WOOL", 35);
+define("DANDELION", 37);
+define("ROSE", 38);
+define("CYAN_FLOWER", 38);
+define("BROWN_MUSHROOM", 39);
+define("RED_MUSHROOM", 40);
+define("GOLD_BLOCK", 41);
+define("IRON_BLOCK", 42);
+define("DOUBLE_SLAB", 43);
+define("DOUBLE_SLABS", 43);
+define("SLAB", 44);
+define("SLABS", 44);
+define("BRICKS", 45);
+define("BRICKS_BLOCK", 45);
+define("TNT", 46);
+define("BOOKSHELF", 47);
+define("MOSS_STONE", 48);
+define("MOSSY_STONE", 48);
+define("OBSIDIAN", 49);
+define("TORCH", 50);
+define("FIRE", 51);
+
+define("WOOD_STAIRS", 53);
+define("WOODEN_STAIRS", 53);
+define("CHEST", 54);
+
+define("DIAMOND_ORE", 56);
+define("DIAMOND_BLOCK", 57);
+define("CRAFTING_TABLE", 58);
+define("WORKBENCH", 58);
+define("WHEAT_BLOCK", 59);
+define("FARMLAND", 60);
+define("FURNACE", 61);
+define("BURNING_FURNACE", 62);
+define("LIT_FURNACE", 62);
+define("SIGN_POST", 63);
+define("DOOR_BLOCK", 64);
+define("WOODEN_DOOR_BLOCK", 64);
+define("WOOD_DOOR_BLOCK", 64);
+define("LADDER", 65);
+
+define("COBBLE_STAIRS", 67);
+define("COBBLESTONE_STAIRS", 67);
+define("WALL_SIGN", 68);
+
+define("IRON_DOOR_BLOCK", 71);
+
+define("REDSTONE_ORE", 73);
+define("GLOWING_REDSTONE_ORE", 74);
+define("LIT_REDSTONE_ORE", 74);
+
+define("SNOW", 78);
+define("SNOW_LAYER", 78);
+define("ICE", 79);
+define("SNOW_BLOCK", 80);
+define("CACTUS", 81);
+define("CLAY_BLOCK", 82);
+define("REEDS", 83);
+define("SUGARCANE_BLOCK", 83);
+
+define("FENCE", 85);
+
+define("NETHERRACK", 87);
+define("SOUL_SAND", 88);
+define("GLOWSTONE", 89);
+define("GLOWSTONE_BLOCK", 89);
+
+define("CAKE_BLOCK", 92);
+
+define("TRAPDOOR", 96);
+
+define("STONE_BRICKS", 98);
+define("STONE_BRICK", 98);
+
+define("GLASS_PANE", 102);
+define("GLASS_PANEL", 102);
+define("MELON_BLOCK", 103);
+
+define("MELON_STEM", 105);
+
+define("FENCE_GATE", 107);
+define("BRICK_STAIRS", 108);
+define("STONE_BRICK_STAIRS", 109);
+
+define("NETHER_BRICKS", 112);
+define("NETHER_BRICK_BLOCK", 112);
+
+define("NETHER_BRICKS_STAIRS", 114);
+
+define("SANDSTONE_STAIRS", 128);
+
+define("QUARTZ_BLOCK", 155);
+define("QUARTZ_STAIRS", 156);
+
+define("STONECUTTER", 245);
+define("GLOWING_OBSIDIAN", 246);
+define("NETHER_REACTOR", 247);
--- a/src/constants/GeneralConstants.php
+++ b/src/constants/GeneralConstants.php
@ -0,0 +1,79 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+
+define("PMF_LEVEL_DEFLATE_LEVEL", 6);
+
+//Gamemodes
+define("SURVIVAL", 0);
+define("CREATIVE", 1);
+define("ADVENTURE", 2);
+define("VIEW", 3);
+define("VIEWER", 3);
+
+
+//Players
+define("MAX_CHUNK_RATE", 20 / arg("max-chunks-per-second", 3.5)); //Default rate ~172 kB/s
+define("PLAYER_MAX_QUEUE", 1024);
+
+define("PLAYER_SURVIVAL_SLOTS", 36);
+define("PLAYER_CREATIVE_SLOTS", 112);
+
+
+//Block Updates
+define("BLOCK_UPDATE_NORMAL", 1);
+define("BLOCK_UPDATE_RANDOM", 2);
+define("BLOCK_UPDATE_SCHEDULED", 3);
+define("BLOCK_UPDATE_WEAK", 4);
+define("BLOCK_UPDATE_TOUCH", 5);
+
+
+//Entities
+define("ENTITY_PLAYER", 1);
+
+define("ENTITY_MOB", 2);
+	define("MOB_CHICKEN", 10);
+	define("MOB_COW", 11);
+	define("MOB_PIG", 12);
+	define("MOB_SHEEP", 13);
+
+	define("MOB_ZOMBIE", 32);
+	define("MOB_CREEPER", 33);
+	define("MOB_SKELETON", 34);
+	define("MOB_SPIDER", 35);
+	define("MOB_PIGMAN", 36);
+
+define("ENTITY_OBJECT", 3);
+	define("OBJECT_ARROW", 80);
+	define("OBJECT_PAINTING", 83);
+
+define("ENTITY_ITEM", 4);
+
+define("ENTITY_FALLING", 5);
+	define("FALLING_SAND", 66);
+
+
+//TileEntities
+define("TILE_SIGN", "Sign");
+define("TILE_CHEST", "Chest");
+	define("CHEST_SLOTS", 27);
+define("TILE_FURNACE", "Furnace");
+	define("FURNACE_SLOTS", 3);
--- a/src/constants/ItemIDs.php
+++ b/src/constants/ItemIDs.php
@ -0,0 +1,150 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+define("IRON_SHOVEL", 256);//Implemented
+define("IRON_PICKAXE", 257);//Implemented
+define("IRON_AXE", 258);//Implemented
+define("FLINT_STEEL", 259);
+define("FLINT_AND_STEEL", 259);
+define("APPLE", 260);//Implemented
+define("BOW", 261);
+define("ARROW", 262);
+define("COAL", 263);//Implemented
+define("DIAMOND", 264);//Implemented
+define("IRON_INGOT", 265);//Implemented
+define("GOLD_INGOT", 266);//Implemented
+define("IRON_SWORD", 267);
+define("WOODEN_SWORD", 268);//Implemented
+define("WOODEN_SHOVEL", 269);//Implemented
+define("WOODEN_PICKAXE", 270);//Implemented
+define("WOODEN_AXE", 271);//Implemented
+define("STONE_SWORD", 272);
+define("STONE_SHOVEL", 273);
+define("STONE_PICKAXE", 274);
+define("STONE_AXE", 275);
+define("DIAMOND_SWORD", 276);
+define("DIAMOND_SHOVEL", 277);
+define("DIAMOND_PICKAXE", 278);
+define("DIAMOND_AXE", 279);
+define("STICK", 280);//Implemented
+define("STICKS", 280);
+define("BOWL", 281);//Implemented
+define("MUSHROOM_STEW", 282);
+define("GOLD_SWORD", 283);
+define("GOLD_SHOVEL", 284);
+define("GOLD_PICKAXE", 285);
+define("GOLD_AXE", 286);
+define("GOLDEN_SWORD", 283);
+define("GOLDEN_SHOVEL", 284);
+define("GOLDEN_PICKAXE", 285);
+define("GOLDEN_AXE", 286);
+define("STRING", 287);
+define("FEATHER", 288);//Implemented
+define("GUNPOWDER", 289);
+define("WOODEN_HOE", 290);
+define("STONE_HOE", 291);
+define("IRON_HOE", 292);//Implemented
+define("DIAMOND_HOE", 293);
+define("GOLD_HOE", 294);
+define("GOLDEN_HOE", 294);
+define("SEEDS", 295);
+define("WHEAT_SEEDS", 295);
+define("WHEAT", 296);
+define("BREAD", 297);
+define("LEATHER_CAP", 298);
+define("LEATHER_TUNIC", 299);
+define("LEATHER_PANTS", 300);
+define("LEATHER_BOOTS", 301);
+define("CHAIN_HELMET", 302);
+define("CHAIN_CHESTPLATE", 303);
+define("CHAIN_LEGGINGS", 304);
+define("CHAIN_BOOTS", 305);
+define("IRON_HELMET", 306);
+define("IRON_CHESTPLATE", 307);
+define("IRON_LEGGINGS", 308);
+define("IRON_BOOTS", 309);
+define("DIAMOND_HELMET", 310);
+define("DIAMOND_CHESTPLATE", 311);
+define("DIAMOND_LEGGINGS", 312);
+define("DIAMOND_BOOTS", 313);
+define("GOLD_HELMET", 314);
+define("GOLD_CHESTPLATE", 315);
+define("GOLD_LEGGINGS", 316);
+define("GOLD_BOOTS", 317);
+define("FLINT", 318);
+define("RAW_PORKCHOP", 319);
+define("COOKED_PORKCHOP", 320);
+define("PAINTING", 321);
+define("GOLDEN_APPLE", 322);
+define("SIGN", 323);
+define("WOODEN_DOOR", 324);
+define("BUCKET", 325);
+
+
+define("IRON_DOOR", 330);
+
+define("SNOWBALL", 332);
+
+define("LEATHER", 334);
+
+define("BRICK", 336);
+define("CLAY", 337);
+define("SUGARCANE", 338);
+define("SUGAR_CANE", 338);
+define("SUGAR_CANES", 338);
+define("PAPER", 339);
+define("SLIMEBALL", 341);
+
+define("EGG", 344);
+define("COMPASS", 345);
+
+define("GLOWSTONE_DUST", 348);
+//define("RAW_FISH", 349);
+//define("COOKED_FISH", 350);
+define("DYE", 351);
+define("BONE", 352);
+define("SUGAR", 353);
+define("CAKE", 354);
+define("BED", 355);
+
+
+//define("COOKIE", 357);
+
+
+define("SHEARS", 359);
+define("MELON", 360);
+define("MELON_SLICE", 360);
+
+define("MELON_SEEDS", 362);
+define("RAW_BEEF", 363);
+define("STEAK", 364);
+define("COOKED_BEEF", 364);
+
+define("RAW_CHICKEN", 365);
+define("COOKED_CHICKEN", 366);
+
+define("SPAWN_EGG", 383);
+
+define("NETHER_BRICK", 405);
+define("QUARTZ", 406);
+define("NETHER_QUARTZ", 406);
+
+define("CAMERA", 456);
--- a/src/dependencies.php
+++ b/src/dependencies.php
@ -0,0 +1,84 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+/***REM_START***/
+require_once(dirname(__FILE__)."/config.php");
+require_once(FILE_PATH."/src/functions.php");
+/***REM_END***/
+define(DATA_PATH, realpath(arg("data-path", FILE_PATH))."/");
+
+if(arg("enable-ansi", strpos(strtoupper(php_uname("s")), "WIN") === false ? true:false) === true){
+	define("ENABLE_ANSI", true);
+}else{
+	define("ENABLE_ANSI", false);
+}
+
+set_error_handler("error_handler", E_ALL);
+
+$errors = 0;
+
+if(version_compare("5.4.0", PHP_VERSION) > 0){
+	console("[ERROR] Use PHP >= 5.4.0", true, true, 0);
+	++$errors;
+}
+
+if(php_sapi_name() !== "cli"){
+	console("[ERROR] You must run PocketMine-MP using the CLI.", true, true, 0);
+	++$errors;
+}
+
+if(!extension_loaded("sockets") and @dl((PHP_SHLIB_SUFFIX === "dll" ? "php_":"") . "sockets." . PHP_SHLIB_SUFFIX) === false){
+	console("[ERROR] Unable to find the Socket extension.", true, true, 0);
+	++$errors;
+}
+
+if(!extension_loaded("pthreads") and @dl((PHP_SHLIB_SUFFIX === "dll" ? "php_":"") . "pthreads." . PHP_SHLIB_SUFFIX) === false){
+	console("[ERROR] Unable to find the pthreads extension.", true, true, 0);
+	++$errors;
+}
+
+if(!extension_loaded("curl") and @dl((PHP_SHLIB_SUFFIX === "dll" ? "php_":"") . "curl." . PHP_SHLIB_SUFFIX) === false){
+	console("[ERROR] Unable to find the cURL extension.", true, true, 0);
+	++$errors;
+}
+
+if(!extension_loaded("sqlite3") and @dl((PHP_SHLIB_SUFFIX === "dll" ? "php_":"") . "sqlite3." . PHP_SHLIB_SUFFIX) === false){
+	console("[ERROR] Unable to find the SQLite3 extension.", true, true, 0);
+	++$errors;
+}
+
+if(!extension_loaded("zlib") and @dl((PHP_SHLIB_SUFFIX === "dll" ? "php_":"") . "zlib." . PHP_SHLIB_SUFFIX) === false){
+	console("[ERROR] Unable to find the Zlib extension.", true, true, 0);
+	++$errors;
+}
+
+if($errors > 0){
+	console("[ERROR] Please use the installer provided on the homepage.", true, true, 0);
+	exit(1); //Exit with error
+}
+
+/***REM_START***/
+require_once(FILE_PATH."/src/math/Vector3.php");
+require_once(FILE_PATH."/src/world/Position.php");
+require_once(FILE_PATH."/src/pmf/PMF.php");
+
+require_all(FILE_PATH . "src/");
+/***REM_END***/
--- a/src/common/functions.php
+++ b/src/common/functions.php
@ -1,61 +1,102 @@
 <?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")){
+	function cli_set_process_title($title){
+		if(ENABLE_ANSI === true){
+			echo "\x1b]0;".$title."\x07";
+			return true;
+		}else{
+			return false;
+		}
+	}
+}

+function dummy(){
+	
+}
+
+function safe_var_dump($var, $cnt = 0){
+	switch(true){
+		case is_array($var):
+			echo str_repeat("  ", $cnt)."array(".count($var).") {".PHP_EOL;
+			foreach($var as $key => $value){
+				echo str_repeat("  ", $cnt + 1)."[".(is_integer($key) ? $key:'"'.$key.'"')."]=>".PHP_EOL;
+				safe_var_dump($value, $cnt + 1);
+			}
+			echo str_repeat("  ", $cnt)."}".PHP_EOL;
+			break;
+		case is_integer($var):
+			echo str_repeat("  ", $cnt)."int(".$var.")".PHP_EOL;
+			break;
+		case is_float($var):
+			echo str_repeat("  ", $cnt)."float(".$var.")".PHP_EOL;
+			break;
+		case is_bool($var):
+			echo str_repeat("  ", $cnt)."bool(".($var === true ? "true":"false").")".PHP_EOL;
+			break;
+		case is_string($var):
+			echo str_repeat("  ", $cnt)."string(".strlen($var).") \"$var\"".PHP_EOL;
+			break;
+		case is_resource($var):
+			echo str_repeat("  ", $cnt)."resource() of type (".get_resource_type($var).")".PHP_EOL;
+			break;
+		case is_object($var):
+			echo str_repeat("  ", $cnt)."object(".get_class($var).")".PHP_EOL;
+			break;
+		case is_null($var):
+			echo str_repeat("  ", $cnt)."NULL".PHP_EOL;
+			break;
+	}
+}

 function kill($pid){
 	switch(Utils::getOS()){
 		case "win":
-			ob_start();
-			passthru("%WINDIR%\\System32\\taskkill.exe /F /PID ".((int) $pid));
-			ob_end_clean();
+			exec("taskkill.exe /F /PID ".((int) $pid)." > NUL");
 			break;
 		case "mac":
 		case "linux":
 		default:
-			ob_start();
-			passthru("kill -9 ".((int) $pid));
-			ob_end_clean();
+			exec("kill -9 ".((int) $pid)." > /dev/null 2>&1");
 	}
 }


 function require_all($path, &$count = 0){
 	$dir = dir($path."/");
+	$dirs = array();
 	while(false !== ($file = $dir->read())){
 		if($file !== "." and $file !== ".."){
 			if(!is_dir($path.$file) and strtolower(substr($file, -3)) === "php"){
 				require_once($path.$file);
 				++$count;
 			}elseif(is_dir($path.$file)){
-				require_all($path.$file."/", $count);
+				$dirs[] = $path.$file."/";
 			}
 		}
 	}
+	foreach($dirs as $dir){
+		require_all($dir, $count);
+	}

 }

@ -81,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)){
@ -173,8 +188,9 @@ function console($message, $EOL = true, $log = true, $level = 1){
 			logg($replaced, "console", false, $level);
 		}
 		if(ENABLE_ANSI === true){
+			$add = "";
 			if(preg_match("/\[([a-zA-Z0-9]*)\]/", $message, $matches) > 0){
-				$add = "\x1b";
+				$add .= "\x1b";
 				switch($matches[1]){
 					case "ERROR":
 						$add .= "[31;1m";
@ -193,8 +209,8 @@ function console($message, $EOL = true, $log = true, $level = 1){
 						$add = "";
 						break;
 				}
-				$message = $time . $add . $message . "\x1b[0m";
 			}
+			$message = $time . $add . $message . "\x1b[0m";
 		}else{
 			$message = $replaced;
 		}
@ -202,15 +218,12 @@ function console($message, $EOL = true, $log = true, $level = 1){
 	}
 }

-function fatal_handler($errno, $errstr, $errfile, $errline){
-	global $lasttrace;
+function error_handler($errno, $errstr, $errfile, $errline){
+	if(error_reporting() === 0){ //@ error-control
+		return false;
+	}
 	console("[ERROR] A level ".$errno." error happened: \"$errstr\" in \"$errfile\" at line $errline", true, true, 0);
-	ob_start(); 
-	debug_print_backtrace(); 
-	$lasttrace = ob_get_contents(); 
-	ob_end_clean();
-	console("[ERROR] [Backtrace] $lasttrace", true, true, 0);
-	return false;
+	return true;
 }

 function logg($message, $name, $EOL = true, $level = 2, $close = false){
@ -221,7 +234,7 @@ function logg($message, $name, $EOL = true, $level = 2, $close = false){
 			$fpointers = array();
 		}
 		if(!isset($fpointers[$name]) or $fpointers[$name] === false){
-			$fpointers[$name] = @fopen(FILE_PATH."logs/".$name.".log", "ab");
+			$fpointers[$name] = @fopen(DATA_PATH."/".$name.".log", "ab");
 		}
 		@fwrite($fpointers[$name], $message);
 		if($close === true){
--- a/src/inventory/Window.php
+++ b/src/inventory/Window.php
@ -0,0 +1,34 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+define("WINDOW_CHEST", 0);
+define("WINDOW_WORKBENCH", 1);
+define("WINDOW_FURNACE", 2);
+define("WINDOW_STONECUTTER", 3);
+
+class Window{
+	private $server;
+	public function __construct(){
+		$this->server = ServerAPI::request();
+	}
+}
+
+?>
--- a/src/material/Block.php
+++ b/src/material/Block.php
@ -0,0 +1,223 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+abstract class Block extends Position{
+	public static $class = array(
+			AIR => "AirBlock",
+			STONE => "StoneBlock",
+			GRASS => "GrassBlock",
+			DIRT => "DirtBlock",
+			COBBLESTONE => "CobblestoneBlock",
+			PLANKS => "PlanksBlock",
+			SAPLING => "SaplingBlock",
+			BEDROCK => "BedrockBlock",
+			WATER => "WaterBlock",
+			STILL_WATER => "StillWaterBlock",
+			LAVA => "LavaBlock",
+			STILL_LAVA => "StillLavaBlock",
+			SAND => "SandBlock",
+			GRAVEL => "GravelBlock",
+			GOLD_ORE => "GoldOreBlock",
+			IRON_ORE => "IronOreBlock",
+			COAL_ORE => "CoalOreBlock",
+			WOOD => "WoodBlock",
+			LEAVES => "LeavesBlock",
+			GLASS => "GlassBlock",
+			LAPIS_ORE => "LapisOreBlock",
+			LAPIS_BLOCK => "LapisBlock",
+			SANDSTONE => "SandstoneBlock",
+			BED_BLOCK => "BedBlock",
+			COBWEB => "CobwebBlock",
+			TALL_GRASS => "TallGrassBlock",
+			DEAD_BUSH => "DeadBushBlock",
+			WOOL => "WoolBlock",
+			DANDELION => "DandelionBlock",
+			CYAN_FLOWER => "CyanFlowerBlock",
+			BROWN_MUSHROOM => "BrownMushroomBlock",
+			RED_MUSHROOM => "RedMushRoomBlock",
+			GOLD_BLOCK => "GoldBlock",
+			IRON_BLOCK => "IronBlock",
+			DOUBLE_SLAB => "DoubleSlabBlock",
+			SLAB => "SlabBlock",
+			BRICKS_BLOCK => "BricksBlock",
+			TNT => "TNTBlock",
+			BOOKSHELF => "BookshelfBlock",
+			MOSS_STONE => "MossStoneBlock",
+			OBSIDIAN => "ObsidianBlock",
+			TORCH => "TorchBlock",
+			FIRE => "FireBlock",
+
+			WOOD_STAIRS => "WoodStairsBlock",
+			CHEST => "ChestBlock",
+
+			DIAMOND_ORE => "DiamondOreBlock",
+			DIAMOND_BLOCK => "DiamondBlock",
+			WORKBENCH => "WorkbenchBlock",
+			WHEAT_BLOCK => "WheatBlock",
+			FARMLAND => "FarmlandBlock",
+			FURNACE => "FurnaceBlock",
+			BURNING_FURNACE => "BurningFurnaceBlock",
+			SIGN_POST => "SignPostBlock",
+			WOOD_DOOR_BLOCK => "WoodDoorBlock",
+			LADDER => "LadderBlock",
+
+			COBBLESTONE_STAIRS => "CobblestoneStairsBlock",
+			WALL_SIGN => "WallSignBlock",
+
+			IRON_DOOR_BLOCK => "IronDoorBlock",
+			REDSTONE_ORE => "RedstoneOreBlock",
+			GLOWING_REDSTONE_ORE => "GlowingRedstoneOreBlock",
+
+			SNOW_LAYER => "SnowLayerBlock",
+			ICE => "IceBlock",
+			SNOW_BLOCK => "SnowBlock",
+			CACTUS => "CactusBlock",
+			CLAY_BLOCK => "ClayBlock",
+			SUGARCANE_BLOCK => "SugarcaneBlock",
+
+			FENCE => "FenceBlock",
+
+			NETHERRACK => "NetherrackBlock",
+			SOUL_SAND => "SoulSandBlock",
+			GLOWSTONE_BLOCK => "GlowstoneBlock",
+
+			CAKE_BLOCK => "CakeBlock",
+			
+			TRAPDOOR => "TrapdoorBlock",
+
+			STONE_BRICKS => "StoneBricksBlock",
+
+			GLASS_PANE => "GlassPaneBlock",
+			MELON_BLOCK => "MelonBlock",
+
+			MELON_STEM => "MelonStemBlock",
+
+			FENCE_GATE => "FenceGateBlock",
+			BRICK_STAIRS => "BrickStairsBlock",
+			STONE_BRICK_STAIRS => "StoneBrickStairsBlock",
+
+			NETHER_BRICKS => "NetherBricksBlock",
+
+			NETHER_BRICKS_STAIRS => "NetherBricksStairsBlock",
+
+			SANDSTONE_STAIRS => "SandstoneStairsBlock",
+
+			QUARTZ_BLOCK => "QuartzBlock",
+			QUARTZ_STAIRS => "QuartzStairsBlock",
+
+			STONECUTTER => "StonecutterBlock",
+			GLOWING_OBSIDIAN => "GlowingObsidianBlock",
+			NETHER_REACTOR => "NetherReactorBlock",
+	);
+	protected $id;
+	protected $meta;
+	protected $name;
+	protected $breakTime;
+	public $isActivable = false;
+	public $breakable = true;
+	public $isFlowable = false;
+	public $isSolid = true;
+	public $isTransparent = false;
+	public $isReplaceable = false;
+	public $isPlaceable = true;
+	public $level = false;
+	public $hasPhysics = false;
+	public $isLiquid = false;
+	public $isFullBlock = true;
+	public $x = 0;
+	public $y = 0;
+	public $z = 0;
+	
+	public function __construct($id, $meta = 0, $name = "Unknown"){
+		$this->id = (int) $id;
+		$this->meta = (int) $meta;
+		$this->name = $name;
+		$this->breakTime = 0.20;
+	}
+	
+	final public function getName(){
+		return $this->name;
+	}
+	
+	final public function getID(){
+		return $this->id;
+	}
+	
+	final public function getMetadata(){
+		return $this->meta & 0x0F;
+	}
+	
+	final public function position(Position $v){
+		$this->level = $v->level;
+		$this->x = (int) $v->x;
+		$this->y = (int) $v->y;
+		$this->z = (int) $v->z;
+	}
+	
+	public function getDrops(Item $item, Player $player){
+		if(!isset(Block::$class[$this->id])){ //Unknown blocks
+			return array();
+		}else{
+			return array(
+				array($this->id, $this->meta, 1),
+			);
+		}
+	}
+	
+	public function getBreakTime(Item $item, Player $player){
+		if(($player->gamemode & 0x01) === 0x01){
+			return 0.15;
+		}
+		return $this->breakTime;
+	}
+	
+	public function getSide($side){
+		$v = parent::getSide($side);
+		if($this->level instanceof Level){
+			return $this->level->getBlock($v);
+		}
+		return $v;
+	}
+	
+	final public function __toString(){
+		return "Block ". $this->name ." (".$this->id.":".$this->meta.")";
+	}
+	
+	abstract function isBreakable(Item $item, Player $player);
+	
+	abstract function onBreak(Item $item, Player $player);
+	
+	abstract function place(Item $item, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz);
+	
+	abstract function onActivate(Item $item, Player $player);
+	
+	abstract function onUpdate($type);
+}
+
+/***REM_START***/
+require_once("block/GenericBlock.php");
+require_once("block/SolidBlock.php");
+require_once("block/TransparentBlock.php");
+require_once("block/FallableBlock.php");
+require_once("block/LiquidBlock.php");
+require_once("block/StairBlock.php");
+require_once("block/DoorBlock.php");
+/***REM_END***/
--- a/src/material/Item.php
+++ b/src/material/Item.php
@ -0,0 +1,275 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class Item{
+	public static $class = array(
+		SUGARCANE => "SugarcaneItem",	
+		WHEAT_SEEDS => "WheatSeedsItem",
+		MELON_SEEDS => "MelonSeedsItem",
+		SIGN => "SignItem",
+		WOODEN_DOOR => "WoodenDoorItem",
+		BUCKET => "BucketItem",
+		IRON_DOOR => "IronDoorItem",
+		CAKE => "CakeItem",
+		BED => "BedItem",
+		PAINTING => "PaintingItem",
+		COAL => "CoalItem",
+		APPLE => "AppleItem",
+		SPAWN_EGG => "SpawnEggItem",
+		DIAMOND => "DiamondItem",
+		STICK => "StickItem",
+		BOWL => "BowlItem",
+		FEATHER => "FeatherItem",
+		BRICK => "BrickItem",
+		IRON_INGOT => "IronIngotItem",
+		GOLD_INGOT => "GoldIngotItem",
+		IRON_SHOVEL => "IronShovelItem",
+		IRON_PICKAXE => "IronPickaxeItem",
+		IRON_AXE => "IronAxeItem",
+		IRON_HOE => "IronHoeItem",
+		WOODEN_SWORD => "WoodenSwordItem",
+		WOODEN_SHOVEL => "WoodenShovelItem",
+		WOODEN_PICKAXE => "WoodenPickaxeItem",
+		WOODEN_AXE => "WoodenAxeItem",
+		FLINT_STEEL => "FlintSteelItem",
+	);
+	protected $block;
+	protected $id;
+	protected $meta;
+	public $count;
+	protected $maxStackSize = 64;
+	protected $durability = 0;
+	protected $name;
+	public $isActivable = false;
+	
+	public function __construct($id, $meta = 0, $count = 1, $name = "Unknown"){
+		$this->id = (int) $id;
+		$this->meta = (int) $meta;
+		$this->count = (int) $count;
+		$this->name = $name;
+		if(!isset($this->block) and $this->id <= 0xff and isset(Block::$class[$this->id])){
+			$this->block = BlockAPI::get($this->id, $this->meta);
+			$this->name = $this->block->getName();
+		}
+		if($this->isTool() !== false){
+			$this->maxStackSize = 1;
+		}
+	}
+	
+	final public function getName(){
+		return $this->name;
+	}
+	
+	final public function isPlaceable(){
+		return (($this->block instanceof Block) and $this->block->isPlaceable === true);
+	}
+	
+	final public function getBlock(){
+		if($this->block instanceof Block){
+			return $this->block;
+		}else{
+			return BlockAPI::get(AIR);
+		}
+	}
+	
+	final public function getID(){
+		return $this->id;
+	}
+	
+	final public function getMetadata(){
+		return $this->meta;
+	}	
+	
+	final public function getMaxStackSize(){
+		return $this->maxStackSize;
+	}
+	
+	final public function getFuelTime(){
+		if(!isset(FuelData::$duration[$this->id])){
+			return false;
+		}
+		if($this->id !== BUCKET or $this->meta === 10){
+			return FuelData::$duration[$this->id];
+		}
+		return false;
+	}
+	
+	final public function getSmeltItem(){
+		if(!isset(SmeltingData::$product[$this->id])){
+			return false;
+		}
+		
+		if(isset(SmeltingData::$product[$this->id][0]) and !is_array(SmeltingData::$product[$this->id][0])){
+			return BlockAPI::getItem(SmeltingData::$product[$this->id][0], SmeltingData::$product[$this->id][1]);
+		}
+		
+		if(!isset(SmeltingData::$product[$this->id][$this->meta])){
+			return false;
+		}
+		
+		return BlockAPI::getItem(SmeltingData::$product[$this->id][$this->meta][0], SmeltingData::$product[$this->id][$this->meta][1]);
+		
+	}
+	
+	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);
+	}
+	
+	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
+		switch($this->id){
+			case IRON_PICKAXE:
+				return 4;
+			case WOODEN_PICKAXE:
+				return 1;
+			case STONE_PICKAXE:
+				return 3;
+			case DIAMOND_PICKAXE:
+				return 5;
+			case GOLD_PICKAXE:
+				return 2;
+			default:
+				return false;
+		}
+	}
+	
+	final public function isAxe(){
+		switch($this->id){
+			case IRON_AXE:
+				return 4;
+			case WOODEN_AXE:
+				return 1;
+			case STONE_AXE:
+				return 3;
+			case DIAMOND_AXE:
+				return 5;
+			case GOLD_AXE:
+				return 2;
+			default:
+				return false;
+		}
+	}
+
+	final public function isSword(){
+		switch($this->id){
+			case IRON_SWORD:
+				return 4;
+			case WOODEN_SWORD:
+				return 1;
+			case STONE_SWORD:
+				return 3;
+			case DIAMOND_SWORD:
+				return 5;
+			case GOLD_SWORD:
+				return 2;
+			default:
+				return false;
+		}
+	}
+	
+	final public function isShovel(){
+		switch($this->id){
+			case IRON_SHOVEL:
+				return 4;
+			case WOODEN_SHOVEL:
+				return 1;
+			case STONE_SHOVEL:
+				return 3;
+			case DIAMOND_SHOVEL:
+				return 5;
+			case GOLD_SHOVEL:
+				return 2;
+			default:
+				return false;
+		}
+	}
+	
+	public function isHoe(){
+		switch($this->id){
+			case IRON_HOE:
+			case WOODEN_HOE:
+			case STONE_HOE:
+			case DIAMOND_HOE:
+			case GOLD_HOE:
+				return true;
+			default:
+				return false;
+		}
+	}
+
+	public function isShears(){
+		return ($this->id === SHEARS);
+	}
+	
+	final public function __toString(){
+		return "Item ". $this->name ." (".$this->id.":".$this->meta.")";
+	}
+	
+	public function getDestroySpeed(Block $block, Player $player){
+		return 1;
+	}
+	
+	public function onActivate(Level $level, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){
+		return false;
+	}
+	
+}
--- a/src/material/block/DoorBlock.php
+++ b/src/material/block/DoorBlock.php
@ -0,0 +1,88 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class DoorBlock extends TransparentBlock{
+	public function __construct($id, $meta = 0, $name = "Unknown"){
+		parent::__construct($id, $meta, $name);
+		$this->isSolid = false;
+	}
+
+	public function place(Item $item, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){
+		if($face === 1){
+			$blockUp = $this->getSide(1);
+			$blockDown = $this->getSide(0);
+			if($blockUp->isReplaceable === false or $blockDown->isTransparent === true){
+				return false;
+			}
+			$direction = $player->entity->getDirection();
+			$face = array(
+				0 => 3,
+				1 => 4,
+				2 => 2,
+				3 => 5,
+			);
+			$next = $this->getSide($face[(($direction + 2) % 4)]);
+			$next2 = $this->getSide($face[$direction]);
+			$metaUp = 0x08;
+			if($next->getID() === $this->id or ($next2->isTransparent === false and $next->isTransparent === true)){ //Door hinge
+				$metaUp |= 0x01;
+			}
+			$this->level->setBlock($blockUp, BlockAPI::get($this->id, $metaUp)); //Top
+			
+			$this->meta = $direction & 0x03;
+			$this->level->setBlock($block, $this); //Bottom
+			return true;			
+		}
+		return false;
+	}
+	
+	public function onBreak(Item $item, Player $player){
+		if(($this->meta & 0x08) === 0x08){
+			$down = $this->getSide(0);
+			if($down->getID() === $this->id){
+				$this->level->setBlock($down, new AirBlock());
+			}
+		}else{
+			$up = $this->getSide(1);
+			if($up->getID() === $this->id){
+				$this->level->setBlock($up, new AirBlock());
+			}
+		}
+		$this->level->setBlock($this, new AirBlock());
+		return true;
+	}
+	
+	public function onActivate(Item $item, Player $player){
+		if(($this->meta & 0x08) === 0x08){ //Top
+			$down = $this->getSide(0);
+			if($down->getID() === $this->id){
+				$meta = $down->getMetadata() ^ 0x04;
+				$this->level->setBlock($down, BlockAPI::get($this->id, $meta));
+				return true;
+			}
+			return false;
+		}else{
+			$this->meta ^= 0x04;
+			$this->level->setBlock($this, $this);
+		}
+		return true;
+	}
+}
--- a/src/material/block/FallableBlock.php
+++ b/src/material/block/FallableBlock.php
@ -0,0 +1,33 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class FallableBlock extends SolidBlock{
+	public function __construct($id, $meta = 0, $name = "Unknown"){
+		parent::__construct($id, $meta, $name);
+		$this->hasPhysics = true;
+	}
+	
+	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->blockUpdate(clone $this, BLOCK_UPDATE_NORMAL);
+		return $ret;
+	}
+}
--- a/src/material/block/FlowableBlock.php
+++ b/src/material/block/FlowableBlock.php
@ -0,0 +1,29 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class FlowableBlock extends TransparentBlock{
+	public function __construct($id, $meta = 0, $name = "Unknown"){
+		parent::__construct($id, $meta, $name);
+		$this->isFlowable = true;
+		$this->isFullBlock = false;
+		$this->isSolid = false;
+	}
+}
--- a/src/material/block/GenericBlock.php
+++ b/src/material/block/GenericBlock.php
@ -0,0 +1,63 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+
+class GenericBlock extends Block{
+	public function __construct($id, $meta = 0, $name = "Unknown"){
+		parent::__construct($id, $meta, $name);
+	}	
+	public function place(Item $item, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){
+		return $this->level->setBlock($this, $this, true, false, true);
+	}
+	
+	public function isBreakable(Item $item, Player $player){
+		return ($this->breakable);
+	}
+	
+	public function onBreak(Item $item, Player $player){
+		return $this->level->setBlock($this, new AirBlock(), true, false, true);
+	}
+	
+	public function onUpdate($type){
+		if($this->hasPhysics === true and $type === BLOCK_UPDATE_NORMAL){
+			$down = $this->getSide(0);
+			if($down->getID() === AIR or ($down instanceof LiquidBlock)){
+				$data = array(
+					"x" => $this->x + 0.5,
+					"y" => $this->y + 0.5,
+					"z" => $this->z + 0.5,
+					"Tile" => $this->id,
+				);
+				$server = ServerAPI::request();
+				$this->level->setBlock($this, new AirBlock(), false, false, true);
+				$e = $server->api->entity->add($this->level, ENTITY_FALLING, FALLING_SAND, $data);
+				$server->api->entity->spawnToAll($e);
+				$server->api->block->blockUpdateAround(clone $this, BLOCK_UPDATE_NORMAL, 1);
+			}
+			return false;
+		}
+		return false;
+	}
+
+	public function onActivate(Item $item, Player $player){
+		return $this->isActivable;
+	}
+}
--- a/src/material/block/LiquidBlock.php
+++ b/src/material/block/LiquidBlock.php
@ -0,0 +1,31 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class LiquidBlock extends TransparentBlock{
+	public function __construct($id, $meta = 0, $name = "Unknown"){
+		parent::__construct($id, $meta, $name);
+		$this->isLiquid = true;
+		$this->breakable = false;
+		$this->isReplaceable = true;
+		$this->isSolid = false;
+		$this->isFullBlock = true;
+	}
+}
--- a/src/material/block/SolidBlock.php
+++ b/src/material/block/SolidBlock.php
@ -0,0 +1,28 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class SolidBlock extends GenericBlock{
+	public function __construct($id, $meta = 0, $name = "Unknown"){
+		parent::__construct($id, $meta, $name);
+		$this->isSolid = true;
+		$this->isFullBlock = true;
+	}
+}
--- a/src/material/block/StairBlock.php
+++ b/src/material/block/StairBlock.php
@ -0,0 +1,56 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class StairBlock extends TransparentBlock{
+	public function __construct($id, $meta = 0, $name = "Unknown"){
+		parent::__construct($id, $meta, $name);
+		if(($this->meta & 0x04) === 0x04){
+			$this->isFullBlock = true;
+		}else{
+			$this->isFullBlock = false;
+		}
+	}
+
+	public function place(Item $item, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){
+		$faces = array(
+			0 => 0,
+			1 => 2,
+			2 => 1,
+			3 => 3,
+		);
+		$this->meta = $faces[$player->entity->getDirection()] & 0x03;
+		if(($fy > 0.5 and $face !== 1) or $face === 0){
+			$this->meta |= 0x04; //Upside-down stairs
+		}
+		$this->level->setBlock($block, $this);
+		return true;
+	}
+	
+	public function getDrops(Item $item, Player $player){
+		if($item->isPickaxe() >= 1){
+			return array(
+				array($this->id, 0, 1),
+			);
+		}else{
+			return array();
+		}
+	}
+}
--- a/src/material/block/TransparentBlock.php
+++ b/src/material/block/TransparentBlock.php
@ -0,0 +1,33 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class TransparentBlock extends GenericBlock{
+	public function __construct($id, $meta = 0, $name = "Unknown"){
+		parent::__construct($id, $meta, $name);
+		$this->isActivable = false;
+		$this->breakable = true;
+		$this->isFlowable = false;
+		$this->isTransparent = true;
+		$this->isReplaceable = false;
+		$this->isPlaceable = true;		
+		$this->isSolid = true;
+	}
+}
--- a/src/material/block/attachable/Ladder.php
+++ b/src/material/block/attachable/Ladder.php
@ -0,0 +1,49 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class LadderBlock extends TransparentBlock{
+	public function __construct($meta = 0){
+		parent::__construct(LADDER, $meta, "Ladder");
+		$this->isSolid = false;
+		$this->isFullBlock = false;
+	}
+	public function place(Item $item, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){
+		if($target->isTransparent === false){
+				$faces = array(
+					2 => 2,
+					3 => 3,
+					4 => 4,
+					5 => 5,
+				);
+			if(isset($faces[$face])){
+				$this->meta = $faces[$face];
+				$this->level->setBlock($block, $this);
+				return true;
+			}
+		}
+		return false;
+	}
+	public function getDrops(Item $item, Player $player){
+		return array(
+			array($this->id, 0, 1),
+		);
+	}		
+}
--- a/src/material/block/attachable/SignPost.php
+++ b/src/material/block/attachable/SignPost.php
@ -0,0 +1,71 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class SignPostBlock extends TransparentBlock{
+	public function __construct($meta = 0){
+		parent::__construct(SIGN_POST, $meta, "Sign Post");
+		$this->isSolid = false;
+		$this->isFullBlock = false;
+	}
+	
+	public function place(Item $item, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){
+		if($face !== 0){
+			$faces = array(
+				2 => 2,
+				3 => 3,
+				4 => 4,
+				5 => 5,
+			);
+			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));
+				return true;
+			}else{
+				$this->meta = $faces[$face];
+				$this->level->setBlock($block, BlockAPI::get(WALL_SIGN, $this->meta));
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	public function onUpdate($type){
+		if($type === BLOCK_UPDATE_NORMAL){
+			if($this->getSide(0)->getID() === AIR){ //Replace wit common break method
+				ServerAPI::request()->api->entity->drop($this, BlockAPI::getItem(SIGN, 0, 1));
+				$this->level->setBlock($this, new AirBlock(), false);
+				return BLOCK_UPDATE_NORMAL;
+			}
+		}
+		return false;
+	}
+	
+	public function onBreak(Item $item, Player $player){
+		$this->level->setBlock($this, new AirBlock(), true, true);
+		return true;
+	}
+
+	public function getDrops(Item $item, Player $player){
+		return array(
+			array(SIGN, 0, 1),
+		);
+	}	
+}
--- a/src/material/block/attachable/Torch.php
+++ b/src/material/block/attachable/Torch.php
@ -0,0 +1,73 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class TorchBlock extends FlowableBlock{
+	public function __construct($meta = 0){
+		parent::__construct(TORCH, $meta, "Torch");
+	}
+	
+	public function onUpdate($type){
+		if($type === BLOCK_UPDATE_NORMAL){
+			$side = $this->getMetadata();
+			$faces = array(
+					1 => 4,
+					2 => 5,
+					3 => 2,
+					4 => 3,
+					5 => 0,
+					6 => 0,
+					0 => 0,
+			);
+
+			if($this->getSide($faces[$side])->isTransparent === true and !($side === 0 and $this->getSide(0)->getID() === FENCE)){ //Replace wit common break method
+				ServerAPI::request()->api->entity->drop($this, BlockAPI::getItem($this->id, 0, 1));
+				$this->level->setBlock($this, 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($target->isTransparent === false and $face !== 0){
+			$faces = array(
+				1 => 5,
+				2 => 4,
+				3 => 3,
+				4 => 2,
+				5 => 1,
+			);
+			$this->meta = $faces[$face];
+			$this->level->setBlock($block, $this);
+			return true;
+		}elseif($this->getSide(0)->isTransparent === false or $this->getSide(0)->getID() === FENCE){
+			$this->meta = 0;
+			$this->level->setBlock($block, $this);
+			return true;
+		}
+		return false;
+	}
+	public function getDrops(Item $item, Player $player){
+		return array(
+			array($this->id, 0, 1),
+		);
+	}
+}
--- a/src/material/block/attachable/Trapdoor.php
+++ b/src/material/block/attachable/Trapdoor.php
@ -0,0 +1,58 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class TrapdoorBlock extends TransparentBlock{
+	public function __construct($meta = 0){
+		parent::__construct(TRAPDOOR, $meta, "Trapdoor");
+		$this->isActivable = true;
+		if(($this->meta & 0x04) === 0x04){
+			$this->isFullBlock = false;
+		}else{
+			$this->isFullBlock = true;
+		}
+	}
+	public function place(Item $item, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){
+			if(($target->isTransparent === false or $target->getID() === SLAB) and $face !== 0 and $face !== 1){
+				$faces = array(
+					2 => 0,
+					3 => 1,
+					4 => 2,
+					5 => 3,
+				);
+				$this->meta = $faces[$face] & 0x03;
+				if($fy > 0.5){
+					$this->meta |= 0x08;
+				}
+				$this->level->setBlock($block, $this);
+				return true;
+			}
+	}
+	public function getDrops(Item $item, Player $player){
+		return array(
+			array($this->id, 0, 1),
+		);
+	}
+	public function onActivate(Item $item, Player $player){
+		$this->meta ^= 0x04;
+		$this->level->setBlock($this, $this);
+		return true;
+	}
+}
--- a/src/material/block/attachable/WallSign.php
+++ b/src/material/block/attachable/WallSign.php
@ -0,0 +1,34 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+/***REM_START***/
+require_once("SignPost.php");
+/***REM_END***/
+
+class WallSignBlock extends SignPostBlock{
+	public function __construct($meta = 0){
+		TransparentBlock::__construct(WALL_SIGN, $meta, "Wall Sign");
+	}
+
+	public function onUpdate($type){
+		return false;
+	}
+}
--- a/src/material/block/liquid/Lava.php
+++ b/src/material/block/liquid/Lava.php
@ -0,0 +1,27 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class LavaBlock extends LiquidBlock{
+	public function __construct($meta = 0){
+		parent::__construct(LAVA, $meta, "Lava");
+	}
+	
+}
--- a/src/material/block/liquid/StillLava.php
+++ b/src/material/block/liquid/StillLava.php
@ -0,0 +1,27 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class StillLavaBlock extends LiquidBlock{
+	public function __construct($meta = 0){
+		parent::__construct(STILL_LAVA, $meta, "Still Lava");
+	}
+	
+}
--- a/src/material/block/liquid/StillWater.php
+++ b/src/material/block/liquid/StillWater.php
@ -0,0 +1,32 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+
+/***REM_START***/
+require_once("Water.php");
+/***REM_END***/
+
+class StillWaterBlock extends WaterBlock{
+	public function __construct($meta = 0){
+		LiquidBlock::__construct(STILL_WATER, $meta, "Still Water");
+	}
+	
+}
--- a/src/material/block/liquid/Water.php
+++ b/src/material/block/liquid/Water.php
@ -0,0 +1,112 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+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;
+		$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(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;
+		}
+		
+		$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;
+	}	
+}
--- a/src/material/block/misc/Air.php
+++ b/src/material/block/misc/Air.php
@ -0,0 +1,37 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class AirBlock extends TransparentBlock{
+	public function __construct(){
+		parent::__construct(AIR, 0, "Air");
+		$this->isActivable = false;
+		$this->breakable = false;
+		$this->isFlowable = true;
+		$this->isTransparent = true;
+		$this->isReplaceable = true;
+		$this->isPlaceable = false;
+		$this->hasPhysics = false;
+		$this->isSolid = false;
+		$this->isFullBlock = true;
+		
+	}
+	
+}
--- a/src/material/block/misc/Bed.php
+++ b/src/material/block/misc/Bed.php
@ -0,0 +1,95 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class BedBlock extends TransparentBlock{
+	public function __construct($type = 0){
+		parent::__construct(BED_BLOCK, $type, "Bed Block");
+		$this->isActivable = true;
+		$this->isFullBlock = false;
+	}
+	
+	public function onActivate(Item $item, Player $player){
+		$player->dataPacket(MC_CLIENT_MESSAGE, array(
+			"message" => "This bed has been corrupted by your hands!"
+		));
+		return true;
+	}
+	
+	public function place(Item $item, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){
+			$down = $this->getSide(0);
+			if($down->isTransparent === false){
+				$faces = array(
+					0 => 3,
+					1 => 4,
+					2 => 2,
+					3 => 5,
+				);
+				$d = $player->entity->getDirection();
+				$next = $this->getSide($faces[(($d + 3) % 4)]);
+				$downNext = $this->getSide(0);
+				if($next->isReplaceable === true and $downNext->isTransparent === false){
+					$meta = (($d + 3) % 4) & 0x03;
+					$this->level->setBlock($block, BlockAPI::get($this->id, $meta));
+					$this->level->setBlock($next, BlockAPI::get($this->id, $meta | 0x08));
+					return true;
+				}
+			}
+		return false;
+	}	
+	
+	public function onBreak(Item $item, Player $player){
+			$blockNorth = $this->getSide(2); //Gets the blocks around them
+			$blockSouth = $this->getSide(3);
+			$blockEast = $this->getSide(5);
+			$blockWest = $this->getSide(4);
+			
+			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());
+				}elseif($blockSouth->getID() === $this->id and $blockSouth->meta !== 0x08){
+					$this->level->setBlock($blockSouth, new AirBlock());
+				}elseif($blockEast->getID() === $this->id and $blockEast->meta !== 0x08){
+					$this->level->setBlock($blockEast, new AirBlock());
+				}elseif($blockWest->getID() === $this->id and $blockWest->meta !== 0x08){
+					$this->level->setBlock($blockWest, new AirBlock());
+				}
+			}else{ //Bottom Part of Bed
+				if($blockNorth->getID() === $this->id and ($blockNorth->meta & 0x08) === 0x08){
+					$this->level->setBlock($blockNorth, new AirBlock());
+				}elseif($blockSouth->getID() === $this->id and ($blockSouth->meta & 0x08) === 0x08){
+					$this->level->setBlock($blockSouth, new AirBlock());
+				}elseif($blockEast->getID() === $this->id and ($blockEast->meta & 0x08) === 0x08){
+					$this->level->setBlock($blockEast, new AirBlock());
+				}elseif($blockWest->getID() === $this->id and ($blockWest->meta & 0x08) === 0x08){
+					$this->level->setBlock($blockWest, new AirBlock());
+				}				
+			}
+			$this->level->setBlock($this, new AirBlock());
+			return true;
+	}
+	
+	public function getDrops(Item $item, Player $player){
+		return array(
+			array(BED, 0, 1),
+		);
+	}
+	
+}
--- a/src/material/block/misc/Fire.php
+++ b/src/material/block/misc/Fire.php
@ -0,0 +1,53 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class FireBlock extends FlowableBlock{
+	public function __construct($meta = 0){
+		parent::__construct(FIRE, $meta, "Fire");
+		$this->isReplaceable = true;
+		$this->breakable = false;
+		$this->isFullBlock = true;
+	}
+	
+	public function getDrops(Item $item, Player $player){
+		return array();
+	}
+	
+	public function onUpdate($type){
+		if($type === BLOCK_UPDATE_NORMAL){
+			for($s = 0; $s <= 5; ++$s){
+				$side = $this->getSide($s);
+				if($side->getID() !== AIR and !($side instanceof LiquidBlock)){
+					return false;
+				}
+			}
+			$this->level->setBlock($this, new AirBlock(), false);
+			return BLOCK_UPDATE_NORMAL;
+		}elseif($type === BLOCK_UPDATE_RANDOM){
+			if($this->getSide(0)->getID() !== NETHERRACK){
+				$this->level->setBlock($this, new AirBlock(), false);
+				return BLOCK_UPDATE_NORMAL;
+			}
+		}
+		return false;
+	}
+	
+}
--- a/src/material/block/misc/NetherReactor.php
+++ b/src/material/block/misc/NetherReactor.php
@ -0,0 +1,28 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class NetherReactorBlock extends SolidBlock{
+	public function __construct($meta = 0){
+		parent::__construct(NETHER_REACTOR, $meta, "Nether Reactor");
+		$this->isActivable = true;
+	}
+	
+}
--- a/src/material/block/misc/TNT.php
+++ b/src/material/block/misc/TNT.php
@ -0,0 +1,26 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class TNTBlock extends SolidBlock{
+	public function __construct(){
+		parent::__construct(TNT, 0, "TNT");
+	}
+}
--- a/src/material/block/nonfull/Cake.php
+++ b/src/material/block/nonfull/Cake.php
@ -0,0 +1,58 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class CakeBlock extends TransparentBlock{
+	public function __construct($meta = 0){
+		parent::__construct(CAKE_BLOCK, 0, "Cake Block");
+		$this->isFullBlock = false;
+		$this->isActivable = true;
+		$this->meta = $meta & 0x07;
+	}
+	
+	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);
+				return BLOCK_UPDATE_NORMAL;
+			}
+		}
+		return false;
+	}
+	
+	public function getDrops(Item $item, Player $player){
+		return array();
+	}
+	
+	public function onActivate(Item $item, Player $player){
+		if($player->entity->getHealth() < 20){
+			++$this->meta;
+			$player->entity->heal(3, "cake");
+			if($this->meta >= 0x06){
+				$this->level->setBlock($this, new AirBlock());
+			}else{
+				$this->level->setBlock($this, $this);
+			}
+			return true;
+		}
+		return false;
+	}
+	
+}
--- a/src/material/block/nonfull/Cobweb.php
+++ b/src/material/block/nonfull/Cobweb.php
@ -0,0 +1,31 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class CobwebBlock extends FlowableBlock{
+	public function __construct(){
+		parent::__construct(COBWEB, 0, "Cobweb");		
+		$this->isSolid = true;
+		$this->isFullBlock = false;
+	}
+	public function getDrops(Item $item, Player $player){
+		return array();
+	}	
+}
--- a/src/material/block/nonfull/Fence.php
+++ b/src/material/block/nonfull/Fence.php
@ -0,0 +1,28 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class FenceBlock extends TransparentBlock{
+	public function __construct(){
+		parent::__construct(FENCE, 0, "Fence");
+		$this->isFullBlock = false;
+	}
+	
+}
--- a/src/material/block/nonfull/FenceGate.php
+++ b/src/material/block/nonfull/FenceGate.php
@ -0,0 +1,59 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class FenceGateBlock extends TransparentBlock{
+	public function __construct($meta = 0){
+		parent::__construct(FENCE_GATE, $meta, "Fence Gate");
+		$this->isActivable = true;
+		if(($this->meta & 0x04) === 0x04){
+			$this->isFullBlock = true;
+		}else{
+			$this->isFullBlock = false;
+		}
+	}
+	public function place(Item $item, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){
+		$faces = array(
+			0 => 3,
+			1 => 0,
+			2 => 1,
+			3 => 2,
+		);
+		$this->meta = $faces[$player->entity->getDirection()] & 0x03;
+		$this->level->setBlock($block, $this);
+		return true;
+	}
+	public function getDrops(Item $item, Player $player){
+		return array(
+			array($this->id, 0, 1),
+		);
+	}
+	public function onActivate(Item $item, Player $player){
+		$faces = array(
+			0 => 3,
+			1 => 0,
+			2 => 1,
+			3 => 2,
+		);
+		$this->meta = ($faces[$player->entity->getDirection()] & 0x03) | ((~$this->meta) & 0x04);
+		$this->level->setBlock($this, $this);
+		return true;
+	}	
+}
--- a/src/material/block/nonfull/GlassPane.php
+++ b/src/material/block/nonfull/GlassPane.php
@ -0,0 +1,27 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class GlassPaneBlock extends TransparentBlock{
+	public function __construct(){
+		parent::__construct(GLASS_PANE, 0, "Glass Pane");
+	}
+	
+}
--- a/src/material/block/nonfull/IronDoor.php
+++ b/src/material/block/nonfull/IronDoor.php
@ -0,0 +1,70 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class IronDoorBlock extends DoorBlock{
+	public function __construct($meta = 0){
+		parent::__construct(IRON_DOOR_BLOCK, $meta, "Iron Door Block");
+		//$this->isActivable = true;
+	}
+	
+	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(1) instanceof DoorBlock){
+					$this->level->setBlock($this->getSide(1), new AirBlock(), false);
+				}
+				return BLOCK_UPDATE_NORMAL;
+			}
+		}
+		return false;
+	}
+
+	public function getBreakTime(Item $item, Player $player){
+		if(($player->gamemode & 0x01) === 0x01){
+			return 0.20;
+		}		
+		switch($item->isPickaxe()){
+			case 5:
+				return 0.95;
+			case 4:
+				return 1.25;
+			case 3:
+				return 1.9;
+			case 2:
+				return 0.65;
+			case 1:
+				return 3.75;
+			default:
+				return 25;
+		}
+	}
+	
+	public function getDrops(Item $item, Player $player){
+		if($item->isPickaxe() >= 1){
+			return array(
+				array(IRON_DOOR, 0, 1),
+			);
+		}else{
+			return array();
+		}
+	}
+}
--- a/src/material/block/nonfull/Slab.php
+++ b/src/material/block/nonfull/Slab.php
@ -0,0 +1,108 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class SlabBlock extends TransparentBlock{
+	public function __construct($meta = 0){
+		parent::__construct(SLAB, $meta, "Slab");
+		$names = array(
+			0 => "Stone",
+			1 => "Sandstone",
+			2 => "Wooden",
+			3 => "Cobblestone",
+			4 => "Brick",
+			5 => "Stone Brick",
+			//6 => "Nether Brick",
+			6 => "Quartz",
+		);
+		$this->name = (($this->meta & 0x08) === 0x08 ? "Upper ":"") . $names[$this->meta & 0x07] . " Slab";	
+		if(($this->meta & 0x08) === 0x08){
+			$this->isFullBlock = true;
+		}else{
+			$this->isFullBlock = false;
+		}
+	}
+	
+	public function place(Item $item, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){
+			$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));
+					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));
+					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));
+						return true;
+					}
+					return false;
+				}else{
+					if($fy > 0.5){
+						$this->meta |= 0x08;
+					}
+				}
+			}else{
+				return false;
+			}
+			if($block->getID() === SLAB and ($target->getMetadata() & 0x07) !== ($this->meta & 0x07)){
+				return false;
+			}
+			$this->level->setBlock($block, $this);
+			return true;
+	}
+
+	public function getBreakTime(Item $item, Player $player){
+		if(($player->gamemode & 0x01) === 0x01){
+			return 0.20;
+		}		
+		switch($item->isPickaxe()){
+			case 5:
+				return 0.4;
+			case 4:
+				return 0.5;
+			case 3:
+				return 0.75;
+			case 2:
+				return 0.25;
+			case 1:
+				return 1.5;
+			default:
+				return 10;
+		}
+	}
+	
+	public function getDrops(Item $item, Player $player){
+		if($item->isPickaxe() >= 1){
+			return array(
+				array($this->id, $this->meta & 0x07, 1),
+			);
+		}else{
+			return array();
+		}
+	}
+}
--- a/src/material/block/nonfull/SnowLayer.php
+++ b/src/material/block/nonfull/SnowLayer.php
@ -0,0 +1,47 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class SnowLayerBlock extends FlowableBlock{
+	public function __construct($meta = 0){
+		parent::__construct(SNOW_LAYER, $meta, "Snow Layer");
+		$this->isReplaceable = true;
+		$this->isSolid = false;
+		$this->isFullBlock = false;
+	}
+	
+	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);
+				return BLOCK_UPDATE_NORMAL;
+			}
+		}
+		return false;
+	}
+	
+	public function getDrops(Item $item, Player $player){
+		if($item->isShovel() !== false){
+			return array(
+				array(SNOWBALL, 0, 1),
+			);
+		}
+	}
+}
--- a/src/material/block/nonfull/WoodDoor.php
+++ b/src/material/block/nonfull/WoodDoor.php
@ -0,0 +1,33 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class WoodDoorBlock extends DoorBlock{
+	public function __construct($meta = 0){
+		parent::__construct(WOOD_DOOR_BLOCK, $meta, "Wood Door Block");
+		$this->isActivable = true;
+	}
+	
+	public function getDrops(Item $item, Player $player){
+		return array(
+			array(WOODEN_DOOR, 0, 1),
+		);
+	}
+}
--- a/src/material/block/nonfull/stairs/BrickStairs.php
+++ b/src/material/block/nonfull/stairs/BrickStairs.php
@ -0,0 +1,27 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class BrickStairsBlock extends StairBlock{
+	public function __construct($meta = 0){
+		parent::__construct(BRICK_STAIRS, $meta, "Brick Stairs");
+	}
+	
+}
--- a/src/material/block/nonfull/stairs/CobblestoneStairs.php
+++ b/src/material/block/nonfull/stairs/CobblestoneStairs.php
@ -0,0 +1,27 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class CobblestoneStairsBlock extends StairBlock{
+	public function __construct($meta = 0){
+		parent::__construct(COBBLESTONE_STAIRS, $meta, "Cobblestone Stairs");
+	}
+	
+}
--- a/src/material/block/nonfull/stairs/NetherBricksStairs.php
+++ b/src/material/block/nonfull/stairs/NetherBricksStairs.php
@ -0,0 +1,27 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class NetherBricksStairsBlock extends StairBlock{
+	public function __construct($meta = 0){
+		parent::__construct(NETHER_BRICKS_STAIRS, $meta, "Nether Bricks Stairs");
+	}
+	
+}
--- a/src/material/block/nonfull/stairs/QuartzStairs.php
+++ b/src/material/block/nonfull/stairs/QuartzStairs.php
@ -0,0 +1,27 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class QuartzStairsBlock extends StairBlock{
+	public function __construct($meta = 0){
+		parent::__construct(QUARTZ_STAIRS, $meta, "Quartz Stairs");
+	}
+	
+}
--- a/src/material/block/nonfull/stairs/SandstoneStairs.php
+++ b/src/material/block/nonfull/stairs/SandstoneStairs.php
@ -0,0 +1,27 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class SandstoneStairsBlock extends StairBlock{
+	public function __construct($meta = 0){
+		parent::__construct(SANDSTONE_STAIRS, $meta, "Sandstone Stairs");
+	}
+	
+}
--- a/src/material/block/nonfull/stairs/StoneBrickStairs.php
+++ b/src/material/block/nonfull/stairs/StoneBrickStairs.php
@ -0,0 +1,27 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class StoneBrickStairsBlock extends StairBlock{
+	public function __construct($meta = 0){
+		parent::__construct(STONE_BRICK_STAIRS, $meta, "Stone Brick Stairs");
+	}
+	
+}
--- a/src/material/block/nonfull/stairs/WoodStairs.php
+++ b/src/material/block/nonfull/stairs/WoodStairs.php
@ -0,0 +1,27 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class WoodStairsBlock extends StairBlock{
+	public function __construct($meta = 0){
+		parent::__construct(WOOD_STAIRS, $meta, "Wood Stairs");
+	}
+	
+}
--- a/src/material/block/ore/CoalOre.php
+++ b/src/material/block/ore/CoalOre.php
@ -0,0 +1,57 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class CoalOreBlock extends SolidBlock{
+	public function __construct(){
+		parent::__construct(COAL_ORE, 0, "Coal Ore");
+	}
+	
+	public function getBreakTime(Item $item, Player $player){
+		if(($player->gamemode & 0x01) === 0x01){
+			return 0.20;
+		}		
+		switch($item->isPickaxe()){
+			case 5:
+				return 0.6;
+			case 4:
+				return 0.75;
+			case 3:
+				return 1.15;
+			case 2:
+				return 0.4;
+			case 1:
+				return 2.25;
+			default:
+				return 15;
+		}
+	}
+	
+	public function getDrops(Item $item, Player $player){
+		if($item->isPickaxe() >= 1){
+			return array(
+				array(COAL, 0, 1),
+			);
+		}else{
+			return array();
+		}
+	}
+	
+}
--- a/src/material/block/ore/DiamondOre.php
+++ b/src/material/block/ore/DiamondOre.php
@ -0,0 +1,50 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class DiamondOreBlock extends SolidBlock{
+	public function __construct(){
+		parent::__construct(DIAMOND_ORE, 0, "Diamond Ore");
+	}
+	
+	public function getBreakTime(Item $item, Player $player){
+		if(($player->gamemode & 0x01) === 0x01){
+			return 0.20;
+		}		
+		switch($item->isPickaxe()){
+			case 5:
+				return 0.6;
+			case 4:
+				return 0.75;
+			default:
+				return 15;
+		}
+	}
+	
+	public function getDrops(Item $item, Player $player){
+		if($item->isPickaxe() >= 4){
+			return array(
+				array(DIAMOND, 0, 1),
+			);
+		}else{
+			return array();
+		}
+	}
+}
--- a/src/material/block/ore/GlowingRedstoneOre.php
+++ b/src/material/block/ore/GlowingRedstoneOre.php
@ -0,0 +1,62 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class GlowingRedstoneOreBlock extends SolidBlock{
+	public function __construct(){
+		parent::__construct(GLOWING_REDSTONE_ORE, 0, "Glowing Redstone Ore");
+	}
+
+	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);			
+			return BLOCK_UPDATE_WEAK;
+		}else{
+			$this->level->scheduleBlockUpdate(new Position($this, 0, 0, $this->level), Utils::getRandomUpdateTicks(), BLOCK_UPDATE_RANDOM);
+		}
+		return false;
+	}
+	
+
+	public function getBreakTime(Item $item, Player $player){
+		if(($player->gamemode & 0x01) === 0x01){
+			return 0.20;
+		}		
+		switch($item->isPickaxe()){
+			case 5:
+				return 0.6;
+			case 4:
+				return 0.75;
+			default:
+				return 15;
+		}
+	}
+	
+	public function getDrops(Item $item, Player $player){
+		if($item->isPickaxe() >= 4){
+			return array(
+				//array(331, 4, mt_rand(4, 5)),
+			);
+		}else{
+			return array();
+		}
+	}
+	
+}
--- a/src/material/block/ore/GoldOre.php
+++ b/src/material/block/ore/GoldOre.php
@ -0,0 +1,50 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class GoldOreBlock extends SolidBlock{
+	public function __construct(){
+		parent::__construct(GOLD_ORE, 0, "Gold Ore");
+	}
+
+	public function getBreakTime(Item $item, Player $player){
+		if(($player->gamemode & 0x01) === 0x01){
+			return 0.20;
+		}		
+		switch($item->isPickaxe()){
+			case 5:
+				return 0.6;
+			case 4:
+				return 0.75;
+			default:
+				return 15;
+		}
+	}
+	
+	public function getDrops(Item $item, Player $player){
+		if($item->isPickaxe() >= 4){
+			return array(
+				array(GOLD_ORE, 0, 1),
+			);
+		}else{
+			return array();
+		}
+	}
+}
--- a/src/material/block/ore/IronOre.php
+++ b/src/material/block/ore/IronOre.php
@ -0,0 +1,52 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class IronOreBlock extends SolidBlock{
+	public function __construct(){
+		parent::__construct(IRON_ORE, 0, "Iron Ore");
+	}
+
+	public function getBreakTime(Item $item, Player $player){
+		if(($player->gamemode & 0x01) === 0x01){
+			return 0.20;
+		}		
+		switch($item->isPickaxe()){
+			case 5:
+				return 0.6;
+			case 4:
+				return 0.75;
+			case 3:
+				return 1.15;
+			default:
+				return 15;
+		}
+	}
+	
+	public function getDrops(Item $item, Player $player){
+		if($item->isPickaxe() >= 3){
+			return array(
+				array(IRON_ORE, 0, 1),
+			);
+		}else{
+			return array();
+		}
+	}
+}
--- a/Show More
+++ b/Show More