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

Removed obsolete parameters from Entity->attack() and Entity->heal()

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-08-21 13:18:39 +01:00
parent b62597fe63
commit 456ddd3fb3
15 changed files with 40 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,9 +49,9 @@ abstract class Projectile extends Entity{
parent::__construct($level, $nbt);
}
public function attack($damage, EntityDamageEvent $source){
public function attack(EntityDamageEvent $source){
if($source->getCause() === EntityDamageEvent::CAUSE_VOID){
parent::attack($damage, $source);
parent::attack($source);
}
}
@ -88,7 +88,7 @@ abstract class Projectile extends Entity{
$ev = new EntityDamageByChildEntityEvent($this->getOwningEntity(), $this, $entity, EntityDamageEvent::CAUSE_PROJECTILE, $damage);
}
$entity->attack($ev->getFinalDamage(), $ev);
$entity->attack($ev);
$this->hadCollision = true;