From 3d8c3ca671b84d1a5117cf866596815cd4a7331c Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Thu, 18 Apr 2019 00:32:47 +0000 Subject: [PATCH] Need to at least check if quest is active when actionForEachPlayer is used. --- .../Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java | 2 +- .../Q00150_ExtremeChallengePrimalMotherResurrected.java | 2 +- .../Q10316_UndecayingMemoryOfThePast.java | 2 +- .../scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java | 2 +- .../Q10354_ResurrectedOwnerOfHall.java | 2 +- .../Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java | 2 +- .../Q00150_ExtremeChallengePrimalMotherResurrected.java | 2 +- .../Q10316_UndecayingMemoryOfThePast.java | 2 +- .../scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java | 2 +- .../Q10354_ResurrectedOwnerOfHall.java | 2 +- .../Q10818_ConfrontingAGiantMonster.java | 2 +- .../Q10841_DeepInsideAteliaFortress.java | 2 +- .../Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java | 2 +- .../Q00150_ExtremeChallengePrimalMotherResurrected.java | 2 +- .../Q10316_UndecayingMemoryOfThePast.java | 2 +- .../scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java | 2 +- .../Q10354_ResurrectedOwnerOfHall.java | 2 +- .../Q10818_ConfrontingAGiantMonster.java | 2 +- .../Q10841_DeepInsideAteliaFortress.java | 2 +- .../Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java | 2 +- .../Q00150_ExtremeChallengePrimalMotherResurrected.java | 2 +- .../Q10316_UndecayingMemoryOfThePast.java | 2 +- .../scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java | 2 +- .../Q10354_ResurrectedOwnerOfHall.java | 2 +- .../Q10818_ConfrontingAGiantMonster.java | 2 +- .../Q10841_DeepInsideAteliaFortress.java | 2 +- .../Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java | 2 +- .../Q00150_ExtremeChallengePrimalMotherResurrected.java | 2 +- .../Q10316_UndecayingMemoryOfThePast.java | 2 +- .../scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java | 2 +- .../Q10354_ResurrectedOwnerOfHall.java | 2 +- .../Q10818_ConfrontingAGiantMonster.java | 2 +- .../Q10841_DeepInsideAteliaFortress.java | 2 +- .../Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java | 2 +- .../Q00150_ExtremeChallengePrimalMotherResurrected.java | 2 +- .../Q10316_UndecayingMemoryOfThePast.java | 2 +- .../scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java | 2 +- .../Q10354_ResurrectedOwnerOfHall.java | 2 +- .../Q10818_ConfrontingAGiantMonster.java | 2 +- .../Q10841_DeepInsideAteliaFortress.java | 2 +- .../Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java | 2 +- .../Q00150_ExtremeChallengePrimalMotherResurrected.java | 2 +- .../Q10316_UndecayingMemoryOfThePast.java | 2 +- .../scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java | 2 +- .../Q10354_ResurrectedOwnerOfHall.java | 2 +- .../Q10818_ConfrontingAGiantMonster.java | 2 +- .../Q10841_DeepInsideAteliaFortress.java | 2 +- .../Q10519_ControllingYourTemper.java | 2 +- .../custom/Q10520_TempleGuardians/Q10520_TempleGuardians.java | 2 +- 49 files changed, 49 insertions(+), 49 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java index 36acedc191..9de7985fe4 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java @@ -145,7 +145,7 @@ public final class Q00149_PrimalMotherIstina extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { giveItems(player, SHILENS_MARK, 1); qs.setCond(2, true); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java index 73c5b50c2d..90d6b83353 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java @@ -135,7 +135,7 @@ public final class Q00150_ExtremeChallengePrimalMotherResurrected extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { giveItems(player, SHILENS_MARK, 1); qs.setCond(2, true); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java index 02848532f6..febc45d886 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java @@ -157,7 +157,7 @@ public final class Q10316_UndecayingMemoryOfThePast extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { qs.setCond(2, true); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java index 2e7b2baee6..0b5922de88 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java @@ -136,7 +136,7 @@ public final class Q10351_OwnerOfHall extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { qs.setCond(2, true); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java index 83fd0f826a..411cff3ce3 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java @@ -135,7 +135,7 @@ public final class Q10354_ResurrectedOwnerOfHall extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { qs.setCond(2, true); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java index 36acedc191..9de7985fe4 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java @@ -145,7 +145,7 @@ public final class Q00149_PrimalMotherIstina extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { giveItems(player, SHILENS_MARK, 1); qs.setCond(2, true); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java index 73c5b50c2d..90d6b83353 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java @@ -135,7 +135,7 @@ public final class Q00150_ExtremeChallengePrimalMotherResurrected extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { giveItems(player, SHILENS_MARK, 1); qs.setCond(2, true); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java index 02848532f6..febc45d886 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java @@ -157,7 +157,7 @@ public final class Q10316_UndecayingMemoryOfThePast extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { qs.setCond(2, true); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java index 2e7b2baee6..0b5922de88 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java @@ -136,7 +136,7 @@ public final class Q10351_OwnerOfHall extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { qs.setCond(2, true); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java index 83fd0f826a..411cff3ce3 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java @@ -135,7 +135,7 @@ public final class Q10354_ResurrectedOwnerOfHall extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { qs.setCond(2, true); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java index cdfdefd93f..844ff167d7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java @@ -170,7 +170,7 @@ public final class Q10818_ConfrontingAGiantMonster extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { if (npc.getId() == TRASKEN) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java index d82369da64..bd06fffb1f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java @@ -154,7 +154,7 @@ public final class Q10841_DeepInsideAteliaFortress extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { giveItems(player, KELBIM_ARMOR_PIECE, 1); qs.setCond(2, true); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java index 36acedc191..9de7985fe4 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java @@ -145,7 +145,7 @@ public final class Q00149_PrimalMotherIstina extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { giveItems(player, SHILENS_MARK, 1); qs.setCond(2, true); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java index 73c5b50c2d..90d6b83353 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java @@ -135,7 +135,7 @@ public final class Q00150_ExtremeChallengePrimalMotherResurrected extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { giveItems(player, SHILENS_MARK, 1); qs.setCond(2, true); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java index 02848532f6..febc45d886 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java @@ -157,7 +157,7 @@ public final class Q10316_UndecayingMemoryOfThePast extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { qs.setCond(2, true); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java index 2e7b2baee6..0b5922de88 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java @@ -136,7 +136,7 @@ public final class Q10351_OwnerOfHall extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { qs.setCond(2, true); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java index 83fd0f826a..411cff3ce3 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java @@ -135,7 +135,7 @@ public final class Q10354_ResurrectedOwnerOfHall extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { qs.setCond(2, true); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java index cdfdefd93f..844ff167d7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java @@ -170,7 +170,7 @@ public final class Q10818_ConfrontingAGiantMonster extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { if (npc.getId() == TRASKEN) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java index d82369da64..bd06fffb1f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java @@ -154,7 +154,7 @@ public final class Q10841_DeepInsideAteliaFortress extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { giveItems(player, KELBIM_ARMOR_PIECE, 1); qs.setCond(2, true); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java index 36acedc191..9de7985fe4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java @@ -145,7 +145,7 @@ public final class Q00149_PrimalMotherIstina extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { giveItems(player, SHILENS_MARK, 1); qs.setCond(2, true); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java index 73c5b50c2d..90d6b83353 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java @@ -135,7 +135,7 @@ public final class Q00150_ExtremeChallengePrimalMotherResurrected extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { giveItems(player, SHILENS_MARK, 1); qs.setCond(2, true); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java index 02848532f6..febc45d886 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java @@ -157,7 +157,7 @@ public final class Q10316_UndecayingMemoryOfThePast extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { qs.setCond(2, true); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java index 2e7b2baee6..0b5922de88 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java @@ -136,7 +136,7 @@ public final class Q10351_OwnerOfHall extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { qs.setCond(2, true); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java index 83fd0f826a..411cff3ce3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java @@ -135,7 +135,7 @@ public final class Q10354_ResurrectedOwnerOfHall extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { qs.setCond(2, true); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java index cdfdefd93f..844ff167d7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java @@ -170,7 +170,7 @@ public final class Q10818_ConfrontingAGiantMonster extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { if (npc.getId() == TRASKEN) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java index d82369da64..bd06fffb1f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java @@ -154,7 +154,7 @@ public final class Q10841_DeepInsideAteliaFortress extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { giveItems(player, KELBIM_ARMOR_PIECE, 1); qs.setCond(2, true); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java index 36acedc191..9de7985fe4 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java @@ -145,7 +145,7 @@ public final class Q00149_PrimalMotherIstina extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { giveItems(player, SHILENS_MARK, 1); qs.setCond(2, true); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java index 73c5b50c2d..90d6b83353 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java @@ -135,7 +135,7 @@ public final class Q00150_ExtremeChallengePrimalMotherResurrected extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { giveItems(player, SHILENS_MARK, 1); qs.setCond(2, true); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java index 02848532f6..febc45d886 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java @@ -157,7 +157,7 @@ public final class Q10316_UndecayingMemoryOfThePast extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { qs.setCond(2, true); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java index 2e7b2baee6..0b5922de88 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java @@ -136,7 +136,7 @@ public final class Q10351_OwnerOfHall extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { qs.setCond(2, true); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java index 83fd0f826a..411cff3ce3 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java @@ -135,7 +135,7 @@ public final class Q10354_ResurrectedOwnerOfHall extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { qs.setCond(2, true); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java index cdfdefd93f..844ff167d7 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java @@ -170,7 +170,7 @@ public final class Q10818_ConfrontingAGiantMonster extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { if (npc.getId() == TRASKEN) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java index d82369da64..bd06fffb1f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java @@ -154,7 +154,7 @@ public final class Q10841_DeepInsideAteliaFortress extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { giveItems(player, KELBIM_ARMOR_PIECE, 1); qs.setCond(2, true); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java index 36acedc191..9de7985fe4 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java @@ -145,7 +145,7 @@ public final class Q00149_PrimalMotherIstina extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { giveItems(player, SHILENS_MARK, 1); qs.setCond(2, true); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java index 73c5b50c2d..90d6b83353 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java @@ -135,7 +135,7 @@ public final class Q00150_ExtremeChallengePrimalMotherResurrected extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { giveItems(player, SHILENS_MARK, 1); qs.setCond(2, true); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java index 02848532f6..febc45d886 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java @@ -157,7 +157,7 @@ public final class Q10316_UndecayingMemoryOfThePast extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { qs.setCond(2, true); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java index 2e7b2baee6..0b5922de88 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java @@ -136,7 +136,7 @@ public final class Q10351_OwnerOfHall extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { qs.setCond(2, true); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java index 83fd0f826a..411cff3ce3 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java @@ -135,7 +135,7 @@ public final class Q10354_ResurrectedOwnerOfHall extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { qs.setCond(2, true); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java index cdfdefd93f..844ff167d7 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java @@ -170,7 +170,7 @@ public final class Q10818_ConfrontingAGiantMonster extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { if (npc.getId() == TRASKEN) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java index d82369da64..bd06fffb1f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java @@ -154,7 +154,7 @@ public final class Q10841_DeepInsideAteliaFortress extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { giveItems(player, KELBIM_ARMOR_PIECE, 1); qs.setCond(2, true); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java index 36acedc191..9de7985fe4 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java @@ -145,7 +145,7 @@ public final class Q00149_PrimalMotherIstina extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { giveItems(player, SHILENS_MARK, 1); qs.setCond(2, true); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java index 73c5b50c2d..90d6b83353 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java @@ -135,7 +135,7 @@ public final class Q00150_ExtremeChallengePrimalMotherResurrected extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { giveItems(player, SHILENS_MARK, 1); qs.setCond(2, true); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java index 02848532f6..febc45d886 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java @@ -157,7 +157,7 @@ public final class Q10316_UndecayingMemoryOfThePast extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { qs.setCond(2, true); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java index 2e7b2baee6..0b5922de88 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java @@ -136,7 +136,7 @@ public final class Q10351_OwnerOfHall extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { qs.setCond(2, true); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java index 83fd0f826a..411cff3ce3 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java @@ -135,7 +135,7 @@ public final class Q10354_ResurrectedOwnerOfHall extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { qs.setCond(2, true); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java index cdfdefd93f..844ff167d7 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java @@ -170,7 +170,7 @@ public final class Q10818_ConfrontingAGiantMonster extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { if (npc.getId() == TRASKEN) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java index d82369da64..bd06fffb1f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10841_DeepInsideAteliaFortress/Q10841_DeepInsideAteliaFortress.java @@ -154,7 +154,7 @@ public final class Q10841_DeepInsideAteliaFortress extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { giveItems(player, KELBIM_ARMOR_PIECE, 1); qs.setCond(2, true); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/custom/Q10519_ControllingYourTemper/Q10519_ControllingYourTemper.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/custom/Q10519_ControllingYourTemper/Q10519_ControllingYourTemper.java index acb5027381..ccac5f2887 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/custom/Q10519_ControllingYourTemper/Q10519_ControllingYourTemper.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/custom/Q10519_ControllingYourTemper/Q10519_ControllingYourTemper.java @@ -150,7 +150,7 @@ public class Q10519_ControllingYourTemper extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { qs.setCond(FINISH_COND); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/custom/Q10520_TempleGuardians/Q10520_TempleGuardians.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/custom/Q10520_TempleGuardians/Q10520_TempleGuardians.java index fdd634f3a1..938319527d 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/custom/Q10520_TempleGuardians/Q10520_TempleGuardians.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/custom/Q10520_TempleGuardians/Q10520_TempleGuardians.java @@ -150,7 +150,7 @@ public class Q10520_TempleGuardians extends Quest public void actionForEachPlayer(PlayerInstance player, Npc npc, boolean isSummon) { final QuestState qs = getQuestState(player, false); - if ((qs != null) && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) + if ((qs != null) && qs.isStarted() && player.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE)) { qs.setCond(FINISH_COND); }