From fb7cab64bbb05fb734c6d2274232e096f3799dca Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Thu, 12 Dec 2019 00:36:20 +0000 Subject: [PATCH] Fixed showing rewards for Expulsion of Evil Spirits (311). --- L2J_Mobius_CT_2.4_Epilogue/dist/game/data/multisell/2010.xml | 3 +++ .../Q00311_ExpulsionOfEvilSpirits.java | 2 +- L2J_Mobius_CT_2.6_HighFive/dist/game/data/multisell/2010.xml | 3 +++ .../Q00311_ExpulsionOfEvilSpirits.java | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/multisell/2010.xml b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/multisell/2010.xml index 80e3ecaefd..afe83a8e94 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/multisell/2010.xml +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/multisell/2010.xml @@ -1,5 +1,8 @@ + + 32655 + diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java index 5a0cdd0b8f..06c65b6d03 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java @@ -163,7 +163,7 @@ public class Q00311_ExpulsionOfEvilSpirits extends Quest } else if (qs.isStarted()) { - htmltext = !hasQuestItems(player, SOUL_CORE_CONTAINING_EVIL_SPIRIT, RAGNA_ORCS_AMULET) ? "32655-05.html" : "32655-06.html"; + htmltext = hasAtLeastOneQuestItem(player, RAGNA_ORCS_AMULET, SOUL_CORE_CONTAINING_EVIL_SPIRIT) ? "32655-06.html" : "32655-05.html"; } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/multisell/2010.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/multisell/2010.xml index 80e3ecaefd..afe83a8e94 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/multisell/2010.xml +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/multisell/2010.xml @@ -1,5 +1,8 @@ + + 32655 + diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java index 5a0cdd0b8f..06c65b6d03 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java @@ -163,7 +163,7 @@ public class Q00311_ExpulsionOfEvilSpirits extends Quest } else if (qs.isStarted()) { - htmltext = !hasQuestItems(player, SOUL_CORE_CONTAINING_EVIL_SPIRIT, RAGNA_ORCS_AMULET) ? "32655-05.html" : "32655-06.html"; + htmltext = hasAtLeastOneQuestItem(player, RAGNA_ORCS_AMULET, SOUL_CORE_CONTAINING_EVIL_SPIRIT) ? "32655-06.html" : "32655-05.html"; } return htmltext; }