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

Add and make use of Block->isSameType()

Browse Source
This commit is contained in:
Dylan K. Taylor
2018-09-27 17:59:06 +01:00
parent 8910c93de1
commit 35d51570be
8 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/pocketmine/block/Door.php
View File

@ -75,7 +75,7 @@ abstract class Door extends Transparent{
*/
private function updateStateFromOtherHalf() : void{
$other = $this->getSide($this->top ? Facing::DOWN : Facing::UP);
if($other instanceof Door and $other->getId() === $this->getId()){
if($other instanceof Door and $other->isSameType($this)){
if($this->top){
$this->facing = $other->facing;
$this->open = $other->open;
@ -165,7 +165,7 @@ abstract class Door extends Transparent{
$next = $this->getSide(Facing::rotate($this->facing, Facing::AXIS_Y, false));
$next2 = $this->getSide(Facing::rotate($this->facing, Facing::AXIS_Y, true));
if($next->getId() === $this->getId() or (!$next2->isTransparent() and $next->isTransparent())){ //Door hinge
if($next->isSameType($this) or (!$next2->isTransparent() and $next->isTransparent())){ //Door hinge
$this->hingeRight = true;
}
@ -185,7 +185,7 @@ abstract class Door extends Transparent{
$this->open = !$this->open;
$other = $this->getSide($this->top ? Facing::DOWN : Facing::UP);
if($other instanceof Door and $this->getId() === $other->getId()){
if($other instanceof Door and $other->isSameType($this)){
$other->open = $this->open;
$this->level->setBlock($other, $other);
}
@ -210,7 +210,7 @@ abstract class Door extends Transparent{
public function getAffectedBlocks() : array{
$other = $this->getSide($this->top ? Facing::DOWN : Facing::UP);
if($other->getId() === $this->getId()){
if($other->isSameType($this)){
return [$this, $other];
}
return parent::getAffectedBlocks();