Fixed wrong paths

src/pocketmine/entity/Ageable.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/
+ * 
+ *
+*/
+
+namespace pocketmine\entity;
+
+
+interface Ageable{
+
+}

src/pocketmine/entity/Animal.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/
+ * 
+ *
+*/
+
+namespace pocketmine\entity;
+
+
+abstract class Animal extends Creature implements Ageable{
+
+}

src/pocketmine/entity/Arrow.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/
+ * 
+ *
+*/
+
+namespace pocketmine\entity;
+
+
+class Arrow extends Projectile{
+
+}

src/pocketmine/entity/Attachable.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/
+ * 
+ *
+*/
+
+namespace pocketmine\entity;
+
+
+interface Attachable{
+
+}

src/pocketmine/entity/Chicken.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/
+ * 
+ *
+*/
+
+namespace pocketmine\entity;
+
+
+class Chicken extends Animal{
+
+}

src/pocketmine/entity/Colorable.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/
+ * 
+ *
+*/
+
+namespace pocketmine\entity;
+
+
+interface Colorable{
+
+}

src/pocketmine/entity/Cow.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/
+ * 
+ *
+*/
+
+namespace pocketmine\entity;
+
+
+class Cow extends Animal{
+
+}

src/pocketmine/entity/Creature.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/
+ * 
+ *
+*/
+
+namespace pocketmine\entity;
+
+
+abstract class Creature extends Living{
+
+}

src/pocketmine/entity/Creeper.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/
+ * 
+ *
+*/
+
+namespace pocketmine\entity;
+
+
+class Creeper extends Monster implements Explosive{
+
+}

src/pocketmine/entity/Damageable.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/
+ * 
+ *
+*/
+
+namespace pocketmine\entity;
+
+
+interface Damageable{
+
+}

src/pocketmine/entity/DroppedItem.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/
+ * 
+ *
+*/
+
+namespace pocketmine\entity;
+
+
+class DroppedItem extends Entity{
+
+}

src/pocketmine/entity/Egg.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/
+ * 
+ *
+*/
+
+namespace pocketmine\entity;
+
+
+class Egg extends Projectile{
+
+}

src/pocketmine/entity/EnderPearl.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/
+ * 
+ *
+*/
+
+namespace pocketmine\entity;
+
+
+class EnderPearl extends Projectile{
+
+}

src/pocketmine/entity/Enderman.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/
+ * 
+ *
+*/
+
+namespace pocketmine\entity;
+
+
+class Enderman extends Monster implements InventorySource{
+
+}

src/pocketmine/entity/Entity.php

@@ -0,0 +1,552 @@
+<?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/
+ * 
+ *
+*/
+
+/**
+ * All the entity classes
+ */
+namespace pocketmine\entity;
+
+use pocketmine\event\entity\EntityDespawnEvent;
+use pocketmine\event\entity\EntityLevelChangeEvent;
+use pocketmine\event\entity\EntityMotionEvent;
+use pocketmine\event\entity\EntityMoveEvent;
+use pocketmine\event\entity\EntitySpawnEvent;
+use pocketmine\level\Level;
+use pocketmine\level\Position;
+use pocketmine\math\AxisAlignedBB;
+use pocketmine\math\Vector3 as Vector3;
+use pocketmine\nbt\tag\Compound;
+use pocketmine\network\protocol\MoveEntityPacket_PosRot;
+use pocketmine\network\protocol\MovePlayerPacket;
+use pocketmine\network\protocol\RemoveEntityPacket;
+use pocketmine\network\protocol\SetEntityMotionPacket;
+use pocketmine\Network;
+use pocketmine\network\protocol\SetTimePacket;
+use pocketmine\Player;
+use pocketmine\pmf\LevelFormat;
+use pocketmine\Server;
+
+abstract class Entity extends Position{
+	public static $entityCount = 1;
+
+	/**
+	 * @var Entity[]
+	 */
+	public static $list = array();
+
+	/**
+	 * @var Entity[]
+	 */
+	public static $needUpdate = array();
+
+	/**
+	 * @var Player[]
+	 */
+	protected $hasSpawned = array();
+
+	protected $id;
+
+	public $passenger = null;
+	public $vehicle = null;
+
+	public $chunkIndex;
+
+	public $lastX;
+	public $lastY;
+	public $lastZ;
+
+	public $motionX;
+	public $motionY;
+	public $motionZ;
+
+	public $yaw;
+	public $pitch;
+	public $lastYaw;
+	public $lastPitch;
+
+	public $boundingBox;
+	public $onGround;
+	public $positionChanged;
+	public $motionChanged;
+	public $dead;
+
+	public $height;
+	public $width;
+	public $length;
+
+	public $fallDistance;
+	public $ticksLived;
+	public $lastUpdate;
+	public $maxFireTicks;
+	public $fireTicks;
+	public $airTicks;
+	public $namedtag;
+
+	protected $inWater;
+	public $noDamageTicks;
+	private $justCreated;
+	protected $fireProof;
+	private $invulnerable;
+
+	public $closed;
+
+	public static function get($entityID){
+		return isset(Entity::$list[$entityID]) ? Entity::$list[$entityID] : false;
+	}
+
+	public static function getAll(){
+		return Entity::$list;
+	}
+
+
+	public function __construct(Level $level, Compound $nbt){
+		$this->id = Entity::$entityCount++;
+		$this->justCreated = true;
+		$this->closed = false;
+		$this->namedtag = $nbt;
+		$this->level = $level;
+
+		$this->boundingBox = new AxisAlignedBB(0, 0, 0, 0, 0, 0);
+		$this->setPositionAndRotation(new Vector3($this->namedtag["Pos"][0], $this->namedtag["Pos"][1], $this->namedtag["Pos"][2]), $this->namedtag->Rotation[0], $this->namedtag->Rotation[1]);
+		$this->setMotion(new Vector3($this->namedtag["Motion"][0], $this->namedtag["Motion"][1], $this->namedtag["Motion"][2]));
+
+		$this->fallDistance = $this->namedtag["FallDistance"];
+		$this->fireTicks = $this->namedtag["Fire"];
+		$this->airTicks = $this->namedtag["Air"];
+		$this->onGround = $this->namedtag["OnGround"] > 0 ? true : false;
+		$this->invulnerable = $this->namedtag["Invulnerable"] > 0 ? true : false;
+
+		$index = LevelFormat::getIndex($this->x >> 4, $this->z >> 4);
+		$this->chunkIndex = $index;
+		Entity::$list[$this->id] = $this;
+		$this->level->entities[$this->id] = $this;
+		$this->level->chunkEntities[$this->chunkIndex][$this->id] = $this;
+		$this->lastUpdate = microtime(true);
+		$this->initEntity();
+		Server::getInstance()->getPluginManager()->callEvent(new EntitySpawnEvent($this));
+	}
+
+	public function saveNBT(){
+		$this->namedtag["Pos"][0] = $this->x;
+		$this->namedtag["Pos"][1] = $this->y;
+		$this->namedtag["Pos"][2] = $this->z;
+
+		$this->namedtag["Motion"][0] = $this->motionX;
+		$this->namedtag["Motion"][1] = $this->motionY;
+		$this->namedtag["Motion"][2] = $this->motionZ;
+
+		$this->namedtag["Rotation"][0] = $this->yaw;
+		$this->namedtag["Rotation"][1] = $this->pitch;
+
+		$this->namedtag["FallDistance"] = $this->fallDistance;
+		$this->namedtag["Fire"] = $this->fireTicks;
+		$this->namedtag["Air"] = $this->airTicks;
+		$this->namedtag["OnGround"] = $this->onGround == true ? 1 : 0;
+		$this->namedtag["Invulnerable"] = $this->invulnerable == true ? 1 : 0;
+	}
+
+	protected abstract function initEntity();
+
+	public function spawnTo(Player $player){
+		if(!isset($this->hasSpawned[$player->getID()]) and $player->chunksLoaded[$this->chunkIndex] !== 0xff){
+			$this->hasSpawned[$player->getID()] = $player;
+		}
+	}
+
+	public function despawnFrom(Player $player){
+		if(isset($this->hasSpawned[$player->getID()])){
+			$pk = new RemoveEntityPacket;
+			$pk->eid = $this->id;
+			$player->dataPacket($pk);
+			unset($this->hasSpawned[$player->getID()]);
+		}
+	}
+
+	abstract function attack($damage, $source = "generic");
+
+	abstract function heal($amount, $source = "generic");
+
+	public function onUpdate(){
+		if($this->closed !== false){
+			return false;
+		}
+
+		$timeNow = microtime(true);
+		$this->ticksLived += ($timeNow - $this->lastUpdate) * 20;
+
+		if($this->handleWaterMovement()){
+			$this->fallDistance = 0;
+			$this->inWater = true;
+			$this->extinguish();
+		}else{
+			$this->inWater = false;
+		}
+
+		if($this->fireTicks > 0){
+			if($this->fireProof === true){
+				$this->fireTicks -= 4;
+				if($this->fireTicks < 0){
+					$this->fireTicks = 0;
+				}
+			}else{
+				if(($this->fireTicks % 20) === 0){
+					$this->attackEntity(1, "onFire");
+				}
+				--$this->fireTicks;
+			}
+		}
+
+		if($this->handleLavaMovement()){
+			$this->attackEntity(4, "lava");
+			$this->setOnFire(15);
+			$this->fallDistance *= 0.5;
+		}
+
+		if($this->y < -64){
+			$this->kill();
+		}
+
+		if($this->x !== $this->lastX or $this->y !== $this->lastY or $this->z !== $this->lastZ or $this->yaw !== $this->lastYaw or $this->pitch !== $this->lastPitch){
+			$this->lastX = $this->x;
+			$this->lastY = $this->y;
+			$this->lastZ = $this->z;
+
+			$this->lastYaw = $this->yaw;
+			$this->lastPitch = $this->pitch;
+
+			if($this instanceof Human){
+				$pk = new MovePlayerPacket;
+				$pk->eid = $this->id;
+				$pk->x = $this->x;
+				$pk->y = $this->y;
+				$pk->z = $this->z;
+				$pk->yaw = $this->yaw;
+				$pk->pitch = $this->pitch;
+				$pk->bodyYaw = $this->yaw;
+			}else{
+				$pk = new MoveEntityPacket_PosRot;
+				$pk->eid = $this->id;
+				$pk->x = $this->x;
+				$pk->y = $this->y;
+				$pk->z = $this->z;
+				$pk->yaw = $this->yaw;
+				$pk->pitch = $this->pitch;
+			}
+			Player::broadcastPacket($this->hasSpawned, $pk);
+		}
+
+		if($this->motionChanged === true){
+			$this->motionChanged = false;
+
+			$pk = new SetEntityMotionPacket;
+			$pk->eid = $this->id;
+			$pk->speedX = $this->motionX;
+			$pk->speedY = $this->motionY;
+			$pk->speedZ = $this->motionZ;
+			Player::broadcastPacket($this->hasSpawned, $pk);
+		}
+
+		$this->lastUpdate = $timeNow;
+
+		return false;
+	}
+
+	public final function scheduleUpdate(){
+		Entity::$needUpdate[$this->id] = $this;
+	}
+
+	public abstract function getMetadata();
+
+	public function setOnFire($seconds){
+		$ticks = $seconds * 20;
+		if($ticks > $this->fireTicks){
+			$this->fireTicks = $ticks;
+		}
+	}
+
+	public function getDirection(){
+		$rotation = ($this->yaw - 90) % 360;
+		if($rotation < 0){
+			$rotation += 360.0;
+		}
+		if((0 <= $rotation and $rotation < 45) or (315 <= $rotation and $rotation < 360)){
+			return 2; //North
+		}elseif(45 <= $rotation and $rotation < 135){
+			return 3; //East
+		}elseif(135 <= $rotation and $rotation < 225){
+			return 0; //South
+		}elseif(225 <= $rotation and $rotation < 315){
+			return 1; //West
+		}else{
+			return null;
+		}
+	}
+
+	public function extinguish(){
+		$this->fireTicks = 0;
+	}
+
+	public function canTriggerWalking(){
+		return true;
+	}
+
+	protected function updateFallState($distanceThisTick, $onGround){
+		if($onGround === true){
+			if($this->fallDistance > 0){
+				if($this instanceof Living){
+					//TODO
+				}
+
+				$this->fall($this->fallDistance);
+				$this->fallDistance = 0;
+			}
+		}elseif($distanceThisTick < 0){
+			$this->fallDistance -= $distanceThisTick;
+		}
+	}
+
+	public function getBoundingBox(){
+		return $this->boundingBox;
+	}
+
+	public function fall($fallDistance){ //TODO
+
+	}
+
+	public function handleWaterMovement(){ //TODO
+
+	}
+
+	public function handleLavaMovement(){ //TODO
+
+	}
+
+	public function getEyeHeight(){
+		return 0;
+	}
+
+	public function moveFlying(){ //TODO
+
+	}
+
+	public function onCollideWithPlayer(Human $entityPlayer){
+
+	}
+
+	protected function switchLevel(Level $targetLevel){
+		if($this->level instanceof Level){
+			Server::getInstance()->getPluginManager()->callEvent($ev = new EntityLevelChangeEvent($this, $this->level, $targetLevel));
+			if($ev->isCancelled()){
+				return false;
+			}
+			unset($this->level->entities[$this->id]);
+			unset($this->level->chunkEntities[$this->chunkIndex][$this->id]);
+			$this->despawnFromAll();
+			if($this instanceof Player){
+				foreach($this->chunksLoaded as $index => $Yndex){
+					if($Yndex !== 0xff){
+						$X = null;
+						$Z = null;
+						LevelFormat::getXZ($index, $X, $Z);
+						foreach($this->level->getChunkEntities($X, $Z) as $entity){
+							$entity->despawnFrom($this);
+						}
+					}
+				}
+				$this->level->freeAllChunks($this);
+			}
+		}
+		$this->level = $targetLevel;
+		$this->level->entities[$this->id] = $this;
+		if($this instanceof Player){
+			$this->chunksLoaded = array();
+			$pk = new SetTimePacket();
+			$pk->time = $this->level->getTime();
+			$pk->started = $this->level->stopTime == false;
+			$this->dataPacket($pk);
+		}
+		$this->spawnToAll();
+		$this->chunkIndex = false;
+	}
+
+	public function getPosition(){
+		return new Position($this->x, $this->y, $this->z, $this->level);
+	}
+
+	public function move(Vector3 $displacement){
+		if($displacement->x == 0 and $displacement->y == 0 and $displacement->z == 0){
+			return;
+		}
+
+		$x = $this->x;
+		$y = $this->y;
+		$z = $this->z;
+		$this->scheduleUpdate();
+	}
+
+	public function setPositionAndRotation(Vector3 $pos, $yaw, $pitch){
+		if($this->setPosition($pos) === true){
+			$this->setRotation($yaw, $pitch);
+
+			return true;
+		}
+
+		return false;
+	}
+
+	public function setRotation($yaw, $pitch){
+		$this->yaw = $yaw;
+		$this->pitch = $pitch;
+		$this->scheduleUpdate();
+	}
+
+	public function setPosition(Vector3 $pos){
+		if($pos instanceof Position and $pos->level instanceof Level and $pos->level !== $this->level){
+			if($this->switchLevel($pos->level) === false){
+				return false;
+			}
+		}
+		Server::getInstance()->getPluginManager()->callEvent($ev = new EntityMoveEvent($this, $pos));
+		if($ev->isCancelled()){
+			return false;
+		}
+		$this->x = $pos->x;
+		$this->y = $pos->y;
+		$this->z = $pos->z;
+
+		$radius = $this->width / 2;
+		if(($index = LevelFormat::getIndex($this->x >> 4, $this->z >> 4)) !== $this->chunkIndex){
+			if($this->chunkIndex !== false){
+				unset($this->level->chunkEntities[$this->chunkIndex][$this->id]);
+			}
+			$this->chunkIndex = $index;
+			$this->level->loadChunk($this->x >> 4, $this->z >> 4);
+
+			$newChunk = $this->level->getUsingChunk($this->x >> 4, $this->z >> 4);
+			foreach($this->hasSpawned as $player){
+				if(!isset($newChunk[$player->CID])){
+					$this->despawnFrom($player);
+				}else{
+					unset($newChunk[$player->CID]);
+				}
+			}
+			foreach($newChunk as $player){
+				$this->spawnTo($player);
+			}
+
+			$this->level->chunkEntities[$this->chunkIndex][$this->id] = $this;
+		}
+		$this->boundingBox->setBounds($pos->x - $radius, $pos->y, $pos->z - $radius, $pos->x + $radius, $pos->y + $this->height, $pos->z + $radius);
+
+		$this->scheduleUpdate();
+
+		return true;
+	}
+
+	public function getMotion(){
+		return new Vector3($this->motionX, $this->motionY, $this->motionZ);
+	}
+
+	public function setMotion(Vector3 $motion){
+		Server::getInstance()->getPluginManager()->callEvent($ev = new EntityMotionEvent($this, $motion));
+		if($ev->isCancelled()){
+			return false;
+		}
+		$this->motionX = $motion->x;
+		$this->motionY = $motion->y;
+		$this->motionZ = $motion->z;
+		$this->scheduleUpdate();
+	}
+
+	public function isOnGround(){
+		return $this->onGround === true;
+	}
+
+	public function kill(){
+		$this->dead = true;
+	}
+
+	public function getLevel(){
+		return $this->level;
+	}
+
+	public function teleport(Vector3 $pos, $yaw = false, $pitch = false){
+		$this->setMotion(new Vector3(0, 0, 0));
+		if($this->setPositionAndRotation($pos, $yaw === false ? $this->yaw : $yaw, $pitch === false ? $this->pitch : $pitch) !== false){
+			if($this instanceof Player){
+				$this->airTicks = 300;
+				$this->fallDistance = 0;
+				$this->orderChunks();
+				$this->getNextChunk(true);
+				$this->forceMovement = $pos;
+
+				$pk = new MovePlayerPacket;
+				$pk->eid = 0;
+				$pk->x = $this->x;
+				$pk->y = $this->y;
+				$pk->z = $this->z;
+				$pk->bodyYaw = $this->yaw;
+				$pk->pitch = $this->pitch;
+				$pk->yaw = $this->yaw;
+				$this->dataPacket($pk);
+			}
+
+			return true;
+		}
+
+		return false;
+	}
+
+	public function getID(){
+		return $this->id;
+	}
+
+	public function spawnToAll(){
+		foreach($this->level->getPlayers() as $player){
+			if(isset($player->id) and $player->spawned === true){
+				$this->spawnTo($player);
+			}
+		}
+	}
+
+	public function despawnFromAll(){
+		foreach($this->hasSpawned as $player){
+			$this->despawnFrom($player);
+		}
+	}
+
+	public function close(){
+		if($this->closed === false){
+			$this->closed = true;
+			unset(Entity::$needUpdate[$this->id]);
+			unset($this->level->entities[$this->id]);
+			unset($this->level->chunkEntities[$this->chunkIndex][$this->id]);
+			unset(Entity::$list[$this->id]);
+			$this->despawnFromAll();
+			Server::getInstance()->getPluginManager()->callEvent(new EntityDespawnEvent($this));
+		}
+	}
+
+	public function __destruct(){
+		$this->close();
+	}
+
+}

src/pocketmine/entity/Explosive.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/
+ * 
+ *
+*/
+
+namespace pocketmine\entity;
+
+
+interface Explosive{
+
+}

src/pocketmine/entity/FallingBlock.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/
+ * 
+ *
+*/
+
+namespace pocketmine\entity;
+
+
+class FallingBlock extends Entity{
+
+}

src/pocketmine/entity/Hanging.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/
+ * 
+ *
+*/
+
+namespace pocketmine\entity;
+
+
+abstract class Hanging extends Entity implements Attachable{
+
+}

src/pocketmine/entity/Human.php

@@ -0,0 +1,413 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+namespace pocketmine\entity;
+
+use pocketmine\event\entity\EntityArmorChangeEvent;
+use pocketmine\event\entity\EntityInventoryChangeEvent;
+use pocketmine\item\Item;
+use pocketmine\nbt\NBT;
+use pocketmine\nbt\tag\Byte;
+use pocketmine\nbt\tag\Compound;
+use pocketmine\nbt\tag\Enum;
+use pocketmine\nbt\tag\Short;
+use pocketmine\network\protocol\AddPlayerPacket;
+use pocketmine\network\protocol\ContainerSetContentPacket;
+use pocketmine\network\protocol\PlayerArmorEquipmentPacket;
+use pocketmine\network\protocol\PlayerEquipmentPacket;
+use pocketmine\network\protocol\RemovePlayerPacket;
+use pocketmine\network\protocol\SetEntityMotionPacket;
+use pocketmine\Network;
+use pocketmine\Player;
+use pocketmine\Server;
+
+class Human extends Creature implements ProjectileSource, InventorySource{
+
+	protected $nameTag = "TESTIFICATE";
+	protected $inventory = array();
+	public $slot;
+	protected $hotbar = array();
+	protected $armor = array();
+
+	protected function initEntity(){
+		if(isset($this->namedtag->NameTag)){
+			$this->nameTag = $this->namedtag["NameTag"];
+		}
+		$this->hotbar = array(-1, -1, -1, -1, -1, -1, -1, -1, -1);
+		$this->armor = array(
+			0 => Item::get(Item::AIR, 0, 0),
+			1 => Item::get(Item::AIR, 0, 0),
+			2 => Item::get(Item::AIR, 0, 0),
+			3 => Item::get(Item::AIR, 0, 0)
+		);
+
+		foreach($this->namedtag->Inventory as $item){
+			if($item["Slot"] >= 0 and $item["Slot"] < 9){ //Hotbar
+				$this->hotbar[$item["Slot"]] = isset($item["TrueSlot"]) ? $item["TrueSlot"] : -1;
+			}elseif($item["Slot"] >= 100 and $item["Slot"] < 104){ //Armor
+				$this->armor[$item["Slot"] - 100] = Item::get($item["id"], $item["Damage"], $item["Count"]);
+			}else{
+				$this->inventory[$item["Slot"] - 9] = Item::get($item["id"], $item["Damage"], $item["Count"]);
+			}
+		}
+		$this->slot = $this->hotbar[0];
+
+		$this->height = 1.8; //Or 1.62?
+		$this->width = 0.6;
+	}
+
+	public function saveNBT(){
+		parent::saveNBT();
+		$this->namedtag->Inventory = new Enum("Inventory", array());
+		$this->namedtag->Inventory->setTagType(NBT::TAG_Compound);
+		for($slot = 0; $slot < 9; ++$slot){
+			if(isset($this->hotbar[$slot]) and $this->hotbar[$slot] !== -1){
+				$item = $this->getSlot($this->hotbar[$slot]);
+				if($item->getID() !== 0 and $item->getCount() > 0){
+					$this->namedtag->Inventory[$slot] = new Compound(false, array(
+						new Byte("Count", $item->getCount()),
+						new Short("Damage", $item->getMetadata()),
+						new Byte("Slot", $slot),
+						new Byte("TrueSlot", $this->hotbar[$slot]),
+						new Short("id", $item->getID()),
+					));
+					continue;
+				}
+			}
+			$this->namedtag->Inventory[$slot] = new Compound(false, array(
+				new Byte("Count", 0),
+				new Short("Damage", 0),
+				new Byte("Slot", $slot),
+				new Byte("TrueSlot", -1),
+				new Short("id", 0),
+			));
+		}
+
+		//Normal inventory
+		$slotCount = Player::SURVIVAL_SLOTS + 9;
+		//$slotCount = (($this instanceof Player and ($this->gamemode & 0x01) === 1) ? Player::CREATIVE_SLOTS : Player::SURVIVAL_SLOTS) + 9;
+		for($slot = 9; $slot < $slotCount; ++$slot){
+			$item = $this->getSlot($slot - 9);
+			$this->namedtag->Inventory[$slot] = new Compound(false, array(
+				new Byte("Count", $item->getCount()),
+				new Short("Damage", $item->getMetadata()),
+				new Byte("Slot", $slot),
+				new Short("id", $item->getID()),
+			));
+		}
+
+		//Armor
+		for($slot = 100; $slot < 104; ++$slot){
+			$item = $this->armor[$slot - 100];
+			if($item instanceof Item){
+				$this->namedtag->Inventory[$slot] = new Compound(false, array(
+					new Byte("Count", $item->getCount()),
+					new Short("Damage", $item->getMetadata()),
+					new Byte("Slot", $slot),
+					new Short("id", $item->getID()),
+				));
+			}
+		}
+	}
+
+	public function spawnTo(Player $player){
+		if($player !== $this and !isset($this->hasSpawned[$player->getID()])){
+			$this->hasSpawned[$player->getID()] = $player;
+
+			$pk = new AddPlayerPacket;
+			$pk->clientID = 0;
+			$pk->username = $this->nameTag;
+			$pk->eid = $this->id;
+			$pk->x = $this->x;
+			$pk->y = $this->y;
+			$pk->z = $this->z;
+			$pk->yaw = 0;
+			$pk->pitch = 0;
+			$pk->unknown1 = 0;
+			$pk->unknown2 = 0;
+			$pk->metadata = $this->getMetadata();
+			$player->dataPacket($pk);
+
+			$pk = new SetEntityMotionPacket;
+			$pk->eid = $this->id;
+			$pk->speedX = $this->motionX;
+			$pk->speedY = $this->motionY;
+			$pk->speedZ = $this->motionZ;
+			$player->dataPacket($pk);
+
+			$this->sendCurrentEquipmentSlot($player);
+
+			$this->sendArmor($player);
+		}
+	}
+
+	public function despawnFrom(Player $player){
+		if(isset($this->hasSpawned[$player->getID()])){
+			$pk = new RemovePlayerPacket;
+			$pk->eid = $this->id;
+			$pk->clientID = 0;
+			$player->dataPacket($pk);
+			unset($this->hasSpawned[$player->getID()]);
+		}
+	}
+
+	public function setEquipmentSlot($equipmentSlot, $inventorySlot){
+		$this->hotbar[$equipmentSlot] = $inventorySlot;
+		if($equipmentSlot === $this->slot){
+			foreach($this->hasSpawned as $p){
+				$this->sendEquipmentSlot($p);
+			}
+		}
+	}
+
+	public function setCurrentEquipmentSlot($slot){
+		if(isset($this->hotbar[$slot])){
+			$this->slot = (int) $slot;
+			foreach($this->hasSpawned as $p){
+				$this->sendEquipmentSlot($p);
+			}
+		}
+	}
+
+	public function sendCurrentEquipmentSlot(Player $player){
+		$pk = new PlayerEquipmentPacket;
+		$pk->eid = $this->id;
+		$pk->item = $this->getSlot($this->slot)->getID();
+		$pk->meta = $this->getSlot($this->slot)->getMetadata();
+		$pk->slot = 0;
+		$player->dataPacket($pk);
+	}
+
+	public function setArmorSlot($slot, Item $item){
+		Server::getInstance()->getPluginManager()->callEvent($ev = new EntityArmorChangeEvent($this, $this->getArmorSlot($slot), $item, $slot));
+		if($ev->isCancelled()){
+			return false;
+		}
+		$this->armor[(int) $slot] = $ev->getNewItem();
+		foreach($this->hasSpawned as $p){
+			$this->sendArmor($p);
+		}
+		if($this instanceof Player){
+			$this->sendArmor();
+		}
+
+		return true;
+	}
+
+	public function getArmorSlot($slot){
+		$slot = (int) $slot;
+		if(!isset($this->armor[$slot])){
+			$this->armor[$slot] = Item::get(Item::AIR, 0, 0);
+		}
+
+		return $this->armor[$slot];
+	}
+
+	public function sendArmor($player = null){
+		$slots = array();
+		for($i = 0; $i < 4; ++$i){
+			if(isset($this->armor[$i]) and ($this->armor[$i] instanceof Item) and $this->armor[$i]->getID() > Item::AIR){
+				$slots[$i] = $this->armor[$i]->getID() !== Item::AIR ? $this->armor[$i]->getID() - 256 : 0;
+			}else{
+				$this->armor[$i] = Item::get(Item::AIR, 0, 0);
+				$slots[$i] = 255;
+			}
+		}
+		if($player instanceof Player){
+			$pk = new PlayerArmorEquipmentPacket();
+			$pk->eid = $this->id;
+			$pk->slots = $slots;
+			$player->dataPacket($pk);
+		}elseif($this instanceof Player){
+			$pk = new ContainerSetContentPacket;
+			$pk->windowid = 0x78; //Armor window id
+			$pk->slots = $this->armor;
+			$this->dataPacket($pk);
+		}
+	}
+
+	public function getMetadata(){ //TODO
+		$flags = 0;
+		$flags |= $this->fireTicks > 0 ? 1 : 0;
+		//$flags |= ($this->crouched === true ? 0b10:0) << 1;
+		//$flags |= ($this->inAction === true ? 0b10000:0);
+		$d = array(
+			0 => array("type" => 0, "value" => $flags),
+			1 => array("type" => 1, "value" => $this->airTicks),
+			16 => array("type" => 0, "value" => 0),
+			17 => array("type" => 6, "value" => array(0, 0, 0)),
+		);
+
+		/*if($this->class === ENTITY_MOB and $this->type === MOB_SHEEP){
+			if(!isset($this->data["Sheared"])){
+				$this->data["Sheared"] = 0;
+				$this->data["Color"] = mt_rand(0,15);
+			}
+			$d[16]["value"] = (($this->data["Sheared"] == 1 ? 1:0) << 4) | ($this->data["Color"] & 0x0F);
+		}elseif($this->type === OBJECT_PRIMEDTNT){
+			$d[16]["value"] = (int) max(0, $this->data["fuse"] - (microtime(true) - $this->spawntime) * 20);
+		}elseif($this->class === ENTITY_PLAYER){
+			if($this->player->sleeping !== false){
+				$d[16]["value"] = 2;
+				$d[17]["value"] = array($this->player->sleeping->x, $this->player->sleeping->y, $this->player->sleeping->z);
+			}
+		}*/
+
+		return $d;
+	}
+
+	public function attack($damage, $source = "generic"){
+
+	}
+
+	public function heal($amount, $source = "generic"){
+
+	}
+
+	public function hasItem(Item $item, $checkDamage = true){
+		foreach($this->inventory as $s => $i){
+			if($i->equals($item, $checkDamage)){
+				return $i;
+			}
+		}
+
+		return false;
+	}
+
+	public function canAddItem(Item $item){
+		$inv = $this->inventory;
+		while($item->getCount() > 0){
+			$add = 0;
+			foreach($inv as $s => $i){
+				if($i->getID() === Item::AIR){
+					$add = min($i->getMaxStackSize(), $item->getCount());
+					$inv[$s] = clone $item;
+					$inv[$s]->setCount($add);
+					break;
+				}elseif($i->equals($item)){
+					$add = min($i->getMaxStackSize() - $i->getCount(), $item->getCount());
+					if($add <= 0){
+						continue;
+					}
+					$inv[$s] = clone $item;
+					$inv[$s]->setCount($i->getCount() + $add);
+					break;
+				}
+			}
+			if($add <= 0){
+				return false;
+			}
+			$item->setCount($item->getCount() - $add);
+		}
+
+		return true;
+	}
+
+	public function addItem(Item $item){
+		while($item->getCount() > 0){
+			$add = 0;
+			foreach($this->inventory as $s => $i){
+				if($i->getID() === Item::AIR){
+					$add = min($i->getMaxStackSize(), $item->getCount());
+					$i2 = clone $item;
+					$i2->setCount($add);
+					$this->setSlot($s, $i2);
+					break;
+				}elseif($i->equals($item)){
+					$add = min($i->getMaxStackSize() - $i->getCount(), $item->getCount());
+					if($add <= 0){
+						continue;
+					}
+					$i2 = clone $item;
+					$i2->setCount($i->getCount() + $add);
+					$this->setSlot($s, $i2);
+					break;
+				}
+			}
+			if($add <= 0){
+				return false;
+			}
+			$item->setCount($item->getCount() - $add);
+		}
+
+		return true;
+	}
+
+	public function canRemoveItem(Item $item, $checkDamage = true){
+		return $this->hasItem($item, $checkDamage);
+	}
+
+	public function removeItem(Item $item, $checkDamage = true){
+		while($item->getCount() > 0){
+			$remove = 0;
+			foreach($this->inventory as $s => $i){
+				if($i->equals($item, $checkDamage)){
+					$remove = min($item->getCount(), $i->getCount());
+					if($item->getCount() < $i->getCount()){
+						$i->setCount($i->getCount() - $item->getCount());
+						$this->setSlot($s, $i);
+					}else{
+						$this->setSlot($s, Item::get(Item::AIR, 0, 0));
+					}
+					break;
+				}
+			}
+			if($remove <= 0){
+				return false;
+			}
+			$item->setCount($item->getCount() - $remove);
+		}
+
+		return true;
+	}
+
+	public function setSlot($slot, Item $item){
+		Server::getInstance()->getPluginManager()->callEvent($ev = new EntityInventoryChangeEvent($this, $this->getSlot($slot), $item, $slot));
+		if($ev->isCancelled()){
+			return false;
+		}
+		$this->inventory[(int) $slot] = $ev->getNewItem();
+
+		return true;
+	}
+
+	/**
+	 * @param int $slot
+	 *
+	 * @return Item
+	 */
+	public function getSlot($slot){
+		$slot = (int) $slot;
+		if(!isset($this->inventory[$slot])){
+			$this->inventory[$slot] = Item::get(Item::AIR, 0, 0);
+		}
+
+		return $this->inventory[$slot];
+	}
+
+	public function getAllSlots(){
+		return $this->inventory;
+	}
+
+	public function getSlotCount(){
+		return count($this->inventory);
+	}
+}

src/pocketmine/entity/InventorySource.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/
+ * 
+ *
+*/
+
+namespace pocketmine\entity;
+
+use pocketmine\item\Item;
+
+interface InventorySource{
+
+	public function hasItem(Item $item, $checkDamage = true);
+
+	public function canAddItem(Item $item);
+
+	/**
+	 * @param Item $item
+	 *
+	 * @return boolean hasBeenAdded
+	 */
+	public function addItem(Item $item);
+
+	public function canRemoveItem(Item $item, $checkDamage = true);
+
+	/**
+	 * @param Item    $item
+	 * @param boolean $checkDamage
+	 *
+	 * @return boolean hasBeenRemoved
+	 */
+	public function removeItem(Item $item, $checkDamage = true);
+
+	public function getSlotCount();
+
+	public function getAllSlots();
+
+	public function getSlot($slot);
+
+	public function setSlot($slot, Item $item);
+
+
+}

src/pocketmine/entity/Living.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/
+ * 
+ *
+*/
+
+namespace pocketmine\entity;
+
+
+abstract class Living extends Entity implements Damageable{
+
+}

src/pocketmine/entity/Minecart.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/
+ * 
+ *
+*/
+
+namespace pocketmine\entity;
+
+
+class Minecart extends Vehicle{
+
+}

src/pocketmine/entity/Monster.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/
+ * 
+ *
+*/
+
+namespace pocketmine\entity;
+
+
+abstract class Monster extends Creature{
+
+}

src/pocketmine/entity/NPC.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/
+ * 
+ *
+*/
+
+namespace pocketmine\entity;
+
+
+interface NPC{
+
+}

src/pocketmine/entity/Ocelot.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/
+ * 
+ *
+*/
+
+namespace pocketmine\entity;
+
+
+class Ocelot extends Animal implements Tameable{
+
+}

src/pocketmine/entity/Painting.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/
+ * 
+ *
+*/
+
+namespace pocketmine\entity;
+
+
+class Painting extends Hanging{
+
+}

src/pocketmine/entity/Pig.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/
+ * 
+ *
+*/
+
+namespace pocketmine\entity;
+
+
+class Pig extends Animal implements Rideable{
+
+}

src/pocketmine/entity/PigZombie.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/
+ * 
+ *
+*/
+
+namespace pocketmine\entity;
+
+
+class PigZombie extends Zombie{
+
+}

src/pocketmine/entity/Projectile.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/
+ * 
+ *
+*/
+
+namespace pocketmine\entity;
+
+
+abstract class Projectile extends Entity{
+
+}

src/pocketmine/entity/ProjectileSource.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/
+ * 
+ *
+*/
+
+namespace pocketmine\entity;
+
+
+interface ProjectileSource{
+
+}

src/pocketmine/entity/Rideable.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/
+ * 
+ *
+*/
+
+namespace pocketmine\entity;
+
+
+interface Rideable{
+
+}

src/pocketmine/entity/Sheep.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/
+ * 
+ *
+*/
+
+namespace pocketmine\entity;
+
+
+class Sheep extends Animal implements Colorable{
+
+}

src/pocketmine/entity/Silverfish.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/
+ * 
+ *
+*/
+
+namespace pocketmine\entity;
+
+
+class Silverfish extends Monster{
+
+}

src/pocketmine/entity/Skeleton.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/
+ * 
+ *
+*/
+
+namespace pocketmine\entity;
+
+
+class Skeleton extends Monster implements ProjectileSource{
+
+}

src/pocketmine/entity/Slime.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/
+ * 
+ *
+*/
+
+namespace pocketmine\entity;
+
+
+class Slime extends Living{
+
+}

src/pocketmine/entity/Snowball.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/
+ * 
+ *
+*/
+
+namespace pocketmine\entity;
+
+
+class Snowball extends Projectile{
+
+}

src/pocketmine/entity/Spider.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/
+ * 
+ *
+*/
+
+namespace pocketmine\entity;
+
+
+class Spider extends Monster{
+
+}

src/pocketmine/entity/TNTPrimed.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/
+ * 
+ *
+*/
+
+namespace pocketmine\entity;
+
+
+class TNTPrimed extends Entity implements Explosive{
+
+}

src/pocketmine/entity/Tameable.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/
+ * 
+ *
+*/
+
+namespace pocketmine\entity;
+
+
+interface Tameable{
+
+}

src/pocketmine/entity/Vehicle.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/
+ * 
+ *
+*/
+
+namespace pocketmine\entity;
+
+
+abstract class Vehicle extends Entity implements Rideable{
+
+}

src/pocketmine/entity/Villager.php

@@ -0,0 +1,40 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+namespace pocketmine\entity;
+
+
+class Villager extends Creature implements NPC, Ageable{
+	const FARMER = 0;
+	const LIBRARIAN = 1;
+	const PRIEST = 2;
+	const BLACKSMITH = 3;
+	const BUTCHER = 4;
+
+	/**
+	 * Sets the villager profession
+	 *
+	 * @param $profession
+	 */
+	public function setProfession($profession){
+
+	}
+}

src/pocketmine/entity/Wolf.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/
+ * 
+ *
+*/
+
+namespace pocketmine\entity;
+
+
+class Wolf extends Animal implements Tameable{
+
+}

src/pocketmine/entity/Zombie.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/
+ * 
+ *
+*/
+
+namespace pocketmine\entity;
+
+
+class Zombie extends Monster{
+
+}