From c3fc085adcbdda2b886e67eff826c1017639154f Mon Sep 17 00:00:00 2001
From: Steven Lawson <steven@smlawson.com>
Date: Sat, 20 Jul 2013 19:38:27 -0400
Subject: [PATCH] Fix for Bukkit NPE in /enchant.

---
 appinfo.properties                            |  6 +++---
 buildnumber.properties                        |  4 ++--
 .../Commands/Command_enchant.java             | 19 +++++++++++++++++--
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/appinfo.properties b/appinfo.properties
index 587e2eb0..d9a2cfbd 100644
--- a/appinfo.properties
+++ b/appinfo.properties
@@ -1,6 +1,6 @@
-#Fri, 19 Jul 2013 19:19:28 -0400
+#Sat, 20 Jul 2013 19:28:30 -0400
 
 program.VERSION=2.21
-program.BUILDNUM=318
-program.BUILDDATE=07/19/2013 07\:19 PM
+program.BUILDNUM=320
+program.BUILDDATE=07/20/2013 07\:28 PM
 
diff --git a/buildnumber.properties b/buildnumber.properties
index de2f2dde..719dde51 100644
--- a/buildnumber.properties
+++ b/buildnumber.properties
@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Fri Jul 19 19:19:28 EDT 2013
-build.number=319
+#Sat Jul 20 19:28:30 EDT 2013
+build.number=321
diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_enchant.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_enchant.java
index e170a838..29dacb8b 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_enchant.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_enchant.java
@@ -1,5 +1,6 @@
 package me.StevenLawson.TotalFreedomMod.Commands;
 
+import me.StevenLawson.TotalFreedomMod.TFM_Log;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.enchantments.Enchantment;
@@ -53,9 +54,23 @@ public class Command_enchant extends TFM_Command
         {
             for (Enchantment ench : Enchantment.values())
             {
-                if (ench.canEnchantItem(itemInHand))
+                /*
+                 2013-07-20 23:17:13 [INFO] [TotalFreedomMod]: Command Error: enchant
+                 java.lang.NullPointerException
+                 at net.minecraft.server.v1_6_R2.EnchantmentDurability.canEnchant(SourceFile:33)
+                 at org.bukkit.craftbukkit.v1_6_R2.enchantments.CraftEnchantment.canEnchantItem(CraftEnchantment.java:55)
+                 at me.StevenLawson.TotalFreedomMod.Commands.Command_enchant.run(Command_enchant.java:56)
+                 */
+                try
                 {
-                    itemInHand.addEnchantment(ench, ench.getMaxLevel());
+                    if (ench.canEnchantItem(itemInHand))
+                    {
+                        itemInHand.addEnchantment(ench, ench.getMaxLevel());
+                    }
+                }
+                catch (Exception ex)
+                {
+                    TFM_Log.info("Error using " + ench.getName() + " on " + itemInHand.getType().name() + " held by " + sender_p.getName() + ".");
                 }
             }