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

Food and exhaustion should not apply in creative, close #860

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-04-24 13:31:05 +01:00
parent 0e7f364a41
commit d682fdfdf0
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/pocketmine/Player.php
View File

@ -1706,6 +1706,20 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade
return true; return true;
} }
public function doFoodTick(int $tickDiff = 1){
if($this->isSurvival()){
parent::doFoodTick($tickDiff);
}
}
public function exhaust(float $amount, int $cause = PlayerExhaustEvent::CAUSE_CUSTOM) : float{
if($this->isSurvival()){
return parent::exhaust($amount, $cause);
}
return 0.0;
}
public function checkNetwork(){ public function checkNetwork(){
if(!$this->isOnline()){ if(!$this->isOnline()){
return; return;

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

@ -374,12 +374,18 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
public function entityBaseTick($tickDiff = 1){ public function entityBaseTick($tickDiff = 1){
$hasUpdate = parent::entityBaseTick($tickDiff); $hasUpdate = parent::entityBaseTick($tickDiff);
$this->doFoodTick($tickDiff);
return $hasUpdate;
}
public function doFoodTick(int $tickDiff = 1){
if($this->isAlive()){ if($this->isAlive()){
$food = $this->getFood(); $food = $this->getFood();
$health = $this->getHealth(); $health = $this->getHealth();
$difficulty = $this->server->getDifficulty(); $difficulty = $this->server->getDifficulty();
$this->foodTickTimer++; $this->foodTickTimer += $tickDiff;
if($this->foodTickTimer >= 80){ if($this->foodTickTimer >= 80){
$this->foodTickTimer = 0; $this->foodTickTimer = 0;
} }
@ -412,8 +418,6 @@ class Human extends Creature implements ProjectileSource, InventoryHolder{
} }
} }
} }
return $hasUpdate;
} }
public function getName(){ public function getName(){