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

sanity checks that were missing, also there may be a ship def somewhere using the string literal "null" instead of null

Browse Source
This commit is contained in:
DarthArgus
2016-01-31 17:11:28 -06:00
parent 8fb5c32b03
commit 650dd4edaa
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sku.0/sys.server/compiled/game/script/space/combat/combat_ship_capital.java
+3 -3
View File
@@ -33,7 +33,7 @@ public class combat_ship_capital extends script.space.combat.combat_space_base
setShipComponentEfficiencyEnergy(self, intSlots[intI], 1.0f);
}
String strCapitalShipType = getStringObjVar(self, "strCapitalShipType");
if ((strCapitalShipType == null) || (strCapitalShipType.equals("")))
if ((strCapitalShipType == null) || (strCapitalShipType.equals("")) || strCapitalShipType == "null") //yes, it seems there's a literal string "null" somewhere
{
debugSpeakMsg(self, "BAD CAPITAL SHIP DEFINED!");
}
@@ -164,7 +164,7 @@ public class combat_ship_capital extends script.space.combat.combat_space_base
setShipSlotTargetable(objShip, intSlots[intI], false);
}
String strCapitalShipType = getStringObjVar(objShip, "strCapitalShipType");
if (strCapitalShipType == null)
if ((strCapitalShipType == null) || (strCapitalShipType.equals("")) || strCapitalShipType == "null")
{
return;
}
@@ -241,7 +241,7 @@ public class combat_ship_capital extends script.space.combat.combat_space_base
public void processDamagePhase(obj_id objShip) throws InterruptedException
{
String strCapitalShipType = getStringObjVar(objShip, "strCapitalShipType");
if (strCapitalShipType == null)
if ((strCapitalShipType == null) || (strCapitalShipType.equals("")) || strCapitalShipType == "null")
{
return;
}