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

More command service improvements

Browse Source
This commit is contained in:
Treeku
2014-04-07 06:41:32 +01:00
parent 3eeb1bb7d5
commit 577bbdb23b
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/command/CommandService.java
+5 -5
View File
@@ -88,10 +88,6 @@ public class CommandService implements INetworkDispatch {
return false;
}
if (target != null && actor.getPosition().getDistance(target.getPosition) > command.getMaxRangeToTarget()) {
return false;
}
WeaponObject weapon = (WeaponObject) core.objectService.getObject(actor.getWeaponId());
if (weapon != null && weapon.getWeaponType() == command.getInvalidWeapon()) {
@@ -182,6 +178,10 @@ public class CommandService implements INetworkDispatch {
break;
}
if (target != null && actor.getPosition().getDistance(target.getPosition) > command.getMaxRangeToTarget()) {
return false;
}
if (command.shouldCallOnTarget()) {
if (target == null || !(target instanceof CreatureObject)) {
return false;
@@ -468,7 +468,7 @@ public class CommandService implements INetworkDispatch {
SWGObject target = core.objectService.getObject(commandEnqueue.getTargetID());
if (!callCommand(actor, command, target, commandEnqueue.getActionCounter(), commandEnqueue.getCommandArguments())) {
if (!callCommand(actor, target, command, commandEnqueue.getActionCounter(), commandEnqueue.getCommandArguments())) {
// Call failScriptHook
}
}