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

Fixed a crash

Browse Source
This commit is contained in:
PEMapModder 2016-02-22 15:06:45 +08:00
parent a2641f923d
commit 83f29fd871
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -282,6 +282,8 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
} }
} }
parent::initEntity();
if(!isset($this->namedtag->foodLevel) or !($this->namedtag->foodLevel instanceof IntTag)){ if(!isset($this->namedtag->foodLevel) or !($this->namedtag->foodLevel instanceof IntTag)){
$this->namedtag->foodLevel = new IntTag("foodLevel", $this->getFood()); $this->namedtag->foodLevel = new IntTag("foodLevel", $this->getFood());
}else{ }else{
@ -327,13 +329,12 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
}else{ }else{
$this->xpSeed = $this->namedtag["XpSeed"]; $this->xpSeed = $this->namedtag["XpSeed"];
} }
parent::initEntity();
} }
protected function addAttributes(){ protected function addAttributes(){
parent::addAttributes(); parent::addAttributes();
echo "a", PHP_EOL;
$this->attributeMap->addAttribute(Attribute::getAttribute(Attribute::SATURATION)); $this->attributeMap->addAttribute(Attribute::getAttribute(Attribute::SATURATION));
$this->attributeMap->addAttribute(Attribute::getAttribute(Attribute::EXHAUSTION)); $this->attributeMap->addAttribute(Attribute::getAttribute(Attribute::EXHAUSTION));
$this->attributeMap->addAttribute(Attribute::getAttribute(Attribute::HUNGER)); $this->attributeMap->addAttribute(Attribute::getAttribute(Attribute::HUNGER));
@ -348,10 +349,11 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
$health = $this->getHealth(); $health = $this->getHealth();
if($food >= 18){ if($food >= 18){
$this->foodTickTimer++; $this->foodTickTimer++;
if($this->foodTickTimer >= 80){ if($this->foodTickTimer >= 80 and $health < $this->getMaxHealth()){
$this->heal(1, new EntityRegainHealthEvent($this, 1, EntityRegainHealthEvent::CAUSE_SATURATION)); $this->heal(1, new EntityRegainHealthEvent($this, 1, EntityRegainHealthEvent::CAUSE_SATURATION));
$this->exhaust(3.0, PlayerExhaustEvent::CAUSE_HEALTH_REGEN); $this->exhaust(3.0, PlayerExhaustEvent::CAUSE_HEALTH_REGEN);
$this->foodTickTimer = 0; $this->foodTickTimer = 0;
} }
}elseif($food === 0){ }elseif($food === 0){
$this->foodTickTimer++; $this->foodTickTimer++;