Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2025-02-18 13:31:20 +01:00
Code Issues Projects Releases Wiki Activity

! Fix NPE in player listeners

Browse Source
This commit is contained in:
PikachuEXE 2015-04-16 07:08:53 +08:00
parent 7783144b68
commit 2fbea95b39
1 changed files with 54 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -379,17 +379,21 @@ 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()) {
Stage currentStage = quester.getCurrentStage(quest);
if (currentStage == null) {
continue;
}
if (quester.getCurrentStage(quest).chatEvents.isEmpty() == false) { if (currentStage.chatEvents.isEmpty() == false) {
String chat = evt.getMessage(); String chat = evt.getMessage();
for (String s : quester.getCurrentStage(quest).chatEvents.keySet()) { for (String s : currentStage.chatEvents.keySet()) {
if (s.equalsIgnoreCase(chat)) { if (s.equalsIgnoreCase(chat)) {
if (quester.getQuestData(quest).eventFired.get(s) == null || quester.getQuestData(quest).eventFired.get(s) == false) { if (quester.getQuestData(quest).eventFired.get(s) == null || quester.getQuestData(quest).eventFired.get(s) == false) {
quester.getCurrentStage(quest).chatEvents.get(s).fire(quester, quest); currentStage.chatEvents.get(s).fire(quester, quest);
quester.getQuestData(quest).eventFired.put(s, true); quester.getQuestData(quest).eventFired.put(s, true);
} }
@ -873,13 +877,17 @@ 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()) {
Stage currentStage = quester.getCurrentStage(quest);
if (currentStage == null) {
continue;
}
if (quester.getCurrentStage(quest).delay > -1) { if (currentStage.delay > -1) {
quester.stopStageTimer(quest); quester.stopStageTimer(quest);
} }
if (quester.getCurrentStage(quest).disconnectEvent != null) { if (currentStage.disconnectEvent != null) {
quester.getCurrentStage(quest).disconnectEvent.fire(quester, quest); currentStage.disconnectEvent.fire(quester, quest);
} }
} }