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

Fixed noDamageTicks not preventing damage when last damage cause is null

Browse Source 
noDamageTicks should make the entity completely invulnerable while active.
This commit is contained in:
Dylan K. Taylor 2019-07-07 17:37:52 +01:00
parent 11fc16617a
commit c7a5b8b0b4
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -541,7 +541,9 @@ abstract class Living extends Entity implements Damageable{
} }
public function attack(EntityDamageEvent $source) : void{ public function attack(EntityDamageEvent $source) : void{
if($this->attackTime > 0 or $this->noDamageTicks > 0){ if($this->noDamageTicks > 0){
$source->setCancelled();
}elseif($this->attackTime > 0){
$lastCause = $this->getLastDamageCause(); $lastCause = $this->getLastDamageCause();
if($lastCause !== null and $lastCause->getBaseDamage() >= $source->getBaseDamage()){ if($lastCause !== null and $lastCause->getBaseDamage() >= $source->getBaseDamage()){
$source->setCancelled(); $source->setCancelled();