Probably fix attack cancel errors

I can't replicate the error with this code, but I never tested without it so maybe I just can't replicate. Either way, here's some code that de-stupids existing code.
DenizenScript · Jan 14, 2015 · c1b223a · c1b223a
1 parent 90898dc
commit c1b223a
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/AttackCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/AttackCommand.java
@@ -25,7 +25,7 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException
             if (!scriptEntry.hasObject("cancel")
                     && arg.matches("cancel", "stop")) {
 
-                scriptEntry.addObject("cancel", "");
+                scriptEntry.addObject("cancel", "true");
             }
 
             else if (!scriptEntry.hasObject("target")
@@ -68,10 +68,10 @@ public void execute(final ScriptEntry scriptEntry) throws CommandExecutionExcept
         // Get objects
         List<dEntity> entities = (List<dEntity>) scriptEntry.getObject("entities");
         dEntity target = (dEntity) scriptEntry.getObject("target");
-        Boolean cancel = scriptEntry.hasObject("cancel");
+        boolean cancel = scriptEntry.hasObject("cancel");
 
         // Report to dB
-        dB.report(scriptEntry, getName(), (cancel ? aH.debugObj("cancel", cancel) : "") +
+        dB.report(scriptEntry, getName(), (cancel ? aH.debugObj("cancel", "true") : "") +
                 aH.debugObj("entities", entities.toString()) +
                 (target != null ? aH.debugObj("target", target) : ""));
 
@@ -82,7 +82,7 @@ public void execute(final ScriptEntry scriptEntry) throws CommandExecutionExcept
             if (entity.isNPC()) {
                 Navigator nav = entity.getDenizenNPC().getCitizen().getNavigator();
 
-                if (cancel.equals(false)) {
+                if (!cancel) {
                     nav.setTarget(target.getBukkitEntity(), true);
                 }
                 else {
@@ -96,7 +96,7 @@ public void execute(final ScriptEntry scriptEntry) throws CommandExecutionExcept
                 }
             }
             else {
-                if (cancel.equals(false)) {
+                if (!cancel) {
                     entity.target(target.getLivingEntity());
                 }
                 else {