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

Fixed combat commands and added a better check for combat commands

Browse Source
This commit is contained in:
Seefo
2014-04-09 16:32:15 -04:00
parent bf24229235
commit 399cf7a535
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/command/CommandService.java
+8 -12
View File
@@ -122,7 +122,7 @@ public class CommandService implements INetworkDispatch {
break;
}
if (actor.getPosition().getDistance(target.getPosition()) > command.getMaxRangeToTarget()) {
if (command.getMaxRangeToTarget() != 0 && actor.getPosition().getDistance(target.getPosition()) > command.getMaxRangeToTarget()) {
return false;
}
@@ -286,8 +286,11 @@ public class CommandService implements INetworkDispatch {
boolean isCombatCommand = false;
if(visitor.getObject(i, 82-sub) instanceof Boolean)
isCombatCommand = (Boolean) visitor.getObject(i, 82-sub);
System.out.println(((String) visitor.getObject(i, 85-sub)));
if(((String) visitor.getObject(i, 3)).equals("failSpecialAttack") || ((String) visitor.getObject(i, 85-sub)).equals("defaultattack"))
isCombatCommand = true;
if (hasCharacterAbility || isCombatCommand) {
CombatCommand command = new CombatCommand(name.toLowerCase());
@@ -347,8 +350,8 @@ public class CommandService implements INetworkDispatch {
boolean isCombatCommand = false;
if(visitor.getObject(i, 82-sub) instanceof Boolean)
isCombatCommand = (Boolean) visitor.getObject(i, 82-sub);
if(((String) visitor.getObject(i, 3)).equals("failSpecialAttack") || ((String) visitor.getObject(i, 85-sub)).equals("defaultattack"))
isCombatCommand = true;
// "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) {
@@ -373,7 +376,6 @@ public class CommandService implements INetworkDispatch {
public void processCommand(CreatureObject actor, SWGObject target, BaseSWGCommand command, int actionCounter, String commandArgs) {
actor.addCooldown(command.getCooldownGroup(), command.getCooldown());
if (command instanceof CombatCommand) {
processCombatCommand(actor, target, (CombatCommand) command, actionCounter, commandArgs);
} else {
@@ -397,12 +399,6 @@ public class CommandService implements INetworkDispatch {
{
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;