From e38944e9d55d012a4be1b3c1099d7ba2222876fd Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Mon, 11 Dec 2017 07:02:01 +0000
Subject: [PATCH] TvT inactivity warning.

---
 .../scripts/custom/events/TeamVsTeam/TvT.java | 31 ++++++++++++-------
 .../scripts/custom/events/TeamVsTeam/TvT.java | 31 ++++++++++++-------
 .../scripts/custom/events/TeamVsTeam/TvT.java | 31 ++++++++++++-------
 .../scripts/custom/events/TeamVsTeam/TvT.java | 31 ++++++++++++-------
 .../scripts/custom/events/TeamVsTeam/TvT.java | 31 ++++++++++++-------
 5 files changed, 100 insertions(+), 55 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index 4fef0f9f3d..88e6267207 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -529,18 +529,25 @@ public class TvT extends Event
 		// Activity timer.
 		if (event.startsWith("KickPlayer") && (player != null) && (player.getInstanceWorld() == PVP_WORLD))
 		{
-			player.setTeam(Team.NONE);
-			PVP_WORLD.ejectPlayer(player);
-			PLAYER_LIST.remove(player);
-			PLAYER_SCORES.remove(player);
-			BLUE_TEAM.remove(player);
-			RED_TEAM.remove(player);
-			player.setOnCustomEvent(false);
-			removeListeners(player);
-			player.sendMessage("You have been kicked for been inactive.");
-			if (PVP_WORLD != null)
+			if (event.contains("Warning"))
 			{
-				broadcastScreenMessageWithEffect("Player " + player.getName() + " was kicked for been inactive.", 7);
+				player.sendPacket(new ExShowScreenMessage("You have been marked as inactive!", ExShowScreenMessage.TOP_CENTER, 10000, 0, true, false));
+			}
+			else
+			{
+				player.setTeam(Team.NONE);
+				PVP_WORLD.ejectPlayer(player);
+				PLAYER_LIST.remove(player);
+				PLAYER_SCORES.remove(player);
+				BLUE_TEAM.remove(player);
+				RED_TEAM.remove(player);
+				player.setOnCustomEvent(false);
+				removeListeners(player);
+				player.sendMessage("You have been kicked for been inactive.");
+				if (PVP_WORLD != null)
+				{
+					broadcastScreenMessageWithEffect("Player " + player.getName() + " was kicked for been inactive!", 7);
+				}
 			}
 		}
 		return htmltext;
@@ -591,6 +598,7 @@ public class TvT extends Event
 					((zone == RED_PEACE_ZONE) && (character.getTeam() == Team.RED)))))
 			{
 				startQuestTimer("KickPlayer" + character.getObjectId(), PVP_WORLD.getDoor(BLUE_DOOR_ID).isOpen() ? INACTIVITY_TIME * 60000 : (INACTIVITY_TIME * 60000) + (WAIT_TIME * 60000), null, character.getActingPlayer());
+				startQuestTimer("KickPlayerWarning" + character.getObjectId(), PVP_WORLD.getDoor(BLUE_DOOR_ID).isOpen() ? (INACTIVITY_TIME / 2) * 60000 : ((INACTIVITY_TIME / 2) * 60000) + (WAIT_TIME * 60000), null, character.getActingPlayer());
 			}
 		}
 		return null;
@@ -602,6 +610,7 @@ public class TvT extends Event
 		if (character.isPlayer() && character.getActingPlayer().isOnCustomEvent())
 		{
 			cancelQuestTimer("KickPlayer" + character.getObjectId(), null, character.getActingPlayer());
+			cancelQuestTimer("KickPlayerWarning" + character.getObjectId(), null, character.getActingPlayer());
 		}
 		return super.onExitZone(character, zone);
 	}
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index 4fef0f9f3d..88e6267207 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -529,18 +529,25 @@ public class TvT extends Event
 		// Activity timer.
 		if (event.startsWith("KickPlayer") && (player != null) && (player.getInstanceWorld() == PVP_WORLD))
 		{
-			player.setTeam(Team.NONE);
-			PVP_WORLD.ejectPlayer(player);
-			PLAYER_LIST.remove(player);
-			PLAYER_SCORES.remove(player);
-			BLUE_TEAM.remove(player);
-			RED_TEAM.remove(player);
-			player.setOnCustomEvent(false);
-			removeListeners(player);
-			player.sendMessage("You have been kicked for been inactive.");
-			if (PVP_WORLD != null)
+			if (event.contains("Warning"))
 			{
-				broadcastScreenMessageWithEffect("Player " + player.getName() + " was kicked for been inactive.", 7);
+				player.sendPacket(new ExShowScreenMessage("You have been marked as inactive!", ExShowScreenMessage.TOP_CENTER, 10000, 0, true, false));
+			}
+			else
+			{
+				player.setTeam(Team.NONE);
+				PVP_WORLD.ejectPlayer(player);
+				PLAYER_LIST.remove(player);
+				PLAYER_SCORES.remove(player);
+				BLUE_TEAM.remove(player);
+				RED_TEAM.remove(player);
+				player.setOnCustomEvent(false);
+				removeListeners(player);
+				player.sendMessage("You have been kicked for been inactive.");
+				if (PVP_WORLD != null)
+				{
+					broadcastScreenMessageWithEffect("Player " + player.getName() + " was kicked for been inactive!", 7);
+				}
 			}
 		}
 		return htmltext;
@@ -591,6 +598,7 @@ public class TvT extends Event
 					((zone == RED_PEACE_ZONE) && (character.getTeam() == Team.RED)))))
 			{
 				startQuestTimer("KickPlayer" + character.getObjectId(), PVP_WORLD.getDoor(BLUE_DOOR_ID).isOpen() ? INACTIVITY_TIME * 60000 : (INACTIVITY_TIME * 60000) + (WAIT_TIME * 60000), null, character.getActingPlayer());
+				startQuestTimer("KickPlayerWarning" + character.getObjectId(), PVP_WORLD.getDoor(BLUE_DOOR_ID).isOpen() ? (INACTIVITY_TIME / 2) * 60000 : ((INACTIVITY_TIME / 2) * 60000) + (WAIT_TIME * 60000), null, character.getActingPlayer());
 			}
 		}
 		return null;
@@ -602,6 +610,7 @@ public class TvT extends Event
 		if (character.isPlayer() && character.getActingPlayer().isOnCustomEvent())
 		{
 			cancelQuestTimer("KickPlayer" + character.getObjectId(), null, character.getActingPlayer());
+			cancelQuestTimer("KickPlayerWarning" + character.getObjectId(), null, character.getActingPlayer());
 		}
 		return super.onExitZone(character, zone);
 	}
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index 4fef0f9f3d..88e6267207 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -529,18 +529,25 @@ public class TvT extends Event
 		// Activity timer.
 		if (event.startsWith("KickPlayer") && (player != null) && (player.getInstanceWorld() == PVP_WORLD))
 		{
-			player.setTeam(Team.NONE);
-			PVP_WORLD.ejectPlayer(player);
-			PLAYER_LIST.remove(player);
-			PLAYER_SCORES.remove(player);
-			BLUE_TEAM.remove(player);
-			RED_TEAM.remove(player);
-			player.setOnCustomEvent(false);
-			removeListeners(player);
-			player.sendMessage("You have been kicked for been inactive.");
-			if (PVP_WORLD != null)
+			if (event.contains("Warning"))
 			{
-				broadcastScreenMessageWithEffect("Player " + player.getName() + " was kicked for been inactive.", 7);
+				player.sendPacket(new ExShowScreenMessage("You have been marked as inactive!", ExShowScreenMessage.TOP_CENTER, 10000, 0, true, false));
+			}
+			else
+			{
+				player.setTeam(Team.NONE);
+				PVP_WORLD.ejectPlayer(player);
+				PLAYER_LIST.remove(player);
+				PLAYER_SCORES.remove(player);
+				BLUE_TEAM.remove(player);
+				RED_TEAM.remove(player);
+				player.setOnCustomEvent(false);
+				removeListeners(player);
+				player.sendMessage("You have been kicked for been inactive.");
+				if (PVP_WORLD != null)
+				{
+					broadcastScreenMessageWithEffect("Player " + player.getName() + " was kicked for been inactive!", 7);
+				}
 			}
 		}
 		return htmltext;
@@ -591,6 +598,7 @@ public class TvT extends Event
 					((zone == RED_PEACE_ZONE) && (character.getTeam() == Team.RED)))))
 			{
 				startQuestTimer("KickPlayer" + character.getObjectId(), PVP_WORLD.getDoor(BLUE_DOOR_ID).isOpen() ? INACTIVITY_TIME * 60000 : (INACTIVITY_TIME * 60000) + (WAIT_TIME * 60000), null, character.getActingPlayer());
+				startQuestTimer("KickPlayerWarning" + character.getObjectId(), PVP_WORLD.getDoor(BLUE_DOOR_ID).isOpen() ? (INACTIVITY_TIME / 2) * 60000 : ((INACTIVITY_TIME / 2) * 60000) + (WAIT_TIME * 60000), null, character.getActingPlayer());
 			}
 		}
 		return null;
@@ -602,6 +610,7 @@ public class TvT extends Event
 		if (character.isPlayer() && character.getActingPlayer().isOnCustomEvent())
 		{
 			cancelQuestTimer("KickPlayer" + character.getObjectId(), null, character.getActingPlayer());
+			cancelQuestTimer("KickPlayerWarning" + character.getObjectId(), null, character.getActingPlayer());
 		}
 		return super.onExitZone(character, zone);
 	}
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index 4fef0f9f3d..88e6267207 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -529,18 +529,25 @@ public class TvT extends Event
 		// Activity timer.
 		if (event.startsWith("KickPlayer") && (player != null) && (player.getInstanceWorld() == PVP_WORLD))
 		{
-			player.setTeam(Team.NONE);
-			PVP_WORLD.ejectPlayer(player);
-			PLAYER_LIST.remove(player);
-			PLAYER_SCORES.remove(player);
-			BLUE_TEAM.remove(player);
-			RED_TEAM.remove(player);
-			player.setOnCustomEvent(false);
-			removeListeners(player);
-			player.sendMessage("You have been kicked for been inactive.");
-			if (PVP_WORLD != null)
+			if (event.contains("Warning"))
 			{
-				broadcastScreenMessageWithEffect("Player " + player.getName() + " was kicked for been inactive.", 7);
+				player.sendPacket(new ExShowScreenMessage("You have been marked as inactive!", ExShowScreenMessage.TOP_CENTER, 10000, 0, true, false));
+			}
+			else
+			{
+				player.setTeam(Team.NONE);
+				PVP_WORLD.ejectPlayer(player);
+				PLAYER_LIST.remove(player);
+				PLAYER_SCORES.remove(player);
+				BLUE_TEAM.remove(player);
+				RED_TEAM.remove(player);
+				player.setOnCustomEvent(false);
+				removeListeners(player);
+				player.sendMessage("You have been kicked for been inactive.");
+				if (PVP_WORLD != null)
+				{
+					broadcastScreenMessageWithEffect("Player " + player.getName() + " was kicked for been inactive!", 7);
+				}
 			}
 		}
 		return htmltext;
@@ -591,6 +598,7 @@ public class TvT extends Event
 					((zone == RED_PEACE_ZONE) && (character.getTeam() == Team.RED)))))
 			{
 				startQuestTimer("KickPlayer" + character.getObjectId(), PVP_WORLD.getDoor(BLUE_DOOR_ID).isOpen() ? INACTIVITY_TIME * 60000 : (INACTIVITY_TIME * 60000) + (WAIT_TIME * 60000), null, character.getActingPlayer());
+				startQuestTimer("KickPlayerWarning" + character.getObjectId(), PVP_WORLD.getDoor(BLUE_DOOR_ID).isOpen() ? (INACTIVITY_TIME / 2) * 60000 : ((INACTIVITY_TIME / 2) * 60000) + (WAIT_TIME * 60000), null, character.getActingPlayer());
 			}
 		}
 		return null;
@@ -602,6 +610,7 @@ public class TvT extends Event
 		if (character.isPlayer() && character.getActingPlayer().isOnCustomEvent())
 		{
 			cancelQuestTimer("KickPlayer" + character.getObjectId(), null, character.getActingPlayer());
+			cancelQuestTimer("KickPlayerWarning" + character.getObjectId(), null, character.getActingPlayer());
 		}
 		return super.onExitZone(character, zone);
 	}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
index 6900d2b3b0..522987b27d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java
@@ -531,18 +531,25 @@ public class TvT extends Event
 		// Activity timer.
 		if (event.startsWith("KickPlayer") && (player != null) && (player.getInstanceWorld() == PVP_WORLD))
 		{
-			player.setTeam(Team.NONE);
-			PVP_WORLD.ejectPlayer(player);
-			PLAYER_LIST.remove(player);
-			PLAYER_SCORES.remove(player);
-			BLUE_TEAM.remove(player);
-			RED_TEAM.remove(player);
-			player.setOnCustomEvent(false);
-			removeListeners(player);
-			player.sendMessage("You have been kicked for been inactive.");
-			if (PVP_WORLD != null)
+			if (event.contains("Warning"))
 			{
-				broadcastScreenMessageWithEffect("Player " + player.getName() + " was kicked for been inactive.", 7);
+				player.sendPacket(new ExShowScreenMessage("You have been marked as inactive!", ExShowScreenMessage.TOP_CENTER, 10000, 0, true, false));
+			}
+			else
+			{
+				player.setTeam(Team.NONE);
+				PVP_WORLD.ejectPlayer(player);
+				PLAYER_LIST.remove(player);
+				PLAYER_SCORES.remove(player);
+				BLUE_TEAM.remove(player);
+				RED_TEAM.remove(player);
+				player.setOnCustomEvent(false);
+				removeListeners(player);
+				player.sendMessage("You have been kicked for been inactive.");
+				if (PVP_WORLD != null)
+				{
+					broadcastScreenMessageWithEffect("Player " + player.getName() + " was kicked for been inactive!", 7);
+				}
 			}
 		}
 		return htmltext;
@@ -593,6 +600,7 @@ public class TvT extends Event
 					((zone == RED_PEACE_ZONE) && (character.getTeam() == Team.RED)))))
 			{
 				startQuestTimer("KickPlayer" + character.getObjectId(), PVP_WORLD.getDoor(BLUE_DOOR_ID).isOpen() ? INACTIVITY_TIME * 60000 : (INACTIVITY_TIME * 60000) + (WAIT_TIME * 60000), null, character.getActingPlayer());
+				startQuestTimer("KickPlayerWarning" + character.getObjectId(), PVP_WORLD.getDoor(BLUE_DOOR_ID).isOpen() ? (INACTIVITY_TIME / 2) * 60000 : ((INACTIVITY_TIME / 2) * 60000) + (WAIT_TIME * 60000), null, character.getActingPlayer());
 			}
 		}
 		return null;
@@ -604,6 +612,7 @@ public class TvT extends Event
 		if (character.isPlayer() && character.getActingPlayer().isOnCustomEvent())
 		{
 			cancelQuestTimer("KickPlayer" + character.getObjectId(), null, character.getActingPlayer());
+			cancelQuestTimer("KickPlayerWarning" + character.getObjectId(), null, character.getActingPlayer());
 		}
 		return super.onExitZone(character, zone);
 	}