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

Replace all applicable prompt data for custom objectives

Browse Source
This commit is contained in:
PikaMug 2019-04-16 04:30:39 -04:00
parent 70d8176042
commit dc45761f17
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -844,8 +844,11 @@ public class Quester {
for (Entry<String,Object> prompt : co.getData()) { for (Entry<String,Object> prompt : co.getData()) {
String replacement = "%" + prompt.getKey() + "%"; String replacement = "%" + prompt.getKey() + "%";
try { try {
if (display.contains(replacement)) if (display.contains(replacement)) {
display = display.replace(replacement, ((String) getCurrentStage(quest).customObjectiveData.get(dataIndex).getValue())); if (dataIndex < getCurrentStage(quest).customObjectiveData.size()) {
display = display.replace(replacement, ((String) getCurrentStage(quest).customObjectiveData.get(dataIndex).getValue()));
}
}
} catch (NullPointerException ne) { } catch (NullPointerException ne) {
plugin.getLogger().severe("Unable to fetch display for " + co.getName() + " on " + quest.getName()); plugin.getLogger().severe("Unable to fetch display for " + co.getName() + " on " + quest.getName());
ne.printStackTrace(); ne.printStackTrace();
@ -1698,8 +1701,12 @@ public class Quester {
break; break;
} }
} }
Entry<String, Object> datamap = getCurrentStage(quest).customObjectiveData.get(index); List<Entry<String, Object>> sub = getCurrentStage(quest).customObjectiveData.subList(index, getCurrentStage(quest).customObjectiveData.size());
message = message.replace("%" + ((String) datamap.getKey()) + "%", (String) datamap.getValue()); List<Entry<String, Object>> end = new LinkedList<Entry<String, Object>>(sub);
sub.clear(); // since sub is backed by end, this removes all sub-list items from end
for (Entry<String, Object> datamap : end) {
message = message.replace("%" + ((String) datamap.getKey()) + "%", (String) datamap.getValue());
}
if (co.canShowCount()) { if (co.canShowCount()) {
message = message.replace("%count%", getCurrentStage(quest).customObjectiveCounts.get(index) + "/" + getCurrentStage(quest).customObjectiveCounts.get(index)); message = message.replace("%count%", getCurrentStage(quest).customObjectiveCounts.get(index) + "/" + getCurrentStage(quest).customObjectiveCounts.get(index));