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

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

@ -24,6 +24,8 @@ declare(strict_types=1);
namespace pocketmine\block;
use pocketmine\item\Item;
use pocketmine\math\Bearing;
use pocketmine\math\Facing;
use pocketmine\math\Vector3;
use pocketmine\Player;
@ -52,19 +54,20 @@ class Lever extends Flowable{
return false;
}
if($face === Vector3::SIDE_DOWN){
if($face === Facing::DOWN){
$this->meta = 0;
}else{
$this->meta = 6 - $face;
}
if($player !== null){
if(($player->getDirection() & 0x01) === 0){
if($face === Vector3::SIDE_UP){
$bearing = $player->getDirection();
if($bearing === Bearing::EAST or $bearing === Bearing::WEST){
if($face === Facing::UP){
$this->meta = 6;
}
}else{
if($face === Vector3::SIDE_DOWN){
if($face === Facing::DOWN){
$this->meta = 7;
}
}
@ -74,15 +77,15 @@ class Lever extends Flowable{
}
public function onNearbyBlockChange() : void{
$faces = [
0 => Vector3::SIDE_UP,
1 => Vector3::SIDE_WEST,
2 => Vector3::SIDE_EAST,
3 => Vector3::SIDE_NORTH,
4 => Vector3::SIDE_SOUTH,
5 => Vector3::SIDE_DOWN,
6 => Vector3::SIDE_DOWN,
7 => Vector3::SIDE_UP
static $faces = [
0 => Facing::UP,
1 => Facing::WEST,
2 => Facing::EAST,
3 => Facing::NORTH,
4 => Facing::SOUTH,
5 => Facing::DOWN,
6 => Facing::DOWN,
7 => Facing::UP
];
if(!$this->getSide($faces[$this->meta & 0x07])->isSolid()){
$this->level->useBreakOn($this);