animate command cleanup

DenizenScript · May 14, 2021 · 7300315 · 7300315
1 parent c4a9ccd
commit 7300315
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/AnimateCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/AnimateCommand.java
@@ -100,10 +100,10 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException
                 if (arg.matchesEnum(PlayerAnimation.values())) {
                     scriptEntry.addObject("animation", PlayerAnimation.valueOf(arg.getValue().toUpperCase()));
                 }
-                else if (arg.matchesEnum(EntityEffect.values())) {
+                if (arg.matchesEnum(EntityEffect.values())) {
                     scriptEntry.addObject("effect", EntityEffect.valueOf(arg.getValue().toUpperCase()));
                 }
-                else if (animationHelper.hasEntityAnimation(arg.getValue())) {
+                if (animationHelper.hasEntityAnimation(arg.getValue())) {
                     scriptEntry.addObject("nms_animation", arg.getValue());
                 }
             }
@@ -148,13 +148,17 @@ else if (effect != null) {
                             entity.getBukkitEntity().playEffect(effect);
                         }
                     }
-                    else {
+                    else if (nmsAnimation != null) {
                         EntityAnimation entityAnimation = NMSHandler.getAnimationHelper().getEntityAnimation(nmsAnimation);
                         entityAnimation.play(entity.getBukkitEntity());
                     }
+                    else {
+                        Debug.echoError("No way to play the given animation on entity '" + entity + "'");
+                    }
                 }
                 catch (Exception e) {
                     Debug.echoError(scriptEntry.getResidingQueue(), "Error playing that animation!");
+                    Debug.echoError(e);
                 }
             }
         }