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

EntityDamageByEntityEvent: added APIs to get and set vertical knockback limits

Browse Source 
this was requested and PR'd as far back as 2020 (see #3782).
Since no issue was filed about this, it became forgotten until #5946.
However, #5946 overcomplicates the solution to the problem, and breaks BC without an obvious reason.
This commit is contained in:
Dylan K. Taylor 2023-07-28 12:52:15 +01:00
parent c972e65741
commit 5ec3f4655f
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/entity/Living.php
View File

@ -557,14 +557,14 @@ abstract class Living extends Entity{
$e = $source->getChild(); $e = $source->getChild();
if($e !== null){ if($e !== null){
$motion = $e->getMotion(); $motion = $e->getMotion();
$this->knockBack($motion->x, $motion->z, $source->getKnockBack()); $this->knockBack($motion->x, $motion->z, $source->getKnockBack(), $source->getVerticalKnockBackLimit());
} }
}elseif($source instanceof EntityDamageByEntityEvent){ }elseif($source instanceof EntityDamageByEntityEvent){
$e = $source->getDamager(); $e = $source->getDamager();
if($e !== null){ if($e !== null){
$deltaX = $this->location->x - $e->location->x; $deltaX = $this->location->x - $e->location->x;
$deltaZ = $this->location->z - $e->location->z; $deltaZ = $this->location->z - $e->location->z;
$this->knockBack($deltaX, $deltaZ, $source->getKnockBack()); $this->knockBack($deltaX, $deltaZ, $source->getKnockBack(), $source->getVerticalKnockBackLimit());
} }
} }

28
src/event/entity/EntityDamageByEntityEvent.php
View File

@ -36,7 +36,15 @@ class EntityDamageByEntityEvent extends EntityDamageEvent{
/** /**
* @param float[] $modifiers * @param float[] $modifiers
*/ */
public function __construct(Entity $damager, Entity $entity, int $cause, float $damage, array $modifiers = [], private float $knockBack = Living::DEFAULT_KNOCKBACK_FORCE){ public function __construct(
Entity $damager,
Entity $entity,
int $cause,
float $damage,
array $modifiers = [],
private float $knockBack = Living::DEFAULT_KNOCKBACK_FORCE,
private float $verticalKnockBackLimit = Living::DEFAULT_KNOCKBACK_VERTICAL_LIMIT
){
$this->damagerEntityId = $damager->getId(); $this->damagerEntityId = $damager->getId();
parent::__construct($entity, $cause, $damage, $modifiers); parent::__construct($entity, $cause, $damage, $modifiers);
$this->addAttackerModifiers($damager); $this->addAttackerModifiers($damager);
@ -79,4 +87,22 @@ class EntityDamageByEntityEvent extends EntityDamageEvent{
public function setKnockBack(float $knockBack) : void{ public function setKnockBack(float $knockBack) : void{
$this->knockBack = $knockBack; $this->knockBack = $knockBack;
} }
/**
* Returns the maximum upwards velocity the victim may have after being knocked back.
* This ensures that the victim doesn't fly up into the sky when high levels of knockback are applied.
*
* @see Living::DEFAULT_KNOCKBACK_VERTICAL_LIMIT
*/
public function getVerticalKnockBackLimit() : float{
return $this->verticalKnockBackLimit;
}
/**
* Sets the maximum upwards velocity the victim may have after being knocked back.
* Larger values will allow the victim to fly higher if the knockback force is also large.
*/
public function setVerticalKnockBackLimit(float $verticalKnockBackLimit) : void{
$this->verticalKnockBackLimit = $verticalKnockBackLimit;
}
} }