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

Make Living::addEffect() return bool (#1755)

Browse Source
This commit is contained in:
Muqsit 2017-12-01 20:56:37 +04:00 committed by Dylan K. Taylor
parent 0afe20c382
commit 92a1f45175
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -233,15 +233,17 @@ abstract class Living extends Entity implements Damageable{
* If a weaker or equal-strength effect is already applied but has a shorter duration, it will be replaced. * If a weaker or equal-strength effect is already applied but has a shorter duration, it will be replaced.
* *
* @param Effect $effect * @param Effect $effect
*
* @return bool whether the effect has been successfully applied.
*/ */
public function addEffect(Effect $effect){ public function addEffect(Effect $effect) : bool{
if(isset($this->effects[$effect->getId()])){ if(isset($this->effects[$effect->getId()])){
$oldEffect = $this->effects[$effect->getId()]; $oldEffect = $this->effects[$effect->getId()];
if( if(
abs($effect->getAmplifier()) < $oldEffect->getAmplifier() abs($effect->getAmplifier()) < $oldEffect->getAmplifier()
or (abs($effect->getAmplifier()) === abs($oldEffect->getAmplifier()) and $effect->getDuration() < $oldEffect->getDuration()) or (abs($effect->getAmplifier()) === abs($oldEffect->getAmplifier()) and $effect->getDuration() < $oldEffect->getDuration())
){ ){
return; return false;
} }
$effect->add($this, $oldEffect); $effect->add($this, $oldEffect);
}else{ }else{
@ -251,6 +253,8 @@ abstract class Living extends Entity implements Damageable{
$this->effects[$effect->getId()] = $effect; $this->effects[$effect->getId()] = $effect;
$this->recalculateEffectColor(); $this->recalculateEffectColor();
return true;
} }
/** /**