Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2024-09-30 16:07:27 +02:00
Code Issues Projects Releases Wiki Activity

Revert 8f0daba6f1, try something else

Browse Source
This commit is contained in:
HappyPikachu 2015-02-22 19:57:52 -05:00
parent 443ac6f3e3
commit 01e7db0390
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/me/blackvein/quests/PlayerListener.java
View File

@ -369,7 +369,7 @@ public class PlayerListener implements Listener, ColorUtil {
if (quester.currentQuests.isEmpty() == false) { if (quester.currentQuests.isEmpty() == false) {
for (Quest quest : quester.currentQuests.keySet()) { for (Quest quest : quester.currentQuests.keySet()) {
if (quester.getCurrentStage(quest) != null)
if (quester.getCurrentStage(quest).chatEvents.isEmpty() == false) { if (quester.getCurrentStage(quest).chatEvents.isEmpty() == false) {
String chat = evt.getMessage(); String chat = evt.getMessage();
@ -758,7 +758,7 @@ public class PlayerListener implements Listener, ColorUtil {
Quester quester = plugin.getQuester(player.getUniqueId()); Quester quester = plugin.getQuester(player.getUniqueId());
for (Quest quest : quester.currentQuests.keySet()) { for (Quest quest : quester.currentQuests.keySet()) {
if (quester.getCurrentStage(quest) != null)
if (quester.getCurrentStage(quest).deathEvent != null) { if (quester.getCurrentStage(quest).deathEvent != null) {
quester.getCurrentStage(quest).deathEvent.fire(quester, quest); quester.getCurrentStage(quest).deathEvent.fire(quester, quest);
} }
@ -840,7 +840,7 @@ public class PlayerListener implements Listener, ColorUtil {
} }
for (Quest quest : quester.currentQuests.keySet()) { for (Quest quest : quester.currentQuests.keySet()) {
if (quester.getCurrentStage(quest) != null)
if (quester.getCurrentStage(quest).delay > -1) { if (quester.getCurrentStage(quest).delay > -1) {
quester.startStageTimer(quest); quester.startStageTimer(quest);
@ -864,7 +864,7 @@ public class PlayerListener implements Listener, ColorUtil {
Quester quester = plugin.getQuester(evt.getPlayer().getUniqueId()); Quester quester = plugin.getQuester(evt.getPlayer().getUniqueId());
for (Quest quest : quester.currentQuests.keySet()) { for (Quest quest : quester.currentQuests.keySet()) {
if (quester.getCurrentStage(quest) != null)
if (quester.getCurrentStage(quest).delay > -1) { if (quester.getCurrentStage(quest).delay > -1) {
quester.stopStageTimer(quest); quester.stopStageTimer(quest);
} }

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

@ -4,6 +4,7 @@ import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.*; import java.util.*;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
@ -40,7 +41,7 @@ public class Quester {
boolean hasJournal = false; boolean hasJournal = false;
public String questToTake; public String questToTake;
public LinkedHashMap<Quest, Integer> currentQuests = new LinkedHashMap<Quest, Integer>() { public ConcurrentHashMap<Quest, Integer> currentQuests = new ConcurrentHashMap<Quest, Integer>() {
private static final long serialVersionUID = 6361484975823846780L; private static final long serialVersionUID = 6361484975823846780L;