keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Fix NPE in enchangint books.

Browse source
This commit is contained in:
LexManos 2013-08-13 15:25:09 -07:00
parent b0f4497bbe
commit ffd2fbcc84
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
patches/minecraft/net/minecraft/enchantment/EnchantmentHelper.java.patch
View file

@ -1,12 +1,14 @@
--- ../src_base/minecraft/net/minecraft/enchantment/EnchantmentHelper.java --- ../src_base/minecraft/net/minecraft/enchantment/EnchantmentHelper.java
+++ ../src_work/minecraft/net/minecraft/enchantment/EnchantmentHelper.java +++ ../src_work/minecraft/net/minecraft/enchantment/EnchantmentHelper.java
@@ -463,7 +463,8 @@ @@ -463,7 +463,10 @@
{ {
Enchantment enchantment = aenchantment[k]; Enchantment enchantment = aenchantment[k];
- if (enchantment != null && (enchantment.type.canEnchantItem(item) || flag)) - if (enchantment != null && (enchantment.type.canEnchantItem(item) || flag))
+ if (enchantment == null) continue;
+
+ flag = (par1ItemStack.itemID == Item.book.itemID) && enchantment.isAllowedOnBooks(); + flag = (par1ItemStack.itemID == Item.book.itemID) && enchantment.isAllowedOnBooks();
+ if (enchantment != null && (enchantment.canApplyAtEnchantingTable(par1ItemStack) || flag)) + if (enchantment.canApplyAtEnchantingTable(par1ItemStack) || flag)
{ {
for (int l = enchantment.getMinLevel(); l <= enchantment.getMaxLevel(); ++l) for (int l = enchantment.getMinLevel(); l <= enchantment.getMaxLevel(); ++l)
{ {