Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2024-12-18 15:18:34 +01:00
Code Issues Projects Releases Wiki Activity

Ignore durability for extreme values, untested. Fixes #620

Browse Source
This commit is contained in:
BuildTools 2019-01-07 17:29:28 -05:00
parent e3f388e485
commit 03a866465c
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/me/blackvein/quests/prompts/ItemStackPrompt.java
View File

@ -357,6 +357,10 @@ public class ItemStackPrompt extends FixedSetPrompt {
return new ItemStackPrompt(oldPrompt); return new ItemStackPrompt(oldPrompt);
} }
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
if (input.equals("*")) {
cc.setSessionData("tempData", Short.parseShort("999")); // wildcard value
return new ItemStackPrompt(oldPrompt);
}
cc.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("itemCreateInvalidInput")); cc.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("itemCreateInvalidInput"));
return new DataPrompt(); return new DataPrompt();
} }

4
src/main/java/me/blackvein/quests/util/ItemUtil.java
View File

@ -62,7 +62,9 @@ public class ItemUtil {
} else if ((one.getAmount() != two.getAmount()) && ignoreAmount == false) { } else if ((one.getAmount() != two.getAmount()) && ignoreAmount == false) {
return -2; return -2;
} else if (one.getDurability() != two.getDurability()) { } else if (one.getDurability() != two.getDurability()) {
return -3; if (one.getDurability() >= 999 && two.getDurability() >= 999) { // wildcard value
return -3;
}
} }
if (one.hasItemMeta() || two.hasItemMeta()) { if (one.hasItemMeta() || two.hasItemMeta()) {
if (one.hasItemMeta() && two.hasItemMeta() == false) { if (one.hasItemMeta() && two.hasItemMeta() == false) {