projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-09-29 14:12:52 -04:00
Code Issues Projects Releases Wiki Activity

Fixed most warnings

Browse Source
This commit is contained in:
Treeku
2014-04-10 11:52:09 +01:00
parent 62fea5c7cc
commit e91362a12f
63 changed files with 18 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/command/CommandService.java
+4 -27
View File
@@ -83,7 +83,7 @@ public class CommandService implements INetworkDispatch {
return false;
}
if (command.getGodLevel() > 0 && !actor.getClient().isGM()) {
if (command.getGodLevel() > 0 && (actor.getClient() == null || !actor.getClient().isGM())) {
return false;
}
@@ -177,7 +177,7 @@ public class CommandService implements INetworkDispatch {
}
// Without this we could be buffing ally NPCs and such
if (object.getSlottedObject("ghost") == null) {
if (actor.getSlottedObject("ghost") != null && object.getSlottedObject("ghost") == null) {
return false;
}
@@ -222,28 +222,7 @@ public class CommandService implements INetworkDispatch {
}
public void callCommand(SWGObject actor, String commandName, SWGObject target, String commandArgs) {
System.out.println("CommandService: void callCommand(actor, commandName, target, commandArgs): This shouldn't be called anymore.");
if (actor == null)
return;
BaseSWGCommand command = getCommandByName(commandName);
if (command == null)
return;
if(command instanceof CombatCommand) {
CombatCommand command2;
try {
command2 = (CombatCommand) command.clone();
processCombatCommand((CreatureObject) actor, target, command2, 0, "");
} catch (CloneNotSupportedException e) {
e.printStackTrace();
}
return;
}
core.scriptService.callScript("scripts/commands/", command.getCommandName(), "run", core, actor, target, commandArgs);
callCommand((CreatureObject) actor, target, getCommandByName(commandName), 0, commandArgs);
}
public BaseSWGCommand getCommandByCRC(int commandCRC) {
@@ -364,9 +343,7 @@ public class CommandService implements INetworkDispatch {
} else {
if (FileUtilities.doesFileExist("scripts/commands/" + command.getCommandName() + ".py")) {
core.scriptService.callScript("scripts/commands/", command.getCommandName(), "run", core, actor, target, commandArgs);
}
if (FileUtilities.doesFileExist("scripts/commands/combat/" + command.getCommandName() + ".py")) {
} else if (FileUtilities.doesFileExist("scripts/commands/combat/" + command.getCommandName() + ".py")) {
core.scriptService.callScript("scripts/commands/combat/", command.getCommandName(), "run", core, actor, target, commandArgs);
}
}