Skip to content

Commit c3fc085

Browse files
committed
Fix for Bukkit NPE in /enchant.
1 parent aad8f17 commit c3fc085

3 files changed

Lines changed: 22 additions & 7 deletions

File tree

appinfo.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Fri, 19 Jul 2013 19:19:28 -0400
1+
#Sat, 20 Jul 2013 19:28:30 -0400
22

33
program.VERSION=2.21
4-
program.BUILDNUM=318
5-
program.BUILDDATE=07/19/2013 07\:19 PM
4+
program.BUILDNUM=320
5+
program.BUILDDATE=07/20/2013 07\:28 PM
66

buildnumber.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#Build Number for ANT. Do not edit!
2-
#Fri Jul 19 19:19:28 EDT 2013
3-
build.number=319
2+
#Sat Jul 20 19:28:30 EDT 2013
3+
build.number=321

src/me/StevenLawson/TotalFreedomMod/Commands/Command_enchant.java

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package me.StevenLawson.TotalFreedomMod.Commands;
22

3+
import me.StevenLawson.TotalFreedomMod.TFM_Log;
34
import org.bukkit.command.Command;
45
import org.bukkit.command.CommandSender;
56
import org.bukkit.enchantments.Enchantment;
@@ -53,9 +54,23 @@ else if (args[0].equalsIgnoreCase("addall"))
5354
{
5455
for (Enchantment ench : Enchantment.values())
5556
{
56-
if (ench.canEnchantItem(itemInHand))
57+
/*
58+
2013-07-20 23:17:13 [INFO] [TotalFreedomMod]: Command Error: enchant
59+
java.lang.NullPointerException
60+
at net.minecraft.server.v1_6_R2.EnchantmentDurability.canEnchant(SourceFile:33)
61+
at org.bukkit.craftbukkit.v1_6_R2.enchantments.CraftEnchantment.canEnchantItem(CraftEnchantment.java:55)
62+
at me.StevenLawson.TotalFreedomMod.Commands.Command_enchant.run(Command_enchant.java:56)
63+
*/
64+
try
5765
{
58-
itemInHand.addEnchantment(ench, ench.getMaxLevel());
66+
if (ench.canEnchantItem(itemInHand))
67+
{
68+
itemInHand.addEnchantment(ench, ench.getMaxLevel());
69+
}
70+
}
71+
catch (Exception ex)
72+
{
73+
TFM_Log.info("Error using " + ench.getName() + " on " + itemInHand.getType().name() + " held by " + sender_p.getName() + ".");
5974
}
6075
}
6176

0 commit comments

Comments
 (0)