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

Separate facing/bearing handling from Vector3, deobfusticate a ton of @shoghicp old code

Browse Source
This commit is contained in:
Dylan K. Taylor
2018-09-05 19:56:14 +01:00
parent 99fb267333
commit f218868338
57 changed files with 338 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +25,8 @@ namespace pocketmine\block;
use pocketmine\item\Item;
use pocketmine\math\AxisAlignedBB;
use pocketmine\math\Bearing;
use pocketmine\math\Facing;
use pocketmine\math\Vector3;
use pocketmine\Player;
@ -69,14 +71,16 @@ abstract class Stair extends Transparent{
}
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
$faces = [
0 => 0,
1 => 2,
2 => 1,
3 => 3
static $faces = [
Bearing::SOUTH => 3, //north
Bearing::WEST => 0, //east
Bearing::NORTH => 2, //south
Bearing::EAST => 1 //west
];
$this->meta = $faces[$player->getDirection()] & 0x03;
if(($clickVector->y > 0.5 and $face !== Vector3::SIDE_UP) or $face === Vector3::SIDE_DOWN){
if($player !== null){
$this->meta = $faces[$player->getDirection()];
}
if(($clickVector->y > 0.5 and $face !== Facing::UP) or $face === Facing::DOWN){
$this->meta |= 0x04; //Upside-down stairs
}
$this->getLevel()->setBlock($blockReplace, $this, true, true);