From 732deeeb742ecee1c39370ec7eb72d9fa1443de0 Mon Sep 17 00:00:00 2001 From: Cekis Date: Wed, 25 May 2016 23:54:46 +0100 Subject: [PATCH] Added check on dynamic armor to abort if it no longer exists (error avoidance). --- .../game/script/item/armor/dynamic_armor.java | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) mode change 100644 => 100755 sku.0/sys.server/compiled/game/script/item/armor/dynamic_armor.java diff --git a/sku.0/sys.server/compiled/game/script/item/armor/dynamic_armor.java b/sku.0/sys.server/compiled/game/script/item/armor/dynamic_armor.java old mode 100644 new mode 100755 index fad308287..9e0d464f8 --- a/sku.0/sys.server/compiled/game/script/item/armor/dynamic_armor.java +++ b/sku.0/sys.server/compiled/game/script/item/armor/dynamic_armor.java @@ -1,18 +1,11 @@ package script.item.armor; -import script.*; -import script.base_class.*; -import script.combat_engine.*; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Vector; -import script.base_script; - -import script.library.static_item; -import script.library.utils; -import script.library.buff; import script.library.armor; import script.library.combat; +import script.library.static_item; +import script.library.utils; +import script.obj_id; +import script.string_id; public class dynamic_armor extends script.base_script { @@ -127,6 +120,9 @@ public class dynamic_armor extends script.base_script } public int OnGetAttributes(obj_id self, obj_id player, String[] names, String[] attribs) throws InterruptedException { + if(self == null || self == obj_id.NULL_ID || !isIdValid(self) || !exists(self)){ + return SCRIPT_CONTINUE; + } int free = getFirstFreeIndex(names); if (free == -1) {