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

Few command improvements

Browse Source
This commit is contained in:
Treeku
2014-04-08 05:06:03 +01:00
parent d5c9d226e3
commit 9a18eb1eaa
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/command/CommandService.java
+4 -6
View File
@@ -114,7 +114,7 @@ public class CommandService implements INetworkDispatch {
break;
case 1: // Other Only
if (target == null || target == actor) {
if (target == actor) {
return false;
}
@@ -272,7 +272,7 @@ public class CommandService implements INetworkDispatch {
boolean hasCharacterAbility = (((String) visitor.getObject(i, 7-sub)).length() > 0);
if (tableArray[n].startsWith("client_") && tableArray[n].startsWith("command_table_")) {
if (tableArray[n].startsWith("client_") || tableArray[n].startsWith("command_table_")) {
sub += 7;
}
@@ -333,7 +333,7 @@ public class CommandService implements INetworkDispatch {
boolean hasCharacterAbility = (((String) visitor.getObject(i, 7-sub)).length() > 0);
if (tableArray[n].startsWith("client_") && tableArray[n].startsWith("command_table_")) {
if (tableArray[n].startsWith("client_") || tableArray[n].startsWith("command_table_")) {
sub += 7;
}
@@ -367,9 +367,7 @@ public class CommandService implements INetworkDispatch {
}
public void processCommand(CreatureObject actor, SWGObject target, BaseSWGCommand command, int actionCounter, String commandArgs) {
if (command.getCooldown() > (float) 1) {
actor.addCooldown(command.getCooldownGroup(), command.getCooldown());
}
actor.addCooldown(command.getCooldownGroup(), command.getCooldown());
if (command instanceof CombatCommand) {
processCombatCommand(actor, target, (CombatCommand) command, actionCounter, commandArgs);