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

Entity: remove fallDistance parameter from fall()

Browse Source
This commit is contained in:
Dylan K. Taylor 2021-09-05 13:34:43 +01:00
parent 7e82cafdeb
commit 6ecad153ea
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/entity/Entity.php
View File

@ -1025,7 +1025,7 @@ abstract class Entity{
protected function updateFallState(float $distanceThisTick, bool $onGround) : void{
if($onGround){
if($this->fallDistance > 0){
$this->fall($this->fallDistance);
$this->fall();
$this->resetFallDistance();
}
}elseif($distanceThisTick < $this->fallDistance){
@ -1042,7 +1042,7 @@ abstract class Entity{
/**
* Called when a falling entity hits the ground.
*/
public function fall(float $fallDistance) : void{
public function fall() : void{
}

4
src/entity/Living.php
View File

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

4
src/player/Player.php
View File

@ -1200,9 +1200,9 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
$this->sendPosition($from, $from->yaw, $from->pitch, MovePlayerPacket::MODE_RESET);
}
public function fall(float $fallDistance) : void{
public function fall() : void{
if(!$this->flying){
parent::fall($fallDistance);
parent::fall();
}
}