mirror of
https://github.com/ChestShop-authors/ChestShop-3.git
synced 2024-09-27 14:13:05 +02:00
I hate you too, GitHub for Windows
This commit is contained in:
parent
efc8a32f98
commit
51d4cf1b61
@ -241,11 +241,7 @@ public class MaterialUtil {
|
|||||||
* @return Enchantments found
|
* @return Enchantments found
|
||||||
*/
|
*/
|
||||||
public static Map<org.bukkit.enchantments.Enchantment, Integer> getEnchantments(String base32) {
|
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)) {
|
if (base32 == null || base32.isEmpty() || !NumberUtil.isEnchantment(base32)) {
|
||||||
>>>>>>> Fixed enchantments -.-
|
|
||||||
return new HashMap<org.bukkit.enchantments.Enchantment, Integer>();
|
return new HashMap<org.bukkit.enchantments.Enchantment, Integer>();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user