projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-07-28 23:15:53 -04:00
Code Issues Projects Releases Wiki Activity

Temporary fix for certain commands being registered as combat commands even though the are not combat commands

Browse Source
This commit is contained in:
Seefo
2014-04-08 10:30:16 -04:00
parent 7eaed057c7
commit f60583dff2
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/command/CommandService.java
+9
View File
@@ -350,6 +350,7 @@ public class CommandService implements INetworkDispatch {
if(visitor.getObject(i, 82-sub) instanceof Boolean)
isCombatCommand = (Boolean) visitor.getObject(i, 82-sub);
// "isCombatCommand" needs to be changed so that non-combat commands that are flagged to added to a combat queue are not considered combat commands
if (hasCharacterAbility || isCombatCommand) {
CombatCommand command = new CombatCommand(commandName);
commandLookup.add(command);
@@ -393,7 +394,15 @@ public class CommandService implements INetworkDispatch {
//}
if(FileUtilities.doesFileExist("scripts/commands/combat/" + command.getCommandName() + ".py"))
{
core.scriptService.callScript("scripts/commands/combat/", command.getCommandName(), "setup", core, attacker, target, command);
}
// Temporary fix for certain non-combat commands being registered as combat commands
else if(FileUtilities.doesFileExist("scripts/commands/" + command.getCommandName() + ".py"))
{
core.scriptService.callScript("scripts/commands/", command.getCommandName(), "run", core, attacker, target, commandArgs);
return;
}
boolean success = true;