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

Merge commit '089180fef4534b383a31a9d560a76bfaf0d16c6b'

Browse Source 
# Conflicts:
#	resources/vanilla
#	src/entity/Living.php
This commit is contained in:
Dylan K. Taylor 2020-05-19 21:14:54 +01:00
commit 45ec4645d2
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/entity/Living.php
View File

@ -433,13 +433,6 @@ abstract class Living extends Entity{
} }
if($e !== null){ if($e !== null){
if((
$source->getCause() === EntityDamageEvent::CAUSE_PROJECTILE or
$source->getCause() === EntityDamageEvent::CAUSE_ENTITY_ATTACK
) and $e->isOnFire()){
$this->setOnFire(2 * $this->getWorld()->getDifficulty());
}
$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());