From ef2f7b2418f91218a9ea1bf2cc96d1e24a4846cd Mon Sep 17 00:00:00 2001 From: Cekis Date: Sun, 29 May 2016 07:09:18 +0100 Subject: [PATCH] Fixed issue where a bomber squadron leader could not taunt because it was being destroyed. --- .../compiled/game/script/space/combat/combat_ship_player.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sku.0/sys.server/compiled/game/script/space/combat/combat_ship_player.java b/sku.0/sys.server/compiled/game/script/space/combat/combat_ship_player.java index c695b255e..67256adeb 100755 --- a/sku.0/sys.server/compiled/game/script/space/combat/combat_ship_player.java +++ b/sku.0/sys.server/compiled/game/script/space/combat/combat_ship_player.java @@ -1939,7 +1939,7 @@ public class combat_ship_player extends script.base_script string_id sid = new string_id("space/space_interaction", "bomber_down"); prose_package pp = new prose_package(); pp.stringId = sid; - dogfightTauntPlayer(bomberSquaddyList[0], self, pp); + if(isIdValid(bomberSquaddyList[0]) && isIdValid(self)) dogfightTauntPlayer(bomberSquaddyList[0], self, pp); return SCRIPT_CONTINUE; } public int bomberStrikeEscortUnitDestroyed(obj_id self, dictionary params) throws InterruptedException