mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-11 08:19:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '8c5a81cf5'

Browse Source 
# Conflicts:
#	resources/vanilla
This commit is contained in:
Dylan K. Taylor 2020-06-03 12:50:09 +01:00
commit 2bf73c7a4a
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/entity/Living.php
View File

@ -467,12 +467,14 @@ abstract class Living extends Entity{
$this->attackTime = $source->getAttackCooldown(); $this->attackTime = $source->getAttackCooldown();
if($source instanceof EntityDamageByEntityEvent){ if($source instanceof EntityDamageByChildEntityEvent){
$e = $source->getDamager(); $e = $source->getChild();
if($source instanceof EntityDamageByChildEntityEvent){ if($e !== null){
$e = $source->getChild(); $motion = $e->getMotion();
$this->knockBack($motion->x, $motion->z, $source->getKnockBack());
} }
}elseif($source instanceof EntityDamageByEntityEvent){
$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;