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

ShulkerBox: fixed incorrect block-picking behaviour

Browse Source
This commit is contained in:
Dylan K. Taylor 2021-07-19 18:08:13 +01:00
parent dcbc0bc2a6
commit f64ef50ce3
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/block/ShulkerBox.php
View File

@ -59,19 +59,30 @@ class ShulkerBox extends Opaque{
return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player); return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
} }
public function asItem() : Item{ private function addDataFromTile(TileShulkerBox $tile, Item $item) : void{
$item = parent::asItem(); $shulkerNBT = $tile->getCleanedNBT();
$shulker = $this->pos->getWorld()->getTile($this->pos); if($shulkerNBT !== null){
if($shulker instanceof TileShulkerBox){ $item->setNamedTag($shulkerNBT);
$shulkerNBT = $shulker->getCleanedNBT();
if($shulkerNBT !== null){
$item->setNamedTag($shulkerNBT);
}
if($shulker->hasName()){
$item->setCustomName($shulker->getName());
}
} }
return $item; if($tile->hasName()){
$item->setCustomName($tile->getName());
}
}
public function getDropsForCompatibleTool(Item $item) : array{
$drop = $this->asItem();
if(($tile = $this->pos->getWorld()->getTile($this->pos)) instanceof TileShulkerBox){
$this->addDataFromTile($tile, $drop);
}
return [$drop];
}
public function getPickedItem(bool $addUserData = false) : Item{
$result = parent::getPickedItem($addUserData);
if($addUserData && ($tile = $this->pos->getWorld()->getTile($this->pos)) instanceof TileShulkerBox){
$this->addDataFromTile($tile, $result);
}
return $result;
} }
public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{ public function onInteract(Item $item, int $face, Vector3 $clickVector, ?Player $player = null) : bool{