diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java index 97c83d3cc12e1e398eb922d5e87bfa1810ea8568..41caf49b81b5ed20224b54c819b3934d6fb0ad4c 100644 --- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java +++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java @@ -1242,6 +1242,16 @@ public class FinalEmperialTomb extends Quest return null; } + @Override + public String onSpellFinished(L2Npc npc, L2PcInstance player, L2Skill skill) + { + if (skill.isSuicideAttack()) + { + return onKill(npc, null, false); + } + return super.onSpellFinished(npc, player, skill); + } + @Override public String onKill(L2Npc npc, L2PcInstance player, boolean isPet) { @@ -1320,12 +1330,13 @@ public class FinalEmperialTomb extends Quest addKillId(DARK_CHOIR_PLAYER); addAttackId(SCARLET1); addKillId(SCARLET2); - for (int mobId : PORTRAITS) - addKillId(mobId); - for (int mobId : DEMONS) - addKillId(mobId); + addKillId(PORTRAITS); + addKillId(DEMONS); for (int mobId : _mustKillMobsId) + { addKillId(mobId); + } + addSpellFinishedId(18333); } public static void main(String[] args)