From 69f18a35573adb8f0686b2bcdd11cf3d1473ef5e Mon Sep 17 00:00:00 2001 From: Cekis Date: Thu, 19 Jan 2017 16:30:27 +0000 Subject: [PATCH] Added more logging to identify an issue with a grenade not being able to be thrown. --- .../compiled/game/script/systems/combat/combat_actions.java | 6 ++++++ 1 file changed, 6 insertions(+) mode change 100644 => 100755 sku.0/sys.server/compiled/game/script/systems/combat/combat_actions.java diff --git a/sku.0/sys.server/compiled/game/script/systems/combat/combat_actions.java b/sku.0/sys.server/compiled/game/script/systems/combat/combat_actions.java old mode 100644 new mode 100755 index 02dd966dc..c1785464f --- a/sku.0/sys.server/compiled/game/script/systems/combat/combat_actions.java +++ b/sku.0/sys.server/compiled/game/script/systems/combat/combat_actions.java @@ -9516,6 +9516,12 @@ public class combat_actions extends script.systems.combat.combat_base intCount = intCount - 1; String strTemplate = getSharedObjectTemplateName(objGrenade); dictionary dctGrenadeCommand = dataTableGetRow("datatables/timer/template_command_mapping.iff", strTemplate); + if(dctGrenadeCommand == null){ + LOG("grenade", "Can't find entry for template (" + strTemplate + ") in datatable datatables/timer/template_command_mapping.iff." + + "Thrown by (" + self + ":" + getTemplateName(self) + ") who " + (isPlayer(target) ? "IS" : "IS NOT") + " a player, thrown at (" + + target + ":" + getTemplateName(target) + ") who " + (isPlayer(target) ? "IS" : "IS NOT") + " a player."); + return SCRIPT_OVERRIDE; + } String strCommand = dctGrenadeCommand.getString("COMMAND"); if (!combatStandardAction(strCommand, self, target, objGrenade, "", null, false)) {