diff --git a/src/pocketmine/item/Bucket.php b/src/pocketmine/item/Bucket.php index 489c6d1c2..9b4414442 100644 --- a/src/pocketmine/item/Bucket.php +++ b/src/pocketmine/item/Bucket.php @@ -51,13 +51,13 @@ class Bucket extends Item{ } public function onActivate(Level $level, Player $player, Block $block, Block $target, int $face, Vector3 $facePos) : bool{ - $targetBlock = BlockFactory::get($this->meta); + $resultBlock = BlockFactory::get($this->meta); - if($targetBlock instanceof Air){ + if($resultBlock instanceof Air){ if($target instanceof Liquid and $target->getDamage() === 0){ - $result = clone $this; - $result->setDamage($target->getId()); - $player->getServer()->getPluginManager()->callEvent($ev = new PlayerBucketFillEvent($player, $block, $face, $this, $result)); + $resultItem = clone $this; + $resultItem->setDamage($target->getId()); + $player->getServer()->getPluginManager()->callEvent($ev = new PlayerBucketFillEvent($player, $block, $face, $this, $resultItem)); if(!$ev->isCancelled()){ $player->getLevel()->setBlock($target, BlockFactory::get(Block::AIR), true, true); if($player->isSurvival()){ @@ -68,12 +68,12 @@ class Bucket extends Item{ $player->getInventory()->sendContents($player); } } - }elseif($targetBlock instanceof Liquid){ - $result = clone $this; - $result->setDamage(0); - $player->getServer()->getPluginManager()->callEvent($ev = new PlayerBucketEmptyEvent($player, $block, $face, $this, $result)); + }elseif($resultBlock instanceof Liquid){ + $resultItem = clone $this; + $resultItem->setDamage(0); + $player->getServer()->getPluginManager()->callEvent($ev = new PlayerBucketEmptyEvent($player, $block, $face, $this, $resultItem)); if(!$ev->isCancelled()){ - $player->getLevel()->setBlock($block, $targetBlock, true, true); + $player->getLevel()->setBlock($block, $resultBlock, true, true); if($player->isSurvival()){ $player->getInventory()->setItemInHand($ev->getItem()); }