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

Made other efficiency changes to getting droid commands for a player

Browse Source
This commit is contained in:
CekisSWG
2018-06-06 20:50:03 +01:00
parent d5cd1a00db
commit e5a33f2d2b
3 changed files with 20 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sku.0/sys.server/compiled/game/script/library/space_combat.java
+14 -20
View File
@@ -2,6 +2,8 @@ package script.library;
import script.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Vector;
public class space_combat extends script.base_script
@@ -1947,33 +1949,25 @@ public class space_combat extends script.base_script
{
return null;
}
obj_id[] objContents = utils.getContents(objDataPad);
Vector strCommands = new Vector();
strCommands.setSize(0);
for (obj_id objContent : objContents) {
if (hasObjVar(objContent, "strDroidCommand")) {
String strTest = getStringObjVar(objContent, "strDroidCommand");
strCommands = utils.addElement(strCommands, strTest);
obj_id[] dataPadItems = utils.getContents(objDataPad);
List<String> droidCommands = new ArrayList<>();
for (obj_id dataPadItem : dataPadItems) {
if (hasObjVar(dataPadItem, "strDroidCommand")) {
droidCommands.add(getStringObjVar(dataPadItem, "strDroidCommand"));
}
}
if(strCommands.size() > 0)
return (String[]) strCommands.toArray(new String[0]);
return null;
return droidCommands.toArray(new String[0]);
}
public static String[] getDroidCommands(obj_id objPlayer) throws InterruptedException
{
String[] strRawCommands = getCommandListingForPlayer(objPlayer);
Vector strDroidCommands = new Vector();
strDroidCommands.setSize(0);
for (String strRawCommand : strRawCommands) {
int intIndex = strRawCommand.indexOf("droidcommand");
if (intIndex > -1) {
strDroidCommands = utils.addElement(strDroidCommands, strRawCommand);
String[] playerCommands = getCommandListingForPlayer(objPlayer);
List<String> droidCommands = new ArrayList<>();
for (String playerCommand : playerCommands) {
if (playerCommand.contains("droidcommand")) {
droidCommands.add(playerCommand);
}
}
if (strDroidCommands.size() > 0)
return (String[]) strDroidCommands.toArray();
return null;
return droidCommands.toArray(new String[0]);
}
public static void grantCapitalShipSequenceRewardsAndCreditForKills(obj_id objDefender) throws InterruptedException
{