diff --git a/src/com/extendedclip/papi/expansion/checkitem/CheckItemExpansion.java b/src/com/extendedclip/papi/expansion/checkitem/CheckItemExpansion.java index 9a8e142..b93f790 100644 --- a/src/com/extendedclip/papi/expansion/checkitem/CheckItemExpansion.java +++ b/src/com/extendedclip/papi/expansion/checkitem/CheckItemExpansion.java @@ -1176,10 +1176,12 @@ private int getInt(String s) { return -1; } } - + @SuppressWarnings("deprecation") private ItemWrapper getWrapper(ItemWrapper wrapper, String input, Player p) { input = input.replaceAll("__", " "); + String regex = "(&#[a-fA-F0-9]{6}|&[a-fA-F0-9k-orK-OR])"; + input = input.replaceAll(regex, ""); String[] arrayOfString; int j = (arrayOfString = input.split("(? enchantments = new HashMap<>(); String[] enchArray = part.split("(? 1) { - NamespacedKey key = NamespacedKey - .minecraft(PlaceholderAPI.setBracketPlaceholders(p, ench[0]).toLowerCase()); - enchantments.put(Enchantment.getByKey(key), - Integer.valueOf(PlaceholderAPI.setBracketPlaceholders(p, ench[1]))); + NamespacedKey key = NamespacedKey.minecraft(PlaceholderAPI.setBracketPlaceholders(p, ench[0]).toLowerCase()); + enchantments.put(Enchantment.getByKey(key), Integer.valueOf(PlaceholderAPI.setBracketPlaceholders(p, ench[1]))); } else { NamespacedKey key = NamespacedKey.minecraft(PlaceholderAPI.setBracketPlaceholders(p, s).toLowerCase()); enchantments.put(Enchantment.getByKey(key), -1); @@ -1270,15 +1270,13 @@ private ItemWrapper getWrapper(ItemWrapper wrapper, String input, Player p) { for (String s : enchArray) { String[] ench; if ((ench = s.split("=")).length > 1) { - enchantments.put(Enchantment.getByName(PlaceholderAPI.setBracketPlaceholders(p, ench[0]).toUpperCase()), - Integer.valueOf(PlaceholderAPI.setBracketPlaceholders(p, ench[1]))); + enchantments.put(Enchantment.getByName(PlaceholderAPI.setBracketPlaceholders(p, ench[0]).toUpperCase()), Integer.valueOf(PlaceholderAPI.setBracketPlaceholders(p, ench[1]))); } else { enchantments.put(Enchantment.getByName(PlaceholderAPI.setBracketPlaceholders(p, s).toUpperCase()), -1); } } } catch (IllegalArgumentException e) { log(Level.WARNING, "Invalid Key for enchantment(s). -- Ignore if enchantment is blank on purpose"); - } catch (Exception e) { e.printStackTrace(); } @@ -1314,8 +1312,7 @@ private ItemWrapper getWrapper(ItemWrapper wrapper, String input, Player p) { for (String s : nbtArray) { String[] nbt; if ((nbt = s.split("=")).length > 1) { - nbtStrings.put(PlaceholderAPI.setBracketPlaceholders(p, nbt[0]), - PlaceholderAPI.setBracketPlaceholders(p, nbt[1])); + nbtStrings.put(PlaceholderAPI.setBracketPlaceholders(p, nbt[0]), PlaceholderAPI.setBracketPlaceholders(p, nbt[1])); } } wrapper.setNbtStrings(nbtStrings); @@ -1330,8 +1327,7 @@ private ItemWrapper getWrapper(ItemWrapper wrapper, String input, Player p) { String[] nbt; if ((nbt = s.split("=")).length > 1) { try { - nbtInts.put(PlaceholderAPI.setBracketPlaceholders(p, nbt[0]), - Integer.parseInt(PlaceholderAPI.setBracketPlaceholders(p, nbt[1]))); + nbtInts.put(PlaceholderAPI.setBracketPlaceholders(p, nbt[0]), Integer.parseInt(PlaceholderAPI.setBracketPlaceholders(p, nbt[1]))); } catch (NumberFormatException e) { } } @@ -1356,7 +1352,6 @@ else if (part.equals("off")) wrapper.setCheckMainHand(true); wrapper.setCheckOffHand(true); } - continue; } if (part.equals("strict")) { @@ -1367,7 +1362,6 @@ else if (part.equals("off")) wrapper.setCheckEnchanted(true); continue; } - } return wrapper; }