From fedc16b6abb5f84ea615b0316f95887c35a11b24 Mon Sep 17 00:00:00 2001
From: Rumen Nikiforov <unafraid89@gmail.com>
Date: Sun, 27 May 2012 23:12:18 +0000
Subject: [PATCH] BETA: Fixing Frintezza instance bug when a monster
 self-destruct should trigger onKill thanks '''tukune'''

---
 .../FinalEmperialTomb/FinalEmperialTomb.java  | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

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 97c83d3cc1..41caf49b81 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)
-- 
GitLab