diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java index 3e5d9ba709..fe1f0114e0 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java @@ -171,7 +171,6 @@ public final class Q00453_NotStrongEnoughAlone extends Quest checkProgress(st, 20, MONSTER3[0], MONSTER3[1], MONSTER3[2]); } } - sendNpcLogList(player); } @Override @@ -380,7 +379,6 @@ public final class Q00453_NotStrongEnoughAlone extends Quest { final QuestState qs = getQuestState(activeChar, false); final Set npcLogList = new HashSet<>(3); - if (qs != null) { switch (qs.getCond()) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00462_StuffedAncientHeroes/Q00462_StuffedAncientHeroes.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00462_StuffedAncientHeroes/Q00462_StuffedAncientHeroes.java index 2bf8e04e77..d2e6a2a839 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00462_StuffedAncientHeroes/Q00462_StuffedAncientHeroes.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00462_StuffedAncientHeroes/Q00462_StuffedAncientHeroes.java @@ -176,7 +176,6 @@ public class Q00462_StuffedAncientHeroes extends Quest else { playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); - sendNpcLogList(killer); } } return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java index 7c9e1a8e4a..60d2cb100a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java @@ -215,7 +215,6 @@ public final class Q00476_PlainMission extends Quest { st.setCond(2, true); } - sendNpcLogList(killer); } return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00481_ShadowHelper/Q00481_ShadowHelper.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00481_ShadowHelper/Q00481_ShadowHelper.java index 997b792c1f..be7def0aba 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00481_ShadowHelper/Q00481_ShadowHelper.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00481_ShadowHelper/Q00481_ShadowHelper.java @@ -159,10 +159,6 @@ public final class Q00481_ShadowHelper extends Quest { qs.setCond(2, true); } - else - { - sendNpcLogList(killer); - } } return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00490_DutyOfTheSurvivor/Q00490_DutyOfTheSurvivor.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00490_DutyOfTheSurvivor/Q00490_DutyOfTheSurvivor.java index bcb77da0c6..3583e71de0 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00490_DutyOfTheSurvivor/Q00490_DutyOfTheSurvivor.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00490_DutyOfTheSurvivor/Q00490_DutyOfTheSurvivor.java @@ -175,11 +175,6 @@ public final class Q00490_DutyOfTheSurvivor extends Quest { st.setCond(2); } - else - { - sendNpcLogList(player); - } - } } return super.onKill(npc, player, isSummon); @@ -189,7 +184,7 @@ public final class Q00490_DutyOfTheSurvivor extends Quest public Set getNpcLogList(L2PcInstance player) { final QuestState qs = getQuestState(player, false); - if (qs != null) + if ((qs != null) && qs.isCond(1)) { final Set npcLogList = new HashSet<>(2); npcLogList.add(new NpcLogListHolder(EXTRACT, false, (int) getQuestItemsCount(player, EXTRACT))); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java index c250f77aaa..b05ec4d1a4 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java @@ -158,10 +158,6 @@ public final class Q00493_KickingOutUnwelcomeGuests extends Quest { st.setCond(2, true); } - else - { - sendNpcLogList(player); - } } } @@ -176,7 +172,7 @@ public final class Q00493_KickingOutUnwelcomeGuests extends Quest public Set getNpcLogList(L2PcInstance player) { final QuestState st = getQuestState(player, false); - if (st != null) + if ((st != null) && st.isCond(1)) { final Set npcLogList = new HashSet<>(5); npcLogList.add(new NpcLogListHolder(LUNATIC_CREATURE, false, st.getInt(Integer.toString(LUNATIC_CREATURE)))); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10305_UnstoppableFutileEfforts/Q10305_UnstoppableFutileEfforts.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10305_UnstoppableFutileEfforts/Q10305_UnstoppableFutileEfforts.java index 7ded67f349..0d2b37a2fa 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10305_UnstoppableFutileEfforts/Q10305_UnstoppableFutileEfforts.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10305_UnstoppableFutileEfforts/Q10305_UnstoppableFutileEfforts.java @@ -85,7 +85,6 @@ public final class Q10305_UnstoppableFutileEfforts extends Quest if (killedCocoon < 5) { qs.setMemoStateEx(LARGE_COCOON, killedCocoon); - sendNpcLogList(player); playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); } else @@ -152,7 +151,6 @@ public final class Q10305_UnstoppableFutileEfforts extends Quest public Set getNpcLogList(L2PcInstance activeChar) { final QuestState qs = getQuestState(activeChar, false); - if ((qs != null) && qs.isCond(1)) { final Set npcLogList = new HashSet<>(1); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java index c63915df10..0c1443baef 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java @@ -242,7 +242,6 @@ public final class Q10333_DisappearedSakum extends Quest { qs.setCond(3, true); } - sendNpcLogList(killer); } return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java index f6bf3d491f..dec0ee824a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java @@ -260,7 +260,6 @@ public final class Q10335_RequestToFindSakum extends Quest { st.setCond(3, true); } - sendNpcLogList(killer); } return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java index e63a8660db..d162394452 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java @@ -271,7 +271,6 @@ public final class Q10337_SakumsImpact extends Quest { qs.setCond(3, true); } - sendNpcLogList(killer); } return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java index 8f582b0287..edaed55083 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java @@ -181,7 +181,6 @@ public final class Q10339_FightingTheForgotten extends Quest else { st.setMemoState(monsterCount); - sendNpcLogList(player); } } return super.onKill(npc, player, isSummon); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java index f382837000..b0d144d1c7 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java @@ -210,7 +210,6 @@ public final class Q10353_CertificationOfValue extends Quest public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) { final QuestState qs = getQuestState(killer, false); - if ((qs != null) && qs.isStarted() && qs.isCond(2)) { final int killCount = qs.getInt(KILL_COUNT_VAR) + 1; @@ -222,7 +221,6 @@ public final class Q10353_CertificationOfValue extends Quest } else { - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java index 4d6d40f498..7c71e43096 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java @@ -187,7 +187,6 @@ public final class Q10358_DividedSakumPoslof extends Quest { st.setCond(2, true); } - sendNpcLogList(killer); } else if (st.isCond(3)) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java index 0e73ac5307..72ae47ede4 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java @@ -119,7 +119,6 @@ public final class Q10362_CertificationOfTheSeeker extends Quest if (killedStalker <= 10) { qs.setMemoStateEx(STALKER, killedStalker); - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } @@ -129,7 +128,6 @@ public final class Q10362_CertificationOfTheSeeker extends Quest if (killedCrawler <= 5) { qs.setMemoStateEx(CRAWLER, killedCrawler); - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } @@ -206,7 +204,6 @@ public final class Q10362_CertificationOfTheSeeker extends Quest public Set getNpcLogList(L2PcInstance activeChar) { final QuestState qs = getQuestState(activeChar, false); - if ((qs != null) && qs.isCond(1)) { final Set npcLogList = new HashSet<>(2); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10368_RebellionOfMonsters/Q10368_RebellionOfMonsters.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10368_RebellionOfMonsters/Q10368_RebellionOfMonsters.java index 8bcb9ea19a..c03a91f5ef 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10368_RebellionOfMonsters/Q10368_RebellionOfMonsters.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10368_RebellionOfMonsters/Q10368_RebellionOfMonsters.java @@ -185,7 +185,6 @@ public final class Q10368_RebellionOfMonsters extends Quest { qs.setCond(2, true); } - sendNpcLogList(killer); } return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java index 4c7045a813..ca014094f2 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java @@ -145,7 +145,6 @@ public class Q10389_TheVoiceOfAuthority extends Quest else { playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); - sendNpcLogList(killer); } } return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java index cee0832d94..ed1381803c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java @@ -181,7 +181,6 @@ public final class Q10394_MutualBenefit extends Quest { st.setCond(2, true); } - sendNpcLogList(killer); } return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java index 890e1008e8..a6610acb19 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java @@ -162,10 +162,6 @@ public final class Q10395_NotATraitor extends Quest { st.setCond(2, true); } - else - { - sendNpcLogList(killer); - } } return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java index 21670e9e07..4113f178c1 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java @@ -148,7 +148,6 @@ public final class Q10402_NowhereToTurn extends Quest killCount++; st.set("KILLED_COUNT", killCount); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); - sendNpcLogList(killer); } if (killCount == 40) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java index 9f3c8eec89..31b60075a6 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java @@ -140,7 +140,6 @@ public final class Q10406_BeforeDarknessBearsFruit extends Quest killCount++; st.set("KILLED_COUNT", killCount); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); - sendNpcLogList(killer); } if (killCount == 10) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java index 1efbb49152..e4e62c4377 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java @@ -161,7 +161,6 @@ public final class Q10410_EmbryoInTheSwampOfScreams extends Quest } else { - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } @@ -179,7 +178,6 @@ public final class Q10410_EmbryoInTheSwampOfScreams extends Quest public Set getNpcLogList(L2PcInstance activeChar) { final QuestState st = getQuestState(activeChar, false); - if ((st != null) && st.isCond(1)) { final Set npcLogList = new HashSet<>(1); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java index 0bbaac0a18..cac1cb3bb8 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java @@ -190,7 +190,6 @@ public final class Q10413_EmbryoInTheForestOfTheDead extends Quest } else { - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } @@ -208,7 +207,6 @@ public final class Q10413_EmbryoInTheForestOfTheDead extends Quest public Set getNpcLogList(L2PcInstance activeChar) { final QuestState st = getQuestState(activeChar, false); - if ((st != null) && st.isCond(1)) { final Set npcLogList = new HashSet<>(1); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10440_TheSealOfPunishmentTheFields/Q10440_TheSealOfPunishmentTheFields.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10440_TheSealOfPunishmentTheFields/Q10440_TheSealOfPunishmentTheFields.java index 03952f6a9c..151e0f998a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10440_TheSealOfPunishmentTheFields/Q10440_TheSealOfPunishmentTheFields.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10440_TheSealOfPunishmentTheFields/Q10440_TheSealOfPunishmentTheFields.java @@ -231,18 +231,15 @@ public class Q10440_TheSealOfPunishmentTheFields extends Quest if ((count >= 50) && (qs.isMemoState(1))) { qs.setCond(2, true); - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } else if ((count >= 50) && (qs.isMemoState(2))) { qs.setCond(3, true); - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } else { - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java index d220f643b0..56b658f8f8 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java @@ -143,7 +143,6 @@ public final class Q10446_HitAndRun extends Quest } else { - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java index 4abe0e783c..0c33b4c672 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java @@ -171,7 +171,6 @@ public final class Q10743_StrangeFungus extends Quest qs.set(EVOLVED_SPAWN_VAR, killCount); } qs.set(KILL_COUNT_VAR, qs.getInt(KILL_COUNT_VAR) + 1); - sendNpcLogList(killer); break; } case EVOLVED_GROWLER: diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java index 05ac7923b0..02b06adca8 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java @@ -416,7 +416,6 @@ public final class Q10751_WindsOfFateEncounters extends Quest if (killCount <= 5) { qs.set(KILL_COUNT_VAR, ++killCount); - sendNpcLogList(killer); } if ((killCount >= 5) && !L2World.getInstance().getVisibleObjects(npc, L2Npc.class, 1000).stream().anyMatch(n -> ((n.getId() == TELESHA) && (n.getSummoner() == killer)))) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java index e360cb0387..308411b969 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java @@ -634,7 +634,6 @@ public final class Q10753_WindsOfFateChoices extends Quest giveItems(killer, CRYSTAL_EYE, 1); qs.set(CRYSTAL_EYE_VAR, ++EyeCount); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); - sendNpcLogList(killer); } break; } @@ -645,7 +644,6 @@ public final class Q10753_WindsOfFateChoices extends Quest giveItems(killer, BROKEN_STONE_OF_PURITY, 1); qs.set(BROKEN_STONE_OF_PURITY_VAR, ++PurityCount); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); - sendNpcLogList(killer); } break; } @@ -656,7 +654,6 @@ public final class Q10753_WindsOfFateChoices extends Quest giveItems(killer, MIRACLE_DRUG_OF_ENCHANTMENT, 1); qs.set(EMPTY_REGEANT_FLASK_VAR, ++FlaskCount); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); - sendNpcLogList(killer); } break; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java index 676269a77f..426ba81fc8 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java @@ -141,13 +141,11 @@ public final class Q10757_QuietingTheStorm extends Quest if (vortexCount < 5) { qs.set(VORTEX_COUNT_VAR, ++vortexCount); - sendNpcLogList(killer); } } else if (windimaCount != 1) { qs.set(WINDIMA_COUNT_VAR, ++windimaCount); - sendNpcLogList(killer); } if ((vortexCount >= 5) && (windimaCount >= 1)) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java index c650191204..90549b0055 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java @@ -146,10 +146,6 @@ public class Q10761_AnOrcInLove extends Quest { qs.setCond(2, true); } - else - { - sendNpcLogList(killer); - } } } return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10780_AWeakenedBarrier/Q10780_AWeakenedBarrier.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10780_AWeakenedBarrier/Q10780_AWeakenedBarrier.java index 09fe203bdb..b69f493b67 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10780_AWeakenedBarrier/Q10780_AWeakenedBarrier.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10780_AWeakenedBarrier/Q10780_AWeakenedBarrier.java @@ -157,10 +157,6 @@ public final class Q10780_AWeakenedBarrier extends Quest { qs.setCond(2, true); } - else - { - sendNpcLogList(killer); - } } } return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java index 69ee846d25..f7b182da57 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java @@ -159,7 +159,6 @@ public final class Q10786_ResidentProblemSolver extends Quest else { playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); - sendNpcLogList(killer); } } return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java index f37c466a81..b84fe17ed4 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java @@ -156,7 +156,6 @@ public final class Q10793_SaveTheSouls extends Quest } else { - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java index 33ee666a78..365870bfe4 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java @@ -203,7 +203,6 @@ public final class Q10794_InvestigateTheForest extends Quest } else { - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java index bb1611ee87..df16bff45f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java @@ -153,7 +153,6 @@ public class Q10799_StrangeThingsAfootInTheValley extends Quest } else { - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java index a19bb15bc0..fffa46ca70 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java @@ -155,7 +155,6 @@ public class Q10800_ReconnaissanceAtDragonValley extends Quest } else { - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/quest/Quest.java index b307ab0bc9..02004e3c1a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/quest/Quest.java @@ -1119,6 +1119,10 @@ public class Quest extends AbstractScript implements IIdentifiable */ public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) { + if (!getNpcLogList(killer).isEmpty()) + { + sendNpcLogList(killer); + } return null; } @@ -2934,9 +2938,7 @@ public class Quest extends AbstractScript implements IIdentifiable public void sendNpcLogList(L2PcInstance activeChar) { - final QuestState qs = activeChar.getQuestState(getName()); - - if (qs != null) + if (activeChar.getQuestState(getName()) != null) { final ExQuestNpcLogList packet = new ExQuestNpcLogList(getId()); getNpcLogList(activeChar).forEach(packet::add); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java index 3e5d9ba709..fe1f0114e0 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java @@ -171,7 +171,6 @@ public final class Q00453_NotStrongEnoughAlone extends Quest checkProgress(st, 20, MONSTER3[0], MONSTER3[1], MONSTER3[2]); } } - sendNpcLogList(player); } @Override @@ -380,7 +379,6 @@ public final class Q00453_NotStrongEnoughAlone extends Quest { final QuestState qs = getQuestState(activeChar, false); final Set npcLogList = new HashSet<>(3); - if (qs != null) { switch (qs.getCond()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00462_StuffedAncientHeroes/Q00462_StuffedAncientHeroes.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00462_StuffedAncientHeroes/Q00462_StuffedAncientHeroes.java index 2bf8e04e77..d2e6a2a839 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00462_StuffedAncientHeroes/Q00462_StuffedAncientHeroes.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00462_StuffedAncientHeroes/Q00462_StuffedAncientHeroes.java @@ -176,7 +176,6 @@ public class Q00462_StuffedAncientHeroes extends Quest else { playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); - sendNpcLogList(killer); } } return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java index 7c9e1a8e4a..60d2cb100a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java @@ -215,7 +215,6 @@ public final class Q00476_PlainMission extends Quest { st.setCond(2, true); } - sendNpcLogList(killer); } return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00481_ShadowHelper/Q00481_ShadowHelper.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00481_ShadowHelper/Q00481_ShadowHelper.java index 997b792c1f..be7def0aba 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00481_ShadowHelper/Q00481_ShadowHelper.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00481_ShadowHelper/Q00481_ShadowHelper.java @@ -159,10 +159,6 @@ public final class Q00481_ShadowHelper extends Quest { qs.setCond(2, true); } - else - { - sendNpcLogList(killer); - } } return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00490_DutyOfTheSurvivor/Q00490_DutyOfTheSurvivor.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00490_DutyOfTheSurvivor/Q00490_DutyOfTheSurvivor.java index bcb77da0c6..3583e71de0 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00490_DutyOfTheSurvivor/Q00490_DutyOfTheSurvivor.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00490_DutyOfTheSurvivor/Q00490_DutyOfTheSurvivor.java @@ -175,11 +175,6 @@ public final class Q00490_DutyOfTheSurvivor extends Quest { st.setCond(2); } - else - { - sendNpcLogList(player); - } - } } return super.onKill(npc, player, isSummon); @@ -189,7 +184,7 @@ public final class Q00490_DutyOfTheSurvivor extends Quest public Set getNpcLogList(L2PcInstance player) { final QuestState qs = getQuestState(player, false); - if (qs != null) + if ((qs != null) && qs.isCond(1)) { final Set npcLogList = new HashSet<>(2); npcLogList.add(new NpcLogListHolder(EXTRACT, false, (int) getQuestItemsCount(player, EXTRACT))); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java index c250f77aaa..b05ec4d1a4 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java @@ -158,10 +158,6 @@ public final class Q00493_KickingOutUnwelcomeGuests extends Quest { st.setCond(2, true); } - else - { - sendNpcLogList(player); - } } } @@ -176,7 +172,7 @@ public final class Q00493_KickingOutUnwelcomeGuests extends Quest public Set getNpcLogList(L2PcInstance player) { final QuestState st = getQuestState(player, false); - if (st != null) + if ((st != null) && st.isCond(1)) { final Set npcLogList = new HashSet<>(5); npcLogList.add(new NpcLogListHolder(LUNATIC_CREATURE, false, st.getInt(Integer.toString(LUNATIC_CREATURE)))); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10305_UnstoppableFutileEfforts/Q10305_UnstoppableFutileEfforts.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10305_UnstoppableFutileEfforts/Q10305_UnstoppableFutileEfforts.java index 7ded67f349..0d2b37a2fa 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10305_UnstoppableFutileEfforts/Q10305_UnstoppableFutileEfforts.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10305_UnstoppableFutileEfforts/Q10305_UnstoppableFutileEfforts.java @@ -85,7 +85,6 @@ public final class Q10305_UnstoppableFutileEfforts extends Quest if (killedCocoon < 5) { qs.setMemoStateEx(LARGE_COCOON, killedCocoon); - sendNpcLogList(player); playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); } else @@ -152,7 +151,6 @@ public final class Q10305_UnstoppableFutileEfforts extends Quest public Set getNpcLogList(L2PcInstance activeChar) { final QuestState qs = getQuestState(activeChar, false); - if ((qs != null) && qs.isCond(1)) { final Set npcLogList = new HashSet<>(1); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java index c63915df10..0c1443baef 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java @@ -242,7 +242,6 @@ public final class Q10333_DisappearedSakum extends Quest { qs.setCond(3, true); } - sendNpcLogList(killer); } return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java index f6bf3d491f..dec0ee824a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java @@ -260,7 +260,6 @@ public final class Q10335_RequestToFindSakum extends Quest { st.setCond(3, true); } - sendNpcLogList(killer); } return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java index e63a8660db..d162394452 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java @@ -271,7 +271,6 @@ public final class Q10337_SakumsImpact extends Quest { qs.setCond(3, true); } - sendNpcLogList(killer); } return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java index 8f582b0287..edaed55083 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java @@ -181,7 +181,6 @@ public final class Q10339_FightingTheForgotten extends Quest else { st.setMemoState(monsterCount); - sendNpcLogList(player); } } return super.onKill(npc, player, isSummon); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java index f382837000..b0d144d1c7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java @@ -210,7 +210,6 @@ public final class Q10353_CertificationOfValue extends Quest public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) { final QuestState qs = getQuestState(killer, false); - if ((qs != null) && qs.isStarted() && qs.isCond(2)) { final int killCount = qs.getInt(KILL_COUNT_VAR) + 1; @@ -222,7 +221,6 @@ public final class Q10353_CertificationOfValue extends Quest } else { - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java index 4d6d40f498..7c71e43096 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java @@ -187,7 +187,6 @@ public final class Q10358_DividedSakumPoslof extends Quest { st.setCond(2, true); } - sendNpcLogList(killer); } else if (st.isCond(3)) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java index 0e73ac5307..72ae47ede4 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java @@ -119,7 +119,6 @@ public final class Q10362_CertificationOfTheSeeker extends Quest if (killedStalker <= 10) { qs.setMemoStateEx(STALKER, killedStalker); - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } @@ -129,7 +128,6 @@ public final class Q10362_CertificationOfTheSeeker extends Quest if (killedCrawler <= 5) { qs.setMemoStateEx(CRAWLER, killedCrawler); - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } @@ -206,7 +204,6 @@ public final class Q10362_CertificationOfTheSeeker extends Quest public Set getNpcLogList(L2PcInstance activeChar) { final QuestState qs = getQuestState(activeChar, false); - if ((qs != null) && qs.isCond(1)) { final Set npcLogList = new HashSet<>(2); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10368_RebellionOfMonsters/Q10368_RebellionOfMonsters.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10368_RebellionOfMonsters/Q10368_RebellionOfMonsters.java index 8bcb9ea19a..c03a91f5ef 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10368_RebellionOfMonsters/Q10368_RebellionOfMonsters.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10368_RebellionOfMonsters/Q10368_RebellionOfMonsters.java @@ -185,7 +185,6 @@ public final class Q10368_RebellionOfMonsters extends Quest { qs.setCond(2, true); } - sendNpcLogList(killer); } return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java index 4c7045a813..ca014094f2 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java @@ -145,7 +145,6 @@ public class Q10389_TheVoiceOfAuthority extends Quest else { playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); - sendNpcLogList(killer); } } return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java index cee0832d94..ed1381803c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java @@ -181,7 +181,6 @@ public final class Q10394_MutualBenefit extends Quest { st.setCond(2, true); } - sendNpcLogList(killer); } return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java index 890e1008e8..a6610acb19 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java @@ -162,10 +162,6 @@ public final class Q10395_NotATraitor extends Quest { st.setCond(2, true); } - else - { - sendNpcLogList(killer); - } } return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java index 21670e9e07..4113f178c1 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java @@ -148,7 +148,6 @@ public final class Q10402_NowhereToTurn extends Quest killCount++; st.set("KILLED_COUNT", killCount); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); - sendNpcLogList(killer); } if (killCount == 40) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java index 9f3c8eec89..31b60075a6 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java @@ -140,7 +140,6 @@ public final class Q10406_BeforeDarknessBearsFruit extends Quest killCount++; st.set("KILLED_COUNT", killCount); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); - sendNpcLogList(killer); } if (killCount == 10) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java index 1efbb49152..e4e62c4377 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java @@ -161,7 +161,6 @@ public final class Q10410_EmbryoInTheSwampOfScreams extends Quest } else { - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } @@ -179,7 +178,6 @@ public final class Q10410_EmbryoInTheSwampOfScreams extends Quest public Set getNpcLogList(L2PcInstance activeChar) { final QuestState st = getQuestState(activeChar, false); - if ((st != null) && st.isCond(1)) { final Set npcLogList = new HashSet<>(1); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java index 0bbaac0a18..cac1cb3bb8 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java @@ -190,7 +190,6 @@ public final class Q10413_EmbryoInTheForestOfTheDead extends Quest } else { - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } @@ -208,7 +207,6 @@ public final class Q10413_EmbryoInTheForestOfTheDead extends Quest public Set getNpcLogList(L2PcInstance activeChar) { final QuestState st = getQuestState(activeChar, false); - if ((st != null) && st.isCond(1)) { final Set npcLogList = new HashSet<>(1); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10440_TheSealOfPunishmentTheFields/Q10440_TheSealOfPunishmentTheFields.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10440_TheSealOfPunishmentTheFields/Q10440_TheSealOfPunishmentTheFields.java index 03952f6a9c..151e0f998a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10440_TheSealOfPunishmentTheFields/Q10440_TheSealOfPunishmentTheFields.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10440_TheSealOfPunishmentTheFields/Q10440_TheSealOfPunishmentTheFields.java @@ -231,18 +231,15 @@ public class Q10440_TheSealOfPunishmentTheFields extends Quest if ((count >= 50) && (qs.isMemoState(1))) { qs.setCond(2, true); - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } else if ((count >= 50) && (qs.isMemoState(2))) { qs.setCond(3, true); - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } else { - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java index d220f643b0..56b658f8f8 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java @@ -143,7 +143,6 @@ public final class Q10446_HitAndRun extends Quest } else { - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java index 4abe0e783c..0c33b4c672 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java @@ -171,7 +171,6 @@ public final class Q10743_StrangeFungus extends Quest qs.set(EVOLVED_SPAWN_VAR, killCount); } qs.set(KILL_COUNT_VAR, qs.getInt(KILL_COUNT_VAR) + 1); - sendNpcLogList(killer); break; } case EVOLVED_GROWLER: diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java index 05ac7923b0..02b06adca8 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java @@ -416,7 +416,6 @@ public final class Q10751_WindsOfFateEncounters extends Quest if (killCount <= 5) { qs.set(KILL_COUNT_VAR, ++killCount); - sendNpcLogList(killer); } if ((killCount >= 5) && !L2World.getInstance().getVisibleObjects(npc, L2Npc.class, 1000).stream().anyMatch(n -> ((n.getId() == TELESHA) && (n.getSummoner() == killer)))) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java index e360cb0387..308411b969 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java @@ -634,7 +634,6 @@ public final class Q10753_WindsOfFateChoices extends Quest giveItems(killer, CRYSTAL_EYE, 1); qs.set(CRYSTAL_EYE_VAR, ++EyeCount); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); - sendNpcLogList(killer); } break; } @@ -645,7 +644,6 @@ public final class Q10753_WindsOfFateChoices extends Quest giveItems(killer, BROKEN_STONE_OF_PURITY, 1); qs.set(BROKEN_STONE_OF_PURITY_VAR, ++PurityCount); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); - sendNpcLogList(killer); } break; } @@ -656,7 +654,6 @@ public final class Q10753_WindsOfFateChoices extends Quest giveItems(killer, MIRACLE_DRUG_OF_ENCHANTMENT, 1); qs.set(EMPTY_REGEANT_FLASK_VAR, ++FlaskCount); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); - sendNpcLogList(killer); } break; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java index 676269a77f..426ba81fc8 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java @@ -141,13 +141,11 @@ public final class Q10757_QuietingTheStorm extends Quest if (vortexCount < 5) { qs.set(VORTEX_COUNT_VAR, ++vortexCount); - sendNpcLogList(killer); } } else if (windimaCount != 1) { qs.set(WINDIMA_COUNT_VAR, ++windimaCount); - sendNpcLogList(killer); } if ((vortexCount >= 5) && (windimaCount >= 1)) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java index c650191204..90549b0055 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java @@ -146,10 +146,6 @@ public class Q10761_AnOrcInLove extends Quest { qs.setCond(2, true); } - else - { - sendNpcLogList(killer); - } } } return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10780_AWeakenedBarrier/Q10780_AWeakenedBarrier.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10780_AWeakenedBarrier/Q10780_AWeakenedBarrier.java index 09fe203bdb..b69f493b67 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10780_AWeakenedBarrier/Q10780_AWeakenedBarrier.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10780_AWeakenedBarrier/Q10780_AWeakenedBarrier.java @@ -157,10 +157,6 @@ public final class Q10780_AWeakenedBarrier extends Quest { qs.setCond(2, true); } - else - { - sendNpcLogList(killer); - } } } return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java index 69ee846d25..f7b182da57 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java @@ -159,7 +159,6 @@ public final class Q10786_ResidentProblemSolver extends Quest else { playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); - sendNpcLogList(killer); } } return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java index f37c466a81..b84fe17ed4 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java @@ -156,7 +156,6 @@ public final class Q10793_SaveTheSouls extends Quest } else { - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java index 33ee666a78..365870bfe4 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java @@ -203,7 +203,6 @@ public final class Q10794_InvestigateTheForest extends Quest } else { - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java index bb1611ee87..df16bff45f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java @@ -153,7 +153,6 @@ public class Q10799_StrangeThingsAfootInTheValley extends Quest } else { - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java index a19bb15bc0..fffa46ca70 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java @@ -155,7 +155,6 @@ public class Q10800_ReconnaissanceAtDragonValley extends Quest } else { - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10815_StepUp/Q10815_StepUp.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10815_StepUp/Q10815_StepUp.java index 8b9e52551a..cccfb23ad4 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10815_StepUp/Q10815_StepUp.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10815_StepUp/Q10815_StepUp.java @@ -186,7 +186,6 @@ public final class Q10815_StepUp extends Quest else { qs.set("chat", chatCount); - sendNpcLogList(player); if (Config.WORLD_CHAT_INTERVAL.getSeconds() > 0) { REUSE.put(player.getObjectId(), now.plus(Config.WORLD_CHAT_INTERVAL)); @@ -200,13 +199,10 @@ public final class Q10815_StepUp extends Quest public Set getNpcLogList(L2PcInstance activeChar) { final QuestState qs = getQuestState(activeChar, false); - if (qs != null) + if ((qs != null) && qs.isCond(1)) { final Set npcLogList = new HashSet<>(1); - if (qs.isCond(1)) - { - npcLogList.add(new NpcLogListHolder(NpcStringId.WORLD_CHAT, qs.getInt("chat"))); - } + npcLogList.add(new NpcLogListHolder(NpcStringId.WORLD_CHAT, qs.getInt("chat"))); return npcLogList; } return super.getNpcLogList(activeChar); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10838_TheReasonForNotBeingAbleToGetOut/Q10838_TheReasonForNotBeingAbleToGetOut.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10838_TheReasonForNotBeingAbleToGetOut/Q10838_TheReasonForNotBeingAbleToGetOut.java index e1afcc7cda..f0cd31095c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10838_TheReasonForNotBeingAbleToGetOut/Q10838_TheReasonForNotBeingAbleToGetOut.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10838_TheReasonForNotBeingAbleToGetOut/Q10838_TheReasonForNotBeingAbleToGetOut.java @@ -156,7 +156,6 @@ public final class Q10838_TheReasonForNotBeingAbleToGetOut extends Quest { giveItems(killer, DARK_ATELIA_NATURALIZER, 1); } - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10839_BlackbirdsNameValue/Q10839_BlackbirdsNameValue.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10839_BlackbirdsNameValue/Q10839_BlackbirdsNameValue.java index f764c9cb98..0fc9704c4b 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10839_BlackbirdsNameValue/Q10839_BlackbirdsNameValue.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10839_BlackbirdsNameValue/Q10839_BlackbirdsNameValue.java @@ -150,7 +150,6 @@ public final class Q10839_BlackbirdsNameValue extends Quest } else { - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10840_TimeToRecover/Q10840_TimeToRecover.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10840_TimeToRecover/Q10840_TimeToRecover.java index b9a6910ef2..7729843a10 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10840_TimeToRecover/Q10840_TimeToRecover.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10840_TimeToRecover/Q10840_TimeToRecover.java @@ -151,7 +151,6 @@ public final class Q10840_TimeToRecover extends Quest } else { - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/quest/Quest.java index 6affe2cb1f..34abe34bae 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/quest/Quest.java @@ -1121,6 +1121,10 @@ public class Quest extends AbstractScript implements IIdentifiable */ public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) { + if (!getNpcLogList(killer).isEmpty()) + { + sendNpcLogList(killer); + } return null; } @@ -2936,9 +2940,7 @@ public class Quest extends AbstractScript implements IIdentifiable public void sendNpcLogList(L2PcInstance activeChar) { - final QuestState qs = activeChar.getQuestState(getName()); - - if (qs != null) + if (activeChar.getQuestState(getName()) != null) { final ExQuestNpcLogList packet = new ExQuestNpcLogList(getId()); getNpcLogList(activeChar).forEach(packet::add); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java index 3e5d9ba709..fe1f0114e0 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java @@ -171,7 +171,6 @@ public final class Q00453_NotStrongEnoughAlone extends Quest checkProgress(st, 20, MONSTER3[0], MONSTER3[1], MONSTER3[2]); } } - sendNpcLogList(player); } @Override @@ -380,7 +379,6 @@ public final class Q00453_NotStrongEnoughAlone extends Quest { final QuestState qs = getQuestState(activeChar, false); final Set npcLogList = new HashSet<>(3); - if (qs != null) { switch (qs.getCond()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00462_StuffedAncientHeroes/Q00462_StuffedAncientHeroes.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00462_StuffedAncientHeroes/Q00462_StuffedAncientHeroes.java index 2bf8e04e77..d2e6a2a839 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00462_StuffedAncientHeroes/Q00462_StuffedAncientHeroes.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00462_StuffedAncientHeroes/Q00462_StuffedAncientHeroes.java @@ -176,7 +176,6 @@ public class Q00462_StuffedAncientHeroes extends Quest else { playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); - sendNpcLogList(killer); } } return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java index 7c9e1a8e4a..60d2cb100a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java @@ -215,7 +215,6 @@ public final class Q00476_PlainMission extends Quest { st.setCond(2, true); } - sendNpcLogList(killer); } return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00490_DutyOfTheSurvivor/Q00490_DutyOfTheSurvivor.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00490_DutyOfTheSurvivor/Q00490_DutyOfTheSurvivor.java index bcb77da0c6..3583e71de0 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00490_DutyOfTheSurvivor/Q00490_DutyOfTheSurvivor.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00490_DutyOfTheSurvivor/Q00490_DutyOfTheSurvivor.java @@ -175,11 +175,6 @@ public final class Q00490_DutyOfTheSurvivor extends Quest { st.setCond(2); } - else - { - sendNpcLogList(player); - } - } } return super.onKill(npc, player, isSummon); @@ -189,7 +184,7 @@ public final class Q00490_DutyOfTheSurvivor extends Quest public Set getNpcLogList(L2PcInstance player) { final QuestState qs = getQuestState(player, false); - if (qs != null) + if ((qs != null) && qs.isCond(1)) { final Set npcLogList = new HashSet<>(2); npcLogList.add(new NpcLogListHolder(EXTRACT, false, (int) getQuestItemsCount(player, EXTRACT))); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java index c250f77aaa..b05ec4d1a4 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java @@ -158,10 +158,6 @@ public final class Q00493_KickingOutUnwelcomeGuests extends Quest { st.setCond(2, true); } - else - { - sendNpcLogList(player); - } } } @@ -176,7 +172,7 @@ public final class Q00493_KickingOutUnwelcomeGuests extends Quest public Set getNpcLogList(L2PcInstance player) { final QuestState st = getQuestState(player, false); - if (st != null) + if ((st != null) && st.isCond(1)) { final Set npcLogList = new HashSet<>(5); npcLogList.add(new NpcLogListHolder(LUNATIC_CREATURE, false, st.getInt(Integer.toString(LUNATIC_CREATURE)))); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java index 3816f9e9a7..b1c2584ca2 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java @@ -172,7 +172,6 @@ public class Q00937_ToReviveTheFishingGuild extends Quest } else { - sendNpcLogList(player); playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10305_UnstoppableFutileEfforts/Q10305_UnstoppableFutileEfforts.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10305_UnstoppableFutileEfforts/Q10305_UnstoppableFutileEfforts.java index 7ded67f349..0d2b37a2fa 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10305_UnstoppableFutileEfforts/Q10305_UnstoppableFutileEfforts.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10305_UnstoppableFutileEfforts/Q10305_UnstoppableFutileEfforts.java @@ -85,7 +85,6 @@ public final class Q10305_UnstoppableFutileEfforts extends Quest if (killedCocoon < 5) { qs.setMemoStateEx(LARGE_COCOON, killedCocoon); - sendNpcLogList(player); playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); } else @@ -152,7 +151,6 @@ public final class Q10305_UnstoppableFutileEfforts extends Quest public Set getNpcLogList(L2PcInstance activeChar) { final QuestState qs = getQuestState(activeChar, false); - if ((qs != null) && qs.isCond(1)) { final Set npcLogList = new HashSet<>(1); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java index c63915df10..0c1443baef 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java @@ -242,7 +242,6 @@ public final class Q10333_DisappearedSakum extends Quest { qs.setCond(3, true); } - sendNpcLogList(killer); } return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java index f6bf3d491f..dec0ee824a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java @@ -260,7 +260,6 @@ public final class Q10335_RequestToFindSakum extends Quest { st.setCond(3, true); } - sendNpcLogList(killer); } return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java index e63a8660db..d162394452 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java @@ -271,7 +271,6 @@ public final class Q10337_SakumsImpact extends Quest { qs.setCond(3, true); } - sendNpcLogList(killer); } return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java index 8f582b0287..edaed55083 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java @@ -181,7 +181,6 @@ public final class Q10339_FightingTheForgotten extends Quest else { st.setMemoState(monsterCount); - sendNpcLogList(player); } } return super.onKill(npc, player, isSummon); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java index f382837000..b0d144d1c7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java @@ -210,7 +210,6 @@ public final class Q10353_CertificationOfValue extends Quest public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) { final QuestState qs = getQuestState(killer, false); - if ((qs != null) && qs.isStarted() && qs.isCond(2)) { final int killCount = qs.getInt(KILL_COUNT_VAR) + 1; @@ -222,7 +221,6 @@ public final class Q10353_CertificationOfValue extends Quest } else { - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java index 4d6d40f498..7c71e43096 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java @@ -187,7 +187,6 @@ public final class Q10358_DividedSakumPoslof extends Quest { st.setCond(2, true); } - sendNpcLogList(killer); } else if (st.isCond(3)) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java index fc29cb2164..afb67747aa 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java @@ -122,7 +122,6 @@ public final class Q10362_CertificationOfTheSeeker extends Quest if (killedStalker <= 10) { qs.setMemoStateEx(STALKER, killedStalker); - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } @@ -132,7 +131,6 @@ public final class Q10362_CertificationOfTheSeeker extends Quest if (killedCrawler <= 10) { qs.setMemoStateEx(CRAWLER, killedCrawler); - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } @@ -210,7 +208,6 @@ public final class Q10362_CertificationOfTheSeeker extends Quest public Set getNpcLogList(L2PcInstance activeChar) { final QuestState qs = getQuestState(activeChar, false); - if ((qs != null) && qs.isCond(2)) { final Set npcLogList = new HashSet<>(2); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10366_ReportOnTheSituationAtTheRuins/Q10366_ReportOnTheSituationAtTheRuins.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10366_ReportOnTheSituationAtTheRuins/Q10366_ReportOnTheSituationAtTheRuins.java index 5f34b87eff..ec0de5fe4b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10366_ReportOnTheSituationAtTheRuins/Q10366_ReportOnTheSituationAtTheRuins.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10366_ReportOnTheSituationAtTheRuins/Q10366_ReportOnTheSituationAtTheRuins.java @@ -149,7 +149,6 @@ public final class Q10366_ReportOnTheSituationAtTheRuins extends Quest else { playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); - sendNpcLogList(killer); } } return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java index 4c7045a813..ca014094f2 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java @@ -145,7 +145,6 @@ public class Q10389_TheVoiceOfAuthority extends Quest else { playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); - sendNpcLogList(killer); } } return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java index cee0832d94..ed1381803c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java @@ -181,7 +181,6 @@ public final class Q10394_MutualBenefit extends Quest { st.setCond(2, true); } - sendNpcLogList(killer); } return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java index 890e1008e8..a6610acb19 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java @@ -162,10 +162,6 @@ public final class Q10395_NotATraitor extends Quest { st.setCond(2, true); } - else - { - sendNpcLogList(killer); - } } return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java index 21670e9e07..4113f178c1 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java @@ -148,7 +148,6 @@ public final class Q10402_NowhereToTurn extends Quest killCount++; st.set("KILLED_COUNT", killCount); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); - sendNpcLogList(killer); } if (killCount == 40) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java index 9f3c8eec89..31b60075a6 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java @@ -140,7 +140,6 @@ public final class Q10406_BeforeDarknessBearsFruit extends Quest killCount++; st.set("KILLED_COUNT", killCount); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); - sendNpcLogList(killer); } if (killCount == 10) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10407_LetsGoFishing/Q10407_LetsGoFishing.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10407_LetsGoFishing/Q10407_LetsGoFishing.java index c5e6980732..e6c51fc243 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10407_LetsGoFishing/Q10407_LetsGoFishing.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10407_LetsGoFishing/Q10407_LetsGoFishing.java @@ -213,7 +213,6 @@ public class Q10407_LetsGoFishing extends Quest } else { - sendNpcLogList(player); playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java index 7a5f138937..d9ed0f1a03 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java @@ -161,7 +161,6 @@ public final class Q10410_EmbryoInTheSwampOfScreams extends Quest } else { - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } @@ -179,7 +178,6 @@ public final class Q10410_EmbryoInTheSwampOfScreams extends Quest public Set getNpcLogList(L2PcInstance activeChar) { final QuestState st = getQuestState(activeChar, false); - if ((st != null) && st.isCond(1)) { final Set npcLogList = new HashSet<>(1); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java index 0bbaac0a18..cac1cb3bb8 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java @@ -190,7 +190,6 @@ public final class Q10413_EmbryoInTheForestOfTheDead extends Quest } else { - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } @@ -208,7 +207,6 @@ public final class Q10413_EmbryoInTheForestOfTheDead extends Quest public Set getNpcLogList(L2PcInstance activeChar) { final QuestState st = getQuestState(activeChar, false); - if ((st != null) && st.isCond(1)) { final Set npcLogList = new HashSet<>(1); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java index 38af93a0b6..b14f8f34b3 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java @@ -20,8 +20,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import quests.Q10416_InSearchOfTheEyeOfArgos.Q10416_InSearchOfTheEyeOfArgos; - import com.l2jmobius.commons.util.CommonUtil; import com.l2jmobius.gameserver.enums.QuestSound; import com.l2jmobius.gameserver.enums.Race; @@ -34,6 +32,8 @@ import com.l2jmobius.gameserver.model.quest.QuestState; import com.l2jmobius.gameserver.model.quest.State; import com.l2jmobius.gameserver.network.NpcStringId; +import quests.Q10416_InSearchOfTheEyeOfArgos.Q10416_InSearchOfTheEyeOfArgos; + /** * Daimon the White-eyed (10417) * @author St3eT, Iris @@ -226,7 +226,6 @@ public final class Q10417_DaimonTheWhiteEyed extends Quest qs.set("KillCount_MOBS", mobCount); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } - sendNpcLogList(killer); } if (mobCount == 100) @@ -242,7 +241,6 @@ public final class Q10417_DaimonTheWhiteEyed extends Quest playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); qs.setCond(3, true); } - sendNpcLogList(killer); } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java index d220f643b0..56b658f8f8 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java @@ -143,7 +143,6 @@ public final class Q10446_HitAndRun extends Quest } else { - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10522_TheDarkSecretOfVarkaSilenos/Q10522_TheDarkSecretOfVarkaSilenos.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10522_TheDarkSecretOfVarkaSilenos/Q10522_TheDarkSecretOfVarkaSilenos.java index b50103f27d..44affe23c2 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10522_TheDarkSecretOfVarkaSilenos/Q10522_TheDarkSecretOfVarkaSilenos.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10522_TheDarkSecretOfVarkaSilenos/Q10522_TheDarkSecretOfVarkaSilenos.java @@ -207,7 +207,6 @@ public class Q10522_TheDarkSecretOfVarkaSilenos extends Quest { qs.setCond(2, true); } - sendNpcLogList(killer); } return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10526_TheDarkSecretOfTheKetraOrcs/Q10526_TheDarkSecretOfTheKetraOrcs.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10526_TheDarkSecretOfTheKetraOrcs/Q10526_TheDarkSecretOfTheKetraOrcs.java index 73eaa61249..d6e5fe027d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10526_TheDarkSecretOfTheKetraOrcs/Q10526_TheDarkSecretOfTheKetraOrcs.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10526_TheDarkSecretOfTheKetraOrcs/Q10526_TheDarkSecretOfTheKetraOrcs.java @@ -217,7 +217,6 @@ public class Q10526_TheDarkSecretOfTheKetraOrcs extends Quest { qs.setCond(2, true); } - sendNpcLogList(killer); } return super.onKill(npc, killer, isSummon); } @@ -226,7 +225,7 @@ public class Q10526_TheDarkSecretOfTheKetraOrcs extends Quest public Set getNpcLogList(L2PcInstance player) { final QuestState qs = getQuestState(player, false); - if (qs.isCond(1)) + if ((qs != null) && qs.isCond(1)) { final Set holder = new HashSet<>(2); holder.add(new NpcLogListHolder(KETRA_BACKUP_SHOOTER, false, qs.getInt("killed_" + KETRA_BACKUP_SHOOTER))); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10541_TrainLikeTheRealThing/Q10541_TrainLikeTheRealThing.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10541_TrainLikeTheRealThing/Q10541_TrainLikeTheRealThing.java index d6047a8700..f23e7e37fa 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10541_TrainLikeTheRealThing/Q10541_TrainLikeTheRealThing.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10541_TrainLikeTheRealThing/Q10541_TrainLikeTheRealThing.java @@ -209,36 +209,38 @@ public final class Q10541_TrainLikeTheRealThing extends Quest public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) { final QuestState qs = getQuestState(killer, false); - if ((qs != null) && qs.isCond(1)) + if (qs != null) { - int killCount = qs.getInt(KILL_COUNT_VAR); - qs.set(KILL_COUNT_VAR, ++killCount); - if (killCount >= 4) + if (qs.isCond(1)) { - qs.setCond(2, true); + int killCount = qs.getInt(KILL_COUNT_VAR); + qs.set(KILL_COUNT_VAR, ++killCount); + if (killCount >= 4) + { + qs.setCond(2, true); + } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } - else + else if (qs.isCond(4)) { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); - sendNpcLogList(killer); - } - } - else if ((qs != null) && qs.isCond(4)) - { - int kills = qs.getInt(Integer.toString(SCARECROW)); - if (kills < 4) - { - kills++; - qs.set(Integer.toString(SCARECROW), kills); - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); - } - final ExQuestNpcLogList log = new ExQuestNpcLogList(getId()); - log.addNpc(SCARECROW, qs.getInt(Integer.toString(SCARECROW))); - qs.getPlayer().sendPacket(log); - - if (qs.getInt(Integer.toString(SCARECROW)) >= 4) - { - qs.setCond(5, true); + int kills = qs.getInt(Integer.toString(SCARECROW)); + if (kills < 4) + { + kills++; + qs.set(Integer.toString(SCARECROW), kills); + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } + final ExQuestNpcLogList log = new ExQuestNpcLogList(getId()); + log.addNpc(SCARECROW, qs.getInt(Integer.toString(SCARECROW))); + qs.getPlayer().sendPacket(log); + + if (qs.getInt(Integer.toString(SCARECROW)) >= 4) + { + qs.setCond(5, true); + } } } return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java index 4abe0e783c..0c33b4c672 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java @@ -171,7 +171,6 @@ public final class Q10743_StrangeFungus extends Quest qs.set(EVOLVED_SPAWN_VAR, killCount); } qs.set(KILL_COUNT_VAR, qs.getInt(KILL_COUNT_VAR) + 1); - sendNpcLogList(killer); break; } case EVOLVED_GROWLER: diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java index 7adc7c0291..46c7cb671d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java @@ -432,7 +432,6 @@ public final class Q10751_WindsOfFateEncounters extends Quest { qs.set(KILL_COUNT_VAR, ++killCount); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); - sendNpcLogList(killer); } if ((killCount >= 5) && !L2World.getInstance().getVisibleObjects(npc, L2Npc.class, 1000).stream().anyMatch(n -> ((n.getId() == TELESHA) && (n.getSummoner() == killer)))) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java index f8299789ab..65bc3ba919 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java @@ -634,7 +634,6 @@ public final class Q10753_WindsOfFateChoices extends Quest giveItems(killer, CRYSTAL_EYE, 1); qs.set(CRYSTAL_EYE_VAR, ++EyeCount); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); - sendNpcLogList(killer); } break; } @@ -645,7 +644,6 @@ public final class Q10753_WindsOfFateChoices extends Quest giveItems(killer, BROKEN_STONE_OF_PURITY, 1); qs.set(BROKEN_STONE_OF_PURITY_VAR, ++PurityCount); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); - sendNpcLogList(killer); } break; } @@ -656,7 +654,6 @@ public final class Q10753_WindsOfFateChoices extends Quest giveItems(killer, MIRACLE_DRUG_OF_ENCHANTMENT, 1); qs.set(EMPTY_REGEANT_FLASK_VAR, ++FlaskCount); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); - sendNpcLogList(killer); } break; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java index 676269a77f..426ba81fc8 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java @@ -141,13 +141,11 @@ public final class Q10757_QuietingTheStorm extends Quest if (vortexCount < 5) { qs.set(VORTEX_COUNT_VAR, ++vortexCount); - sendNpcLogList(killer); } } else if (windimaCount != 1) { qs.set(WINDIMA_COUNT_VAR, ++windimaCount); - sendNpcLogList(killer); } if ((vortexCount >= 5) && (windimaCount >= 1)) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java index c650191204..90549b0055 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java @@ -146,10 +146,6 @@ public class Q10761_AnOrcInLove extends Quest { qs.setCond(2, true); } - else - { - sendNpcLogList(killer); - } } } return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10780_AWeakenedBarrier/Q10780_AWeakenedBarrier.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10780_AWeakenedBarrier/Q10780_AWeakenedBarrier.java index 6f584abff5..089a5678ae 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10780_AWeakenedBarrier/Q10780_AWeakenedBarrier.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10780_AWeakenedBarrier/Q10780_AWeakenedBarrier.java @@ -157,10 +157,6 @@ public final class Q10780_AWeakenedBarrier extends Quest { qs.setCond(2, true); } - else - { - sendNpcLogList(killer); - } } } return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java index 69ee846d25..f7b182da57 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java @@ -159,7 +159,6 @@ public final class Q10786_ResidentProblemSolver extends Quest else { playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); - sendNpcLogList(killer); } } return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java index 99af2ad387..ace0b87d98 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java @@ -152,7 +152,6 @@ public class Q10790_AMercenaryHelper extends Quest } else { - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java index f37c466a81..b84fe17ed4 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java @@ -156,7 +156,6 @@ public final class Q10793_SaveTheSouls extends Quest } else { - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java index 33ee666a78..365870bfe4 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java @@ -203,7 +203,6 @@ public final class Q10794_InvestigateTheForest extends Quest } else { - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java index 2f51b177fc..8d56e31745 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java @@ -166,7 +166,6 @@ public class Q10796_TheEyeThatDefiedTheGods extends Quest } else { - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java index e042951372..a690ab1966 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java @@ -152,7 +152,6 @@ public class Q10799_StrangeThingsAfootInTheValley extends Quest } else { - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java index d7cae57b69..3e8a9ab2ec 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java @@ -154,7 +154,6 @@ public class Q10800_ReconnaissanceAtDragonValley extends Quest } else { - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10815_StepUp/Q10815_StepUp.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10815_StepUp/Q10815_StepUp.java index 8b9e52551a..cccfb23ad4 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10815_StepUp/Q10815_StepUp.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10815_StepUp/Q10815_StepUp.java @@ -186,7 +186,6 @@ public final class Q10815_StepUp extends Quest else { qs.set("chat", chatCount); - sendNpcLogList(player); if (Config.WORLD_CHAT_INTERVAL.getSeconds() > 0) { REUSE.put(player.getObjectId(), now.plus(Config.WORLD_CHAT_INTERVAL)); @@ -200,13 +199,10 @@ public final class Q10815_StepUp extends Quest public Set getNpcLogList(L2PcInstance activeChar) { final QuestState qs = getQuestState(activeChar, false); - if (qs != null) + if ((qs != null) && qs.isCond(1)) { final Set npcLogList = new HashSet<>(1); - if (qs.isCond(1)) - { - npcLogList.add(new NpcLogListHolder(NpcStringId.WORLD_CHAT, qs.getInt("chat"))); - } + npcLogList.add(new NpcLogListHolder(NpcStringId.WORLD_CHAT, qs.getInt("chat"))); return npcLogList; } return super.getNpcLogList(activeChar); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10838_TheReasonForNotBeingAbleToGetOut/Q10838_TheReasonForNotBeingAbleToGetOut.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10838_TheReasonForNotBeingAbleToGetOut/Q10838_TheReasonForNotBeingAbleToGetOut.java index e1afcc7cda..f0cd31095c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10838_TheReasonForNotBeingAbleToGetOut/Q10838_TheReasonForNotBeingAbleToGetOut.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10838_TheReasonForNotBeingAbleToGetOut/Q10838_TheReasonForNotBeingAbleToGetOut.java @@ -156,7 +156,6 @@ public final class Q10838_TheReasonForNotBeingAbleToGetOut extends Quest { giveItems(killer, DARK_ATELIA_NATURALIZER, 1); } - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10839_BlackbirdsNameValue/Q10839_BlackbirdsNameValue.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10839_BlackbirdsNameValue/Q10839_BlackbirdsNameValue.java index f764c9cb98..0fc9704c4b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10839_BlackbirdsNameValue/Q10839_BlackbirdsNameValue.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10839_BlackbirdsNameValue/Q10839_BlackbirdsNameValue.java @@ -150,7 +150,6 @@ public final class Q10839_BlackbirdsNameValue extends Quest } else { - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10840_TimeToRecover/Q10840_TimeToRecover.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10840_TimeToRecover/Q10840_TimeToRecover.java index b9a6910ef2..7729843a10 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10840_TimeToRecover/Q10840_TimeToRecover.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10840_TimeToRecover/Q10840_TimeToRecover.java @@ -151,7 +151,6 @@ public final class Q10840_TimeToRecover extends Quest } else { - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/quest/Quest.java index 2427efb683..633c5534f1 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/quest/Quest.java @@ -1122,6 +1122,10 @@ public class Quest extends AbstractScript implements IIdentifiable */ public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) { + if (!getNpcLogList(killer).isEmpty()) + { + sendNpcLogList(killer); + } return null; } @@ -2937,9 +2941,7 @@ public class Quest extends AbstractScript implements IIdentifiable public void sendNpcLogList(L2PcInstance activeChar) { - final QuestState qs = activeChar.getQuestState(getName()); - - if (qs != null) + if (activeChar.getQuestState(getName()) != null) { final ExQuestNpcLogList packet = new ExQuestNpcLogList(getId()); getNpcLogList(activeChar).forEach(packet::add); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java index 3e5d9ba709..fe1f0114e0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java @@ -171,7 +171,6 @@ public final class Q00453_NotStrongEnoughAlone extends Quest checkProgress(st, 20, MONSTER3[0], MONSTER3[1], MONSTER3[2]); } } - sendNpcLogList(player); } @Override @@ -380,7 +379,6 @@ public final class Q00453_NotStrongEnoughAlone extends Quest { final QuestState qs = getQuestState(activeChar, false); final Set npcLogList = new HashSet<>(3); - if (qs != null) { switch (qs.getCond()) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00462_StuffedAncientHeroes/Q00462_StuffedAncientHeroes.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00462_StuffedAncientHeroes/Q00462_StuffedAncientHeroes.java index 2bf8e04e77..d2e6a2a839 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00462_StuffedAncientHeroes/Q00462_StuffedAncientHeroes.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00462_StuffedAncientHeroes/Q00462_StuffedAncientHeroes.java @@ -176,7 +176,6 @@ public class Q00462_StuffedAncientHeroes extends Quest else { playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); - sendNpcLogList(killer); } } return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java index 7c9e1a8e4a..60d2cb100a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java @@ -215,7 +215,6 @@ public final class Q00476_PlainMission extends Quest { st.setCond(2, true); } - sendNpcLogList(killer); } return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00490_DutyOfTheSurvivor/Q00490_DutyOfTheSurvivor.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00490_DutyOfTheSurvivor/Q00490_DutyOfTheSurvivor.java index bcb77da0c6..3583e71de0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00490_DutyOfTheSurvivor/Q00490_DutyOfTheSurvivor.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00490_DutyOfTheSurvivor/Q00490_DutyOfTheSurvivor.java @@ -175,11 +175,6 @@ public final class Q00490_DutyOfTheSurvivor extends Quest { st.setCond(2); } - else - { - sendNpcLogList(player); - } - } } return super.onKill(npc, player, isSummon); @@ -189,7 +184,7 @@ public final class Q00490_DutyOfTheSurvivor extends Quest public Set getNpcLogList(L2PcInstance player) { final QuestState qs = getQuestState(player, false); - if (qs != null) + if ((qs != null) && qs.isCond(1)) { final Set npcLogList = new HashSet<>(2); npcLogList.add(new NpcLogListHolder(EXTRACT, false, (int) getQuestItemsCount(player, EXTRACT))); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java index 95fca2f6c4..d8580ecf76 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java @@ -158,10 +158,6 @@ public final class Q00493_KickingOutUnwelcomeGuests extends Quest { st.setCond(2, true); } - else - { - sendNpcLogList(player); - } } } @@ -176,7 +172,7 @@ public final class Q00493_KickingOutUnwelcomeGuests extends Quest public Set getNpcLogList(L2PcInstance player) { final QuestState st = getQuestState(player, false); - if (st != null) + if ((st != null) && st.isCond(1)) { final Set npcLogList = new HashSet<>(5); npcLogList.add(new NpcLogListHolder(LUNATIC_CREATURE, false, st.getInt(Integer.toString(LUNATIC_CREATURE)))); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java index 3816f9e9a7..b1c2584ca2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00937_ToReviveTheFishingGuild/Q00937_ToReviveTheFishingGuild.java @@ -172,7 +172,6 @@ public class Q00937_ToReviveTheFishingGuild extends Quest } else { - sendNpcLogList(player); playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10305_UnstoppableFutileEfforts/Q10305_UnstoppableFutileEfforts.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10305_UnstoppableFutileEfforts/Q10305_UnstoppableFutileEfforts.java index 7ded67f349..0d2b37a2fa 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10305_UnstoppableFutileEfforts/Q10305_UnstoppableFutileEfforts.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10305_UnstoppableFutileEfforts/Q10305_UnstoppableFutileEfforts.java @@ -85,7 +85,6 @@ public final class Q10305_UnstoppableFutileEfforts extends Quest if (killedCocoon < 5) { qs.setMemoStateEx(LARGE_COCOON, killedCocoon); - sendNpcLogList(player); playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); } else @@ -152,7 +151,6 @@ public final class Q10305_UnstoppableFutileEfforts extends Quest public Set getNpcLogList(L2PcInstance activeChar) { final QuestState qs = getQuestState(activeChar, false); - if ((qs != null) && qs.isCond(1)) { final Set npcLogList = new HashSet<>(1); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java index c63915df10..0c1443baef 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java @@ -242,7 +242,6 @@ public final class Q10333_DisappearedSakum extends Quest { qs.setCond(3, true); } - sendNpcLogList(killer); } return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java index f6bf3d491f..dec0ee824a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10335_RequestToFindSakum/Q10335_RequestToFindSakum.java @@ -260,7 +260,6 @@ public final class Q10335_RequestToFindSakum extends Quest { st.setCond(3, true); } - sendNpcLogList(killer); } return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java index e63a8660db..d162394452 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java @@ -271,7 +271,6 @@ public final class Q10337_SakumsImpact extends Quest { qs.setCond(3, true); } - sendNpcLogList(killer); } return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java index 8f582b0287..edaed55083 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java @@ -181,7 +181,6 @@ public final class Q10339_FightingTheForgotten extends Quest else { st.setMemoState(monsterCount); - sendNpcLogList(player); } } return super.onKill(npc, player, isSummon); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java index f382837000..b0d144d1c7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java @@ -210,7 +210,6 @@ public final class Q10353_CertificationOfValue extends Quest public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) { final QuestState qs = getQuestState(killer, false); - if ((qs != null) && qs.isStarted() && qs.isCond(2)) { final int killCount = qs.getInt(KILL_COUNT_VAR) + 1; @@ -222,7 +221,6 @@ public final class Q10353_CertificationOfValue extends Quest } else { - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java index 4d6d40f498..7c71e43096 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java @@ -187,7 +187,6 @@ public final class Q10358_DividedSakumPoslof extends Quest { st.setCond(2, true); } - sendNpcLogList(killer); } else if (st.isCond(3)) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java index fc29cb2164..afb67747aa 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java @@ -122,7 +122,6 @@ public final class Q10362_CertificationOfTheSeeker extends Quest if (killedStalker <= 10) { qs.setMemoStateEx(STALKER, killedStalker); - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } @@ -132,7 +131,6 @@ public final class Q10362_CertificationOfTheSeeker extends Quest if (killedCrawler <= 10) { qs.setMemoStateEx(CRAWLER, killedCrawler); - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } @@ -210,7 +208,6 @@ public final class Q10362_CertificationOfTheSeeker extends Quest public Set getNpcLogList(L2PcInstance activeChar) { final QuestState qs = getQuestState(activeChar, false); - if ((qs != null) && qs.isCond(2)) { final Set npcLogList = new HashSet<>(2); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10366_ReportOnTheSituationAtTheRuins/Q10366_ReportOnTheSituationAtTheRuins.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10366_ReportOnTheSituationAtTheRuins/Q10366_ReportOnTheSituationAtTheRuins.java index de0840fd3e..4500933779 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10366_ReportOnTheSituationAtTheRuins/Q10366_ReportOnTheSituationAtTheRuins.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10366_ReportOnTheSituationAtTheRuins/Q10366_ReportOnTheSituationAtTheRuins.java @@ -148,7 +148,6 @@ public final class Q10366_ReportOnTheSituationAtTheRuins extends Quest else { playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); - sendNpcLogList(killer); } } return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java index 4c7045a813..ca014094f2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java @@ -145,7 +145,6 @@ public class Q10389_TheVoiceOfAuthority extends Quest else { playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); - sendNpcLogList(killer); } } return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java index 7f9be44ca4..57286aa68b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10394_MutualBenefit/Q10394_MutualBenefit.java @@ -181,7 +181,6 @@ public final class Q10394_MutualBenefit extends Quest { st.setCond(2, true); } - sendNpcLogList(killer); } return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java index f04db07b91..68b36644df 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10395_NotATraitor/Q10395_NotATraitor.java @@ -162,10 +162,6 @@ public final class Q10395_NotATraitor extends Quest { st.setCond(2, true); } - else - { - sendNpcLogList(killer); - } } return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java index d4e26690e8..7c456f4910 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10402_NowhereToTurn/Q10402_NowhereToTurn.java @@ -148,7 +148,6 @@ public final class Q10402_NowhereToTurn extends Quest killCount++; st.set("KILLED_COUNT", killCount); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); - sendNpcLogList(killer); } if (killCount == 40) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java index 2db37da4d3..e21320e12d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10406_BeforeDarknessBearsFruit/Q10406_BeforeDarknessBearsFruit.java @@ -140,7 +140,6 @@ public final class Q10406_BeforeDarknessBearsFruit extends Quest killCount++; st.set("KILLED_COUNT", killCount); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); - sendNpcLogList(killer); } if (killCount == 10) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10407_LetsGoFishing/Q10407_LetsGoFishing.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10407_LetsGoFishing/Q10407_LetsGoFishing.java index c5e6980732..e6c51fc243 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10407_LetsGoFishing/Q10407_LetsGoFishing.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10407_LetsGoFishing/Q10407_LetsGoFishing.java @@ -213,7 +213,6 @@ public class Q10407_LetsGoFishing extends Quest } else { - sendNpcLogList(player); playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java index 5c14116f99..4ab3f0241e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10410_EmbryoInTheSwampOfScreams/Q10410_EmbryoInTheSwampOfScreams.java @@ -161,7 +161,6 @@ public final class Q10410_EmbryoInTheSwampOfScreams extends Quest } else { - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } @@ -179,7 +178,6 @@ public final class Q10410_EmbryoInTheSwampOfScreams extends Quest public Set getNpcLogList(L2PcInstance activeChar) { final QuestState st = getQuestState(activeChar, false); - if ((st != null) && st.isCond(1)) { final Set npcLogList = new HashSet<>(1); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java index 7d4564a2fd..4e4d33c27c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10413_EmbryoInTheForestOfTheDead/Q10413_EmbryoInTheForestOfTheDead.java @@ -190,7 +190,6 @@ public final class Q10413_EmbryoInTheForestOfTheDead extends Quest } else { - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } @@ -208,7 +207,6 @@ public final class Q10413_EmbryoInTheForestOfTheDead extends Quest public Set getNpcLogList(L2PcInstance activeChar) { final QuestState st = getQuestState(activeChar, false); - if ((st != null) && st.isCond(1)) { final Set npcLogList = new HashSet<>(1); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java index 95a9df2d20..1ddda33bb6 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java @@ -166,7 +166,6 @@ public final class Q10416_InSearchOfTheEyeOfArgos extends Quest } else { - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java index d220f643b0..56b658f8f8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java @@ -143,7 +143,6 @@ public final class Q10446_HitAndRun extends Quest } else { - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10522_TheDarkSecretOfVarkaSilenos/Q10522_TheDarkSecretOfVarkaSilenos.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10522_TheDarkSecretOfVarkaSilenos/Q10522_TheDarkSecretOfVarkaSilenos.java index b50103f27d..44affe23c2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10522_TheDarkSecretOfVarkaSilenos/Q10522_TheDarkSecretOfVarkaSilenos.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10522_TheDarkSecretOfVarkaSilenos/Q10522_TheDarkSecretOfVarkaSilenos.java @@ -207,7 +207,6 @@ public class Q10522_TheDarkSecretOfVarkaSilenos extends Quest { qs.setCond(2, true); } - sendNpcLogList(killer); } return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10526_TheDarkSecretOfTheKetraOrcs/Q10526_TheDarkSecretOfTheKetraOrcs.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10526_TheDarkSecretOfTheKetraOrcs/Q10526_TheDarkSecretOfTheKetraOrcs.java index 73eaa61249..d6e5fe027d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10526_TheDarkSecretOfTheKetraOrcs/Q10526_TheDarkSecretOfTheKetraOrcs.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10526_TheDarkSecretOfTheKetraOrcs/Q10526_TheDarkSecretOfTheKetraOrcs.java @@ -217,7 +217,6 @@ public class Q10526_TheDarkSecretOfTheKetraOrcs extends Quest { qs.setCond(2, true); } - sendNpcLogList(killer); } return super.onKill(npc, killer, isSummon); } @@ -226,7 +225,7 @@ public class Q10526_TheDarkSecretOfTheKetraOrcs extends Quest public Set getNpcLogList(L2PcInstance player) { final QuestState qs = getQuestState(player, false); - if (qs.isCond(1)) + if ((qs != null) && qs.isCond(1)) { final Set holder = new HashSet<>(2); holder.add(new NpcLogListHolder(KETRA_BACKUP_SHOOTER, false, qs.getInt("killed_" + KETRA_BACKUP_SHOOTER))); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10541_TrainLikeTheRealThing/Q10541_TrainLikeTheRealThing.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10541_TrainLikeTheRealThing/Q10541_TrainLikeTheRealThing.java index b455913dca..5bdaed7123 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10541_TrainLikeTheRealThing/Q10541_TrainLikeTheRealThing.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10541_TrainLikeTheRealThing/Q10541_TrainLikeTheRealThing.java @@ -209,36 +209,38 @@ public final class Q10541_TrainLikeTheRealThing extends Quest public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) { final QuestState qs = getQuestState(killer, false); - if ((qs != null) && qs.isCond(1)) + if (qs != null) { - int killCount = qs.getInt(KILL_COUNT_VAR); - qs.set(KILL_COUNT_VAR, ++killCount); - if (killCount >= 4) + if (qs.isCond(1)) { - qs.setCond(2, true); + int killCount = qs.getInt(KILL_COUNT_VAR); + qs.set(KILL_COUNT_VAR, ++killCount); + if (killCount >= 4) + { + qs.setCond(2, true); + } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } - else + else if (qs.isCond(4)) { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); - sendNpcLogList(killer); - } - } - else if ((qs != null) && qs.isCond(4)) - { - int kills = qs.getInt(Integer.toString(DUMMY)); - if (kills < 4) - { - kills++; - qs.set(Integer.toString(DUMMY), kills); - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); - } - final ExQuestNpcLogList log = new ExQuestNpcLogList(getId()); - log.addNpc(DUMMY, qs.getInt(Integer.toString(DUMMY))); - qs.getPlayer().sendPacket(log); - - if (qs.getInt(Integer.toString(DUMMY)) >= 4) - { - qs.setCond(5, true); + int kills = qs.getInt(Integer.toString(DUMMY)); + if (kills < 4) + { + kills++; + qs.set(Integer.toString(DUMMY), kills); + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } + final ExQuestNpcLogList log = new ExQuestNpcLogList(getId()); + log.addNpc(DUMMY, qs.getInt(Integer.toString(DUMMY))); + qs.getPlayer().sendPacket(log); + + if (qs.getInt(Integer.toString(DUMMY)) >= 4) + { + qs.setCond(5, true); + } } } return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java index 4abe0e783c..0c33b4c672 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10743_StrangeFungus/Q10743_StrangeFungus.java @@ -171,7 +171,6 @@ public final class Q10743_StrangeFungus extends Quest qs.set(EVOLVED_SPAWN_VAR, killCount); } qs.set(KILL_COUNT_VAR, qs.getInt(KILL_COUNT_VAR) + 1); - sendNpcLogList(killer); break; } case EVOLVED_GROWLER: diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java index 7adc7c0291..46c7cb671d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10751_WindsOfFateEncounters/Q10751_WindsOfFateEncounters.java @@ -432,7 +432,6 @@ public final class Q10751_WindsOfFateEncounters extends Quest { qs.set(KILL_COUNT_VAR, ++killCount); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); - sendNpcLogList(killer); } if ((killCount >= 5) && !L2World.getInstance().getVisibleObjects(npc, L2Npc.class, 1000).stream().anyMatch(n -> ((n.getId() == TELESHA) && (n.getSummoner() == killer)))) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java index f2d06b6102..2dad1e5a50 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java @@ -634,7 +634,6 @@ public final class Q10753_WindsOfFateChoices extends Quest giveItems(killer, CRYSTAL_EYE, 1); qs.set(CRYSTAL_EYE_VAR, ++EyeCount); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); - sendNpcLogList(killer); } break; } @@ -645,7 +644,6 @@ public final class Q10753_WindsOfFateChoices extends Quest giveItems(killer, BROKEN_STONE_OF_PURITY, 1); qs.set(BROKEN_STONE_OF_PURITY_VAR, ++PurityCount); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); - sendNpcLogList(killer); } break; } @@ -656,7 +654,6 @@ public final class Q10753_WindsOfFateChoices extends Quest giveItems(killer, MIRACLE_DRUG_OF_ENCHANTMENT, 1); qs.set(EMPTY_REGEANT_FLASK_VAR, ++FlaskCount); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); - sendNpcLogList(killer); } break; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java index 0ef27c749a..67e4602ebe 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java @@ -141,13 +141,11 @@ public final class Q10757_QuietingTheStorm extends Quest if (vortexCount < 5) { qs.set(VORTEX_COUNT_VAR, ++vortexCount); - sendNpcLogList(killer); } } else if (windimaCount != 1) { qs.set(WINDIMA_COUNT_VAR, ++windimaCount); - sendNpcLogList(killer); } if ((vortexCount >= 5) && (windimaCount >= 1)) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java index 99edda0279..8373ae1a8a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10761_AnOrcInLove/Q10761_AnOrcInLove.java @@ -146,10 +146,6 @@ public class Q10761_AnOrcInLove extends Quest { qs.setCond(2, true); } - else - { - sendNpcLogList(killer); - } } } return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10780_AWeakenedBarrier/Q10780_AWeakenedBarrier.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10780_AWeakenedBarrier/Q10780_AWeakenedBarrier.java index 8161211e43..457f06c852 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10780_AWeakenedBarrier/Q10780_AWeakenedBarrier.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10780_AWeakenedBarrier/Q10780_AWeakenedBarrier.java @@ -157,10 +157,6 @@ public final class Q10780_AWeakenedBarrier extends Quest { qs.setCond(2, true); } - else - { - sendNpcLogList(killer); - } } } return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java index e816e8cb38..e189617ab8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10786_ResidentProblemSolver/Q10786_ResidentProblemSolver.java @@ -159,7 +159,6 @@ public final class Q10786_ResidentProblemSolver extends Quest else { playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); - sendNpcLogList(killer); } } return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java index 78c92c0b09..74813b3df8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10790_AMercenaryHelper/Q10790_AMercenaryHelper.java @@ -152,7 +152,6 @@ public class Q10790_AMercenaryHelper extends Quest } else { - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java index b97fd4db7d..b7753d4e9f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10793_SaveTheSouls/Q10793_SaveTheSouls.java @@ -156,7 +156,6 @@ public final class Q10793_SaveTheSouls extends Quest } else { - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java index 5bfe1c80ff..7a7a4b7e33 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java @@ -203,7 +203,6 @@ public final class Q10794_InvestigateTheForest extends Quest } else { - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java index 14ff87da69..447b5ba2c6 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10796_TheEyeThatDefiedTheGods/Q10796_TheEyeThatDefiedTheGods.java @@ -166,7 +166,6 @@ public class Q10796_TheEyeThatDefiedTheGods extends Quest } else { - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java index fbbf631914..b3734b8122 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10797_CrossingFate/Q10797_CrossingFate.java @@ -151,7 +151,6 @@ public class Q10797_CrossingFate extends Quest } else { - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java index 12d5b6ef33..a6685c2070 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10799_StrangeThingsAfootInTheValley/Q10799_StrangeThingsAfootInTheValley.java @@ -152,7 +152,6 @@ public class Q10799_StrangeThingsAfootInTheValley extends Quest } else { - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java index 5e9bf6c88a..fab382ab35 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10800_ReconnaissanceAtDragonValley/Q10800_ReconnaissanceAtDragonValley.java @@ -154,7 +154,6 @@ public class Q10800_ReconnaissanceAtDragonValley extends Quest } else { - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10815_StepUp/Q10815_StepUp.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10815_StepUp/Q10815_StepUp.java index 80a541c397..b681e388c6 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10815_StepUp/Q10815_StepUp.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10815_StepUp/Q10815_StepUp.java @@ -186,7 +186,6 @@ public final class Q10815_StepUp extends Quest else { qs.set("chat", chatCount); - sendNpcLogList(player); if (Config.WORLD_CHAT_INTERVAL.getSeconds() > 0) { REUSE.put(player.getObjectId(), now.plus(Config.WORLD_CHAT_INTERVAL)); @@ -200,13 +199,10 @@ public final class Q10815_StepUp extends Quest public Set getNpcLogList(L2PcInstance activeChar) { final QuestState qs = getQuestState(activeChar, false); - if (qs != null) + if ((qs != null) && qs.isCond(1)) { final Set npcLogList = new HashSet<>(1); - if (qs.isCond(1)) - { - npcLogList.add(new NpcLogListHolder(NpcStringId.WORLD_CHAT, qs.getInt("chat"))); - } + npcLogList.add(new NpcLogListHolder(NpcStringId.WORLD_CHAT, qs.getInt("chat"))); return npcLogList; } return super.getNpcLogList(activeChar); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10838_TheReasonForNotBeingAbleToGetOut/Q10838_TheReasonForNotBeingAbleToGetOut.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10838_TheReasonForNotBeingAbleToGetOut/Q10838_TheReasonForNotBeingAbleToGetOut.java index e1afcc7cda..f0cd31095c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10838_TheReasonForNotBeingAbleToGetOut/Q10838_TheReasonForNotBeingAbleToGetOut.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10838_TheReasonForNotBeingAbleToGetOut/Q10838_TheReasonForNotBeingAbleToGetOut.java @@ -156,7 +156,6 @@ public final class Q10838_TheReasonForNotBeingAbleToGetOut extends Quest { giveItems(killer, DARK_ATELIA_NATURALIZER, 1); } - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10839_BlackbirdsNameValue/Q10839_BlackbirdsNameValue.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10839_BlackbirdsNameValue/Q10839_BlackbirdsNameValue.java index f764c9cb98..0fc9704c4b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10839_BlackbirdsNameValue/Q10839_BlackbirdsNameValue.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10839_BlackbirdsNameValue/Q10839_BlackbirdsNameValue.java @@ -150,7 +150,6 @@ public final class Q10839_BlackbirdsNameValue extends Quest } else { - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10840_TimeToRecover/Q10840_TimeToRecover.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10840_TimeToRecover/Q10840_TimeToRecover.java index b9a6910ef2..7729843a10 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10840_TimeToRecover/Q10840_TimeToRecover.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10840_TimeToRecover/Q10840_TimeToRecover.java @@ -151,7 +151,6 @@ public final class Q10840_TimeToRecover extends Quest } else { - sendNpcLogList(killer); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/quest/Quest.java index 681b12acd0..8564a44f5b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/quest/Quest.java @@ -1122,6 +1122,10 @@ public class Quest extends AbstractScript implements IIdentifiable */ public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) { + if (!getNpcLogList(killer).isEmpty()) + { + sendNpcLogList(killer); + } return null; } @@ -2937,9 +2941,7 @@ public class Quest extends AbstractScript implements IIdentifiable public void sendNpcLogList(L2PcInstance activeChar) { - final QuestState qs = activeChar.getQuestState(getName()); - - if (qs != null) + if (activeChar.getQuestState(getName()) != null) { final ExQuestNpcLogList packet = new ExQuestNpcLogList(getId()); getNpcLogList(activeChar).forEach(packet::add); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00070_SagaOfThePhoenixKnight/Q00070_SagaOfThePhoenixKnight.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00070_SagaOfThePhoenixKnight/Q00070_SagaOfThePhoenixKnight.java index f31b68fe20..cc3c5bd234 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00070_SagaOfThePhoenixKnight/Q00070_SagaOfThePhoenixKnight.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00070_SagaOfThePhoenixKnight/Q00070_SagaOfThePhoenixKnight.java @@ -500,7 +500,6 @@ public class Q00070_SagaOfThePhoenixKnight extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00071_SagaOfEvasTemplar/Q00071_SagaOfEvasTemplar.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00071_SagaOfEvasTemplar/Q00071_SagaOfEvasTemplar.java index 49a4d6ae17..2fb321dc5a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00071_SagaOfEvasTemplar/Q00071_SagaOfEvasTemplar.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00071_SagaOfEvasTemplar/Q00071_SagaOfEvasTemplar.java @@ -503,7 +503,6 @@ public class Q00071_SagaOfEvasTemplar extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00072_SagaOfTheSwordMuse/Q00072_SagaOfTheSwordMuse.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00072_SagaOfTheSwordMuse/Q00072_SagaOfTheSwordMuse.java index 9a143ca79f..d1458f52da 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00072_SagaOfTheSwordMuse/Q00072_SagaOfTheSwordMuse.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00072_SagaOfTheSwordMuse/Q00072_SagaOfTheSwordMuse.java @@ -503,7 +503,6 @@ public class Q00072_SagaOfTheSwordMuse extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00073_SagaOfTheDuelist/Q00073_SagaOfTheDuelist.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00073_SagaOfTheDuelist/Q00073_SagaOfTheDuelist.java index d1e8560936..b86e246618 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00073_SagaOfTheDuelist/Q00073_SagaOfTheDuelist.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00073_SagaOfTheDuelist/Q00073_SagaOfTheDuelist.java @@ -503,7 +503,6 @@ public class Q00073_SagaOfTheDuelist extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00074_SagaOfTheDreadnought/Q00074_SagaOfTheDreadnought.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00074_SagaOfTheDreadnought/Q00074_SagaOfTheDreadnought.java index d7c212b0c9..e8d9d3bf69 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00074_SagaOfTheDreadnought/Q00074_SagaOfTheDreadnought.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00074_SagaOfTheDreadnought/Q00074_SagaOfTheDreadnought.java @@ -503,7 +503,6 @@ public class Q00074_SagaOfTheDreadnought extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00075_SagaOfTheTitan/Q00075_SagaOfTheTitan.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00075_SagaOfTheTitan/Q00075_SagaOfTheTitan.java index c681ae910a..4deb37ee6c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00075_SagaOfTheTitan/Q00075_SagaOfTheTitan.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00075_SagaOfTheTitan/Q00075_SagaOfTheTitan.java @@ -503,7 +503,6 @@ public class Q00075_SagaOfTheTitan extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00076_SagaOfTheGrandKhavatari/Q00076_SagaOfTheGrandKhavatari.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00076_SagaOfTheGrandKhavatari/Q00076_SagaOfTheGrandKhavatari.java index 1eaa3fff10..ed7fda032b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00076_SagaOfTheGrandKhavatari/Q00076_SagaOfTheGrandKhavatari.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00076_SagaOfTheGrandKhavatari/Q00076_SagaOfTheGrandKhavatari.java @@ -503,7 +503,6 @@ public class Q00076_SagaOfTheGrandKhavatari extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00077_SagaOfTheDominator/Q00077_SagaOfTheDominator.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00077_SagaOfTheDominator/Q00077_SagaOfTheDominator.java index bd6dc9bb48..6b29555a6c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00077_SagaOfTheDominator/Q00077_SagaOfTheDominator.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00077_SagaOfTheDominator/Q00077_SagaOfTheDominator.java @@ -503,7 +503,6 @@ public class Q00077_SagaOfTheDominator extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00078_SagaOfTheDoomcryer/Q00078_SagaOfTheDoomcryer.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00078_SagaOfTheDoomcryer/Q00078_SagaOfTheDoomcryer.java index 8644a157d7..a6da16e67e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00078_SagaOfTheDoomcryer/Q00078_SagaOfTheDoomcryer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00078_SagaOfTheDoomcryer/Q00078_SagaOfTheDoomcryer.java @@ -503,7 +503,6 @@ public class Q00078_SagaOfTheDoomcryer extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00079_SagaOfTheAdventurer/Q00079_SagaOfTheAdventurer.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00079_SagaOfTheAdventurer/Q00079_SagaOfTheAdventurer.java index 647e30e1fb..d1eadf5190 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00079_SagaOfTheAdventurer/Q00079_SagaOfTheAdventurer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00079_SagaOfTheAdventurer/Q00079_SagaOfTheAdventurer.java @@ -503,7 +503,6 @@ public class Q00079_SagaOfTheAdventurer extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00080_SagaOfTheWindRider/Q00080_SagaOfTheWindRider.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00080_SagaOfTheWindRider/Q00080_SagaOfTheWindRider.java index 22d8026f0f..596acf7aaa 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00080_SagaOfTheWindRider/Q00080_SagaOfTheWindRider.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00080_SagaOfTheWindRider/Q00080_SagaOfTheWindRider.java @@ -503,7 +503,6 @@ public class Q00080_SagaOfTheWindRider extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00081_SagaOfTheGhostHunter/Q00081_SagaOfTheGhostHunter.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00081_SagaOfTheGhostHunter/Q00081_SagaOfTheGhostHunter.java index 6fd0ae159e..2b19d44890 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00081_SagaOfTheGhostHunter/Q00081_SagaOfTheGhostHunter.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00081_SagaOfTheGhostHunter/Q00081_SagaOfTheGhostHunter.java @@ -503,7 +503,6 @@ public class Q00081_SagaOfTheGhostHunter extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00082_SagaOfTheSagittarius/Q00082_SagaOfTheSagittarius.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00082_SagaOfTheSagittarius/Q00082_SagaOfTheSagittarius.java index 03b817f8c3..af0f2db20f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00082_SagaOfTheSagittarius/Q00082_SagaOfTheSagittarius.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00082_SagaOfTheSagittarius/Q00082_SagaOfTheSagittarius.java @@ -503,7 +503,6 @@ public class Q00082_SagaOfTheSagittarius extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00083_SagaOfTheMoonlightSentinel/Q00083_SagaOfTheMoonlightSentinel.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00083_SagaOfTheMoonlightSentinel/Q00083_SagaOfTheMoonlightSentinel.java index 078b37f58a..981020b180 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00083_SagaOfTheMoonlightSentinel/Q00083_SagaOfTheMoonlightSentinel.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00083_SagaOfTheMoonlightSentinel/Q00083_SagaOfTheMoonlightSentinel.java @@ -503,7 +503,6 @@ public class Q00083_SagaOfTheMoonlightSentinel extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00084_SagaOfTheGhostSentinel/Q00084_SagaOfTheGhostSentinel.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00084_SagaOfTheGhostSentinel/Q00084_SagaOfTheGhostSentinel.java index ea22534ddb..99d006dc74 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00084_SagaOfTheGhostSentinel/Q00084_SagaOfTheGhostSentinel.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00084_SagaOfTheGhostSentinel/Q00084_SagaOfTheGhostSentinel.java @@ -503,7 +503,6 @@ public class Q00084_SagaOfTheGhostSentinel extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00085_SagaOfTheCardinal/Q00085_SagaOfTheCardinal.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00085_SagaOfTheCardinal/Q00085_SagaOfTheCardinal.java index 9c3b7ff499..0164b08d82 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00085_SagaOfTheCardinal/Q00085_SagaOfTheCardinal.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00085_SagaOfTheCardinal/Q00085_SagaOfTheCardinal.java @@ -513,7 +513,6 @@ public class Q00085_SagaOfTheCardinal extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00086_SagaOfTheHierophant/Q00086_SagaOfTheHierophant.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00086_SagaOfTheHierophant/Q00086_SagaOfTheHierophant.java index 4280142347..725e469963 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00086_SagaOfTheHierophant/Q00086_SagaOfTheHierophant.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00086_SagaOfTheHierophant/Q00086_SagaOfTheHierophant.java @@ -513,7 +513,6 @@ public class Q00086_SagaOfTheHierophant extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00087_SagaOfEvasSaint/Q00087_SagaOfEvasSaint.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00087_SagaOfEvasSaint/Q00087_SagaOfEvasSaint.java index 6ce6994356..d60803d33f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00087_SagaOfEvasSaint/Q00087_SagaOfEvasSaint.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00087_SagaOfEvasSaint/Q00087_SagaOfEvasSaint.java @@ -503,7 +503,6 @@ public class Q00087_SagaOfEvasSaint extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00088_SagaOfTheArchmage/Q00088_SagaOfTheArchmage.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00088_SagaOfTheArchmage/Q00088_SagaOfTheArchmage.java index a6feb42c92..3793e0de96 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00088_SagaOfTheArchmage/Q00088_SagaOfTheArchmage.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00088_SagaOfTheArchmage/Q00088_SagaOfTheArchmage.java @@ -500,7 +500,6 @@ public class Q00088_SagaOfTheArchmage extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00089_SagaOfTheMysticMuse/Q00089_SagaOfTheMysticMuse.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00089_SagaOfTheMysticMuse/Q00089_SagaOfTheMysticMuse.java index 260a9b345d..d6d5ec725a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00089_SagaOfTheMysticMuse/Q00089_SagaOfTheMysticMuse.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00089_SagaOfTheMysticMuse/Q00089_SagaOfTheMysticMuse.java @@ -500,7 +500,6 @@ public class Q00089_SagaOfTheMysticMuse extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00090_SagaOfTheStormScreamer/Q00090_SagaOfTheStormScreamer.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00090_SagaOfTheStormScreamer/Q00090_SagaOfTheStormScreamer.java index b34aa6332a..07819f2d3f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00090_SagaOfTheStormScreamer/Q00090_SagaOfTheStormScreamer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00090_SagaOfTheStormScreamer/Q00090_SagaOfTheStormScreamer.java @@ -500,7 +500,6 @@ public class Q00090_SagaOfTheStormScreamer extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00091_SagaOfTheArcanaLord/Q00091_SagaOfTheArcanaLord.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00091_SagaOfTheArcanaLord/Q00091_SagaOfTheArcanaLord.java index ca95cee738..a903e1fbe3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00091_SagaOfTheArcanaLord/Q00091_SagaOfTheArcanaLord.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00091_SagaOfTheArcanaLord/Q00091_SagaOfTheArcanaLord.java @@ -513,7 +513,6 @@ public class Q00091_SagaOfTheArcanaLord extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00092_SagaOfTheElementalMaster/Q00092_SagaOfTheElementalMaster.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00092_SagaOfTheElementalMaster/Q00092_SagaOfTheElementalMaster.java index 033d95e656..522c452179 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00092_SagaOfTheElementalMaster/Q00092_SagaOfTheElementalMaster.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00092_SagaOfTheElementalMaster/Q00092_SagaOfTheElementalMaster.java @@ -500,7 +500,6 @@ public class Q00092_SagaOfTheElementalMaster extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00093_SagaOfTheSpectralMaster/Q00093_SagaOfTheSpectralMaster.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00093_SagaOfTheSpectralMaster/Q00093_SagaOfTheSpectralMaster.java index 5bea5133b7..7bc732891c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00093_SagaOfTheSpectralMaster/Q00093_SagaOfTheSpectralMaster.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00093_SagaOfTheSpectralMaster/Q00093_SagaOfTheSpectralMaster.java @@ -500,7 +500,6 @@ public class Q00093_SagaOfTheSpectralMaster extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00094_SagaOfTheSoultaker/Q00094_SagaOfTheSoultaker.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00094_SagaOfTheSoultaker/Q00094_SagaOfTheSoultaker.java index 6a2410a089..a942e9424f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00094_SagaOfTheSoultaker/Q00094_SagaOfTheSoultaker.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00094_SagaOfTheSoultaker/Q00094_SagaOfTheSoultaker.java @@ -500,7 +500,6 @@ public class Q00094_SagaOfTheSoultaker extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00095_SagaOfTheHellKnight/Q00095_SagaOfTheHellKnight.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00095_SagaOfTheHellKnight/Q00095_SagaOfTheHellKnight.java index 419ed86900..bed18df931 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00095_SagaOfTheHellKnight/Q00095_SagaOfTheHellKnight.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00095_SagaOfTheHellKnight/Q00095_SagaOfTheHellKnight.java @@ -502,7 +502,6 @@ public class Q00095_SagaOfTheHellKnight extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00096_SagaOfTheSpectralDancer/Q00096_SagaOfTheSpectralDancer.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00096_SagaOfTheSpectralDancer/Q00096_SagaOfTheSpectralDancer.java index add7224c12..96fcaa0fd2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00096_SagaOfTheSpectralDancer/Q00096_SagaOfTheSpectralDancer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00096_SagaOfTheSpectralDancer/Q00096_SagaOfTheSpectralDancer.java @@ -500,7 +500,6 @@ public class Q00096_SagaOfTheSpectralDancer extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00097_SagaOfTheShillienTemplar/Q00097_SagaOfTheShillienTemplar.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00097_SagaOfTheShillienTemplar/Q00097_SagaOfTheShillienTemplar.java index a462881b91..f6ce6d49b0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00097_SagaOfTheShillienTemplar/Q00097_SagaOfTheShillienTemplar.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00097_SagaOfTheShillienTemplar/Q00097_SagaOfTheShillienTemplar.java @@ -500,7 +500,6 @@ public class Q00097_SagaOfTheShillienTemplar extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00098_SagaOfTheShillienSaint/Q00098_SagaOfTheShillienSaint.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00098_SagaOfTheShillienSaint/Q00098_SagaOfTheShillienSaint.java index 5c7986a529..ea6335d450 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00098_SagaOfTheShillienSaint/Q00098_SagaOfTheShillienSaint.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00098_SagaOfTheShillienSaint/Q00098_SagaOfTheShillienSaint.java @@ -503,7 +503,6 @@ public class Q00098_SagaOfTheShillienSaint extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00099_SagaOfTheFortuneSeeker/Q00099_SagaOfTheFortuneSeeker.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00099_SagaOfTheFortuneSeeker/Q00099_SagaOfTheFortuneSeeker.java index b803ac7faa..930b53e374 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00099_SagaOfTheFortuneSeeker/Q00099_SagaOfTheFortuneSeeker.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00099_SagaOfTheFortuneSeeker/Q00099_SagaOfTheFortuneSeeker.java @@ -500,7 +500,6 @@ public class Q00099_SagaOfTheFortuneSeeker extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00100_SagaOfTheMaestro/Q00100_SagaOfTheMaestro.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00100_SagaOfTheMaestro/Q00100_SagaOfTheMaestro.java index 1679750508..2a3712549d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00100_SagaOfTheMaestro/Q00100_SagaOfTheMaestro.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00100_SagaOfTheMaestro/Q00100_SagaOfTheMaestro.java @@ -500,7 +500,6 @@ public class Q00100_SagaOfTheMaestro extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/quest/Quest.java index a746efe524..94d887ee5a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/quest/Quest.java @@ -1106,6 +1106,10 @@ public class Quest extends AbstractScript implements IIdentifiable */ public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) { + if (!getNpcLogList(killer).isEmpty()) + { + sendNpcLogList(killer); + } return null; } @@ -2895,9 +2899,7 @@ public class Quest extends AbstractScript implements IIdentifiable public void sendNpcLogList(L2PcInstance activeChar) { - final QuestState qs = activeChar.getQuestState(getName()); - - if (qs != null) + if (activeChar.getQuestState(getName()) != null) { final ExQuestNpcLogList packet = new ExQuestNpcLogList(getId()); getNpcLogList(activeChar).forEach(packet::add); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00070_SagaOfThePhoenixKnight/Q00070_SagaOfThePhoenixKnight.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00070_SagaOfThePhoenixKnight/Q00070_SagaOfThePhoenixKnight.java index f31b68fe20..cc3c5bd234 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00070_SagaOfThePhoenixKnight/Q00070_SagaOfThePhoenixKnight.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00070_SagaOfThePhoenixKnight/Q00070_SagaOfThePhoenixKnight.java @@ -500,7 +500,6 @@ public class Q00070_SagaOfThePhoenixKnight extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00071_SagaOfEvasTemplar/Q00071_SagaOfEvasTemplar.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00071_SagaOfEvasTemplar/Q00071_SagaOfEvasTemplar.java index 49a4d6ae17..2fb321dc5a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00071_SagaOfEvasTemplar/Q00071_SagaOfEvasTemplar.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00071_SagaOfEvasTemplar/Q00071_SagaOfEvasTemplar.java @@ -503,7 +503,6 @@ public class Q00071_SagaOfEvasTemplar extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00072_SagaOfTheSwordMuse/Q00072_SagaOfTheSwordMuse.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00072_SagaOfTheSwordMuse/Q00072_SagaOfTheSwordMuse.java index 9a143ca79f..d1458f52da 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00072_SagaOfTheSwordMuse/Q00072_SagaOfTheSwordMuse.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00072_SagaOfTheSwordMuse/Q00072_SagaOfTheSwordMuse.java @@ -503,7 +503,6 @@ public class Q00072_SagaOfTheSwordMuse extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00073_SagaOfTheDuelist/Q00073_SagaOfTheDuelist.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00073_SagaOfTheDuelist/Q00073_SagaOfTheDuelist.java index d1e8560936..b86e246618 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00073_SagaOfTheDuelist/Q00073_SagaOfTheDuelist.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00073_SagaOfTheDuelist/Q00073_SagaOfTheDuelist.java @@ -503,7 +503,6 @@ public class Q00073_SagaOfTheDuelist extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00074_SagaOfTheDreadnought/Q00074_SagaOfTheDreadnought.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00074_SagaOfTheDreadnought/Q00074_SagaOfTheDreadnought.java index d7c212b0c9..e8d9d3bf69 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00074_SagaOfTheDreadnought/Q00074_SagaOfTheDreadnought.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00074_SagaOfTheDreadnought/Q00074_SagaOfTheDreadnought.java @@ -503,7 +503,6 @@ public class Q00074_SagaOfTheDreadnought extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00075_SagaOfTheTitan/Q00075_SagaOfTheTitan.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00075_SagaOfTheTitan/Q00075_SagaOfTheTitan.java index c681ae910a..4deb37ee6c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00075_SagaOfTheTitan/Q00075_SagaOfTheTitan.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00075_SagaOfTheTitan/Q00075_SagaOfTheTitan.java @@ -503,7 +503,6 @@ public class Q00075_SagaOfTheTitan extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00076_SagaOfTheGrandKhavatari/Q00076_SagaOfTheGrandKhavatari.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00076_SagaOfTheGrandKhavatari/Q00076_SagaOfTheGrandKhavatari.java index 1eaa3fff10..ed7fda032b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00076_SagaOfTheGrandKhavatari/Q00076_SagaOfTheGrandKhavatari.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00076_SagaOfTheGrandKhavatari/Q00076_SagaOfTheGrandKhavatari.java @@ -503,7 +503,6 @@ public class Q00076_SagaOfTheGrandKhavatari extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00077_SagaOfTheDominator/Q00077_SagaOfTheDominator.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00077_SagaOfTheDominator/Q00077_SagaOfTheDominator.java index bd6dc9bb48..6b29555a6c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00077_SagaOfTheDominator/Q00077_SagaOfTheDominator.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00077_SagaOfTheDominator/Q00077_SagaOfTheDominator.java @@ -503,7 +503,6 @@ public class Q00077_SagaOfTheDominator extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00078_SagaOfTheDoomcryer/Q00078_SagaOfTheDoomcryer.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00078_SagaOfTheDoomcryer/Q00078_SagaOfTheDoomcryer.java index 8644a157d7..a6da16e67e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00078_SagaOfTheDoomcryer/Q00078_SagaOfTheDoomcryer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00078_SagaOfTheDoomcryer/Q00078_SagaOfTheDoomcryer.java @@ -503,7 +503,6 @@ public class Q00078_SagaOfTheDoomcryer extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00079_SagaOfTheAdventurer/Q00079_SagaOfTheAdventurer.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00079_SagaOfTheAdventurer/Q00079_SagaOfTheAdventurer.java index 647e30e1fb..d1eadf5190 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00079_SagaOfTheAdventurer/Q00079_SagaOfTheAdventurer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00079_SagaOfTheAdventurer/Q00079_SagaOfTheAdventurer.java @@ -503,7 +503,6 @@ public class Q00079_SagaOfTheAdventurer extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00080_SagaOfTheWindRider/Q00080_SagaOfTheWindRider.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00080_SagaOfTheWindRider/Q00080_SagaOfTheWindRider.java index 22d8026f0f..596acf7aaa 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00080_SagaOfTheWindRider/Q00080_SagaOfTheWindRider.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00080_SagaOfTheWindRider/Q00080_SagaOfTheWindRider.java @@ -503,7 +503,6 @@ public class Q00080_SagaOfTheWindRider extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00081_SagaOfTheGhostHunter/Q00081_SagaOfTheGhostHunter.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00081_SagaOfTheGhostHunter/Q00081_SagaOfTheGhostHunter.java index 6fd0ae159e..2b19d44890 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00081_SagaOfTheGhostHunter/Q00081_SagaOfTheGhostHunter.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00081_SagaOfTheGhostHunter/Q00081_SagaOfTheGhostHunter.java @@ -503,7 +503,6 @@ public class Q00081_SagaOfTheGhostHunter extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00082_SagaOfTheSagittarius/Q00082_SagaOfTheSagittarius.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00082_SagaOfTheSagittarius/Q00082_SagaOfTheSagittarius.java index 03b817f8c3..af0f2db20f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00082_SagaOfTheSagittarius/Q00082_SagaOfTheSagittarius.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00082_SagaOfTheSagittarius/Q00082_SagaOfTheSagittarius.java @@ -503,7 +503,6 @@ public class Q00082_SagaOfTheSagittarius extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00083_SagaOfTheMoonlightSentinel/Q00083_SagaOfTheMoonlightSentinel.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00083_SagaOfTheMoonlightSentinel/Q00083_SagaOfTheMoonlightSentinel.java index 078b37f58a..981020b180 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00083_SagaOfTheMoonlightSentinel/Q00083_SagaOfTheMoonlightSentinel.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00083_SagaOfTheMoonlightSentinel/Q00083_SagaOfTheMoonlightSentinel.java @@ -503,7 +503,6 @@ public class Q00083_SagaOfTheMoonlightSentinel extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00084_SagaOfTheGhostSentinel/Q00084_SagaOfTheGhostSentinel.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00084_SagaOfTheGhostSentinel/Q00084_SagaOfTheGhostSentinel.java index ea22534ddb..99d006dc74 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00084_SagaOfTheGhostSentinel/Q00084_SagaOfTheGhostSentinel.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00084_SagaOfTheGhostSentinel/Q00084_SagaOfTheGhostSentinel.java @@ -503,7 +503,6 @@ public class Q00084_SagaOfTheGhostSentinel extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00085_SagaOfTheCardinal/Q00085_SagaOfTheCardinal.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00085_SagaOfTheCardinal/Q00085_SagaOfTheCardinal.java index 9c3b7ff499..0164b08d82 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00085_SagaOfTheCardinal/Q00085_SagaOfTheCardinal.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00085_SagaOfTheCardinal/Q00085_SagaOfTheCardinal.java @@ -513,7 +513,6 @@ public class Q00085_SagaOfTheCardinal extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00086_SagaOfTheHierophant/Q00086_SagaOfTheHierophant.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00086_SagaOfTheHierophant/Q00086_SagaOfTheHierophant.java index 4280142347..725e469963 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00086_SagaOfTheHierophant/Q00086_SagaOfTheHierophant.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00086_SagaOfTheHierophant/Q00086_SagaOfTheHierophant.java @@ -513,7 +513,6 @@ public class Q00086_SagaOfTheHierophant extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00087_SagaOfEvasSaint/Q00087_SagaOfEvasSaint.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00087_SagaOfEvasSaint/Q00087_SagaOfEvasSaint.java index 6ce6994356..d60803d33f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00087_SagaOfEvasSaint/Q00087_SagaOfEvasSaint.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00087_SagaOfEvasSaint/Q00087_SagaOfEvasSaint.java @@ -503,7 +503,6 @@ public class Q00087_SagaOfEvasSaint extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00088_SagaOfTheArchmage/Q00088_SagaOfTheArchmage.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00088_SagaOfTheArchmage/Q00088_SagaOfTheArchmage.java index a6feb42c92..3793e0de96 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00088_SagaOfTheArchmage/Q00088_SagaOfTheArchmage.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00088_SagaOfTheArchmage/Q00088_SagaOfTheArchmage.java @@ -500,7 +500,6 @@ public class Q00088_SagaOfTheArchmage extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00089_SagaOfTheMysticMuse/Q00089_SagaOfTheMysticMuse.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00089_SagaOfTheMysticMuse/Q00089_SagaOfTheMysticMuse.java index 260a9b345d..d6d5ec725a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00089_SagaOfTheMysticMuse/Q00089_SagaOfTheMysticMuse.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00089_SagaOfTheMysticMuse/Q00089_SagaOfTheMysticMuse.java @@ -500,7 +500,6 @@ public class Q00089_SagaOfTheMysticMuse extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00090_SagaOfTheStormScreamer/Q00090_SagaOfTheStormScreamer.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00090_SagaOfTheStormScreamer/Q00090_SagaOfTheStormScreamer.java index b34aa6332a..07819f2d3f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00090_SagaOfTheStormScreamer/Q00090_SagaOfTheStormScreamer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00090_SagaOfTheStormScreamer/Q00090_SagaOfTheStormScreamer.java @@ -500,7 +500,6 @@ public class Q00090_SagaOfTheStormScreamer extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00091_SagaOfTheArcanaLord/Q00091_SagaOfTheArcanaLord.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00091_SagaOfTheArcanaLord/Q00091_SagaOfTheArcanaLord.java index ca95cee738..a903e1fbe3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00091_SagaOfTheArcanaLord/Q00091_SagaOfTheArcanaLord.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00091_SagaOfTheArcanaLord/Q00091_SagaOfTheArcanaLord.java @@ -513,7 +513,6 @@ public class Q00091_SagaOfTheArcanaLord extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00092_SagaOfTheElementalMaster/Q00092_SagaOfTheElementalMaster.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00092_SagaOfTheElementalMaster/Q00092_SagaOfTheElementalMaster.java index 033d95e656..522c452179 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00092_SagaOfTheElementalMaster/Q00092_SagaOfTheElementalMaster.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00092_SagaOfTheElementalMaster/Q00092_SagaOfTheElementalMaster.java @@ -500,7 +500,6 @@ public class Q00092_SagaOfTheElementalMaster extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00093_SagaOfTheSpectralMaster/Q00093_SagaOfTheSpectralMaster.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00093_SagaOfTheSpectralMaster/Q00093_SagaOfTheSpectralMaster.java index 5bea5133b7..7bc732891c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00093_SagaOfTheSpectralMaster/Q00093_SagaOfTheSpectralMaster.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00093_SagaOfTheSpectralMaster/Q00093_SagaOfTheSpectralMaster.java @@ -500,7 +500,6 @@ public class Q00093_SagaOfTheSpectralMaster extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00094_SagaOfTheSoultaker/Q00094_SagaOfTheSoultaker.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00094_SagaOfTheSoultaker/Q00094_SagaOfTheSoultaker.java index 6a2410a089..a942e9424f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00094_SagaOfTheSoultaker/Q00094_SagaOfTheSoultaker.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00094_SagaOfTheSoultaker/Q00094_SagaOfTheSoultaker.java @@ -500,7 +500,6 @@ public class Q00094_SagaOfTheSoultaker extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00095_SagaOfTheHellKnight/Q00095_SagaOfTheHellKnight.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00095_SagaOfTheHellKnight/Q00095_SagaOfTheHellKnight.java index 419ed86900..bed18df931 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00095_SagaOfTheHellKnight/Q00095_SagaOfTheHellKnight.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00095_SagaOfTheHellKnight/Q00095_SagaOfTheHellKnight.java @@ -502,7 +502,6 @@ public class Q00095_SagaOfTheHellKnight extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00096_SagaOfTheSpectralDancer/Q00096_SagaOfTheSpectralDancer.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00096_SagaOfTheSpectralDancer/Q00096_SagaOfTheSpectralDancer.java index add7224c12..96fcaa0fd2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00096_SagaOfTheSpectralDancer/Q00096_SagaOfTheSpectralDancer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00096_SagaOfTheSpectralDancer/Q00096_SagaOfTheSpectralDancer.java @@ -500,7 +500,6 @@ public class Q00096_SagaOfTheSpectralDancer extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00097_SagaOfTheShillienTemplar/Q00097_SagaOfTheShillienTemplar.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00097_SagaOfTheShillienTemplar/Q00097_SagaOfTheShillienTemplar.java index a462881b91..f6ce6d49b0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00097_SagaOfTheShillienTemplar/Q00097_SagaOfTheShillienTemplar.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00097_SagaOfTheShillienTemplar/Q00097_SagaOfTheShillienTemplar.java @@ -500,7 +500,6 @@ public class Q00097_SagaOfTheShillienTemplar extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00098_SagaOfTheShillienSaint/Q00098_SagaOfTheShillienSaint.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00098_SagaOfTheShillienSaint/Q00098_SagaOfTheShillienSaint.java index 5c7986a529..ea6335d450 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00098_SagaOfTheShillienSaint/Q00098_SagaOfTheShillienSaint.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00098_SagaOfTheShillienSaint/Q00098_SagaOfTheShillienSaint.java @@ -503,7 +503,6 @@ public class Q00098_SagaOfTheShillienSaint extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00099_SagaOfTheFortuneSeeker/Q00099_SagaOfTheFortuneSeeker.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00099_SagaOfTheFortuneSeeker/Q00099_SagaOfTheFortuneSeeker.java index b803ac7faa..930b53e374 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00099_SagaOfTheFortuneSeeker/Q00099_SagaOfTheFortuneSeeker.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00099_SagaOfTheFortuneSeeker/Q00099_SagaOfTheFortuneSeeker.java @@ -500,7 +500,6 @@ public class Q00099_SagaOfTheFortuneSeeker extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00100_SagaOfTheMaestro/Q00100_SagaOfTheMaestro.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00100_SagaOfTheMaestro/Q00100_SagaOfTheMaestro.java index 1679750508..2a3712549d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00100_SagaOfTheMaestro/Q00100_SagaOfTheMaestro.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00100_SagaOfTheMaestro/Q00100_SagaOfTheMaestro.java @@ -500,7 +500,6 @@ public class Q00100_SagaOfTheMaestro extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/quest/Quest.java index a746efe524..94d887ee5a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/quest/Quest.java @@ -1106,6 +1106,10 @@ public class Quest extends AbstractScript implements IIdentifiable */ public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) { + if (!getNpcLogList(killer).isEmpty()) + { + sendNpcLogList(killer); + } return null; } @@ -2895,9 +2899,7 @@ public class Quest extends AbstractScript implements IIdentifiable public void sendNpcLogList(L2PcInstance activeChar) { - final QuestState qs = activeChar.getQuestState(getName()); - - if (qs != null) + if (activeChar.getQuestState(getName()) != null) { final ExQuestNpcLogList packet = new ExQuestNpcLogList(getId()); getNpcLogList(activeChar).forEach(packet::add); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00070_SagaOfThePhoenixKnight/Q00070_SagaOfThePhoenixKnight.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00070_SagaOfThePhoenixKnight/Q00070_SagaOfThePhoenixKnight.java index f31b68fe20..cc3c5bd234 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00070_SagaOfThePhoenixKnight/Q00070_SagaOfThePhoenixKnight.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00070_SagaOfThePhoenixKnight/Q00070_SagaOfThePhoenixKnight.java @@ -500,7 +500,6 @@ public class Q00070_SagaOfThePhoenixKnight extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00071_SagaOfEvasTemplar/Q00071_SagaOfEvasTemplar.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00071_SagaOfEvasTemplar/Q00071_SagaOfEvasTemplar.java index 49a4d6ae17..2fb321dc5a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00071_SagaOfEvasTemplar/Q00071_SagaOfEvasTemplar.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00071_SagaOfEvasTemplar/Q00071_SagaOfEvasTemplar.java @@ -503,7 +503,6 @@ public class Q00071_SagaOfEvasTemplar extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00072_SagaOfTheSwordMuse/Q00072_SagaOfTheSwordMuse.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00072_SagaOfTheSwordMuse/Q00072_SagaOfTheSwordMuse.java index 9a143ca79f..d1458f52da 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00072_SagaOfTheSwordMuse/Q00072_SagaOfTheSwordMuse.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00072_SagaOfTheSwordMuse/Q00072_SagaOfTheSwordMuse.java @@ -503,7 +503,6 @@ public class Q00072_SagaOfTheSwordMuse extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00073_SagaOfTheDuelist/Q00073_SagaOfTheDuelist.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00073_SagaOfTheDuelist/Q00073_SagaOfTheDuelist.java index d1e8560936..b86e246618 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00073_SagaOfTheDuelist/Q00073_SagaOfTheDuelist.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00073_SagaOfTheDuelist/Q00073_SagaOfTheDuelist.java @@ -503,7 +503,6 @@ public class Q00073_SagaOfTheDuelist extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00074_SagaOfTheDreadnought/Q00074_SagaOfTheDreadnought.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00074_SagaOfTheDreadnought/Q00074_SagaOfTheDreadnought.java index d7c212b0c9..e8d9d3bf69 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00074_SagaOfTheDreadnought/Q00074_SagaOfTheDreadnought.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00074_SagaOfTheDreadnought/Q00074_SagaOfTheDreadnought.java @@ -503,7 +503,6 @@ public class Q00074_SagaOfTheDreadnought extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00075_SagaOfTheTitan/Q00075_SagaOfTheTitan.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00075_SagaOfTheTitan/Q00075_SagaOfTheTitan.java index c681ae910a..4deb37ee6c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00075_SagaOfTheTitan/Q00075_SagaOfTheTitan.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00075_SagaOfTheTitan/Q00075_SagaOfTheTitan.java @@ -503,7 +503,6 @@ public class Q00075_SagaOfTheTitan extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00076_SagaOfTheGrandKhavatari/Q00076_SagaOfTheGrandKhavatari.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00076_SagaOfTheGrandKhavatari/Q00076_SagaOfTheGrandKhavatari.java index 1eaa3fff10..ed7fda032b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00076_SagaOfTheGrandKhavatari/Q00076_SagaOfTheGrandKhavatari.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00076_SagaOfTheGrandKhavatari/Q00076_SagaOfTheGrandKhavatari.java @@ -503,7 +503,6 @@ public class Q00076_SagaOfTheGrandKhavatari extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00077_SagaOfTheDominator/Q00077_SagaOfTheDominator.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00077_SagaOfTheDominator/Q00077_SagaOfTheDominator.java index bd6dc9bb48..6b29555a6c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00077_SagaOfTheDominator/Q00077_SagaOfTheDominator.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00077_SagaOfTheDominator/Q00077_SagaOfTheDominator.java @@ -503,7 +503,6 @@ public class Q00077_SagaOfTheDominator extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00078_SagaOfTheDoomcryer/Q00078_SagaOfTheDoomcryer.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00078_SagaOfTheDoomcryer/Q00078_SagaOfTheDoomcryer.java index 8644a157d7..a6da16e67e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00078_SagaOfTheDoomcryer/Q00078_SagaOfTheDoomcryer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00078_SagaOfTheDoomcryer/Q00078_SagaOfTheDoomcryer.java @@ -503,7 +503,6 @@ public class Q00078_SagaOfTheDoomcryer extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00079_SagaOfTheAdventurer/Q00079_SagaOfTheAdventurer.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00079_SagaOfTheAdventurer/Q00079_SagaOfTheAdventurer.java index 647e30e1fb..d1eadf5190 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00079_SagaOfTheAdventurer/Q00079_SagaOfTheAdventurer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00079_SagaOfTheAdventurer/Q00079_SagaOfTheAdventurer.java @@ -503,7 +503,6 @@ public class Q00079_SagaOfTheAdventurer extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00080_SagaOfTheWindRider/Q00080_SagaOfTheWindRider.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00080_SagaOfTheWindRider/Q00080_SagaOfTheWindRider.java index 22d8026f0f..596acf7aaa 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00080_SagaOfTheWindRider/Q00080_SagaOfTheWindRider.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00080_SagaOfTheWindRider/Q00080_SagaOfTheWindRider.java @@ -503,7 +503,6 @@ public class Q00080_SagaOfTheWindRider extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00081_SagaOfTheGhostHunter/Q00081_SagaOfTheGhostHunter.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00081_SagaOfTheGhostHunter/Q00081_SagaOfTheGhostHunter.java index 6fd0ae159e..2b19d44890 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00081_SagaOfTheGhostHunter/Q00081_SagaOfTheGhostHunter.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00081_SagaOfTheGhostHunter/Q00081_SagaOfTheGhostHunter.java @@ -503,7 +503,6 @@ public class Q00081_SagaOfTheGhostHunter extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00082_SagaOfTheSagittarius/Q00082_SagaOfTheSagittarius.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00082_SagaOfTheSagittarius/Q00082_SagaOfTheSagittarius.java index 03b817f8c3..af0f2db20f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00082_SagaOfTheSagittarius/Q00082_SagaOfTheSagittarius.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00082_SagaOfTheSagittarius/Q00082_SagaOfTheSagittarius.java @@ -503,7 +503,6 @@ public class Q00082_SagaOfTheSagittarius extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00083_SagaOfTheMoonlightSentinel/Q00083_SagaOfTheMoonlightSentinel.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00083_SagaOfTheMoonlightSentinel/Q00083_SagaOfTheMoonlightSentinel.java index 078b37f58a..981020b180 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00083_SagaOfTheMoonlightSentinel/Q00083_SagaOfTheMoonlightSentinel.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00083_SagaOfTheMoonlightSentinel/Q00083_SagaOfTheMoonlightSentinel.java @@ -503,7 +503,6 @@ public class Q00083_SagaOfTheMoonlightSentinel extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00084_SagaOfTheGhostSentinel/Q00084_SagaOfTheGhostSentinel.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00084_SagaOfTheGhostSentinel/Q00084_SagaOfTheGhostSentinel.java index ea22534ddb..99d006dc74 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00084_SagaOfTheGhostSentinel/Q00084_SagaOfTheGhostSentinel.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00084_SagaOfTheGhostSentinel/Q00084_SagaOfTheGhostSentinel.java @@ -503,7 +503,6 @@ public class Q00084_SagaOfTheGhostSentinel extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00085_SagaOfTheCardinal/Q00085_SagaOfTheCardinal.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00085_SagaOfTheCardinal/Q00085_SagaOfTheCardinal.java index 9c3b7ff499..0164b08d82 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00085_SagaOfTheCardinal/Q00085_SagaOfTheCardinal.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00085_SagaOfTheCardinal/Q00085_SagaOfTheCardinal.java @@ -513,7 +513,6 @@ public class Q00085_SagaOfTheCardinal extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00086_SagaOfTheHierophant/Q00086_SagaOfTheHierophant.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00086_SagaOfTheHierophant/Q00086_SagaOfTheHierophant.java index 4280142347..725e469963 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00086_SagaOfTheHierophant/Q00086_SagaOfTheHierophant.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00086_SagaOfTheHierophant/Q00086_SagaOfTheHierophant.java @@ -513,7 +513,6 @@ public class Q00086_SagaOfTheHierophant extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00087_SagaOfEvasSaint/Q00087_SagaOfEvasSaint.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00087_SagaOfEvasSaint/Q00087_SagaOfEvasSaint.java index 6ce6994356..d60803d33f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00087_SagaOfEvasSaint/Q00087_SagaOfEvasSaint.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00087_SagaOfEvasSaint/Q00087_SagaOfEvasSaint.java @@ -503,7 +503,6 @@ public class Q00087_SagaOfEvasSaint extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00088_SagaOfTheArchmage/Q00088_SagaOfTheArchmage.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00088_SagaOfTheArchmage/Q00088_SagaOfTheArchmage.java index a6feb42c92..3793e0de96 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00088_SagaOfTheArchmage/Q00088_SagaOfTheArchmage.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00088_SagaOfTheArchmage/Q00088_SagaOfTheArchmage.java @@ -500,7 +500,6 @@ public class Q00088_SagaOfTheArchmage extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00089_SagaOfTheMysticMuse/Q00089_SagaOfTheMysticMuse.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00089_SagaOfTheMysticMuse/Q00089_SagaOfTheMysticMuse.java index 260a9b345d..d6d5ec725a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00089_SagaOfTheMysticMuse/Q00089_SagaOfTheMysticMuse.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00089_SagaOfTheMysticMuse/Q00089_SagaOfTheMysticMuse.java @@ -500,7 +500,6 @@ public class Q00089_SagaOfTheMysticMuse extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00090_SagaOfTheStormScreamer/Q00090_SagaOfTheStormScreamer.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00090_SagaOfTheStormScreamer/Q00090_SagaOfTheStormScreamer.java index b34aa6332a..07819f2d3f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00090_SagaOfTheStormScreamer/Q00090_SagaOfTheStormScreamer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00090_SagaOfTheStormScreamer/Q00090_SagaOfTheStormScreamer.java @@ -500,7 +500,6 @@ public class Q00090_SagaOfTheStormScreamer extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00091_SagaOfTheArcanaLord/Q00091_SagaOfTheArcanaLord.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00091_SagaOfTheArcanaLord/Q00091_SagaOfTheArcanaLord.java index ca95cee738..a903e1fbe3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00091_SagaOfTheArcanaLord/Q00091_SagaOfTheArcanaLord.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00091_SagaOfTheArcanaLord/Q00091_SagaOfTheArcanaLord.java @@ -513,7 +513,6 @@ public class Q00091_SagaOfTheArcanaLord extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00092_SagaOfTheElementalMaster/Q00092_SagaOfTheElementalMaster.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00092_SagaOfTheElementalMaster/Q00092_SagaOfTheElementalMaster.java index 033d95e656..522c452179 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00092_SagaOfTheElementalMaster/Q00092_SagaOfTheElementalMaster.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00092_SagaOfTheElementalMaster/Q00092_SagaOfTheElementalMaster.java @@ -500,7 +500,6 @@ public class Q00092_SagaOfTheElementalMaster extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00093_SagaOfTheSpectralMaster/Q00093_SagaOfTheSpectralMaster.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00093_SagaOfTheSpectralMaster/Q00093_SagaOfTheSpectralMaster.java index 5bea5133b7..7bc732891c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00093_SagaOfTheSpectralMaster/Q00093_SagaOfTheSpectralMaster.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00093_SagaOfTheSpectralMaster/Q00093_SagaOfTheSpectralMaster.java @@ -500,7 +500,6 @@ public class Q00093_SagaOfTheSpectralMaster extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00094_SagaOfTheSoultaker/Q00094_SagaOfTheSoultaker.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00094_SagaOfTheSoultaker/Q00094_SagaOfTheSoultaker.java index 6a2410a089..a942e9424f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00094_SagaOfTheSoultaker/Q00094_SagaOfTheSoultaker.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00094_SagaOfTheSoultaker/Q00094_SagaOfTheSoultaker.java @@ -500,7 +500,6 @@ public class Q00094_SagaOfTheSoultaker extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00095_SagaOfTheHellKnight/Q00095_SagaOfTheHellKnight.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00095_SagaOfTheHellKnight/Q00095_SagaOfTheHellKnight.java index 419ed86900..bed18df931 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00095_SagaOfTheHellKnight/Q00095_SagaOfTheHellKnight.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00095_SagaOfTheHellKnight/Q00095_SagaOfTheHellKnight.java @@ -502,7 +502,6 @@ public class Q00095_SagaOfTheHellKnight extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00096_SagaOfTheSpectralDancer/Q00096_SagaOfTheSpectralDancer.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00096_SagaOfTheSpectralDancer/Q00096_SagaOfTheSpectralDancer.java index add7224c12..96fcaa0fd2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00096_SagaOfTheSpectralDancer/Q00096_SagaOfTheSpectralDancer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00096_SagaOfTheSpectralDancer/Q00096_SagaOfTheSpectralDancer.java @@ -500,7 +500,6 @@ public class Q00096_SagaOfTheSpectralDancer extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00097_SagaOfTheShillienTemplar/Q00097_SagaOfTheShillienTemplar.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00097_SagaOfTheShillienTemplar/Q00097_SagaOfTheShillienTemplar.java index a462881b91..f6ce6d49b0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00097_SagaOfTheShillienTemplar/Q00097_SagaOfTheShillienTemplar.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00097_SagaOfTheShillienTemplar/Q00097_SagaOfTheShillienTemplar.java @@ -500,7 +500,6 @@ public class Q00097_SagaOfTheShillienTemplar extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00098_SagaOfTheShillienSaint/Q00098_SagaOfTheShillienSaint.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00098_SagaOfTheShillienSaint/Q00098_SagaOfTheShillienSaint.java index 5c7986a529..ea6335d450 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00098_SagaOfTheShillienSaint/Q00098_SagaOfTheShillienSaint.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00098_SagaOfTheShillienSaint/Q00098_SagaOfTheShillienSaint.java @@ -503,7 +503,6 @@ public class Q00098_SagaOfTheShillienSaint extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00099_SagaOfTheFortuneSeeker/Q00099_SagaOfTheFortuneSeeker.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00099_SagaOfTheFortuneSeeker/Q00099_SagaOfTheFortuneSeeker.java index b803ac7faa..930b53e374 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00099_SagaOfTheFortuneSeeker/Q00099_SagaOfTheFortuneSeeker.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00099_SagaOfTheFortuneSeeker/Q00099_SagaOfTheFortuneSeeker.java @@ -500,7 +500,6 @@ public class Q00099_SagaOfTheFortuneSeeker extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00100_SagaOfTheMaestro/Q00100_SagaOfTheMaestro.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00100_SagaOfTheMaestro/Q00100_SagaOfTheMaestro.java index 1679750508..2a3712549d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00100_SagaOfTheMaestro/Q00100_SagaOfTheMaestro.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q00100_SagaOfTheMaestro/Q00100_SagaOfTheMaestro.java @@ -500,7 +500,6 @@ public class Q00100_SagaOfTheMaestro extends Quest if (count < 20) { qs.set(KILL_COUNT_VAR, count + 1); - sendNpcLogList(killer); } if (count >= 20) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/quest/Quest.java index a746efe524..94d887ee5a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/quest/Quest.java @@ -1106,6 +1106,10 @@ public class Quest extends AbstractScript implements IIdentifiable */ public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) { + if (!getNpcLogList(killer).isEmpty()) + { + sendNpcLogList(killer); + } return null; } @@ -2895,9 +2899,7 @@ public class Quest extends AbstractScript implements IIdentifiable public void sendNpcLogList(L2PcInstance activeChar) { - final QuestState qs = activeChar.getQuestState(getName()); - - if (qs != null) + if (activeChar.getQuestState(getName()) != null) { final ExQuestNpcLogList packet = new ExQuestNpcLogList(getId()); getNpcLogList(activeChar).forEach(packet::add);