Merge branch 'release/3.4' into release/3.5

This commit is contained in:
Dylan K. Taylor 2018-12-14 17:32:34 +00:00
commit 4b518f2a58

View File

@ -571,7 +571,10 @@ abstract class Living extends Entity implements Damageable{
}
if($e !== null){
if($e->isOnFire()){
if((
$source->getCause() === EntityDamageEvent::CAUSE_PROJECTILE or
$source->getCause() === EntityDamageEvent::CAUSE_ENTITY_ATTACK
) and $e->isOnFire()){
$this->setOnFire(2 * $this->level->getDifficulty());
}