mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-06 01:46:04 +00:00
Code Issues Projects Releases Wiki Activity

Cleaned up bool comparison mess

Browse Source
This commit is contained in:
Dylan K. Taylor
2018-03-19 14:10:55 +00:00
parent 24c5d7557e
commit ac5a91b67e
39 changed files with 141 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/pocketmine/entity/Entity.php
View File

@ -1723,13 +1723,13 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
return $this->asLocation();
}
public function setPosition(Vector3 $pos){
public function setPosition(Vector3 $pos) : bool{
if($this->closed){
return false;
}
if($pos instanceof Position and $pos->level !== null and $pos->level !== $this->level){
if($this->switchLevel($pos->getLevel()) === false){
if(!$this->switchLevel($pos->getLevel())){
return false;
}
}
@ -1754,7 +1754,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
}
public function setPositionAndRotation(Vector3 $pos, float $yaw, float $pitch) : bool{
if($this->setPosition($pos) === true){
if($this->setPosition($pos)){
$this->setRotation($yaw, $pitch);
return true;
@ -1824,7 +1824,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
}
public function isOnGround() : bool{
return $this->onGround === true;
return $this->onGround;
}
/**
@ -1849,7 +1849,7 @@ abstract class Entity extends Location implements Metadatable, EntityIds{
$pos = $ev->getTo();
$this->setMotion($this->temporalVector->setComponents(0, 0, 0));
if($this->setPositionAndRotation($pos, $yaw ?? $this->yaw, $pitch ?? $this->pitch) !== false){
if($this->setPositionAndRotation($pos, $yaw ?? $this->yaw, $pitch ?? $this->pitch)){
$this->resetFallDistance();
$this->onGround = true;