diff --git a/src/entity/Entity.php b/src/entity/Entity.php index 3d14e452..5ff5349a 100644 --- a/src/entity/Entity.php +++ b/src/entity/Entity.php @@ -193,10 +193,10 @@ class Entity extends Position{ public function environmentUpdate(){ $hasUpdate = false; $time = microtime(true); - if($this->class === ENTITY_PLAYER and ($this->player instanceof Player) and $this->player->spawned === true and $this->player->blocked !== true){ + if($this->class === ENTITY_PLAYER and ($this->player instanceof Player) and $this->player->spawned === true and $this->player->blocked !== true && !$this->dead){ foreach($this->server->api->entity->getRadius($this, 1.5, ENTITY_ITEM) as $item){ - if($item->closed === false and $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( + if(!$item->closed && $item->spawntime > 0 && ($time - $item->spawntime) >= 0.6){ + if((($this->player->gamemode & 0x01) === 1 || $this->player->hasSpace($item->type, $item->meta, $item->stack) === true) && $this->server->api->dhandle("player.pickup", array( "eid" => $this->player->eid, "player" => $this->player, "entity" => $item,