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

Throw error if requirement quest name is unknown, fixes #1502

Browse Source
This commit is contained in:
PikaMug 2020-12-12 23:37:12 -05:00
parent b7a8d25f60
commit 7cbbd6396b
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
main/src/main/java/me/blackvein/quests/Quests.java
View File

@ -1796,7 +1796,12 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
final String name2 = config.getString("quests." + id + ".name"); final String name2 = config.getString("quests." + id + ".name");
if (name2.equalsIgnoreCase(name) if (name2.equalsIgnoreCase(name)
|| ChatColor.stripColor(name2).equalsIgnoreCase(ChatColor.stripColor(name))) { || ChatColor.stripColor(name2).equalsIgnoreCase(ChatColor.stripColor(name))) {
if (getQuest(name) != null) {
temp.add(getQuest(name)); temp.add(getQuest(name));
} else {
throw new QuestFormatException("Requirement quest-blocks has unknown quest name "
+ failedQuest, questKey);
}
done = true; done = true;
break; break;
} }
@ -1827,7 +1832,12 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
final String name2 = config.getString("quests." + id + ".name"); final String name2 = config.getString("quests." + id + ".name");
if (name2.equalsIgnoreCase(name) if (name2.equalsIgnoreCase(name)
|| ChatColor.stripColor(name2).equalsIgnoreCase(ChatColor.stripColor(name))) { || ChatColor.stripColor(name2).equalsIgnoreCase(ChatColor.stripColor(name))) {
if (getQuest(name) != null) {
temp.add(getQuest(name)); temp.add(getQuest(name));
} else {
throw new QuestFormatException("Requirement quests has unknown quest name "
+ failedQuest, questKey);
}
done = true; done = true;
break; break;
} }
@ -1840,7 +1850,8 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
} }
reqs.setNeededQuests(temp); reqs.setNeededQuests(temp);
if (failed) { if (failed) {
throw new QuestFormatException("Requirement quests has invalid quest name " + failedQuest, questKey); throw new QuestFormatException("Requirement quests has invalid quest name "
+ failedQuest, questKey);
} }
} else { } else {
throw new QuestFormatException("Requirement quests is not a list of quest names", questKey); throw new QuestFormatException("Requirement quests is not a list of quest names", questKey);