Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2025-02-17 04:51:19 +01:00
Code Issues Projects Releases Wiki Activity

Fix the Planner's repeat option not working, fixes #713

Browse Source
This commit is contained in:
BuildTools 2019-03-11 14:57:09 -04:00
parent c3b7dd4c32
commit c83e01df38
2 changed files with 50 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,7 @@ import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -389,44 +390,11 @@ public class Quester {
} }
Player player = getPlayer(); Player player = getPlayer();
Planner pln = q.getPlanner(); Planner pln = q.getPlanner();
long start = -1; long start = pln.getStartInMillis(); // Start time in milliseconds since UTC epoch
long end = -1; long end = pln.getEndInMillis(); // End time in milliseconds since UTC epoch
if (pln.hasStart()) { long duration = end - start; // How long the quest can be active for
start = pln.getStartInMillis(); long repeat = pln.getRepeat(); // Length to wait in-between start times
} if (start != -1) {
if (pln.hasEnd()) {
end = pln.getEndInMillis();
}
if (start > -1 && end > -1) {
if (pln.getRepeat() > -1) {
long questLength = end - start;
long nextStart = start;
while (System.currentTimeMillis() >= nextStart) {
nextStart += questLength + pln.getRepeat();
}
long nextEnd = nextStart + questLength;
if (System.currentTimeMillis() < nextStart) {
String early = Lang.get("plnTooEarly");
early = early.replace("<quest>", ChatColor.AQUA + q.getName() + ChatColor.YELLOW);
early = early.replace("<time>", ChatColor.DARK_PURPLE
+ Quests.getTime(nextStart - System.currentTimeMillis()) + ChatColor.YELLOW);
player.sendMessage(ChatColor.YELLOW + early);
return;
}
if (System.currentTimeMillis() > nextEnd) {
if (System.currentTimeMillis() > end) {
String late = Lang.get("plnTooLate");
late = late.replace("<quest>", ChatColor.AQUA + q.getName() + ChatColor.RED);
late = late.replace("<time>", ChatColor.DARK_PURPLE
+ Quests.getTime(System.currentTimeMillis() - end) + ChatColor.RED);
player.sendMessage(ChatColor.RED + late);
return;
}
return;
}
}
}
if (pln.getStart() != null) {
if (System.currentTimeMillis() < start) { if (System.currentTimeMillis() < start) {
String early = Lang.get("plnTooEarly"); String early = Lang.get("plnTooEarly");
early = early.replace("<quest>", ChatColor.AQUA + q.getName() + ChatColor.YELLOW); early = early.replace("<quest>", ChatColor.AQUA + q.getName() + ChatColor.YELLOW);
@ -436,7 +404,7 @@ public class Quester {
return; return;
} }
} }
if (pln.getEnd() != null) { if (end != -1 && repeat == -1) {
if (System.currentTimeMillis() > end) { if (System.currentTimeMillis() > end) {
String late = Lang.get("plnTooLate"); String late = Lang.get("plnTooLate");
late = late.replace("<quest>", ChatColor.AQUA + q.getName() + ChatColor.RED); late = late.replace("<quest>", ChatColor.AQUA + q.getName() + ChatColor.RED);
@ -446,6 +414,47 @@ public class Quester {
return; return;
} }
} }
if (repeat != -1 && start != -1 && end != -1) {
// Ensure that we're past the initial duration
if (System.currentTimeMillis() > end) {
final int maxSize = 2;
final LinkedHashMap<Long, Long> cache = new LinkedHashMap<Long, Long>() {
private static final long serialVersionUID = 1L;
@Override
protected boolean removeEldestEntry(final Map.Entry<Long, Long> eldest) {
return size() > maxSize;
}
};
// Store both the upcoming and most recent period of activity
long nextStart = start;
long nextEnd = end;
while (System.currentTimeMillis() >= nextStart) {
nextStart += repeat;
nextEnd = nextStart + duration;
cache.put(nextStart, nextEnd);
}
// Check whether the quest is currently active
boolean active = false;
for (Entry<Long, Long> startEnd : cache.entrySet()) {
if (startEnd.getKey() <= System.currentTimeMillis() && System.currentTimeMillis() < startEnd.getValue()) {
active = true;
}
}
// If quest is not active, inform user of wait time
if (!active) {
String early = Lang.get("plnTooEarly");
early = early.replace("<quest>", ChatColor.AQUA + q.getName() + ChatColor.YELLOW);
early = early.replace("<time>", ChatColor.DARK_PURPLE
+ Quests.getTime(nextStart - System.currentTimeMillis()) + ChatColor.YELLOW);
player.sendMessage(ChatColor.YELLOW + early);
return;
}
}
}
if (q.testRequirements(player) == true || override) { if (q.testRequirements(player) == true || override) {
addEmptiesFor(q, 0); addEmptiesFor(q, 0);
try { try {

4
main/src/main/java/me/blackvein/quests/prompts/PlannerPrompt.java
View File

@ -44,8 +44,8 @@ public class PlannerPrompt extends FixedSetPrompt {
public String getPromptText(ConversationContext context) { public String getPromptText(ConversationContext context) {
String text; String text;
String lang = Lang.get("plannerTitle"); String lang = Lang.get("plannerTitle");
lang = lang.replaceAll("<quest>", ChatColor.BLUE + (String) context.getSessionData(CK.Q_NAME)); lang = lang.replaceAll("<quest>", ChatColor.AQUA + (String) context.getSessionData(CK.Q_NAME) + ChatColor.DARK_AQUA);
text = ChatColor.AQUA + lang + "\n"; text = ChatColor.DARK_AQUA + lang + "\n";
if (context.getSessionData(CK.PLN_START_DATE) == null) { if (context.getSessionData(CK.PLN_START_DATE) == null) {
text += ChatColor.BLUE + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("plnStart") + " " text += ChatColor.BLUE + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("plnStart") + " "
+ ChatColor.GRAY + "(" + Lang.get("noneSet") + ")\n"; + ChatColor.GRAY + "(" + Lang.get("noneSet") + ")\n";