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-24 12:02:24 +01:00
parent 2779f92828 fd23281183
commit 3afe3b7f44
18 changed files with 71 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/entity/Living.php
View File

@ -520,7 +520,9 @@ abstract class Living extends Entity{
$source->cancel();
}
$this->applyDamageModifiers($source);
if($source->getCause() !== EntityDamageEvent::CAUSE_SUICIDE){
$this->applyDamageModifiers($source);
}
if($source instanceof EntityDamageByEntityEvent && (
$source->getCause() === EntityDamageEvent::CAUSE_BLOCK_EXPLOSION ||