From 315896aa68ac6470d90935a7fbc79a83ea385d0e Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Wed, 6 May 2020 11:54:39 +0000
Subject: [PATCH] Start Etis Van Etina activity task only when fighting.

---
 .../data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java   | 6 +++---
 .../data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java   | 6 +++---
 .../data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java   | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
index c2be351b76..97a6d88c10 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
@@ -378,7 +378,7 @@ public class EtisVanEtina extends AbstractNpcAI
 					}
 					startQuestTimer("end_etina", 2000, null, null);
 				}
-				else
+				else if (GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) == FIGHTING)
 				{
 					startQuestTimer("check_activity_task", 60000, null, null);
 				}
@@ -425,7 +425,7 @@ public class EtisVanEtina extends AbstractNpcAI
 			}
 			case "cancel_timers":
 			{
-				QuestTimer activityTimer = getQuestTimer("check_activity_task", null, null);
+				final QuestTimer activityTimer = getQuestTimer("check_activity_task", null, null);
 				if (activityTimer != null)
 				{
 					activityTimer.cancel();
@@ -695,7 +695,7 @@ public class EtisVanEtina extends AbstractNpcAI
 				BOSS_ZONE.getPlayersInside().forEach(player -> player.sendPacket(new ExShowScreenMessage(NpcStringId.YOU_CAN_T_DEFEAT_PARAGON_WHILE_PARAGON_S_MINIONS_ARE_ALIVE, ExShowScreenMessage.TOP_CENTER, 7000, true)));
 				GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, FIGHTING);
 				_lastAction = System.currentTimeMillis();
-				startQuestTimer("check_activity_task", 60000, null, null, true);
+				startQuestTimer("check_activity_task", 60000, null, null);
 			}
 		}
 		return super.onEnterZone(character, zone);
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
index c2be351b76..97a6d88c10 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
@@ -378,7 +378,7 @@ public class EtisVanEtina extends AbstractNpcAI
 					}
 					startQuestTimer("end_etina", 2000, null, null);
 				}
-				else
+				else if (GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) == FIGHTING)
 				{
 					startQuestTimer("check_activity_task", 60000, null, null);
 				}
@@ -425,7 +425,7 @@ public class EtisVanEtina extends AbstractNpcAI
 			}
 			case "cancel_timers":
 			{
-				QuestTimer activityTimer = getQuestTimer("check_activity_task", null, null);
+				final QuestTimer activityTimer = getQuestTimer("check_activity_task", null, null);
 				if (activityTimer != null)
 				{
 					activityTimer.cancel();
@@ -695,7 +695,7 @@ public class EtisVanEtina extends AbstractNpcAI
 				BOSS_ZONE.getPlayersInside().forEach(player -> player.sendPacket(new ExShowScreenMessage(NpcStringId.YOU_CAN_T_DEFEAT_PARAGON_WHILE_PARAGON_S_MINIONS_ARE_ALIVE, ExShowScreenMessage.TOP_CENTER, 7000, true)));
 				GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, FIGHTING);
 				_lastAction = System.currentTimeMillis();
-				startQuestTimer("check_activity_task", 60000, null, null, true);
+				startQuestTimer("check_activity_task", 60000, null, null);
 			}
 		}
 		return super.onEnterZone(character, zone);
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
index c2be351b76..97a6d88c10 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/EtisVanEtina/EtisVanEtina.java
@@ -378,7 +378,7 @@ public class EtisVanEtina extends AbstractNpcAI
 					}
 					startQuestTimer("end_etina", 2000, null, null);
 				}
-				else
+				else if (GrandBossManager.getInstance().getBossStatus(ETIS_VAN_ETINA1) == FIGHTING)
 				{
 					startQuestTimer("check_activity_task", 60000, null, null);
 				}
@@ -425,7 +425,7 @@ public class EtisVanEtina extends AbstractNpcAI
 			}
 			case "cancel_timers":
 			{
-				QuestTimer activityTimer = getQuestTimer("check_activity_task", null, null);
+				final QuestTimer activityTimer = getQuestTimer("check_activity_task", null, null);
 				if (activityTimer != null)
 				{
 					activityTimer.cancel();
@@ -695,7 +695,7 @@ public class EtisVanEtina extends AbstractNpcAI
 				BOSS_ZONE.getPlayersInside().forEach(player -> player.sendPacket(new ExShowScreenMessage(NpcStringId.YOU_CAN_T_DEFEAT_PARAGON_WHILE_PARAGON_S_MINIONS_ARE_ALIVE, ExShowScreenMessage.TOP_CENTER, 7000, true)));
 				GrandBossManager.getInstance().setBossStatus(ETIS_VAN_ETINA1, FIGHTING);
 				_lastAction = System.currentTimeMillis();
-				startQuestTimer("check_activity_task", 60000, null, null, true);
+				startQuestTimer("check_activity_task", 60000, null, null);
 			}
 		}
 		return super.onEnterZone(character, zone);