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

Fix some strict type violations reported by PhpStorm (strict types <3)

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-06-04 09:50:49 +01:00
parent b775e8c88a
commit cf07af8b55
6 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/pocketmine/entity/Human.php
View File

@ -64,7 +64,7 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
public $eyeHeight = 1.62;
protected $skinId;
protected $skin = null;
protected $skin = "";
protected $foodTickTimer = 0;
@ -72,7 +72,7 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
protected $xpSeed;
public function __construct(Level $level, CompoundTag $nbt){
if($this->skin === null and (!isset($nbt->Skin) or !isset($nbt->Skin->Data) or !Player::isValidSkin($nbt->Skin->Data->getValue()))){
if($this->skin === "" and (!isset($nbt->Skin) or !isset($nbt->Skin->Data) or !Player::isValidSkin($nbt->Skin->Data->getValue()))){
throw new \InvalidStateException((new \ReflectionClass($this))->getShortName() . " must have a valid skin set");
}
@ -250,7 +250,7 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
$this->attributeMap->getAttribute(Attribute::EXPERIENCE)->setValue($progress);
}
public function getTotalXp() : float{
public function getTotalXp() : int{
return $this->totalXp;
}
@ -319,19 +319,19 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
if(!isset($this->namedtag->foodLevel) or !($this->namedtag->foodLevel instanceof IntTag)){
$this->namedtag->foodLevel = new IntTag("foodLevel", (int) $this->getFood());
}else{
$this->setFood($this->namedtag["foodLevel"]);
$this->setFood((float) $this->namedtag["foodLevel"]);
}
if(!isset($this->namedtag->foodExhaustionLevel) or !($this->namedtag->foodExhaustionLevel instanceof IntTag)){
if(!isset($this->namedtag->foodExhaustionLevel) or !($this->namedtag->foodExhaustionLevel instanceof FloatTag)){
$this->namedtag->foodExhaustionLevel = new FloatTag("foodExhaustionLevel", $this->getExhaustion());
}else{
$this->setExhaustion($this->namedtag["foodExhaustionLevel"]);
$this->setExhaustion((float) $this->namedtag["foodExhaustionLevel"]);
}
if(!isset($this->namedtag->foodSaturationLevel) or !($this->namedtag->foodSaturationLevel instanceof IntTag)){
if(!isset($this->namedtag->foodSaturationLevel) or !($this->namedtag->foodSaturationLevel instanceof FloatTag)){
$this->namedtag->foodSaturationLevel = new FloatTag("foodSaturationLevel", $this->getSaturation());
}else{
$this->setSaturation($this->namedtag["foodSaturationLevel"]);
$this->setSaturation((float) $this->namedtag["foodSaturationLevel"]);
}
if(!isset($this->namedtag->foodTickTimer) or !($this->namedtag->foodTickTimer instanceof IntTag)){
@ -343,7 +343,7 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
if(!isset($this->namedtag->XpLevel) or !($this->namedtag->XpLevel instanceof IntTag)){
$this->namedtag->XpLevel = new IntTag("XpLevel", $this->getXpLevel());
}else{
$this->setXpLevel($this->namedtag["XpLevel"]);
$this->setXpLevel((int) $this->namedtag["XpLevel"]);
}
if(!isset($this->namedtag->XpP) or !($this->namedtag->XpP instanceof FloatTag)){