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

Effect: Minor cleanup on Instant Health/Damage effect amplification

Browse Source
This commit is contained in:
Dylan K. Taylor 2017-12-23 11:23:29 +00:00
parent 9d4818d360
commit 6332814a04
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pocketmine/entity/Effect.php
View File

@ -360,14 +360,12 @@ class Effect{
case Effect::INSTANT_HEALTH: case Effect::INSTANT_HEALTH:
//TODO: add particles (witch spell) //TODO: add particles (witch spell)
if($entity->getHealth() < $entity->getMaxHealth()){ if($entity->getHealth() < $entity->getMaxHealth()){
$amount = 2 * (2 ** ($this->getEffectLevel() % 32)); $entity->heal(new EntityRegainHealthEvent($entity, 4 << $this->getEffectLevel(), EntityRegainHealthEvent::CAUSE_MAGIC));
$entity->heal(new EntityRegainHealthEvent($entity, $amount, EntityRegainHealthEvent::CAUSE_MAGIC));
} }
break; break;
case Effect::INSTANT_DAMAGE: case Effect::INSTANT_DAMAGE:
//TODO: add particles (witch spell) //TODO: add particles (witch spell)
$amount = 2 * (2 ** ($this->getEffectLevel() % 32)); $entity->attack(new EntityDamageEvent($entity, EntityDamageEvent::CAUSE_MAGIC, 4 << $this->getEffectLevel()));
$entity->attack(new EntityDamageEvent($entity, EntityDamageEvent::CAUSE_MAGIC, $amount));
break; break;
} }
} }