MattTheTekie/GladiatorMine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Close #882

Browse source
This commit is contained in:
PeratX 2016-04-29 07:12:55 +08:00
commit 8244f9e3df
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/pocketmine/Player.php
View file

@ -2465,7 +2465,7 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
$this->server->getPluginManager()->callEvent($ev = new BlockBreakEvent($this, $block, $this->getInventory()->getItemInHand(), true));
if(!$ev->isCancelled()){
$item = $tile->getItem();
$this->server->getPluginManager()->callEvent($ev = new ItemFrameDropItemEvent($block, $tile, $item));
$this->server->getPluginManager()->callEvent($ev = new ItemFrameDropItemEvent($this, $block, $tile, $item));
if(!$ev->isCancelled()){
if($item->getId() !== Item::AIR){
if((mt_rand(0, 10) / 10) < $tile->getItemDropChance()){

11
src/pocketmine/event/block/ItemFrameDropItemEvent.php
View file

@ -24,21 +24,30 @@ namespace pocketmine\event\block;
use pocketmine\block\Block;
use pocketmine\event\Cancellable;
use pocketmine\item\Item;
use pocketmine\Player;
use pocketmine\tile\ItemFrame;
class ItemFrameDropItemEvent extends BlockEvent implements Cancellable{
public static $handlerList = null;
/** @var Player */
private $player;
/** @var Item */
private $item;
/** @var ItemFrame */
private $itemFrame;
public function __construct(Block $block, ItemFrame $itemFrame, Item $item){
public function __construct(Player $player, Block $block, ItemFrame $itemFrame, Item $item){
$this->player = $player;
$this->block = $block;
$this->itemFrame = $itemFrame;
$this->item = $item;
}
public function getPlayer(){
return $this->player;
}
public function getItemFrame(){
return $this->itemFrame;
}