diff --git a/README b/README
index 4d2b994ba..5d6a38ab8 100644
--- a/README
+++ b/README
@@ -40,4 +40,5 @@ Current features of the server:
 	- Whitelist and IP Ban files
 	- Survival & Creative
 	- Awesome features in server list!
+	- Entities and player spawn as Dropped items
 	- Multiple worlds and importing!
diff --git a/classes/CustomPacketHandler.class.php b/classes/CustomPacketHandler.class.php
index 8fca853f7..8fd85fc17 100644
--- a/classes/CustomPacketHandler.class.php
+++ b/classes/CustomPacketHandler.class.php
@@ -241,6 +241,19 @@ class CustomPacketHandler{
 					$this->raw .= Utils::writeByte($this->data["roll"]);
 				}
 				break;
+			case MC_MOVE_ENTITY:
+				if($this->c === false){	
+					$this->data["eid"] = Utils::readInt($this->get(4));
+					$this->data["x"] = Utils::readFloat($this->get(4));
+					$this->data["y"] = Utils::readFloat($this->get(4));
+					$this->data["z"] = Utils::readFloat($this->get(4));
+				}else{
+					$this->raw .= Utils::writeInt($this->data["eid"]);
+					$this->raw .= Utils::writeFloat($this->data["x"]);
+					$this->raw .= Utils::writeFloat($this->data["y"]);
+					$this->raw .= Utils::writeFloat($this->data["z"]);
+				}
+				break;
 			case MC_MOVE_PLAYER:
 				if($this->c === false){	
 					$this->data["eid"] = Utils::readInt($this->get(4));
diff --git a/classes/Session.class.php b/classes/Session.class.php
index 3b0802142..8e9c3fdee 100644
--- a/classes/Session.class.php
+++ b/classes/Session.class.php
@@ -88,6 +88,24 @@ class Session{
 	
 	public function eventHandler($data, $event){		
 		switch($event){
+			case "onEntityMove":
+				if($data === $this->eid){
+					break;
+				}
+				$entity = $this->server->entities[$this->eid];
+				$this->send(0x84, array(
+					$this->counter[0],
+					0x00,
+					array(
+						"id" => MC_MOVE_ENTITY,
+						"eid" => $data,
+						"x" => $entity->position["x"],
+						"y" => $entity->position["y"],
+						"z" => $entity->position["z"],
+					),
+				));
+				++$this->counter[0];
+				break;
 			case "onHealthChange":
 				if($data["eid"] === $this->eid){
 					$this->send(0x84, array(
@@ -98,6 +116,7 @@ class Session{
 							"health" => $data["health"],
 						),
 					));
+					++$this->counter[0];
 					$this->data["health"] = $data["health"];
 					if(is_object($this->entity)){
 						$this->entity->setHealth($data["health"]);
@@ -108,7 +127,7 @@ class Session{
 				if($data["eid"] === $this->eid){
 					break;
 				}
-				$this->send(0x84, array(
+				/*$this->send(0x84, array(
 					$this->counter[0],
 					0x00,
 					array(
@@ -124,7 +143,24 @@ class Session{
 						"block" => $data["block"],
 						"meta" => $data["meta"],
 					),
-				));				
+				));
+				++$this->counter[0];
+				*/
+				$this->send(0x84, array(
+					$this->counter[0],
+					0x00,
+					array(
+						"id" => MC_ADD_ITEM_ENTITY,
+						"eid" => $data["eid"],
+						"x" => $data["x"],
+						"y" => $data["y"],
+						"z" => $data["z"],
+						"block" => 10,
+						"meta" => 0,
+						"stack" => 1,
+					),
+				));
+				++$this->counter[0];
 				break;
 			case "onEntityRemove":
 				if($data === $this->eid){
@@ -138,6 +174,7 @@ class Session{
 							"eid" => $data,
 						),
 					));
+					++$this->counter[0];
 				}
 				break;
 			case "onTimeChange":
@@ -149,7 +186,7 @@ class Session{
 						"time" => $data,
 					),
 				));
-				++$this->counter[0];				
+				++$this->counter[0];
 				break;
 			case "onChat":
 				$this->send(0x84, array(
@@ -239,6 +276,7 @@ class Session{
 							$this->evid[] = array("onChat", $this->server->event("onChat", array($this, "eventHandler")));
 							$this->evid[] = array("onPlayerAdd", $this->server->event("onPlayerAdd", array($this, "eventHandler")));
 							$this->evid[] = array("onEntityDespawn", $this->server->event("onEntityDespawn", array($this, "eventHandler")));
+							$this->evid[] = array("onEntityMove", $this->server->event("onEntityMove", array($this, "eventHandler")));
 							$this->evid[] = array("onHealthChange", $this->server->event("onHealthChange", array($this, "eventHandler")));
 							$this->send(0x84, array(
 								$this->counter[0],
@@ -274,7 +312,7 @@ class Session{
 							$this->entity = new Entity($this->eid, ENTITY_PLAYER, 0, $this->server);
 							$this->entity->setName($this->username);
 							$this->server->entities[$this->eid] = &$this->entity;
-							/*$this->server->trigger("onPlayerAdd", array(
+							$this->server->trigger("onPlayerAdd", array(
 								"clientID" => $this->clientID,
 								"username" => $this->username,
 								"eid" => $this->eid,
@@ -285,16 +323,50 @@ class Session{
 								"pitch" => $this->data["spawn"]["pitch"],
 								"block" => 0,
 								"meta" => 0,
-							));*/
+							));
+							foreach($this->server->entities as $entity){
+								if($entity->eid !== $this->eid){
+									$this->send(0x84, array(
+										$this->counter[0],
+										0x00,
+										array(
+											"id" => MC_ADD_ITEM_ENTITY,
+											"eid" => $entity->eid,
+											"x" => $entity->position["x"],
+											"y" => $entity->position["y"],
+											"z" => $entity->position["z"],
+											"block" => $entity->type,
+											"meta" => 0,
+											"stack" => 1,
+										),
+									));
+									++$this->counter[0];
+								}							
+							}
 							$this->eventHandler($this->server->motd, "onChat");
 							$this->server->trigger("onChat", $this->username." joined the game");
 							break;
 						case MC_MOVE_PLAYER:
 							$this->entity->setPosition($data["x"], $data["y"], $data["z"], $data["yaw"], $data["pitch"]);
-							$this->server->trigger("onPlayerMove", $this->eid);
+							$this->server->trigger("onEntityMove", $this->eid);
+							$this->send(0x84, array(
+								$this->counter[0],
+								0x00,
+								array(
+									"id" => MC_ADD_ITEM_ENTITY,
+									"eid" => $this->server->eidCnt++,
+									"x" => $data["x"],
+									"y" => $data["y"],
+									"z" => $data["z"],
+									"block" => 7,
+									"meta" => 0,
+									"stack" => 1,
+								),
+							));
+							++$this->counter[0];
 							break;
 						case MC_PLAYER_EQUIPMENT:
-							console("[DEBUG] EID ".$this->eid." has now ".$data["block"]." with metadata ".$data["meta"]." in their hands!", true, true, 2);
+							console("[DEBUG] EID ".$this->eid." has now ".$data["block"].":".$data["meta"]." in their hands!", true, true, 2);
 							break;
 						case MC_REQUEST_CHUNK:
 							console("[DEBUG] Chunk X ".$data["x"]." Z ".$data["z"]." requested", true, true, 2);						
@@ -307,9 +379,9 @@ class Session{
 								array(
 									"id" => MC_ADD_ITEM_ENTITY,
 									"eid" => $this->server->eidCnt++,
-									"x" => $data["x"],
+									"x" => $data["x"] + mt_rand(0, 100)/100,
 									"y" => $data["y"],
-									"z" => $data["z"],
+									"z" => $data["z"] + mt_rand(0, 100)/100,
 									"block" => 1,
 									"meta" => 0,
 									"stack" => 1,
diff --git a/pstruct/5.php b/pstruct/5.php
index e65bd176e..e4f15f3b7 100644
--- a/pstruct/5.php
+++ b/pstruct/5.php
@@ -49,6 +49,8 @@ define("MC_ADD_PLAYER", 0x89);
 define("MC_REMOVE_ENTITY", 0x8d);
 define("MC_ADD_ITEM_ENTITY", 0x8e);
 
+define("MC_MOVE_ENTITY", 0x90);
+
 define("MC_MOVE_ENTITY_POSROT", 0x93);
 define("MC_MOVE_PLAYER", 0x94);
 define("MC_PLACE_BLOCK", 0x95);
diff --git a/pstruct/dataName.php b/pstruct/dataName.php
index f6f62c84a..a9bdf3b9c 100644
--- a/pstruct/dataName.php
+++ b/pstruct/dataName.php
@@ -49,6 +49,8 @@ $dataName = array(
 	MC_REMOVE_ENTITY => "RemoveEntity",
 	MC_ADD_ITEM_ENTITY => "AddItemEntity",
 	
+	MC_MOVE_ENTITY => "MoveEntity",
+	
 	MC_MOVE_ENTITY_POSROT => "MoveEntity_PosRot",
 	MC_MOVE_PLAYER => "MovePlayer",
 	MC_PLACE_BLOCK => "PlaceBlock",