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

Allow duplicate material types per obj pending results, fixes #680

Browse Source
This commit is contained in:
BuildTools 2019-02-05 13:48:26 -05:00
parent 223fa4badf
commit 3dc397921c
3 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/me/blackvein/quests/prompts/BlocksPrompt.java
View File

@ -256,12 +256,12 @@ public class BlocksPrompt extends FixedSetPrompt {
for (String s : args) {
try {
if (Material.matchMaterial(s) != null) {
if (names.contains(s) == false) {
//if (names.contains(s) == false) {
names.add(s);
} else {
context.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("stageEditorContainsDuplicates"));
/*} else {
context.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("stageEditorListContainsDuplicates"));
return new BreakBlockNamesPrompt();
}
}*/
} else {
context.getForWhom().sendRawMessage(ChatColor.LIGHT_PURPLE + s + ChatColor.RED + " " + Lang.get("stageEditorInvalidBlockName"));
return new BreakBlockNamesPrompt();
@ -473,12 +473,12 @@ public class BlocksPrompt extends FixedSetPrompt {
for (String s : args) {
try {
if (Material.matchMaterial(s) != null) {
if (names.contains(s) == false) {
//if (names.contains(s) == false) {
names.add(s);
} else {
/*} else {
context.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("stageEditorListContainsDuplicates"));
return new DamageBlockNamesPrompt();
}
}*/
} else {
context.getForWhom().sendRawMessage(ChatColor.LIGHT_PURPLE + s + ChatColor.RED + " " + Lang.get("stageEditorInvalidBlockName"));
return new DamageBlockNamesPrompt();
@ -690,12 +690,12 @@ public class BlocksPrompt extends FixedSetPrompt {
for (String s : args) {
try {
if (Material.matchMaterial(s) != null) {
if (names.contains(s) == false) {
//if (names.contains(s) == false) {
names.add(s);
} else {
/*} else {
context.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("stageEditorListContainsDuplicates"));
return new PlaceBlockNamesPrompt();
}
}*/
} else {
context.getForWhom().sendRawMessage(ChatColor.LIGHT_PURPLE + s + ChatColor.RED + Lang.get("stageEditorInvalidBlockName"));
return new PlaceBlockNamesPrompt();
@ -907,12 +907,12 @@ public class BlocksPrompt extends FixedSetPrompt {
for (String s : args) {
try {
if (Material.matchMaterial(s) != null) {
if (names.contains(s) == false) {
//if (names.contains(s) == false) {
names.add(s);
} else {
context.getForWhom().sendRawMessage(ChatColor.RED + " " + Lang.get("stageEditorContainsDuplicates"));
/*} else {
context.getForWhom().sendRawMessage(ChatColor.RED + " " + Lang.get("stageEditorListContainsDuplicates"));
return new UseBlockNamesPrompt();
}
}*/
} else {
context.getForWhom().sendRawMessage(ChatColor.LIGHT_PURPLE + s + ChatColor.RED + " " + Lang.get("stageEditorInvalidBlockName"));
return new UseBlockNamesPrompt();
@ -1124,12 +1124,12 @@ public class BlocksPrompt extends FixedSetPrompt {
for (String s : args) {
try {
if (Material.matchMaterial(s) != null) {
if (names.contains(s) == false) {
//if (names.contains(s) == false) {
names.add(s);
} else {
/*} else {
context.getForWhom().sendRawMessage(ChatColor.RED + " " + Lang.get("stageEditorListContainsDuplicates"));
return new CutBlockNamesPrompt();
}
}*/
} else {
context.getForWhom().sendRawMessage(ChatColor.LIGHT_PURPLE + s + ChatColor.RED + " " + Lang.get("stageEditorInvalidBlockName"));
return new CutBlockNamesPrompt();

6
src/main/java/me/blackvein/quests/prompts/ItemsPrompt.java
View File

@ -283,12 +283,12 @@ public class ItemsPrompt extends FixedSetPrompt {
for (String s : args) {
try {
if (Material.matchMaterial(s) != null) {
if (names.contains(s) == false) {
//if (names.contains(s) == false) {
names.add(s);
} else {
/*} else {
context.getForWhom().sendRawMessage(ChatColor.RED + " " + Lang.get("stageEditorListContainsDuplicates"));
return new EnchantItemsPrompt();
}
}*/
} else {
context.getForWhom().sendRawMessage(ChatColor.LIGHT_PURPLE + s + ChatColor.RED + " " + Lang.get("stageEditorInvalidItemName"));
return new EnchantItemsPrompt();

1
src/main/resources/strings.yml
View File

@ -237,7 +237,6 @@ stageEditorObjectiveOverrideCleared: "Objective display override cleared."
stageEditorDeliveryAddItem: "Add item"
stageEditorDeliveryNPCs: "Set NPC IDs"
stageEditorDeliveryMessages: "Set delivery messages"
stageEditorContainsDuplicates: "List contains duplicates!"
stageEditorInvalidBlockName: "is not a valid block name!"
stageEditorInvalidEnchantment: "is not a valid enchantment name!"
stageEditorInvalidNPC: "is not a valid NPC ID!"