mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-08-30 15:01:19 +00:00
Code Issues Projects Releases Wiki Activity

Fixed double chests being openable when the other half has a solid block above it, close #1165

Browse Source
This commit is contained in:
Muqsit 2017-09-01 16:50:55 +01:00 committed by Dylan K. Taylor
parent 226175f961
commit 138d85307b
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/pocketmine/block/Chest.php
View File

@ -136,10 +136,6 @@ class Chest extends Transparent{
public function onActivate(Item $item, Player $player = null) : bool{ public function onActivate(Item $item, Player $player = null) : bool{
if($player instanceof Player){ if($player instanceof Player){
$top = $this->getSide(Vector3::SIDE_UP);
if($top->isTransparent() !== true){
return true;
}
$t = $this->getLevel()->getTile($this); $t = $this->getLevel()->getTile($this);
$chest = null; $chest = null;
@ -157,11 +153,13 @@ class Chest extends Transparent{
$chest = Tile::createTile("Chest", $this->getLevel(), $nbt); $chest = Tile::createTile("Chest", $this->getLevel(), $nbt);
} }
if(isset($chest->namedtag->Lock) and $chest->namedtag->Lock instanceof StringTag){ if(
if($chest->namedtag->Lock->getValue() !== $item->getCustomName()){ !$this->getSide(Vector3::SIDE_UP)->isTransparent() or
($chest->isPaired() and !$chest->getPair()->getBlock()->getSide(Vector3::SIDE_UP)->isTransparent()) or
(isset($chest->namedtag->Lock) and $chest->namedtag->Lock instanceof StringTag and $chest->namedtag->Lock->getValue() !== $item->getCustomName())
){
return true; return true;
} }
}
$player->addWindow($chest->getInventory()); $player->addWindow($chest->getInventory());
} }