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

Show correct goal for custom objectives

Browse Source
This commit is contained in:
PikaMug 2021-07-28 01:40:16 -04:00
parent 497f285140
commit 6562e801e9
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/src/main/java/me/blackvein/quests/Quester.java
View File

@ -1302,7 +1302,7 @@ public class Quester implements Comparable<Quester> {
if (data.customObjectiveCounts.size() > customIndex) {
cleared = data.customObjectiveCounts.get(customIndex);
}
final int toClear = co.getCount();
final int toClear = stage.customObjectiveCounts.get(customIndex);
final ChatColor color = cleared < toClear ? ChatColor.GREEN : ChatColor.GRAY;
String message = color + "- " + co.getDisplay();
for (final Entry<String,Object> prompt : co.getData()) {

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

@ -1506,7 +1506,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
if (data.customObjectiveCounts.size() > customIndex) {
cleared = data.customObjectiveCounts.get(customIndex);
}
final int toClear = co.getCount();
final int toClear = stage.customObjectiveCounts.get(customIndex);
final ChatColor color = cleared < toClear ? ChatColor.GREEN : ChatColor.GRAY;
String message = color + "- " + co.getDisplay();
for (final Entry<String,Object> prompt : co.getData()) {
@ -3873,10 +3873,10 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
return;
}
final Stage oStage = quest.getStage(Integer.parseInt(stageNum) - 1);
oStage.customObjectives = new LinkedList<>();
oStage.customObjectiveCounts = new LinkedList<>();
oStage.customObjectiveData = new LinkedList<>();
oStage.customObjectiveDisplays = new LinkedList<>();
oStage.customObjectives.clear();
oStage.customObjectiveCounts.clear();
oStage.customObjectiveData.clear();
oStage.customObjectiveDisplays.clear();
if (config.contains("quests." + questKey + ".stages.ordered." + stageNum + ".custom-objectives")) {
final ConfigurationSection sec = config.getConfigurationSection("quests." + questKey + ".stages.ordered."
+ stageNum + ".custom-objectives");
@ -3895,13 +3895,13 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener
+ quest.getName() + "\" could not be found!");
continue;
} else {
final ConfigurationSection sec2 = sec.getConfigurationSection(path + ".data");
oStage.customObjectives.add(found.get());
if (count <= 0) {
oStage.customObjectiveCounts.add(0);
} else {
oStage.customObjectiveCounts.add(count);
}
final ConfigurationSection sec2 = sec.getConfigurationSection(path + ".data");
for (final Entry<String,Object> prompt : found.get().getData()) {
final Entry<String, Object> data = populateCustoms(sec2, prompt);
oStage.customObjectiveData.add(data);