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

Change air tank regeneration to match UA (#2396)

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-08-22 19:10:53 +01:00 committed by GitHub
parent 8daf3dc8b4
commit bea634a9b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/pocketmine/entity/Living.php
View File

@ -665,13 +665,8 @@ abstract class Living extends Entity implements Damageable{
$this->attack($ev); $this->attack($ev);
} }
if(!$this->canBreathe()){ if($this->doAirSupplyTick($tickDiff)){
$this->setBreathing(false);
$this->doAirSupplyTick($tickDiff);
$hasUpdate = true; $hasUpdate = true;
}elseif(!$this->isBreathing()){
$this->setBreathing(true);
$this->setAirSupplyTicks($this->getMaxAirSupplyTicks());
} }
} }
@ -700,22 +695,42 @@ abstract class Living extends Entity implements Damageable{
} }
/** /**
* Ticks the entity's air supply when it cannot breathe. * Ticks the entity's air supply, consuming it when underwater and regenerating it when out of water.
*
* @param int $tickDiff * @param int $tickDiff
*
* @return bool
*/ */
protected function doAirSupplyTick(int $tickDiff) : void{ protected function doAirSupplyTick(int $tickDiff) : bool{
$ticks = $this->getAirSupplyTicks();
$oldTicks = $ticks;
if(!$this->canBreathe()){
$this->setBreathing(false);
if(($respirationLevel = $this->armorInventory->getHelmet()->getEnchantmentLevel(Enchantment::RESPIRATION)) <= 0 or if(($respirationLevel = $this->armorInventory->getHelmet()->getEnchantmentLevel(Enchantment::RESPIRATION)) <= 0 or
lcg_value() <= (1 / ($respirationLevel + 1)) lcg_value() <= (1 / ($respirationLevel + 1))
){ ){
$ticks = $this->getAirSupplyTicks() - $tickDiff; $ticks -= $tickDiff;
if($ticks <= -20){ if($ticks <= -20){
$this->setAirSupplyTicks(0); $ticks = 0;
$this->onAirExpired(); $this->onAirExpired();
}else{ }
}
}elseif(!$this->isBreathing()){
if($ticks < ($max = $this->getMaxAirSupplyTicks())){
$ticks += $tickDiff * 5;
}
if($ticks >= $max){
$ticks = $max;
$this->setBreathing(true);
}
}
if($ticks !== $oldTicks){
$this->setAirSupplyTicks($ticks); $this->setAirSupplyTicks($ticks);
} }
}
return $ticks !== $oldTicks;
} }
/** /**