From 39354e69f5a0b7166ef2cc372b67dfaa2ad2af26 Mon Sep 17 00:00:00 2001 From: Cekis Date: Mon, 23 May 2016 16:11:40 +0100 Subject: [PATCH] Fixed null pointer issue when trying to bring up a radial menu on a speeder with no owner (why does it not have an owner??) --- .../systems/vehicle_system/vehicle_base.java | 23 ++----------------- 1 file changed, 2 insertions(+), 21 deletions(-) mode change 100644 => 100755 sku.0/sys.server/compiled/game/script/systems/vehicle_system/vehicle_base.java diff --git a/sku.0/sys.server/compiled/game/script/systems/vehicle_system/vehicle_base.java b/sku.0/sys.server/compiled/game/script/systems/vehicle_system/vehicle_base.java old mode 100644 new mode 100755 index e2ac55f31..d006ad9a4 --- a/sku.0/sys.server/compiled/game/script/systems/vehicle_system/vehicle_base.java +++ b/sku.0/sys.server/compiled/game/script/systems/vehicle_system/vehicle_base.java @@ -1,26 +1,7 @@ package script.systems.vehicle_system; 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.ai_lib; -import script.library.callable; -import script.ai.ai_combat; -import script.library.pet_lib; -import script.library.healing; -import script.library.utils; -import script.library.battlefield; -import script.library.attrib; -import script.library.hue; -import script.library.vehicle; -import script.library.city; -import script.library.trial; -import script.library.buff; +import script.library.*; public class vehicle_base extends script.base_script { @@ -114,7 +95,7 @@ public class vehicle_base extends script.base_script } public int OnObjectMenuRequest(obj_id self, obj_id player, menu_info mi) throws InterruptedException { - if (isDead(self) || ai_lib.aiIsDead(player)) + if (isDead(self) || ai_lib.aiIsDead(player) || self == null || self == obj_id.NULL_ID || !isIdValid(self)) { return SCRIPT_CONTINUE; }