mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-30 07:09:56 +00:00
Code Issues Projects Releases Wiki Activity

Remove ItemFactory usage from Bucket

Browse Source
This commit is contained in:
Dylan K. Taylor 2022-06-05 21:19:38 +01:00
parent d2613039ed
commit 02568bb049
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/item/Bucket.php
View File

@ -24,6 +24,7 @@ declare(strict_types=1);
namespace pocketmine\item; namespace pocketmine\item;
use pocketmine\block\Block; use pocketmine\block\Block;
use pocketmine\block\BlockTypeIds;
use pocketmine\block\Liquid; use pocketmine\block\Liquid;
use pocketmine\block\VanillaBlocks; use pocketmine\block\VanillaBlocks;
use pocketmine\event\player\PlayerBucketFillEvent; use pocketmine\event\player\PlayerBucketFillEvent;
@ -42,7 +43,15 @@ class Bucket extends Item{
$stack = clone $this; $stack = clone $this;
$stack->pop(); $stack->pop();
$resultItem = ItemFactory::getInstance()->get(ItemIds::BUCKET, $blockClicked->getFlowingForm()->getId()); $resultItem = match($blockClicked->getTypeId()){
BlockTypeIds::LAVA => VanillaItems::LAVA_BUCKET(),
BlockTypeIds::WATER => VanillaItems::WATER_BUCKET(),
default => null
};
if($resultItem === null){
return ItemUseResult::FAIL();
}
$ev = new PlayerBucketFillEvent($player, $blockReplace, $face, $this, $resultItem); $ev = new PlayerBucketFillEvent($player, $blockReplace, $face, $this, $resultItem);
$ev->call(); $ev->call();
if(!$ev->isCancelled()){ if(!$ev->isCancelled()){