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

Some condition simplifications suggested by static analysis

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-08-16 20:06:48 +01:00
parent eebc52e00b
commit b4c4005009
4 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1392,10 +1392,7 @@ abstract class Entity extends Location implements Metadatable{
$bb = $block->getBoundingBox(); $bb = $block->getBoundingBox();
if($bb !== null and $block->isSolid() and !$block->isTransparent() and $bb->intersectsWith($this->getBoundingBox())){ return $bb !== null and $block->isSolid() and !$block->isTransparent() and $bb->intersectsWith($this->getBoundingBox());
return true;
}
return false;
} }
public function fastMove(float $dx, float $dy, float $dz) : bool{ public function fastMove(float $dx, float $dy, float $dz) : bool{

5
src/pocketmine/item/Item.php
View File

@ -437,11 +437,8 @@ class Item implements ItemIds, \JsonSerializable{
} }
$tag = $this->getNamedTag(); $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(){ public function clearCustomBlockData(){

6
src/pocketmine/level/format/io/leveldb/LevelDB.php
View File

@ -599,11 +599,7 @@ class LevelDB extends BaseLevelProvider{
} }
public function isChunkGenerated(int $chunkX, int $chunkZ) : bool{ public function isChunkGenerated(int $chunkX, int $chunkZ) : bool{
if($this->chunkExists($chunkX, $chunkZ) and ($chunk = $this->getChunk($chunkX, $chunkZ, false)) !== null){ return $this->chunkExists($chunkX, $chunkZ) and ($chunk = $this->getChunk($chunkX, $chunkZ, false)) !== null;
return true;
}
return false;
} }
public function isChunkPopulated(int $chunkX, int $chunkZ) : bool{ public function isChunkPopulated(int $chunkX, int $chunkZ) : bool{

6
src/pocketmine/tile/Chest.php
View File

@ -213,11 +213,7 @@ class Chest extends Spawnable implements InventoryHolder, Container, Nameable{
} }
public function isPaired(){ public function isPaired(){
if(!isset($this->namedtag->pairx) or !isset($this->namedtag->pairz)){ return !(!isset($this->namedtag->pairx) or !isset($this->namedtag->pairz));
return false;
}
return true;
} }
/** /**