mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-04-22 00:33:59 +00:00
Code Issues Projects Releases Wiki Activity

Bucket: Fixed stack size handling for empty buckets

Browse Source 
GOD this code is horrible
close #1472
This commit is contained in:
Dylan K. Taylor 2018-01-03 14:11:56 +00:00
parent 3a0cbd1cd4
commit db52501462
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,7 +40,7 @@ class Bucket extends Item implements Consumable{
}
public function getMaxStackSize() : int{
return 1;
return $this->meta === Block::AIR ? 16 : 1; //empty buckets stack to 16
}
public function getFuelTime() : int{
@ -56,14 +56,24 @@ class Bucket extends Item implements Consumable{
if($resultBlock instanceof Air){
if($blockClicked instanceof Liquid and $blockClicked->getDamage() === 0){
$resultItem = clone $this;
$stack = clone $this;
$resultItem = $stack->pop();
$resultItem->setDamage($blockClicked->getId());
$player->getServer()->getPluginManager()->callEvent($ev = new PlayerBucketFillEvent($player, $blockReplace, $face, $this, $resultItem));
if(!$ev->isCancelled()){
$player->getLevel()->setBlock($blockClicked, BlockFactory::get(Block::AIR), true, true);
if($player->isSurvival()){
$player->getInventory()->setItemInHand($ev->getItem());
if($stack->getCount() === 0){
$player->getInventory()->setItemInHand($ev->getItem());
}else{
$player->getInventory()->setItemInHand($stack);
$player->getInventory()->addItem($ev->getItem());
}
}else{
$player->getInventory()->addItem($ev->getItem());
}
return true;
}else{
$player->getInventory()->sendContents($player);