Upstream/ChestShop-3
1
0
Fork 0
mirror of https://github.com/ChestShop-authors/ChestShop-3.git synced 2025-02-24 13:51:21 +01:00
Code Issues Projects Releases Wiki Activity

I hate you too, GitHub for Windows

Browse Source
This commit is contained in:
Acrobot 2012-10-28 23:56:40 +01:00
parent efc8a32f98
commit 51d4cf1b61
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -241,11 +241,7 @@ public class MaterialUtil {
* @return Enchantments found
*/
public static Map<org.bukkit.enchantments.Enchantment, Integer> getEnchantments(String base32) {
<<<<<<< HEAD
if (base32 == null || base32.isEmpty() || NumberUtil.isLong(base32)) {
=======
if (base32 == null || base32.isEmpty() || !NumberUtil.isEnchantment(base32)) {
>>>>>>> Fixed enchantments -.-
return new HashMap<org.bukkit.enchantments.Enchantment, Integer>();
}