mirror of
https://github.com/pmmp/PocketMine-MP.git
synced 2025-04-21 08:17:34 +00:00
Some condition simplifications suggested by static analysis
This commit is contained in:
parent
eebc52e00b
commit
b4c4005009
@ -1392,10 +1392,7 @@ abstract class Entity extends Location implements Metadatable{
|
||||
|
||||
$bb = $block->getBoundingBox();
|
||||
|
||||
if($bb !== null and $block->isSolid() and !$block->isTransparent() and $bb->intersectsWith($this->getBoundingBox())){
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
return $bb !== null and $block->isSolid() and !$block->isTransparent() and $bb->intersectsWith($this->getBoundingBox());
|
||||
}
|
||||
|
||||
public function fastMove(float $dx, float $dy, float $dz) : bool{
|
||||
|
@ -437,11 +437,8 @@ class Item implements ItemIds, \JsonSerializable{
|
||||
}
|
||||
|
||||
$tag = $this->getNamedTag();
|
||||
if(isset($tag->BlockEntityTag) and $tag->BlockEntityTag instanceof CompoundTag){
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
return isset($tag->BlockEntityTag) and $tag->BlockEntityTag instanceof CompoundTag;
|
||||
}
|
||||
|
||||
public function clearCustomBlockData(){
|
||||
|
@ -599,11 +599,7 @@ class LevelDB extends BaseLevelProvider{
|
||||
}
|
||||
|
||||
public function isChunkGenerated(int $chunkX, int $chunkZ) : bool{
|
||||
if($this->chunkExists($chunkX, $chunkZ) and ($chunk = $this->getChunk($chunkX, $chunkZ, false)) !== null){
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
return $this->chunkExists($chunkX, $chunkZ) and ($chunk = $this->getChunk($chunkX, $chunkZ, false)) !== null;
|
||||
}
|
||||
|
||||
public function isChunkPopulated(int $chunkX, int $chunkZ) : bool{
|
||||
|
@ -213,11 +213,7 @@ class Chest extends Spawnable implements InventoryHolder, Container, Nameable{
|
||||
}
|
||||
|
||||
public function isPaired(){
|
||||
if(!isset($this->namedtag->pairx) or !isset($this->namedtag->pairz)){
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
return !(!isset($this->namedtag->pairx) or !isset($this->namedtag->pairz));
|
||||
}
|
||||
|
||||
/**
|
||||
|
Loading…
x
Reference in New Issue
Block a user