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

Stair: some BB handling cleanup

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-05-12 16:22:20 +01:00
parent d6b720b55d
commit 166d821bcf
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/pocketmine/block/Stair.php
View File

@ -71,23 +71,21 @@ abstract class Stair extends Transparent{
} }
protected function recalculateCollisionBoxes() : array{ protected function recalculateCollisionBoxes() : array{
$minYSlab = $this->upsideDown ? 0.5 : 0; $topStepFace = $this->upsideDown ? Facing::DOWN : Facing::UP;
$bbs = [ $bbs = [
new AxisAlignedBB(0, $minYSlab, 0, 1, $minYSlab + 0.5, 1) AxisAlignedBB::one()->trim($topStepFace, 0.5)
]; ];
$minY = $this->upsideDown ? 0 : 0.5; $topStep = AxisAlignedBB::one()
->trim(Facing::opposite($topStepFace), 0.5)
$topStep = new AxisAlignedBB(0, $minY, 0, 1, $minY + 0.5, 1); ->trim(Facing::opposite($this->facing), 0.5);
$topStep->trim(Facing::opposite($this->facing), 0.5);
if($this->shape === self::SHAPE_OUTER_LEFT or $this->shape === self::SHAPE_OUTER_RIGHT){ if($this->shape === self::SHAPE_OUTER_LEFT or $this->shape === self::SHAPE_OUTER_RIGHT){
$topStep->trim(Facing::rotateY($this->facing, $this->shape === self::SHAPE_OUTER_LEFT), 0.5); $topStep->trim(Facing::rotateY($this->facing, $this->shape === self::SHAPE_OUTER_LEFT), 0.5);
}elseif($this->shape === self::SHAPE_INNER_LEFT or $this->shape === self::SHAPE_INNER_RIGHT){ }elseif($this->shape === self::SHAPE_INNER_LEFT or $this->shape === self::SHAPE_INNER_RIGHT){
//add an extra cube //add an extra cube
$extraCube = new AxisAlignedBB(0, $minY, 0, 1, $minY + 0.5, 1); $bbs[] = AxisAlignedBB::one()
$bbs[] = $extraCube ->trim(Facing::opposite($topStepFace), 0.5)
->trim($this->facing, 0.5) //avoid overlapping with main step ->trim($this->facing, 0.5) //avoid overlapping with main step
->trim(Facing::rotateY($this->facing, $this->shape === self::SHAPE_INNER_LEFT), 0.5); ->trim(Facing::rotateY($this->facing, $this->shape === self::SHAPE_INNER_LEFT), 0.5);
} }