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

Merge #826: use getEffectLevel() instead of getAmplifier() + 1

Browse Source 
Closes #412
This commit is contained in:
smarticles101
2017-05-05 18:58:54 +08:00
committed by SOFe
parent 76ceddf266
commit 8a7259aa73
6 changed files with 33 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/event/entity/EntityDamageEvent.php
View File

@ -86,7 +86,7 @@ class EntityDamageEvent extends EntityEvent implements Cancellable{
}
if($entity->hasEffect(Effect::DAMAGE_RESISTANCE)){
$this->setDamage(-($this->getDamage(self::MODIFIER_BASE) * 0.20 * ($entity->getEffect(Effect::DAMAGE_RESISTANCE)->getAmplifier() + 1)), self::MODIFIER_RESISTANCE);
$this->setDamage(-($this->getDamage(self::MODIFIER_BASE) * 0.20 * $entity->getEffect(Effect::DAMAGE_RESISTANCE)->getEffectLevel()), self::MODIFIER_RESISTANCE);
}
}