Check if quest has started before TeleporterQuestRecommendationHolder condition check.
This commit is contained in:
parent
e5c1a7fdf3
commit
8e3c2e14d2
@ -180,7 +180,7 @@ public final class TeleporterInstance extends Npc
|
|||||||
for (TeleporterQuestRecommendationHolder rec : QUEST_RECOMENDATIONS.get(npcId))
|
for (TeleporterQuestRecommendationHolder rec : QUEST_RECOMENDATIONS.get(npcId))
|
||||||
{
|
{
|
||||||
final QuestState qs = player.getQuestState(rec.getQuestName());
|
final QuestState qs = player.getQuestState(rec.getQuestName());
|
||||||
if (qs != null)
|
if ((qs != null) && qs.isStarted())
|
||||||
{
|
{
|
||||||
final int cond = rec.getCond();
|
final int cond = rec.getCond();
|
||||||
if ((cond == -1) || qs.isCond(cond))
|
if ((cond == -1) || qs.isCond(cond))
|
||||||
|
@ -180,7 +180,7 @@ public final class TeleporterInstance extends Npc
|
|||||||
for (TeleporterQuestRecommendationHolder rec : QUEST_RECOMENDATIONS.get(npcId))
|
for (TeleporterQuestRecommendationHolder rec : QUEST_RECOMENDATIONS.get(npcId))
|
||||||
{
|
{
|
||||||
final QuestState qs = player.getQuestState(rec.getQuestName());
|
final QuestState qs = player.getQuestState(rec.getQuestName());
|
||||||
if (qs != null)
|
if ((qs != null) && qs.isStarted())
|
||||||
{
|
{
|
||||||
final int cond = rec.getCond();
|
final int cond = rec.getCond();
|
||||||
if ((cond == -1) || qs.isCond(cond))
|
if ((cond == -1) || qs.isCond(cond))
|
||||||
|
@ -180,7 +180,7 @@ public final class TeleporterInstance extends Npc
|
|||||||
for (TeleporterQuestRecommendationHolder rec : QUEST_RECOMENDATIONS.get(npcId))
|
for (TeleporterQuestRecommendationHolder rec : QUEST_RECOMENDATIONS.get(npcId))
|
||||||
{
|
{
|
||||||
final QuestState qs = player.getQuestState(rec.getQuestName());
|
final QuestState qs = player.getQuestState(rec.getQuestName());
|
||||||
if (qs != null)
|
if ((qs != null) && qs.isStarted())
|
||||||
{
|
{
|
||||||
final int cond = rec.getCond();
|
final int cond = rec.getCond();
|
||||||
if ((cond == -1) || qs.isCond(cond))
|
if ((cond == -1) || qs.isCond(cond))
|
||||||
|
@ -180,7 +180,7 @@ public final class TeleporterInstance extends Npc
|
|||||||
for (TeleporterQuestRecommendationHolder rec : QUEST_RECOMENDATIONS.get(npcId))
|
for (TeleporterQuestRecommendationHolder rec : QUEST_RECOMENDATIONS.get(npcId))
|
||||||
{
|
{
|
||||||
final QuestState qs = player.getQuestState(rec.getQuestName());
|
final QuestState qs = player.getQuestState(rec.getQuestName());
|
||||||
if (qs != null)
|
if ((qs != null) && qs.isStarted())
|
||||||
{
|
{
|
||||||
final int cond = rec.getCond();
|
final int cond = rec.getCond();
|
||||||
if ((cond == -1) || qs.isCond(cond))
|
if ((cond == -1) || qs.isCond(cond))
|
||||||
|
@ -187,7 +187,7 @@ public final class TeleporterInstance extends Npc
|
|||||||
for (TeleporterQuestRecommendationHolder rec : QUEST_RECOMENDATIONS.get(npcId))
|
for (TeleporterQuestRecommendationHolder rec : QUEST_RECOMENDATIONS.get(npcId))
|
||||||
{
|
{
|
||||||
final QuestState qs = player.getQuestState(rec.getQuestName());
|
final QuestState qs = player.getQuestState(rec.getQuestName());
|
||||||
if (qs != null)
|
if ((qs != null) && qs.isStarted())
|
||||||
{
|
{
|
||||||
final int cond = rec.getCond();
|
final int cond = rec.getCond();
|
||||||
if ((cond == -1) || qs.isCond(cond))
|
if ((cond == -1) || qs.isCond(cond))
|
||||||
|
@ -187,7 +187,7 @@ public final class TeleporterInstance extends Npc
|
|||||||
for (TeleporterQuestRecommendationHolder rec : QUEST_RECOMENDATIONS.get(npcId))
|
for (TeleporterQuestRecommendationHolder rec : QUEST_RECOMENDATIONS.get(npcId))
|
||||||
{
|
{
|
||||||
final QuestState qs = player.getQuestState(rec.getQuestName());
|
final QuestState qs = player.getQuestState(rec.getQuestName());
|
||||||
if (qs != null)
|
if ((qs != null) && qs.isStarted())
|
||||||
{
|
{
|
||||||
final int cond = rec.getCond();
|
final int cond = rec.getCond();
|
||||||
if ((cond == -1) || qs.isCond(cond))
|
if ((cond == -1) || qs.isCond(cond))
|
||||||
|
@ -187,7 +187,7 @@ public final class TeleporterInstance extends Npc
|
|||||||
for (TeleporterQuestRecommendationHolder rec : QUEST_RECOMENDATIONS.get(npcId))
|
for (TeleporterQuestRecommendationHolder rec : QUEST_RECOMENDATIONS.get(npcId))
|
||||||
{
|
{
|
||||||
final QuestState qs = player.getQuestState(rec.getQuestName());
|
final QuestState qs = player.getQuestState(rec.getQuestName());
|
||||||
if (qs != null)
|
if ((qs != null) && qs.isStarted())
|
||||||
{
|
{
|
||||||
final int cond = rec.getCond();
|
final int cond = rec.getCond();
|
||||||
if ((cond == -1) || qs.isCond(cond))
|
if ((cond == -1) || qs.isCond(cond))
|
||||||
|
@ -162,7 +162,7 @@ public final class TeleporterInstance extends Npc
|
|||||||
for (TeleporterQuestRecommendationHolder rec : QUEST_RECOMENDATIONS.get(npcId))
|
for (TeleporterQuestRecommendationHolder rec : QUEST_RECOMENDATIONS.get(npcId))
|
||||||
{
|
{
|
||||||
final QuestState qs = player.getQuestState(rec.getQuestName());
|
final QuestState qs = player.getQuestState(rec.getQuestName());
|
||||||
if (qs != null)
|
if ((qs != null) && qs.isStarted())
|
||||||
{
|
{
|
||||||
final int cond = rec.getCond();
|
final int cond = rec.getCond();
|
||||||
if ((cond == -1) || qs.isCond(cond))
|
if ((cond == -1) || qs.isCond(cond))
|
||||||
|
@ -162,7 +162,7 @@ public final class TeleporterInstance extends Npc
|
|||||||
for (TeleporterQuestRecommendationHolder rec : QUEST_RECOMENDATIONS.get(npcId))
|
for (TeleporterQuestRecommendationHolder rec : QUEST_RECOMENDATIONS.get(npcId))
|
||||||
{
|
{
|
||||||
final QuestState qs = player.getQuestState(rec.getQuestName());
|
final QuestState qs = player.getQuestState(rec.getQuestName());
|
||||||
if (qs != null)
|
if ((qs != null) && qs.isStarted())
|
||||||
{
|
{
|
||||||
final int cond = rec.getCond();
|
final int cond = rec.getCond();
|
||||||
if ((cond == -1) || qs.isCond(cond))
|
if ((cond == -1) || qs.isCond(cond))
|
||||||
|
@ -162,7 +162,7 @@ public final class TeleporterInstance extends Npc
|
|||||||
for (TeleporterQuestRecommendationHolder rec : QUEST_RECOMENDATIONS.get(npcId))
|
for (TeleporterQuestRecommendationHolder rec : QUEST_RECOMENDATIONS.get(npcId))
|
||||||
{
|
{
|
||||||
final QuestState qs = player.getQuestState(rec.getQuestName());
|
final QuestState qs = player.getQuestState(rec.getQuestName());
|
||||||
if (qs != null)
|
if ((qs != null) && qs.isStarted())
|
||||||
{
|
{
|
||||||
final int cond = rec.getCond();
|
final int cond = rec.getCond();
|
||||||
if ((cond == -1) || qs.isCond(cond))
|
if ((cond == -1) || qs.isCond(cond))
|
||||||
|
@ -162,7 +162,7 @@ public final class TeleporterInstance extends Npc
|
|||||||
for (TeleporterQuestRecommendationHolder rec : QUEST_RECOMENDATIONS.get(npcId))
|
for (TeleporterQuestRecommendationHolder rec : QUEST_RECOMENDATIONS.get(npcId))
|
||||||
{
|
{
|
||||||
final QuestState qs = player.getQuestState(rec.getQuestName());
|
final QuestState qs = player.getQuestState(rec.getQuestName());
|
||||||
if (qs != null)
|
if ((qs != null) && qs.isStarted())
|
||||||
{
|
{
|
||||||
final int cond = rec.getCond();
|
final int cond = rec.getCond();
|
||||||
if ((cond == -1) || qs.isCond(cond))
|
if ((cond == -1) || qs.isCond(cond))
|
||||||
|
Loading…
Reference in New Issue
Block a user