From 50f6b2266a312e5a49e042eff88e369b4edb7d31 Mon Sep 17 00:00:00 2001 From: Maikel de Vries Date: Sun, 19 Feb 2017 11:28:35 +0100 Subject: [PATCH] fix possible script error in no friendly fire rule --- planet/Objects.ocd/Rules.ocd/NoFriendlyFire.ocd/Script.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/planet/Objects.ocd/Rules.ocd/NoFriendlyFire.ocd/Script.c b/planet/Objects.ocd/Rules.ocd/NoFriendlyFire.ocd/Script.c index 23fb20582..7e784c1da 100644 --- a/planet/Objects.ocd/Rules.ocd/NoFriendlyFire.ocd/Script.c +++ b/planet/Objects.ocd/Rules.ocd/NoFriendlyFire.ocd/Script.c @@ -148,7 +148,7 @@ public func NoFF_DoShockwaveCheck(int x, int y, int caused_by, ...) public func NoFF_IsProjectileTarget(object projectile, object shooter, ...) { var w_controller = projectile->GetController(); - if (w_controller == NO_OWNER) + if (shooter && w_controller == NO_OWNER) w_controller = shooter->GetController(); var t_controller = this->GetController(); if (w_controller != NO_OWNER && t_controller != NO_OWNER && !Hostile(w_controller, t_controller))