mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-08 02:42:58 +00:00
Code Issues Projects Releases Wiki Activity

Update Math dependency, obliterate some nasty code from Block

Browse Source
This commit is contained in:
Dylan K. Taylor
2018-11-23 19:41:52 +00:00
parent 4c848bb4c1
commit 101de7adda
9 changed files with 31 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,17 +59,17 @@ abstract class Stair extends Transparent{
$minY = $this->upsideDown ? 0 : 0.5;
$topStep = new AxisAlignedBB(0, $minY, 0, 1, $minY + 0.5, 1);
self::setBoundsForFacing($topStep, $this->facing);
$topStep->trim(Facing::opposite($this->facing), 0.5);
/** @var Stair $corner */
if(($backFacing = $this->getPossibleCornerFacing(false)) !== null){
self::setBoundsForFacing($topStep, $backFacing);
$topStep->trim(Facing::opposite($backFacing), 0.5);
}elseif(($frontFacing = $this->getPossibleCornerFacing(true)) !== null){
//add an extra cube
$extraCube = new AxisAlignedBB(0, $minY, 0, 1, $minY + 0.5, 1);
self::setBoundsForFacing($extraCube, Facing::opposite($this->facing));
self::setBoundsForFacing($extraCube, $frontFacing);
$bbs[] = $extraCube;
$bbs[] = $extraCube
->trim($this->facing, 0.5)
->trim(Facing::opposite($frontFacing), 0.5);
}
$bbs[] = $topStep;
@ -88,25 +88,6 @@ abstract class Stair extends Transparent{
return null;
}
private static function setBoundsForFacing(AxisAlignedBB $bb, int $facing) : void{
switch($facing){
case Facing::EAST:
$bb->minX = 0.5;
break;
case Facing::WEST:
$bb->maxX = 0.5;
break;
case Facing::SOUTH:
$bb->minZ = 0.5;
break;
case Facing::NORTH:
$bb->maxZ = 0.5;
break;
default:
throw new \InvalidArgumentException("Facing must be horizontal");
}
}
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
if($player !== null){
$this->facing = Bearing::toFacing($player->getDirection());