From a8f86a02d2aabac99ea38e4a3cba2c99c2760736 Mon Sep 17 00:00:00 2001 From: Cekis Date: Fri, 3 Feb 2017 01:11:16 +0000 Subject: [PATCH] Added null pointer check when weapon stats cannot be retrieved for a delayed attack. --- .../compiled/game/script/systems/combat/combat_base.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sku.0/sys.server/compiled/game/script/systems/combat/combat_base.java b/sku.0/sys.server/compiled/game/script/systems/combat/combat_base.java index 9ec16995b..cb90d1685 100755 --- a/sku.0/sys.server/compiled/game/script/systems/combat/combat_base.java +++ b/sku.0/sys.server/compiled/game/script/systems/combat/combat_base.java @@ -481,7 +481,8 @@ public class combat_base extends script.base_script return; } dictionary dctWeaponStats = utils.getDictionaryScriptVar(objWeapon, "dctWeaponStats"); - utils.setScriptVar(egg, "dctWeaponStats", dctWeaponStats); + if(dctWeaponStatus) + utils.setScriptVar(egg, "dctWeaponStats", dctWeaponStats); utils.setScriptVar(egg, "isAutoAimed", isAutoAimed); doStandardDelayedAction(egg, target, attackName, actionData, instantHit); }