Fixed #287 Items dropped will be deleted if picked up in creative mode [gh#287]

This commit is contained in:
Shoghi Cervantes
2013-05-25 19:27:29 +02:00
parent 5e1dddaba0
commit a538543e4c
2 changed files with 39 additions and 11 deletions

View File

@ -183,17 +183,19 @@ class Entity extends Position{
}else{
return false;
}
if(($player instanceof Player) and ($player->gamemode & 0x01) === 0x00 and $player->spawned === true){
if($this->server->api->dhandle("player.pickup", array(
"eid" => $player->eid,
"player" => $player,
"entity" => $this,
"block" => $this->type,
"meta" => $this->meta,
"target" => $this->eid
)) !== false){
$this->close();
return false;
if(($player instanceof Player) and $player->spawned === true){
if(($player->gamemode & 0x01) === 0x00){
if($player->hasSpace($this->type, $this->meta, $this->stack) === true and $this->server->api->dhandle("player.pickup", array(
"eid" => $player->eid,
"player" => $player,
"entity" => $this,
"block" => $this->type,
"meta" => $this->meta,
"target" => $this->eid
)) !== false){
$this->close();
return false;
}
}
return true;
}