mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-10 05:34:54 +00:00
Code Issues Projects Releases Wiki Activity

Chests and furnaces drop their items on break

Browse Source
This commit is contained in:
Shoghi Cervantes 2013-06-07 12:44:10 +02:00
parent 45ee7ea7ae
commit fdb7af5df2
3 changed files with 37 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/API/BlockAPI.php
View File

@ -277,9 +277,7 @@ class BlockAPI{
if(($player->gamemode & 0x01) === 0x00 and count($drops) > 0){ if(($player->gamemode & 0x01) === 0x00 and count($drops) > 0){
foreach($drops as $drop){ foreach($drops as $drop){
for($c = 0; $c < $drop[2]; ++$c){ $this->server->api->entity->drop(new Position($target->x + 0.5, $target->y, $target->z + 0.5, $target->level), BlockAPI::getItem($drop[0] & 0xFFFF, $drop[1] & 0xFFFF, $drop[2]));
$this->server->api->entity->drop(new Position($target->x + 0.5, $target->y, $target->z + 0.5, $target->level), BlockAPI::getItem($drop[0] & 0xFFFF, $drop[1] & 0xFFFF, 1));
}
} }
} }
return false; return false;

41
src/material/block/solid/BurningFurnace.php
View File

@ -32,21 +32,21 @@ class BurningFurnaceBlock extends SolidBlock{
} }
public function place(Item $item, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){ public function place(Item $item, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){
$faces = array( $faces = array(
0 => 4, 0 => 4,
1 => 2, 1 => 2,
2 => 5, 2 => 5,
3 => 3, 3 => 3,
); );
$this->meta = $faces[$player->entity->getDirection()]; $this->meta = $faces[$player->entity->getDirection()];
$this->level->setBlock($block, $this); $this->level->setBlock($block, $this);
return true; return true;
} }
public function onBreak(Item $item, Player $player){ public function onBreak(Item $item, Player $player){
$server = ServerAPI::request(); $server = ServerAPI::request();
$this->level->setBlock($this, new AirBlock(), true, true); $this->level->setBlock($this, new AirBlock(), true, true);
return true; return true;
} }
public function onActivate(Item $item, Player $player){ public function onActivate(Item $item, Player $player){
@ -116,12 +116,19 @@ class BurningFurnaceBlock extends SolidBlock{
} }
public function getDrops(Item $item, Player $player){ public function getDrops(Item $item, Player $player){
$drops = array();
if($item->isPickaxe() >= 1){ if($item->isPickaxe() >= 1){
return array( $drops[] = array(FURNACE, 0, 1);
array(FURNACE, 0, 1),
);
}else{
return array();
} }
$t = ServerAPI::request()->api->tile->get($this);
if($t !== false and $t->class === TILE_FURNACE){
for($s = 0; $s < FURNACE_SLOTS; ++$s){
$slot = $t->getSlot($s);
if($slot->getID() > AIR and $slot->count > 0){
$drops[] = array($slot->getID(), $slot->getMetadata(), $slot->count);
}
}
}
return $drops;
} }
} }

14
src/material/block/solid/Chest.php
View File

@ -99,7 +99,7 @@ class ChestBlock extends TransparentBlock{
$slots = array(); $slots = array();
for($s = 0; $s < CHEST_SLOTS; ++$s){ for($s = 0; $s < CHEST_SLOTS; ++$s){
$slot = $chest->getSlot($s); $slot = $chest->getSlot($s);
if($slot->getID() > 0 and $slot->count > 0){ if($slot->getID() > AIR and $slot->count > 0){
$slots[] = $slot; $slots[] = $slot;
}else{ }else{
$slots[] = BlockAPI::getItem(AIR, 0, 0); $slots[] = BlockAPI::getItem(AIR, 0, 0);
@ -115,8 +115,18 @@ class ChestBlock extends TransparentBlock{
} }
public function getDrops(Item $item, Player $player){ public function getDrops(Item $item, Player $player){
return array( $drops = array(
array($this->id, 0, 1), array($this->id, 0, 1),
); );
$t = ServerAPI::request()->api->tile->get($this);
if($t !== false and $t->class === TILE_CHEST){
for($s = 0; $s < CHEST_SLOTS; ++$s){
$slot = $t->getSlot($s);
if($slot->getID() > AIR and $slot->count > 0){
$drops[] = array($slot->getID(), $slot->getMetadata(), $slot->count);
}
}
}
return $drops;
} }
} }