diff --git a/src/world/Entity.php b/src/world/Entity.php
index 51bbe3c60..25840944a 100644
--- a/src/world/Entity.php
+++ b/src/world/Entity.php
@@ -167,6 +167,15 @@ class Entity extends Position{
 					$inv[] = array($slot->getID(), $slot->getMetadata(), $slot->count);
 				}
 			}
+			for($re = 0; $re < 3; $re++)
+			{
+				//TODO: Test this.
+				$slot = $this->player->getArmor($re);
+				$this->player->setArmor($re, BlockAPI::getItem(AIR, 0, 0));
+				if($slot->getID() !== AIR and $slot->count > 0){
+					$inv[] = array($slot->getID(), $slot->getMetadata(), $slot->count);
+				}
+			}
 			return $inv;
 		}elseif($this->class === ENTITY_OBJECT){
 			switch($this->type){