From 4ab5316c66e7ea72b8e772eda51b3374dbfaea03 Mon Sep 17 00:00:00 2001 From: Cekis Date: Sun, 29 May 2016 18:32:33 +0100 Subject: [PATCH] Added check to make sure thing entering a mine area is valid and exists (i.e. it's not already dead). --- .../game/script/systems/combat/combat_mine.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) mode change 100644 => 100755 sku.0/sys.server/compiled/game/script/systems/combat/combat_mine.java diff --git a/sku.0/sys.server/compiled/game/script/systems/combat/combat_mine.java b/sku.0/sys.server/compiled/game/script/systems/combat/combat_mine.java old mode 100644 new mode 100755 index 755076fd5..19568d643 --- a/sku.0/sys.server/compiled/game/script/systems/combat/combat_mine.java +++ b/sku.0/sys.server/compiled/game/script/systems/combat/combat_mine.java @@ -1,17 +1,11 @@ package script.systems.combat; 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.utils; -import script.library.combat; -import script.library.colors; import script.library.attrib; +import script.library.colors; +import script.library.utils; + +import java.util.Vector; public class combat_mine extends script.base_script { @@ -169,6 +163,9 @@ public class combat_mine extends script.base_script } public int OnTriggerVolumeEntered(obj_id self, String volumeName, obj_id breacher) throws InterruptedException { + if(!isIdValid(self) || !exists(self)){ + return SCRIPT_CONTINUE; + } if (isDeactivated()) { return SCRIPT_CONTINUE;