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

Living: added calculateFallDamage()

Browse Source 
to clean up the way that fall damage is handled for flying players; also, onHitGround() isn't only doing fall damage things these days.
This commit is contained in:
Dylan K. Taylor 2021-09-05 14:36:58 +01:00
parent 6b7e671794
commit d4d00a9b80
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/entity/Living.php
View File

@ -305,8 +305,12 @@ abstract class Living extends Entity{
} }
} }
protected function calculateFallDamage(float $fallDistance) : float{
return ceil($fallDistance - 3 - (($jumpBoost = $this->effectManager->get(VanillaEffects::JUMP_BOOST())) !== null ? $jumpBoost->getEffectLevel() : 0));
}
protected function onHitGround() : void{ protected function onHitGround() : void{
$damage = ceil($this->fallDistance - 3 - (($jumpBoost = $this->effectManager->get(VanillaEffects::JUMP_BOOST())) !== null ? $jumpBoost->getEffectLevel() : 0)); $damage = $this->calculateFallDamage($this->fallDistance);
if($damage > 0){ if($damage > 0){
$ev = new EntityDamageEvent($this, EntityDamageEvent::CAUSE_FALL, $damage); $ev = new EntityDamageEvent($this, EntityDamageEvent::CAUSE_FALL, $damage);
$this->attack($ev); $this->attack($ev);

6
src/player/Player.php
View File

@ -1200,10 +1200,8 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
$this->sendPosition($from, $from->yaw, $from->pitch, MovePlayerPacket::MODE_RESET); $this->sendPosition($from, $from->yaw, $from->pitch, MovePlayerPacket::MODE_RESET);
} }
protected function onHitGround() : void{ protected function calculateFallDamage(float $fallDistance) : float{
if(!$this->flying){ return $this->flying ? 0 : parent::calculateFallDamage($fallDistance);
parent::onHitGround();
}
} }
public function jump() : void{ public function jump() : void{