projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-08-03 04:16:19 -04:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into Invasions

Browse Source
This commit is contained in:
CharonInferar
2014-08-10 14:28:41 +02:00
parent 1cd1e95783 661e3db88d
commit 058a3549e7
17 changed files with 203 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/command/CommandService.java
+1 -1
View File
@@ -724,7 +724,7 @@ public class CommandService implements INetworkDispatch {
} 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, "");
core.scriptService.callScript("scripts/commands/", command.getCommandName().toLowerCase(), "run", core, attacker, target, "");
}
}