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

Merge branch 'next-minor'

Browse Source 
# Conflicts:
#	changelogs/3.12.md
#	resources/vanilla
#	src/VersionInfo.php
This commit is contained in:
Dylan K. Taylor
2020-06-03 13:11:30 +01:00
parent 0af5dbc89b c864647cd1
commit b58c425189
5 changed files with 148 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/entity/Living.php
View File

@ -356,6 +356,9 @@ abstract class Living extends Entity{
*/
public function applyDamageModifiers(EntityDamageEvent $source) : void{
if($this->lastDamageCause !== null and $this->attackTime > 0){
if($this->lastDamageCause->getBaseDamage() >= $source->getBaseDamage()){
$source->setCancelled();
}
$source->setModifier(-$this->lastDamageCause->getBaseDamage(), EntityDamageEvent::MODIFIER_PREVIOUS_DAMAGE_COOLDOWN);
}
if($source->canBeReducedByArmor()){