From df7eaa7242606d78592a214459a481f44a464c6b Mon Sep 17 00:00:00 2001 From: PEMapModder Date: Mon, 7 Mar 2016 18:48:27 +0800 Subject: [PATCH] Closes #3548 --- src/pocketmine/entity/Entity.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/pocketmine/entity/Entity.php b/src/pocketmine/entity/Entity.php index e386379e6..2722297b3 100644 --- a/src/pocketmine/entity/Entity.php +++ b/src/pocketmine/entity/Entity.php @@ -602,10 +602,11 @@ abstract class Entity extends Location implements Metadatable{ * */ public function attack($damage, EntityDamageEvent $source){ - if($this->hasEffect(Effect::FIRE_RESISTANCE) - and $source->getCause() === EntityDamageEvent::CAUSE_FIRE - and $source->getCause() === EntityDamageEvent::CAUSE_FIRE_TICK - and $source->getCause() === EntityDamageEvent::CAUSE_LAVA + if($this->hasEffect(Effect::FIRE_RESISTANCE) and ( + $source->getCause() === EntityDamageEvent::CAUSE_FIRE + or $source->getCause() === EntityDamageEvent::CAUSE_FIRE_TICK + or $source->getCause() === EntityDamageEvent::CAUSE_LAVA + ) ){ $source->setCancelled(); }