diff --git a/src/world/Entity.php b/src/world/Entity.php
index cade713d1..218ed8e69 100644
--- a/src/world/Entity.php
+++ b/src/world/Entity.php
@@ -239,7 +239,7 @@ class Entity extends Position{
 		$time = microtime(true);
 		if($this->class === ENTITY_PLAYER and ($this->player instanceof Player) and $this->player->spawned === true and $this->player->blocked !== true){
 			foreach($this->server->api->entity->getRadius($this, 1.5, ENTITY_ITEM) as $item){
-				if($item->spawntime !== -1 and ($time - $item->spawntime) >= 0.6){
+				if($item->spawntime > 0 and ($time - $item->spawntime) >= 0.6){
 					if((($this->player->gamemode & 0x01) === 1 or $this->player->hasSpace($item->type, $item->meta, $item->stack) === true) and $this->server->api->dhandle("player.pickup", array(
 						"eid" => $this->player->eid,
 						"player" => $this->player,
@@ -248,8 +248,9 @@ class Entity extends Position{
 						"meta" => $item->meta,
 						"target" => $item->eid
 					)) !== false){
-						$item->spawntime = -1;
-						$this->server->schedule(15, array($item, "close"));
+						$item->close();
+						//$item->spawntime = 0;
+						//$this->server->schedule(15, array($item, "close"));
 					}
 				}
 			}