From 2d973e7575f0f66416cd659c1e131cf6834684fa Mon Sep 17 00:00:00 2001
From: fullwall <fullwall25@gmail.com>
Date: Fri, 12 Jul 2013 20:32:10 +0800
Subject: [PATCH] Add PlayerAnimation#CRIT and MAGIC_CRIT

---
 .../net/citizensnpcs/commands/NPCCommands.java     |  6 ++----
 .../net/citizensnpcs/util/PlayerAnimation.java     | 14 ++++++++++++++
 .../java/net/citizensnpcs/util/StringHelper.java   |  1 -
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/main/java/net/citizensnpcs/commands/NPCCommands.java b/src/main/java/net/citizensnpcs/commands/NPCCommands.java
index b31763508..7c0a46693 100644
--- a/src/main/java/net/citizensnpcs/commands/NPCCommands.java
+++ b/src/main/java/net/citizensnpcs/commands/NPCCommands.java
@@ -867,10 +867,8 @@ public class NPCCommands {
     @Requirements(selected = true, ownership = true, types = { EntityType.VILLAGER })
     public void profession(CommandContext args, CommandSender sender, NPC npc) throws CommandException {
         String profession = args.getString(1);
-        Profession parsed;
-        try {
-            parsed = Profession.valueOf(profession.toUpperCase());
-        } catch (IllegalArgumentException ex) {
+        Profession parsed = Util.matchEnum(Profession.values(), profession.toUpperCase());
+        if (parsed == null) {
             throw new CommandException(Messages.INVALID_PROFESSION);
         }
         npc.getTrait(VillagerProfession.class).setProfession(parsed);
diff --git a/src/main/java/net/citizensnpcs/util/PlayerAnimation.java b/src/main/java/net/citizensnpcs/util/PlayerAnimation.java
index 33ec7d235..abe0ec6ee 100644
--- a/src/main/java/net/citizensnpcs/util/PlayerAnimation.java
+++ b/src/main/java/net/citizensnpcs/util/PlayerAnimation.java
@@ -19,6 +19,13 @@ public enum PlayerAnimation {
             sendPacketNearby(packet, player, radius);
         }
     },
+    CRIT {
+        @Override
+        protected void playAnimation(EntityPlayer player, int radius) {
+            Packet18ArmAnimation packet = new Packet18ArmAnimation(player, 6);
+            sendPacketNearby(packet, player, radius);
+        }
+    },
     HURT {
         @Override
         protected void playAnimation(EntityPlayer player, int radius) {
@@ -26,6 +33,13 @@ public enum PlayerAnimation {
             sendPacketNearby(packet, player, radius);
         }
     },
+    MAGIC_CRIT {
+        @Override
+        protected void playAnimation(EntityPlayer player, int radius) {
+            Packet18ArmAnimation packet = new Packet18ArmAnimation(player, 7);
+            sendPacketNearby(packet, player, radius);
+        }
+    },
     SIT {
         @Override
         protected void playAnimation(EntityPlayer player, int radius) {
diff --git a/src/main/java/net/citizensnpcs/util/StringHelper.java b/src/main/java/net/citizensnpcs/util/StringHelper.java
index e68064746..b3f69449d 100644
--- a/src/main/java/net/citizensnpcs/util/StringHelper.java
+++ b/src/main/java/net/citizensnpcs/util/StringHelper.java
@@ -6,7 +6,6 @@ import net.citizensnpcs.api.util.Colorizer;
 import org.bukkit.ChatColor;
 
 public class StringHelper {
-
     public static String capitalize(Object string) {
         String capitalize = string.toString();
         return capitalize.length() == 0 ? "" : Character.toUpperCase(capitalize.charAt(0))