From 8e3c2e14d22fe5fc823e121ae466d4062b476f68 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Thu, 11 Apr 2019 13:03:53 +0000 Subject: [PATCH] Check if quest has started before TeleporterQuestRecommendationHolder condition check. --- .../gameserver/model/actor/instance/TeleporterInstance.java | 2 +- .../gameserver/model/actor/instance/TeleporterInstance.java | 2 +- .../gameserver/model/actor/instance/TeleporterInstance.java | 2 +- .../gameserver/model/actor/instance/TeleporterInstance.java | 2 +- .../gameserver/model/actor/instance/TeleporterInstance.java | 2 +- .../gameserver/model/actor/instance/TeleporterInstance.java | 2 +- .../gameserver/model/actor/instance/TeleporterInstance.java | 2 +- .../gameserver/model/actor/instance/TeleporterInstance.java | 2 +- .../gameserver/model/actor/instance/TeleporterInstance.java | 2 +- .../gameserver/model/actor/instance/TeleporterInstance.java | 2 +- .../gameserver/model/actor/instance/TeleporterInstance.java | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java index 6b41c11531..42b0a02ac7 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java @@ -180,7 +180,7 @@ public final class TeleporterInstance extends Npc for (TeleporterQuestRecommendationHolder rec : QUEST_RECOMENDATIONS.get(npcId)) { final QuestState qs = player.getQuestState(rec.getQuestName()); - if (qs != null) + if ((qs != null) && qs.isStarted()) { final int cond = rec.getCond(); if ((cond == -1) || qs.isCond(cond)) diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java index c8426ab1ac..14a11c232e 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java @@ -180,7 +180,7 @@ public final class TeleporterInstance extends Npc for (TeleporterQuestRecommendationHolder rec : QUEST_RECOMENDATIONS.get(npcId)) { final QuestState qs = player.getQuestState(rec.getQuestName()); - if (qs != null) + if ((qs != null) && qs.isStarted()) { final int cond = rec.getCond(); if ((cond == -1) || qs.isCond(cond)) diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java index c8426ab1ac..14a11c232e 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java @@ -180,7 +180,7 @@ public final class TeleporterInstance extends Npc for (TeleporterQuestRecommendationHolder rec : QUEST_RECOMENDATIONS.get(npcId)) { final QuestState qs = player.getQuestState(rec.getQuestName()); - if (qs != null) + if ((qs != null) && qs.isStarted()) { final int cond = rec.getCond(); if ((cond == -1) || qs.isCond(cond)) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java index c8426ab1ac..14a11c232e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java @@ -180,7 +180,7 @@ public final class TeleporterInstance extends Npc for (TeleporterQuestRecommendationHolder rec : QUEST_RECOMENDATIONS.get(npcId)) { final QuestState qs = player.getQuestState(rec.getQuestName()); - if (qs != null) + if ((qs != null) && qs.isStarted()) { final int cond = rec.getCond(); if ((cond == -1) || qs.isCond(cond)) diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java index cf8793d767..8a0f18f5c5 100644 --- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java +++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java @@ -187,7 +187,7 @@ public final class TeleporterInstance extends Npc for (TeleporterQuestRecommendationHolder rec : QUEST_RECOMENDATIONS.get(npcId)) { final QuestState qs = player.getQuestState(rec.getQuestName()); - if (qs != null) + if ((qs != null) && qs.isStarted()) { final int cond = rec.getCond(); if ((cond == -1) || qs.isCond(cond)) diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java index cf8793d767..8a0f18f5c5 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java +++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java @@ -187,7 +187,7 @@ public final class TeleporterInstance extends Npc for (TeleporterQuestRecommendationHolder rec : QUEST_RECOMENDATIONS.get(npcId)) { final QuestState qs = player.getQuestState(rec.getQuestName()); - if (qs != null) + if ((qs != null) && qs.isStarted()) { final int cond = rec.getCond(); if ((cond == -1) || qs.isCond(cond)) diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java index cf8793d767..8a0f18f5c5 100644 --- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java +++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java @@ -187,7 +187,7 @@ public final class TeleporterInstance extends Npc for (TeleporterQuestRecommendationHolder rec : QUEST_RECOMENDATIONS.get(npcId)) { final QuestState qs = player.getQuestState(rec.getQuestName()); - if (qs != null) + if ((qs != null) && qs.isStarted()) { final int cond = rec.getCond(); if ((cond == -1) || qs.isCond(cond)) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java index 45191037a0..7d370b7c6a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java @@ -162,7 +162,7 @@ public final class TeleporterInstance extends Npc for (TeleporterQuestRecommendationHolder rec : QUEST_RECOMENDATIONS.get(npcId)) { final QuestState qs = player.getQuestState(rec.getQuestName()); - if (qs != null) + if ((qs != null) && qs.isStarted()) { final int cond = rec.getCond(); if ((cond == -1) || qs.isCond(cond)) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java index 45191037a0..7d370b7c6a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java @@ -162,7 +162,7 @@ public final class TeleporterInstance extends Npc for (TeleporterQuestRecommendationHolder rec : QUEST_RECOMENDATIONS.get(npcId)) { final QuestState qs = player.getQuestState(rec.getQuestName()); - if (qs != null) + if ((qs != null) && qs.isStarted()) { final int cond = rec.getCond(); if ((cond == -1) || qs.isCond(cond)) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java index 45191037a0..7d370b7c6a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java @@ -162,7 +162,7 @@ public final class TeleporterInstance extends Npc for (TeleporterQuestRecommendationHolder rec : QUEST_RECOMENDATIONS.get(npcId)) { final QuestState qs = player.getQuestState(rec.getQuestName()); - if (qs != null) + if ((qs != null) && qs.isStarted()) { final int cond = rec.getCond(); if ((cond == -1) || qs.isCond(cond)) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java index 45191037a0..7d370b7c6a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java @@ -162,7 +162,7 @@ public final class TeleporterInstance extends Npc for (TeleporterQuestRecommendationHolder rec : QUEST_RECOMENDATIONS.get(npcId)) { final QuestState qs = player.getQuestState(rec.getQuestName()); - if (qs != null) + if ((qs != null) && qs.isStarted()) { final int cond = rec.getCond(); if ((cond == -1) || qs.isCond(cond))