marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix possible script error in no friendly fire rule

alut-include-path
Maikel de Vries 2017-02-19 11:28:35 +01:00
parent a7bbda4ca1
commit 50f6b2266a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
planet/Objects.ocd/Rules.ocd/NoFriendlyFire.ocd/Script.c
View File

@ -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))