From 1206cbf993bbf39bb233d9a8abeb6b8a4a530c04 Mon Sep 17 00:00:00 2001
From: Shoghi Cervantes <shoghicp@gmail.com>
Date: Tue, 11 Feb 2014 13:31:48 +0100
Subject: [PATCH] Basic Entity structure

---
 src/Entity.php                          | 42 +++++++++++++++++++++++++
 src/{world/Entity.php => EntityOLD.php} |  2 +-
 src/entity/AgeableEntity.php            | 24 ++++++++++++++
 src/entity/AnimalEntity.php             | 24 ++++++++++++++
 src/entity/AttachableEntity.php         | 24 ++++++++++++++
 src/entity/CreatureEntity.php           | 24 ++++++++++++++
 src/entity/DamageableEntity.php         | 24 ++++++++++++++
 src/entity/ExplosiveEntity.php          | 24 ++++++++++++++
 src/entity/FallingBlockEntity.php       | 24 ++++++++++++++
 src/entity/HangingEntity.php            | 24 ++++++++++++++
 src/entity/HumanEntity.php              | 24 ++++++++++++++
 src/entity/ItemEntity.php               | 24 ++++++++++++++
 src/entity/LivingEntity.php             | 24 ++++++++++++++
 src/entity/MonsterEntity.php            | 24 ++++++++++++++
 src/entity/PlayerEntity.php             | 24 ++++++++++++++
 src/entity/ProjectileEntity.php         | 24 ++++++++++++++
 src/entity/ProjectileSourceEntity.php   | 24 ++++++++++++++
 src/entity/RideableEntity.php           | 24 ++++++++++++++
 src/entity/TNTPrimedEntity.php          | 24 ++++++++++++++
 src/entity/VehicleEntity.php            | 24 ++++++++++++++
 src/functions.php                       |  1 -
 21 files changed, 475 insertions(+), 2 deletions(-)
 create mode 100644 src/Entity.php
 rename src/{world/Entity.php => EntityOLD.php} (99%)
 create mode 100644 src/entity/AgeableEntity.php
 create mode 100644 src/entity/AnimalEntity.php
 create mode 100644 src/entity/AttachableEntity.php
 create mode 100644 src/entity/CreatureEntity.php
 create mode 100644 src/entity/DamageableEntity.php
 create mode 100644 src/entity/ExplosiveEntity.php
 create mode 100644 src/entity/FallingBlockEntity.php
 create mode 100644 src/entity/HangingEntity.php
 create mode 100644 src/entity/HumanEntity.php
 create mode 100644 src/entity/ItemEntity.php
 create mode 100644 src/entity/LivingEntity.php
 create mode 100644 src/entity/MonsterEntity.php
 create mode 100644 src/entity/PlayerEntity.php
 create mode 100644 src/entity/ProjectileEntity.php
 create mode 100644 src/entity/ProjectileSourceEntity.php
 create mode 100644 src/entity/RideableEntity.php
 create mode 100644 src/entity/TNTPrimedEntity.php
 create mode 100644 src/entity/VehicleEntity.php

diff --git a/src/Entity.php b/src/Entity.php
new file mode 100644
index 000000000..f9f01d9a2
--- /dev/null
+++ b/src/Entity.php
@@ -0,0 +1,42 @@
+<?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 Entity extends Position{
+
+}
+
+/***REM_START***/
+require_once("entity/DamageableEntity.php");
+require_once("entity/ProjectileSourceEntity.php");
+require_once("entity/RideableEntity.php");
+require_once("entity/AttachableEntity.php");
+require_once("entity/ExplosiveEntity.php");
+
+require_once("entity/LivingEntity.php");
+require_once("entity/CreatureEntity.php");
+require_once("entity/MonsterEntity.php");
+require_once("entity/AgeableEntity.php");
+require_once("entity/AnimalEntity.php");
+require_once("entity/HumanEntity.php");
+require_once("entity/ProjectileEntity.php");
+require_once("entity/VehicleEntity.php");
+require_once("entity/HangingEntity.php");
+/***REM_END***/
\ No newline at end of file
diff --git a/src/world/Entity.php b/src/EntityOLD.php
similarity index 99%
rename from src/world/Entity.php
rename to src/EntityOLD.php
index e96703152..25d43aef1 100644
--- a/src/world/Entity.php
+++ b/src/EntityOLD.php
@@ -19,7 +19,7 @@
  *
 */
 
-class Entity extends Position{
+class EntityOLD extends Position{
 	public $age;
 	public $air;
 	public $spawntime;
diff --git a/src/entity/AgeableEntity.php b/src/entity/AgeableEntity.php
new file mode 100644
index 000000000..2799e84ec
--- /dev/null
+++ b/src/entity/AgeableEntity.php
@@ -0,0 +1,24 @@
+<?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 AgeableEntity extends CreatureEntity{
+
+}
\ No newline at end of file
diff --git a/src/entity/AnimalEntity.php b/src/entity/AnimalEntity.php
new file mode 100644
index 000000000..e833f4251
--- /dev/null
+++ b/src/entity/AnimalEntity.php
@@ -0,0 +1,24 @@
+<?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 AnimalEntity extends AgeableEntity{
+
+}
\ No newline at end of file
diff --git a/src/entity/AttachableEntity.php b/src/entity/AttachableEntity.php
new file mode 100644
index 000000000..22dd30d1e
--- /dev/null
+++ b/src/entity/AttachableEntity.php
@@ -0,0 +1,24 @@
+<?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/
+ * 
+ *
+*/
+
+interface AttachableEntity{
+
+}
\ No newline at end of file
diff --git a/src/entity/CreatureEntity.php b/src/entity/CreatureEntity.php
new file mode 100644
index 000000000..5d89324fc
--- /dev/null
+++ b/src/entity/CreatureEntity.php
@@ -0,0 +1,24 @@
+<?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 CreatureEntity extends LivingEntity{
+
+}
\ No newline at end of file
diff --git a/src/entity/DamageableEntity.php b/src/entity/DamageableEntity.php
new file mode 100644
index 000000000..ba2ab8064
--- /dev/null
+++ b/src/entity/DamageableEntity.php
@@ -0,0 +1,24 @@
+<?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/
+ * 
+ *
+*/
+
+interface DamageableEntity{
+
+}
\ No newline at end of file
diff --git a/src/entity/ExplosiveEntity.php b/src/entity/ExplosiveEntity.php
new file mode 100644
index 000000000..031eea711
--- /dev/null
+++ b/src/entity/ExplosiveEntity.php
@@ -0,0 +1,24 @@
+<?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/
+ * 
+ *
+*/
+
+interface ExplosiveEntity{
+
+}
\ No newline at end of file
diff --git a/src/entity/FallingBlockEntity.php b/src/entity/FallingBlockEntity.php
new file mode 100644
index 000000000..6857649e0
--- /dev/null
+++ b/src/entity/FallingBlockEntity.php
@@ -0,0 +1,24 @@
+<?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 FallingBlockEntity extends Entity{
+
+}
\ No newline at end of file
diff --git a/src/entity/HangingEntity.php b/src/entity/HangingEntity.php
new file mode 100644
index 000000000..7ed896a00
--- /dev/null
+++ b/src/entity/HangingEntity.php
@@ -0,0 +1,24 @@
+<?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 HangingEntity extends Entity implements AttachableEntity{
+
+}
\ No newline at end of file
diff --git a/src/entity/HumanEntity.php b/src/entity/HumanEntity.php
new file mode 100644
index 000000000..134e1e925
--- /dev/null
+++ b/src/entity/HumanEntity.php
@@ -0,0 +1,24 @@
+<?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 HumanEntity extends CreatureEntity implements ProjectileSourceEntity{
+
+}
\ No newline at end of file
diff --git a/src/entity/ItemEntity.php b/src/entity/ItemEntity.php
new file mode 100644
index 000000000..6674768f2
--- /dev/null
+++ b/src/entity/ItemEntity.php
@@ -0,0 +1,24 @@
+<?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 ItemEntity extends Entity{
+
+}
\ No newline at end of file
diff --git a/src/entity/LivingEntity.php b/src/entity/LivingEntity.php
new file mode 100644
index 000000000..c2af6d986
--- /dev/null
+++ b/src/entity/LivingEntity.php
@@ -0,0 +1,24 @@
+<?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 LivingEntity extends Entity implements DamageableEntity{
+
+}
\ No newline at end of file
diff --git a/src/entity/MonsterEntity.php b/src/entity/MonsterEntity.php
new file mode 100644
index 000000000..867a28804
--- /dev/null
+++ b/src/entity/MonsterEntity.php
@@ -0,0 +1,24 @@
+<?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 MonsterEntity extends CreatureEntity{
+
+}
\ No newline at end of file
diff --git a/src/entity/PlayerEntity.php b/src/entity/PlayerEntity.php
new file mode 100644
index 000000000..6ad89073d
--- /dev/null
+++ b/src/entity/PlayerEntity.php
@@ -0,0 +1,24 @@
+<?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 PlayerEntity extends HumanEntity{
+
+}
\ No newline at end of file
diff --git a/src/entity/ProjectileEntity.php b/src/entity/ProjectileEntity.php
new file mode 100644
index 000000000..2fab7d34e
--- /dev/null
+++ b/src/entity/ProjectileEntity.php
@@ -0,0 +1,24 @@
+<?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 ProjectileEntity extends Entity{
+
+}
\ No newline at end of file
diff --git a/src/entity/ProjectileSourceEntity.php b/src/entity/ProjectileSourceEntity.php
new file mode 100644
index 000000000..faceb74be
--- /dev/null
+++ b/src/entity/ProjectileSourceEntity.php
@@ -0,0 +1,24 @@
+<?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/
+ * 
+ *
+*/
+
+interface ProjectileSourceEntity{
+
+}
\ No newline at end of file
diff --git a/src/entity/RideableEntity.php b/src/entity/RideableEntity.php
new file mode 100644
index 000000000..8d70cc9e4
--- /dev/null
+++ b/src/entity/RideableEntity.php
@@ -0,0 +1,24 @@
+<?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/
+ * 
+ *
+*/
+
+interface RideableEntity{
+
+}
\ No newline at end of file
diff --git a/src/entity/TNTPrimedEntity.php b/src/entity/TNTPrimedEntity.php
new file mode 100644
index 000000000..c0d0c381d
--- /dev/null
+++ b/src/entity/TNTPrimedEntity.php
@@ -0,0 +1,24 @@
+<?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 TNTPrimedEntity extends Entity implements ExplosiveEntity{
+
+}
\ No newline at end of file
diff --git a/src/entity/VehicleEntity.php b/src/entity/VehicleEntity.php
new file mode 100644
index 000000000..83f868277
--- /dev/null
+++ b/src/entity/VehicleEntity.php
@@ -0,0 +1,24 @@
+<?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 VehicleEntity extends Entity implements RideableEntity{
+
+}
\ No newline at end of file
diff --git a/src/functions.php b/src/functions.php
index 720d8062c..51e321f04 100644
--- a/src/functions.php
+++ b/src/functions.php
@@ -80,7 +80,6 @@ function kill($pid){
 	}
 }
 
-
 function require_all($path, &$count = 0){
 	$dir = dir($path."/");
 	$dirs = array();