mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-08 02:42:58 +00:00
Code Issues Projects Releases Wiki Activity

Refactor confusing parameter names for Item->onActivate()

Browse Source 
next: refactor the function itself
This commit is contained in:
Dylan K. Taylor
2017-10-16 13:30:36 +01:00
parent af85659c63
commit 769a50faa5
5 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/pocketmine/item/Bucket.php
View File

@ -50,16 +50,16 @@ class Bucket extends Item{
return 0;
}
public function onActivate(Level $level, Player $player, Block $block, Block $target, int $face, Vector3 $facePos) : bool{
public function onActivate(Level $level, Player $player, Block $blockReplace, Block $blockClicked, int $face, Vector3 $facePos) : bool{
$resultBlock = BlockFactory::get($this->meta);
if($resultBlock instanceof Air){
if($target instanceof Liquid and $target->getDamage() === 0){
if($blockClicked instanceof Liquid and $blockClicked->getDamage() === 0){
$resultItem = clone $this;
$resultItem->setDamage($target->getId());
$player->getServer()->getPluginManager()->callEvent($ev = new PlayerBucketFillEvent($player, $block, $face, $this, $resultItem));
$resultItem->setDamage($blockClicked->getId());
$player->getServer()->getPluginManager()->callEvent($ev = new PlayerBucketFillEvent($player, $blockReplace, $face, $this, $resultItem));
if(!$ev->isCancelled()){
$player->getLevel()->setBlock($target, BlockFactory::get(Block::AIR), true, true);
$player->getLevel()->setBlock($blockClicked, BlockFactory::get(Block::AIR), true, true);
if($player->isSurvival()){
$player->getInventory()->setItemInHand($ev->getItem());
}
@ -71,9 +71,9 @@ class Bucket extends Item{
}elseif($resultBlock instanceof Liquid){
$resultItem = clone $this;
$resultItem->setDamage(0);
$player->getServer()->getPluginManager()->callEvent($ev = new PlayerBucketEmptyEvent($player, $block, $face, $this, $resultItem));
$player->getServer()->getPluginManager()->callEvent($ev = new PlayerBucketEmptyEvent($player, $blockReplace, $face, $this, $resultItem));
if(!$ev->isCancelled()){
$player->getLevel()->setBlock($block, $resultBlock, true, true);
$player->getLevel()->setBlock($blockReplace, $resultBlock, true, true);
if($player->isSurvival()){
$player->getInventory()->setItemInHand($ev->getItem());
}