Upstream
/
Quests
mirror of https://github.com/PikaMug/Quests.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Disallow colons in item creation, per #566. Bump version number

This commit is contained in:
BuildTools 2018-12-11 22:57:40 -05:00
parent 5001b5c553
commit e908af7599
2 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -3,7 +3,7 @@
<groupId>me.blackvein.quests</groupId> <groupId>me.blackvein.quests</groupId>
<artifactId>quests</artifactId> <artifactId>quests</artifactId>
<version>3.5.1</version> <version>3.5.2</version>
<name>quests</name> <name>quests</name>
<url>https://github.com/FlyingPikachu/Quests/</url> <url>https://github.com/FlyingPikachu/Quests/</url>
<packaging>jar</packaging> <packaging>jar</packaging>

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

@ -287,24 +287,17 @@ public class ItemStackPrompt extends FixedSetPrompt {
@Override @Override
public Prompt acceptInput(ConversationContext cc, String input) { public Prompt acceptInput(ConversationContext cc, String input) {
if (input.equalsIgnoreCase(Lang.get("cmdCancel")) == false) { if (input.equalsIgnoreCase(Lang.get("cmdCancel")) == false) {
String dataString = null; String s = input.replace(":", "");
if (input.contains(":")) { Material mat = Material.matchMaterial(s.toUpperCase().replace(" ", "_"));
String[] splitInput = input.split(":");
input = splitInput[0];
if (splitInput.length > 1) {
dataString = splitInput[1];
}
}
Material mat = Material.matchMaterial(input.toUpperCase().replace(" ", "_"));
if (mat == null) { if (mat == null) {
cc.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("itemCreateInvalidName")); cc.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("itemCreateInvalidName"));
return new NamePrompt(); return new NamePrompt();
} else { } else {
cc.setSessionData("tempName", mat.name()); cc.setSessionData("tempName", mat.name());
cc.setSessionData("tempAmount", 1); cc.setSessionData("tempAmount", 1);
if (dataString != null) { if (s != null) {
try { try {
short data = Short.parseShort(dataString); short data = Short.parseShort(s);
cc.setSessionData("tempData", data); cc.setSessionData("tempData", data);
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
cc.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("itemCreateInvalidData")); cc.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("itemCreateInvalidData"));
@ -393,8 +386,9 @@ public class ItemStackPrompt extends FixedSetPrompt {
@Override @Override
public Prompt acceptInput(ConversationContext cc, String input) { public Prompt acceptInput(ConversationContext cc, String input) {
if (input.equalsIgnoreCase(Lang.get("cmdClear")) == false && input.equalsIgnoreCase(Lang.get("cmdCancel")) == false) { String s = input.replace(":", "");
Enchantment e = Quests.getEnchantmentPretty(MiscUtil.getCapitalized(input)); if (s.equalsIgnoreCase(Lang.get("cmdClear")) == false && s.equalsIgnoreCase(Lang.get("cmdCancel")) == false) {
Enchantment e = Quests.getEnchantmentPretty(MiscUtil.getCapitalized(s));
if (e != null) { if (e != null) {
cc.setSessionData("tempEnchant", e); cc.setSessionData("tempEnchant", e);
return new LevelPrompt(Quester.prettyEnchantmentString(e)); return new LevelPrompt(Quester.prettyEnchantmentString(e));
@ -402,7 +396,7 @@ public class ItemStackPrompt extends FixedSetPrompt {
cc.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("itemCreateInvalidEnch")); cc.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("itemCreateInvalidEnch"));
return new EnchantmentPrompt(); return new EnchantmentPrompt();
} }
} else if (input.equalsIgnoreCase(Lang.get("cmdClear"))) { } else if (s.equalsIgnoreCase(Lang.get("cmdClear"))) {
cc.setSessionData("tempEnchantments", null); cc.setSessionData("tempEnchantments", null);
} }
return new ItemStackPrompt(oldPrompt); return new ItemStackPrompt(oldPrompt);
@ -460,10 +454,11 @@ public class ItemStackPrompt extends FixedSetPrompt {
@Override @Override
public Prompt acceptInput(ConversationContext cc, String input) { public Prompt acceptInput(ConversationContext cc, String input) {
if (input.equalsIgnoreCase(Lang.get("cmdCancel")) == false && input.equalsIgnoreCase(Lang.get("cmdClear")) == false) { String s = input.replace(":", "");
input = Quests.parseString(input); if (s.equalsIgnoreCase(Lang.get("cmdCancel")) == false && s.equalsIgnoreCase(Lang.get("cmdClear")) == false) {
cc.setSessionData("tempDisplay", input); s = Quests.parseString(s);
} else if (input.equalsIgnoreCase(Lang.get("cmdClear"))) { cc.setSessionData("tempDisplay", s);
} else if (s.equalsIgnoreCase(Lang.get("cmdClear"))) {
cc.setSessionData("tempDisplay", null); cc.setSessionData("tempDisplay", null);
} }
return new ItemStackPrompt(oldPrompt); return new ItemStackPrompt(oldPrompt);
@ -479,12 +474,13 @@ public class ItemStackPrompt extends FixedSetPrompt {
@Override @Override
public Prompt acceptInput(ConversationContext cc, String input) { public Prompt acceptInput(ConversationContext cc, String input) {
if (input.equalsIgnoreCase(Lang.get("cmdCancel")) == false && input.equalsIgnoreCase(Lang.get("cmdClear")) == false) { String s = input.replace(":", "");
input = Quests.parseString(input); if (s.equalsIgnoreCase(Lang.get("cmdCancel")) == false && s.equalsIgnoreCase(Lang.get("cmdClear")) == false) {
s = Quests.parseString(s);
LinkedList<String> lore = new LinkedList<String>(); LinkedList<String> lore = new LinkedList<String>();
lore.addAll(Arrays.asList(input.split(Lang.get("charSemi")))); lore.addAll(Arrays.asList(s.split(Lang.get("charSemi"))));
cc.setSessionData("tempLore", lore); cc.setSessionData("tempLore", lore);
} else if (input.equalsIgnoreCase("clear")) { } else if (s.equalsIgnoreCase("clear")) {
cc.setSessionData("tempLore", null); cc.setSessionData("tempLore", null);
} }
return new ItemStackPrompt(oldPrompt); return new ItemStackPrompt(oldPrompt);
@ -540,6 +536,4 @@ public class ItemStackPrompt extends FixedSetPrompt {
return null; return null;
} }
} }
} }