swg-source/dsrc
1
0
Fork 0
mirror of https://github.com/SWG-Source/dsrc.git synced 2026-07-31 00:15:54 -04:00
Code Issues Projects Releases Wiki Activity

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??)

Browse Source
This commit is contained in:
Cekis
2016-05-23 16:11:40 +01:00
parent 2af36b3537
commit 39354e69f5
1 changed files with 2 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sku.0/sys.server/compiled/game/script/systems/vehicle_system/vehicle_base.java
Regular → Executable
+2 -21
View File
@@ -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;
}