Upstream/ChestShop-3
1
0
Fork 0
mirror of https://github.com/ChestShop-authors/ChestShop-3.git synced 2024-11-23 10:35:15 +01:00
Code Issues Projects Releases Wiki Activity

Fix enchantment detection

Browse Source
This commit is contained in:
Acrobot 2012-07-26 13:44:19 +02:00
parent d1732552b0
commit 919b9728f5
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
com/Acrobot/Breeze/Utils/MaterialUtil.java
View File

@ -182,7 +182,11 @@ public class MaterialUtil {
Map<org.bukkit.enchantments.Enchantment, Integer> enchantments = getEnchantments(itemName);
if (!enchantments.isEmpty()) {
itemStack.addEnchantments(enchantments);
try {
itemStack.addEnchantments(enchantments);
} catch (IllegalArgumentException exception) {
//Do nothing, because the enchantment can't be applied
}
}
return itemStack;
@ -237,7 +241,7 @@ public class MaterialUtil {
* @return Enchantments found
*/
public static Map<org.bukkit.enchantments.Enchantment, Integer> getEnchantments(String base32) {
if (base32 == null) {
if (base32 == null || base32.isEmpty()) {
return new HashMap<org.bukkit.enchantments.Enchantment, Integer>();
}