From 51c9b61e9cdbf7f835df94d3eba10bd4d8e1b4f9 Mon Sep 17 00:00:00 2001 From: PikaMug <2267126+PikaMug@users.noreply.github.com> Date: Fri, 27 Nov 2020 00:10:28 -0500 Subject: [PATCH] Limit condition notification to once every 5 seconds. No longer in BETA --- main/src/main/java/me/blackvein/quests/Quester.java | 8 ++++++-- .../quests/convo/quests/stages/StageMainPrompt.java | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/main/src/main/java/me/blackvein/quests/Quester.java b/main/src/main/java/me/blackvein/quests/Quester.java index 6139357b6..2f78f0d8d 100644 --- a/main/src/main/java/me/blackvein/quests/Quester.java +++ b/main/src/main/java/me/blackvein/quests/Quester.java @@ -76,6 +76,7 @@ public class Quester implements Comparable { private String lastKnownName; protected int questPoints = 0; private String compassTargetQuestId; + private long lastNotifiedCondition = 0L; protected ConcurrentHashMap timers = new ConcurrentHashMap(); protected ConcurrentHashMap currentQuests = new ConcurrentHashMap() { @@ -3774,8 +3775,11 @@ public class Quester implements Comparable { } hardQuit(quest); } else if (giveReason) { - getPlayer().sendMessage(ChatColor.YELLOW + Lang.get(getPlayer(), "conditionFailRetry") - .replace("", quest.getName())); + if (System.currentTimeMillis() - lastNotifiedCondition > 5000) { + getPlayer().sendMessage(ChatColor.YELLOW + Lang.get(getPlayer(), "conditionFailRetry") + .replace("", quest.getName())); + lastNotifiedCondition = System.currentTimeMillis(); + } } return false; } diff --git a/main/src/main/java/me/blackvein/quests/convo/quests/stages/StageMainPrompt.java b/main/src/main/java/me/blackvein/quests/convo/quests/stages/StageMainPrompt.java index a9b408102..d7fb139fc 100644 --- a/main/src/main/java/me/blackvein/quests/convo/quests/stages/StageMainPrompt.java +++ b/main/src/main/java/me/blackvein/quests/convo/quests/stages/StageMainPrompt.java @@ -178,9 +178,9 @@ public class StageMainPrompt extends QuestsEditorNumericPrompt { } case 10: if (!hasObjective) { - return ChatColor.GRAY + Lang.get("stageEditorConditions") + ChatColor.RED + " BETA"; + return ChatColor.GRAY + Lang.get("stageEditorConditions"); } else { - return ChatColor.AQUA + Lang.get("stageEditorConditions") + ChatColor.RED + " BETA"; + return ChatColor.AQUA + Lang.get("stageEditorConditions"); } case 11: if (!hasObjective) {