diff --git a/main/src/main/java/me/blackvein/quests/QuestData.java b/main/src/main/java/me/blackvein/quests/QuestData.java index 26e1a4cf8..433d4e68a 100644 --- a/main/src/main/java/me/blackvein/quests/QuestData.java +++ b/main/src/main/java/me/blackvein/quests/QuestData.java @@ -1220,7 +1220,7 @@ public class QuestData { } }; - public LinkedHashMap eventFired = new LinkedHashMap() { + public LinkedHashMap actionFired = new LinkedHashMap() { private static final long serialVersionUID = 7106048037834965123L; diff --git a/main/src/main/java/me/blackvein/quests/Quester.java b/main/src/main/java/me/blackvein/quests/Quester.java index 846681a51..4968389df 100644 --- a/main/src/main/java/me/blackvein/quests/Quester.java +++ b/main/src/main/java/me/blackvein/quests/Quester.java @@ -525,12 +525,12 @@ public class Quester { } if (stage.chatActions.isEmpty() == false) { for (String chatTrigger : stage.chatActions.keySet()) { - questData.get(q).eventFired.put(chatTrigger, false); + questData.get(q).actionFired.put(chatTrigger, false); } } if (stage.commandActions.isEmpty() == false) { for (String commandTrigger : stage.commandActions.keySet()) { - questData.get(q).eventFired.put(commandTrigger, false); + questData.get(q).actionFired.put(commandTrigger, false); } } if (q.initialAction != null) { @@ -2651,10 +2651,10 @@ public class Quester { if (questData.delayTimeLeft > 0) { questSec.set("stage-delay", questData.delayTimeLeft); } - if (questData.eventFired.isEmpty() == false) { + if (questData.actionFired.isEmpty() == false) { LinkedList chatTriggers = new LinkedList(); - for (String trigger : questData.eventFired.keySet()) { - if (questData.eventFired.get(trigger) == true) { + for (String trigger : questData.actionFired.keySet()) { + if (questData.actionFired.get(trigger) == true) { chatTriggers.add(trigger); } } @@ -2662,10 +2662,10 @@ public class Quester { questSec.set("chat-triggers", chatTriggers); } } - if (questData.eventFired.isEmpty() == false) { + if (questData.actionFired.isEmpty() == false) { LinkedList commandTriggers = new LinkedList(); - for (String commandTrigger : questData.eventFired.keySet()) { - if (questData.eventFired.get(commandTrigger) == true) { + for (String commandTrigger : questData.actionFired.keySet()) { + if (questData.actionFired.get(commandTrigger) == true) { commandTriggers.add(commandTrigger); } } @@ -3081,24 +3081,24 @@ public class Quester { } if (getCurrentStage(quest).chatActions.isEmpty() == false) { for (String chatTrig : getCurrentStage(quest).chatActions.keySet()) { - getQuestData(quest).eventFired.put(chatTrig, false); + getQuestData(quest).actionFired.put(chatTrig, false); } } if (questSec.contains("chat-triggers")) { List chatTriggers = questSec.getStringList("chat-triggers"); for (String s : chatTriggers) { - getQuestData(quest).eventFired.put(s, true); + getQuestData(quest).actionFired.put(s, true); } } if (getCurrentStage(quest).commandActions.isEmpty() == false) { for (String commandTrig : getCurrentStage(quest).commandActions.keySet()) { - getQuestData(quest).eventFired.put(commandTrig, false); + getQuestData(quest).actionFired.put(commandTrig, false); } } if (questSec.contains("command-triggers")) { List commandTriggers = questSec.getStringList("command-triggers"); for (String s : commandTriggers) { - getQuestData(quest).eventFired.put(s, true); + getQuestData(quest).actionFired.put(s, true); } } } diff --git a/main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java b/main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java index 06a06b1be..34938d001 100644 --- a/main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java +++ b/main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java @@ -406,8 +406,8 @@ public class PlayerListener implements Listener { String chat = evt.getMessage(); for (final String s : currentStage.getChatActions().keySet()) { if (s.equalsIgnoreCase(chat)) { - if (quester.getQuestData(quest).eventFired.get(s) == null - || quester.getQuestData(quest).eventFired.get(s) == false) { + if (quester.getQuestData(quest).actionFired.get(s) == null + || quester.getQuestData(quest).actionFired.get(s) == false) { new BukkitRunnable() { @Override public void run() { @@ -415,7 +415,7 @@ public class PlayerListener implements Listener { } }.runTask(this.plugin); - quester.getQuestData(quest).eventFired.put(s, true); + quester.getQuestData(quest).actionFired.put(s, true); } } } @@ -460,10 +460,10 @@ public class PlayerListener implements Listener { String command = evt.getMessage(); for (String s : currentStage.getCommandActions().keySet()) { if (command.equalsIgnoreCase("/" + s)) { - if (quester.getQuestData(quest).eventFired.get(s) == null - || quester.getQuestData(quest).eventFired.get(s) == false) { + if (quester.getQuestData(quest).actionFired.get(s) == null + || quester.getQuestData(quest).actionFired.get(s) == false) { currentStage.getCommandActions().get(s).fire(quester, quest); - quester.getQuestData(quest).eventFired.put(s, true); + quester.getQuestData(quest).actionFired.put(s, true); } } }