mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-08 10:53:05 +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

11
src/pocketmine/block/EndRod.php
View File

@ -25,6 +25,7 @@ namespace pocketmine\block;
use pocketmine\item\Item;
use pocketmine\math\AxisAlignedBB;
use pocketmine\math\Facing;
use pocketmine\math\Vector3;
use pocketmine\Player;
@ -41,7 +42,7 @@ class EndRod extends Flowable{
}
public function place(Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, Player $player = null) : bool{
if($face === Vector3::SIDE_UP or $face === Vector3::SIDE_DOWN){
if(Facing::axis($face) === Facing::AXIS_Y){
$this->meta = $face;
}else{
$this->meta = $face ^ 0x01;
@ -62,11 +63,11 @@ class EndRod extends Flowable{
}
protected function recalculateBoundingBox() : ?AxisAlignedBB{
$m = $this->meta & ~0x01;
$m = $this->meta >> 1; //everything except up/down are inverted, but we can still use this for axis
$width = 0.375;
switch($m){
case 0x00: //up/down
case Facing::AXIS_Y:
return new AxisAlignedBB(
$width,
0,
@ -75,7 +76,7 @@ class EndRod extends Flowable{
1,
1 - $width
);
case 0x02: //north/south
case Facing::AXIS_Z:
return new AxisAlignedBB(
0,
$width,
@ -84,7 +85,7 @@ class EndRod extends Flowable{
1 - $width,
1 - $width
);
case 0x04: //east/west
case Facing::AXIS_X:
return new AxisAlignedBB(
$width,
$width,