projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-08-27 17:57:22 -04:00
Code Issues Projects Releases Wiki Activity

Added system err print for combat commands being considered regular scripted commands

Browse Source 
Removed loading of buildout objects temporarily to help make it easier
to resolve major loading crashes

Commands that are considered combat commands by the client but are using
regular command format will work, it'll just give an error. They should
be moved to the proper combat command format.
This commit is contained in:
Waverunner
2014-08-04 16:39:43 -04:00
parent f1b8c50918
commit e16e0373d6
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/command/CommandService.java
+7 -2
View File
@@ -451,8 +451,13 @@ public class CommandService implements INetworkDispatch {
}
public void processCombatCommand(CreatureObject attacker, SWGObject target, CombatCommand command, int actionCounter, String commandArgs) {
if (FileUtilities.doesFileExist("scripts/commands/combat/" + command.getCommandName() + ".py")) {
core.scriptService.callScript("scripts/commands/combat/", command.getCommandName(), "setup", core, attacker, target, command);
if (FileUtilities.doesFileExist("scripts/commands/combat/" + command.getCommandName().toLowerCase() + ".py")) {
core.scriptService.callScript("scripts/commands/combat/", command.getCommandName().toLowerCase(), "setup", core, attacker, target, command);
} else {
if (FileUtilities.doesFileExist("scripts/commands/" + command.getCommandName().toLowerCase() + ".py")) {
System.err.print("Command " + command.getCommandName() + " is considered a combat command by the client but has a regular command script!");
core.scriptService.callScript("scripts/commands/combat/", command.getCommandName().toLowerCase(), "run", core, attacker, target, "");
}
}
boolean success = true;