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

Projectile: allow using negative damage amounts to remove damage effects

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-03-09 11:16:37 +00:00
parent a8a3eb3866
commit cdd3fe81e1
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/entity/projectile/Projectile.php
View File

@ -284,6 +284,7 @@ abstract class Projectile extends Entity{
protected function onHitEntity(Entity $entityHit, RayTraceResult $hitResult) : void{ protected function onHitEntity(Entity $entityHit, RayTraceResult $hitResult) : void{
$damage = $this->getResultDamage(); $damage = $this->getResultDamage();
if($damage >= 0){
if($this->getOwningEntity() === null){ if($this->getOwningEntity() === null){
$ev = new EntityDamageByEntityEvent($this, $entityHit, EntityDamageEvent::CAUSE_PROJECTILE, $damage); $ev = new EntityDamageByEntityEvent($this, $entityHit, EntityDamageEvent::CAUSE_PROJECTILE, $damage);
}else{ }else{
@ -299,6 +300,7 @@ abstract class Projectile extends Entity{
$entityHit->setOnFire($ev->getDuration()); $entityHit->setOnFire($ev->getDuration());
} }
} }
}
$this->flagForDespawn(); $this->flagForDespawn();
} }