From 4291effdb38c37927f24d102289bb56c87a21677 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Thu, 11 Apr 2019 18:30:19 +0000 Subject: [PATCH] Fixed custom quest onKill to match party members. --- .../Q00529_RegularBarrierMaintenance.java | 5 +++-- .../Q00560_HowToOvercomeFear.java | 5 +++-- .../Q10517_FafurionsMinions/Q10517_FafurionsMinions.java | 9 +++++---- .../Q10529_IvoryTowersResearchFloatingSeaJournal.java | 7 ++++--- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/custom/Q00529_RegularBarrierMaintenance/Q00529_RegularBarrierMaintenance.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/custom/Q00529_RegularBarrierMaintenance/Q00529_RegularBarrierMaintenance.java index a37295a703..464b81a4f5 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/custom/Q00529_RegularBarrierMaintenance/Q00529_RegularBarrierMaintenance.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/custom/Q00529_RegularBarrierMaintenance/Q00529_RegularBarrierMaintenance.java @@ -169,11 +169,12 @@ public class Q00529_RegularBarrierMaintenance extends Quest final QuestState qs = PARTY_QUEST ? getRandomPartyMemberState(killer, -1, 3, npc) : getQuestState(killer, false); if ((qs != null) && qs.isCond(KILLING_COND)) { - if (giveItemRandomly(killer, npc, MONSTER_DROP, 1, REQUIRED_DROP_COUNT, 1, true)) + final PlayerInstance player = qs.getPlayer(); + if (giveItemRandomly(player, npc, MONSTER_DROP, 1, REQUIRED_DROP_COUNT, 1, true)) { qs.setCond(FINISH_COND, true); } - sendNpcLogList(killer); + sendNpcLogList(player); } return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/custom/Q00560_HowToOvercomeFear/Q00560_HowToOvercomeFear.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/custom/Q00560_HowToOvercomeFear/Q00560_HowToOvercomeFear.java index dc91aa2b9b..fd63143d4c 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/custom/Q00560_HowToOvercomeFear/Q00560_HowToOvercomeFear.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/custom/Q00560_HowToOvercomeFear/Q00560_HowToOvercomeFear.java @@ -167,11 +167,12 @@ public class Q00560_HowToOvercomeFear extends Quest final QuestState qs = PARTY_QUEST ? getRandomPartyMemberState(killer, -1, 3, npc) : getQuestState(killer, false); if ((qs != null) && qs.isCond(KILLING_COND)) { - if (giveItemRandomly(killer, npc, MONSTER_DROP, 1, REQUIRED_DROP_COUNT, 1, true)) + final PlayerInstance player = qs.getPlayer(); + if (giveItemRandomly(player, npc, MONSTER_DROP, 1, REQUIRED_DROP_COUNT, 1, true)) { qs.setCond(FINISH_COND, true); } - sendNpcLogList(killer); + sendNpcLogList(player); } return super.onKill(npc, killer, isSummon); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/custom/Q10517_FafurionsMinions/Q10517_FafurionsMinions.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/custom/Q10517_FafurionsMinions/Q10517_FafurionsMinions.java index 66e92516c4..8a57176a83 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/custom/Q10517_FafurionsMinions/Q10517_FafurionsMinions.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/custom/Q10517_FafurionsMinions/Q10517_FafurionsMinions.java @@ -171,21 +171,22 @@ public class Q10517_FafurionsMinions extends Quest QuestState qs = PARTY_QUEST ? getRandomPartyMemberState(killer, -1, 3, npc) : getQuestState(killer, false); if ((qs != null) && qs.isCond(KILLING_COND)) { - giveItemRandomly(killer, npc, MONSTER_DROP, 1, REQUIRED_DROP_COUNT, 1, true); + final PlayerInstance player = qs.getPlayer(); + giveItemRandomly(player, npc, MONSTER_DROP, 1, REQUIRED_DROP_COUNT, 1, true); final int killCount = qs.getInt(KILL_COUNT_VAR) + 1; if (killCount < REQUIRED_KILL_COUNT) { qs.set(KILL_COUNT_VAR, killCount); - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); } - if ((killCount >= REQUIRED_KILL_COUNT) && (getQuestItemsCount(killer, MONSTER_DROP) >= REQUIRED_DROP_COUNT)) + if ((killCount >= REQUIRED_KILL_COUNT) && (getQuestItemsCount(player, MONSTER_DROP) >= REQUIRED_DROP_COUNT)) { qs.setCond(FINISH_COND, true); } - sendNpcLogList(killer); + sendNpcLogList(player); } return super.onKill(npc, killer, isSummon); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/custom/Q10529_IvoryTowersResearchFloatingSeaJournal/Q10529_IvoryTowersResearchFloatingSeaJournal.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/custom/Q10529_IvoryTowersResearchFloatingSeaJournal/Q10529_IvoryTowersResearchFloatingSeaJournal.java index c22581c26e..5757850be4 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/custom/Q10529_IvoryTowersResearchFloatingSeaJournal/Q10529_IvoryTowersResearchFloatingSeaJournal.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/custom/Q10529_IvoryTowersResearchFloatingSeaJournal/Q10529_IvoryTowersResearchFloatingSeaJournal.java @@ -194,17 +194,18 @@ public class Q10529_IvoryTowersResearchFloatingSeaJournal extends Quest final QuestState qs = PARTY_QUEST ? getRandomPartyMemberState(killer, -1, 3, npc) : getQuestState(killer, false); if (qs != null) { + final PlayerInstance player = qs.getPlayer(); if (qs.isCond(KILLING_COND_1) && CommonUtil.contains(MONSTERS_1, npc.getId())) { - if (giveItemRandomly(killer, npc, MONSTER_DROP_1, 1, REQUIRED_DROP_COUNT_1, 1, true)) + if (giveItemRandomly(player, npc, MONSTER_DROP_1, 1, REQUIRED_DROP_COUNT_1, 1, true)) { qs.setCond(FINISH_COND_1, true); } - sendNpcLogList(killer); + sendNpcLogList(player); } else if (qs.isCond(KILLING_COND_2) && CommonUtil.contains(MONSTERS_2, npc.getId())) { - if (giveItemRandomly(killer, npc, MONSTER_DROP_2, 1, REQUIRED_DROP_COUNT_2, 1, true)) + if (giveItemRandomly(player, npc, MONSTER_DROP_2, 1, REQUIRED_DROP_COUNT_2, 1, true)) { qs.setCond(FINISH_COND_2, true); }