Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2025-01-13 11:41:21 +01:00
Code Issues Projects Releases Wiki Activity

Only accept solid blocks for Block objectives. Bump version number

Browse Source
This commit is contained in:
PikaMug 2019-07-01 11:31:06 -04:00
parent 7c9512aa74
commit 5ea0f9178b
3 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>me.blackvein.quests</groupId>
<artifactId>quests-parent</artifactId>
<version>3.7.3</version>
<version>3.7.4</version>
</parent>
<artifactId>quests-main</artifactId>

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

@ -255,13 +255,14 @@ public class BlocksPrompt extends FixedSetPrompt {
LinkedList<String> names = new LinkedList<String>();
for (String s : args) {
try {
if (Material.matchMaterial(s) != null) {
//if (names.contains(s) == false) {
Material m = Material.matchMaterial(s);
if (m != null) {
if (m.isBlock()) {
names.add(s);
/*} else {
context.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("listDuplicate"));
} else {
context.getForWhom().sendRawMessage(ChatColor.LIGHT_PURPLE + s + ChatColor.RED + " " + Lang.get("stageEditorNotSolid"));
return new BreakBlockNamesPrompt();
}*/
}
} else {
context.getForWhom().sendRawMessage(ChatColor.LIGHT_PURPLE + s + ChatColor.RED + " " + Lang.get("stageEditorInvalidBlockName"));
return new BreakBlockNamesPrompt();
@ -472,13 +473,14 @@ public class BlocksPrompt extends FixedSetPrompt {
LinkedList<String> names = new LinkedList<String>();
for (String s : args) {
try {
if (Material.matchMaterial(s) != null) {
//if (names.contains(s) == false) {
Material m = Material.matchMaterial(s);
if (m != null) {
if (m.isBlock()) {
names.add(s);
/*} else {
context.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("listDuplicate"));
} else {
context.getForWhom().sendRawMessage(ChatColor.LIGHT_PURPLE + s + ChatColor.RED + " " + Lang.get("stageEditorNotSolid"));
return new DamageBlockNamesPrompt();
}*/
}
} else {
context.getForWhom().sendRawMessage(ChatColor.LIGHT_PURPLE + s + ChatColor.RED + " " + Lang.get("stageEditorInvalidBlockName"));
return new DamageBlockNamesPrompt();
@ -689,13 +691,14 @@ public class BlocksPrompt extends FixedSetPrompt {
LinkedList<String> names = new LinkedList<String>();
for (String s : args) {
try {
if (Material.matchMaterial(s) != null) {
//if (names.contains(s) == false) {
Material m = Material.matchMaterial(s);
if (m != null) {
if (m.isBlock()) {
names.add(s);
/*} else {
context.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("listDuplicate"));
} else {
context.getForWhom().sendRawMessage(ChatColor.LIGHT_PURPLE + s + ChatColor.RED + " " + Lang.get("stageEditorNotSolid"));
return new PlaceBlockNamesPrompt();
}*/
}
} else {
context.getForWhom().sendRawMessage(ChatColor.LIGHT_PURPLE + s + ChatColor.RED + Lang.get("stageEditorInvalidBlockName"));
return new PlaceBlockNamesPrompt();
@ -906,13 +909,14 @@ public class BlocksPrompt extends FixedSetPrompt {
LinkedList<String> names = new LinkedList<String>();
for (String s : args) {
try {
if (Material.matchMaterial(s) != null) {
//if (names.contains(s) == false) {
Material m = Material.matchMaterial(s);
if (m != null) {
if (m.isBlock()) {
names.add(s);
/*} else {
context.getForWhom().sendRawMessage(ChatColor.RED + " " + Lang.get("listDuplicate"));
} else {
context.getForWhom().sendRawMessage(ChatColor.LIGHT_PURPLE + s + ChatColor.RED + " " + Lang.get("stageEditorNotSolid"));
return new UseBlockNamesPrompt();
}*/
}
} else {
context.getForWhom().sendRawMessage(ChatColor.LIGHT_PURPLE + s + ChatColor.RED + " " + Lang.get("stageEditorInvalidBlockName"));
return new UseBlockNamesPrompt();
@ -1123,13 +1127,14 @@ public class BlocksPrompt extends FixedSetPrompt {
LinkedList<String> names = new LinkedList<String>();
for (String s : args) {
try {
if (Material.matchMaterial(s) != null) {
//if (names.contains(s) == false) {
Material m = Material.matchMaterial(s);
if (m != null) {
if (m.isBlock()) {
names.add(s);
/*} else {
context.getForWhom().sendRawMessage(ChatColor.RED + " " + Lang.get("listDuplicate"));
} else {
context.getForWhom().sendRawMessage(ChatColor.LIGHT_PURPLE + s + ChatColor.RED + " " + Lang.get("stageEditorNotSolid"));
return new CutBlockNamesPrompt();
}*/
}
} else {
context.getForWhom().sendRawMessage(ChatColor.LIGHT_PURPLE + s + ChatColor.RED + " " + Lang.get("stageEditorInvalidBlockName"));
return new CutBlockNamesPrompt();

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

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