mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-13 15:05:33 +00:00
Code Issues Projects Releases Wiki Activity

Living: Remove superfluous fire resistance check from dealFireDamage()

Browse Source 
This is already checked in Living->attack(). It's preferable to allow it to be cancelled there since plugins can then un-cancel EntityDamageEvent to bypass the effect.
This commit is contained in:
Dylan K. Taylor 2017-12-07 17:32:50 +00:00
parent 502dd14c67
commit 49dbd8b2c8
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pocketmine/entity/Living.php
View File

@ -518,12 +518,6 @@ abstract class Living extends Entity implements Damageable{
} }
} }
protected function dealFireDamage(){
if(!$this->hasEffect(Effect::FIRE_RESISTANCE)){
parent::dealFireDamage();
}
}
/** /**
* Ticks the entity's air supply when it cannot breathe. * Ticks the entity's air supply when it cannot breathe.
* @param int $tickDiff * @param int $tickDiff