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

Merge branch 'stable' into minor-next

Browse Source
This commit is contained in:
Dylan K. Taylor
2023-07-19 13:22:07 +01:00
parent 6fbc133e5d 763241b11f
commit fba51e3bf9
3 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/entity/Living.php
View File

@ -507,7 +507,7 @@ abstract class Living extends Entity{
}
public function attack(EntityDamageEvent $source) : void{
if($this->noDamageTicks > 0){
if($this->noDamageTicks > 0 && $source->getCause() !== EntityDamageEvent::CAUSE_SUICIDE){
$source->cancel();
}