From f0043b327114d0d4547f40aa40e98c1a3d2560b8 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Fri, 8 Sep 2017 15:29:46 +0000
Subject: [PATCH] Prevent dead Kartia troops broadcast say.

---
 .../ai/areas/KartiasLabyrinth/KartiaSupportTroop.java        | 5 +++--
 .../ai/areas/KartiasLabyrinth/KartiaSupportTroop.java        | 5 +++--
 .../ai/areas/KartiasLabyrinth/KartiaSupportTroop.java        | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/KartiasLabyrinth/KartiaSupportTroop.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/KartiasLabyrinth/KartiaSupportTroop.java
index 0b6462a39e..b0c48c5470 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/KartiasLabyrinth/KartiaSupportTroop.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/KartiasLabyrinth/KartiaSupportTroop.java
@@ -51,9 +51,10 @@ public final class KartiaSupportTroop extends AbstractNpcAI
 	@Override
 	public void onTimerEvent(String event, StatsSet params, L2Npc npc, L2PcInstance player)
 	{
-		if (event.equals("NPC_SAY"))
+		if (event.equals("NPC_SAY") && !npc.isDead())
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.DEFEAT_ALL_THE_MONSTERS);
+			getTimers().addTimer("NPC_SAY", 20000, npc, null);
 		}
 		else if (event.equals("CHECK_TARGET"))
 		{
@@ -79,7 +80,7 @@ public final class KartiaSupportTroop extends AbstractNpcAI
 		if (npc.getInstanceWorld() != null)
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.VANGUARD_OF_ADEN_WE_HAVE_RETURNED);
-			getTimers().addRepeatingTimer("NPC_SAY", 20000, npc, null);
+			getTimers().addTimer("NPC_SAY", 20000, npc, null);
 			getTimers().addRepeatingTimer("CHECK_TARGET", 1000, npc, null);
 		}
 		return super.onSpawn(npc);
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/KartiasLabyrinth/KartiaSupportTroop.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/KartiasLabyrinth/KartiaSupportTroop.java
index 0b6462a39e..b0c48c5470 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/KartiasLabyrinth/KartiaSupportTroop.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/KartiasLabyrinth/KartiaSupportTroop.java
@@ -51,9 +51,10 @@ public final class KartiaSupportTroop extends AbstractNpcAI
 	@Override
 	public void onTimerEvent(String event, StatsSet params, L2Npc npc, L2PcInstance player)
 	{
-		if (event.equals("NPC_SAY"))
+		if (event.equals("NPC_SAY") && !npc.isDead())
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.DEFEAT_ALL_THE_MONSTERS);
+			getTimers().addTimer("NPC_SAY", 20000, npc, null);
 		}
 		else if (event.equals("CHECK_TARGET"))
 		{
@@ -79,7 +80,7 @@ public final class KartiaSupportTroop extends AbstractNpcAI
 		if (npc.getInstanceWorld() != null)
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.VANGUARD_OF_ADEN_WE_HAVE_RETURNED);
-			getTimers().addRepeatingTimer("NPC_SAY", 20000, npc, null);
+			getTimers().addTimer("NPC_SAY", 20000, npc, null);
 			getTimers().addRepeatingTimer("CHECK_TARGET", 1000, npc, null);
 		}
 		return super.onSpawn(npc);
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/KartiasLabyrinth/KartiaSupportTroop.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/KartiasLabyrinth/KartiaSupportTroop.java
index 0b6462a39e..b0c48c5470 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/KartiasLabyrinth/KartiaSupportTroop.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/KartiasLabyrinth/KartiaSupportTroop.java
@@ -51,9 +51,10 @@ public final class KartiaSupportTroop extends AbstractNpcAI
 	@Override
 	public void onTimerEvent(String event, StatsSet params, L2Npc npc, L2PcInstance player)
 	{
-		if (event.equals("NPC_SAY"))
+		if (event.equals("NPC_SAY") && !npc.isDead())
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.DEFEAT_ALL_THE_MONSTERS);
+			getTimers().addTimer("NPC_SAY", 20000, npc, null);
 		}
 		else if (event.equals("CHECK_TARGET"))
 		{
@@ -79,7 +80,7 @@ public final class KartiaSupportTroop extends AbstractNpcAI
 		if (npc.getInstanceWorld() != null)
 		{
 			npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.VANGUARD_OF_ADEN_WE_HAVE_RETURNED);
-			getTimers().addRepeatingTimer("NPC_SAY", 20000, npc, null);
+			getTimers().addTimer("NPC_SAY", 20000, npc, null);
 			getTimers().addRepeatingTimer("CHECK_TARGET", 1000, npc, null);
 		}
 		return super.onSpawn(npc);