Fix DefenseBoomAttack getting hit by own shooter if NoFriendlyFire is off

2017-02-25 23:19:06 -05:00 · 2017-02-25 23:19:06 -05:00 · 50c52eea8c
parent 6f8368da93
commit 50c52eea8c
1 changed files with 1 additions and 1 deletions
--- a/planet/Objects.ocd/Goals.ocd/Defense.ocd/DefenseBoomAttack.ocd/Script.c
+++ b/planet/Objects.ocd/Goals.ocd/Defense.ocd/DefenseBoomAttack.ocd/Script.c
@ -230,7 +230,7 @@ public func OnUnmount(object clonk)

 /*-- Explosion --*/

-public func IsProjectileTarget(target,shooter) { return true; }
+public func IsProjectileTarget(target,shooter) { return (!shooter) || (shooter->GetActionTarget() != this); } // don't get hit by projectiles shot from own rider
 public func OnProjectileHit(object shot) { return DoFireworks(shot->GetController()); }

 public func ContactBottom() { return Hit(); }