Check quest before multiplayer dispatch, part 2. Fixes #1185

This commit is contained in:
PikaMug 2020-04-11 16:58:16 -04:00
parent de712174ee
commit 8f3c699e41

View File

@ -3685,7 +3685,13 @@ public class Quester {
return;
}
for (Quester q : mq) {
if (q != null && q.getCurrentStage(quest).containsObjective(objectiveType)) {
if (q == null) {
return;
}
if (q.getCurrentStage(quest) == null) {
return;
}
if (q.getCurrentStage(quest).containsObjective(objectiveType)) {
if (this.getCurrentStage(quest).containsObjective(objectiveType)
|| !quest.getOptions().getRequireSameQuest()) {
fun.apply(q);
@ -3712,8 +3718,10 @@ public class Quester {
return;
}
for (Quester q : mq) {
if (q != null
&& (q.getCurrentQuests().containsKey(quest) && currentStage.equals(q.getCurrentStage(quest)))
if (q == null) {
return;
}
if ((q.getCurrentQuests().containsKey(quest) && currentStage.equals(q.getCurrentStage(quest)))
|| !quest.getOptions().getRequireSameQuest()) {
fun.apply(q);
}