From 896924ce4b3a0aefb102117debd4ed3059a194dd Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Mon, 11 Dec 2017 16:06:36 +0000
Subject: [PATCH] Made a TvT method to send player messages.

---
 .../scripts/custom/events/TeamVsTeam/TvT.java     | 15 ++++++++++-----
 .../scripts/custom/events/TeamVsTeam/TvT.java     | 15 ++++++++++-----
 .../scripts/custom/events/TeamVsTeam/TvT.java     | 15 ++++++++++-----
 .../scripts/custom/events/TeamVsTeam/TvT.java     | 15 ++++++++++-----
 .../scripts/custom/events/TeamVsTeam/TvT.java     | 15 ++++++++++-----
 5 files changed, 50 insertions(+), 25 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 7c498a2c12..5dd31705f3 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
@@ -495,7 +495,7 @@ public class TvT extends Event
 		{
 			if (event.contains("Warning"))
 			{
-				player.sendPacket(new ExShowScreenMessage("You have been marked as inactive!", ExShowScreenMessage.TOP_CENTER, 10000, 0, true, false));
+				sendScreenMessage(player, "You have been marked as inactive!", 10);
 			}
 			else
 			{
@@ -558,12 +558,12 @@ public class TvT extends Event
 			if ((zone == BLUE_PEACE_ZONE) && (character.getTeam() == Team.RED))
 			{
 				character.teleToLocation(RED_SPAWN_LOC, PVP_WORLD);
-				character.getActingPlayer().sendPacket(new ExShowScreenMessage("Entering the enemy headquarters is prohibited!", ExShowScreenMessage.TOP_CENTER, 10000, 0, true, false));
+				sendScreenMessage(character.getActingPlayer(), "Entering the enemy headquarters is prohibited!", 10);
 			}
 			if ((zone == RED_PEACE_ZONE) && (character.getTeam() == Team.BLUE))
 			{
 				character.teleToLocation(BLUE_SPAWN_LOC, PVP_WORLD);
-				character.getActingPlayer().sendPacket(new ExShowScreenMessage("Entering the enemy headquarters is prohibited!", ExShowScreenMessage.TOP_CENTER, 10000, 0, true, false));
+				sendScreenMessage(character.getActingPlayer(), "Entering the enemy headquarters is prohibited!", 10);
 			}
 			// Start inactivity check.
 			if (character.isPlayer() && //
@@ -670,9 +670,9 @@ public class TvT extends Event
 		return true;
 	}
 	
-	private void broadcastScreenMessageWithEffect(String message, int duration)
+	private void sendScreenMessage(L2PcInstance player, String message, int duration)
 	{
-		PVP_WORLD.broadcastPacket(new ExShowScreenMessage(message, ExShowScreenMessage.TOP_CENTER, duration * 1000, 0, true, true));
+		player.sendPacket(new ExShowScreenMessage(message, ExShowScreenMessage.TOP_CENTER, duration * 1000, 0, true, false));
 	}
 	
 	private void broadcastScreenMessage(String message, int duration)
@@ -680,6 +680,11 @@ public class TvT extends Event
 		PVP_WORLD.broadcastPacket(new ExShowScreenMessage(message, ExShowScreenMessage.TOP_CENTER, duration * 1000, 0, true, false));
 	}
 	
+	private void broadcastScreenMessageWithEffect(String message, int duration)
+	{
+		PVP_WORLD.broadcastPacket(new ExShowScreenMessage(message, ExShowScreenMessage.TOP_CENTER, duration * 1000, 0, true, true));
+	}
+	
 	private void broadcastScoreMessage()
 	{
 		PVP_WORLD.broadcastPacket(new ExShowScreenMessage("Blue: " + BLUE_SCORE + " - Red: " + RED_SCORE, ExShowScreenMessage.BOTTOM_RIGHT, 15000, 0, true, false));
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 7c498a2c12..5dd31705f3 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
@@ -495,7 +495,7 @@ public class TvT extends Event
 		{
 			if (event.contains("Warning"))
 			{
-				player.sendPacket(new ExShowScreenMessage("You have been marked as inactive!", ExShowScreenMessage.TOP_CENTER, 10000, 0, true, false));
+				sendScreenMessage(player, "You have been marked as inactive!", 10);
 			}
 			else
 			{
@@ -558,12 +558,12 @@ public class TvT extends Event
 			if ((zone == BLUE_PEACE_ZONE) && (character.getTeam() == Team.RED))
 			{
 				character.teleToLocation(RED_SPAWN_LOC, PVP_WORLD);
-				character.getActingPlayer().sendPacket(new ExShowScreenMessage("Entering the enemy headquarters is prohibited!", ExShowScreenMessage.TOP_CENTER, 10000, 0, true, false));
+				sendScreenMessage(character.getActingPlayer(), "Entering the enemy headquarters is prohibited!", 10);
 			}
 			if ((zone == RED_PEACE_ZONE) && (character.getTeam() == Team.BLUE))
 			{
 				character.teleToLocation(BLUE_SPAWN_LOC, PVP_WORLD);
-				character.getActingPlayer().sendPacket(new ExShowScreenMessage("Entering the enemy headquarters is prohibited!", ExShowScreenMessage.TOP_CENTER, 10000, 0, true, false));
+				sendScreenMessage(character.getActingPlayer(), "Entering the enemy headquarters is prohibited!", 10);
 			}
 			// Start inactivity check.
 			if (character.isPlayer() && //
@@ -670,9 +670,9 @@ public class TvT extends Event
 		return true;
 	}
 	
-	private void broadcastScreenMessageWithEffect(String message, int duration)
+	private void sendScreenMessage(L2PcInstance player, String message, int duration)
 	{
-		PVP_WORLD.broadcastPacket(new ExShowScreenMessage(message, ExShowScreenMessage.TOP_CENTER, duration * 1000, 0, true, true));
+		player.sendPacket(new ExShowScreenMessage(message, ExShowScreenMessage.TOP_CENTER, duration * 1000, 0, true, false));
 	}
 	
 	private void broadcastScreenMessage(String message, int duration)
@@ -680,6 +680,11 @@ public class TvT extends Event
 		PVP_WORLD.broadcastPacket(new ExShowScreenMessage(message, ExShowScreenMessage.TOP_CENTER, duration * 1000, 0, true, false));
 	}
 	
+	private void broadcastScreenMessageWithEffect(String message, int duration)
+	{
+		PVP_WORLD.broadcastPacket(new ExShowScreenMessage(message, ExShowScreenMessage.TOP_CENTER, duration * 1000, 0, true, true));
+	}
+	
 	private void broadcastScoreMessage()
 	{
 		PVP_WORLD.broadcastPacket(new ExShowScreenMessage("Blue: " + BLUE_SCORE + " - Red: " + RED_SCORE, ExShowScreenMessage.BOTTOM_RIGHT, 15000, 0, true, false));
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 7c498a2c12..5dd31705f3 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
@@ -495,7 +495,7 @@ public class TvT extends Event
 		{
 			if (event.contains("Warning"))
 			{
-				player.sendPacket(new ExShowScreenMessage("You have been marked as inactive!", ExShowScreenMessage.TOP_CENTER, 10000, 0, true, false));
+				sendScreenMessage(player, "You have been marked as inactive!", 10);
 			}
 			else
 			{
@@ -558,12 +558,12 @@ public class TvT extends Event
 			if ((zone == BLUE_PEACE_ZONE) && (character.getTeam() == Team.RED))
 			{
 				character.teleToLocation(RED_SPAWN_LOC, PVP_WORLD);
-				character.getActingPlayer().sendPacket(new ExShowScreenMessage("Entering the enemy headquarters is prohibited!", ExShowScreenMessage.TOP_CENTER, 10000, 0, true, false));
+				sendScreenMessage(character.getActingPlayer(), "Entering the enemy headquarters is prohibited!", 10);
 			}
 			if ((zone == RED_PEACE_ZONE) && (character.getTeam() == Team.BLUE))
 			{
 				character.teleToLocation(BLUE_SPAWN_LOC, PVP_WORLD);
-				character.getActingPlayer().sendPacket(new ExShowScreenMessage("Entering the enemy headquarters is prohibited!", ExShowScreenMessage.TOP_CENTER, 10000, 0, true, false));
+				sendScreenMessage(character.getActingPlayer(), "Entering the enemy headquarters is prohibited!", 10);
 			}
 			// Start inactivity check.
 			if (character.isPlayer() && //
@@ -670,9 +670,9 @@ public class TvT extends Event
 		return true;
 	}
 	
-	private void broadcastScreenMessageWithEffect(String message, int duration)
+	private void sendScreenMessage(L2PcInstance player, String message, int duration)
 	{
-		PVP_WORLD.broadcastPacket(new ExShowScreenMessage(message, ExShowScreenMessage.TOP_CENTER, duration * 1000, 0, true, true));
+		player.sendPacket(new ExShowScreenMessage(message, ExShowScreenMessage.TOP_CENTER, duration * 1000, 0, true, false));
 	}
 	
 	private void broadcastScreenMessage(String message, int duration)
@@ -680,6 +680,11 @@ public class TvT extends Event
 		PVP_WORLD.broadcastPacket(new ExShowScreenMessage(message, ExShowScreenMessage.TOP_CENTER, duration * 1000, 0, true, false));
 	}
 	
+	private void broadcastScreenMessageWithEffect(String message, int duration)
+	{
+		PVP_WORLD.broadcastPacket(new ExShowScreenMessage(message, ExShowScreenMessage.TOP_CENTER, duration * 1000, 0, true, true));
+	}
+	
 	private void broadcastScoreMessage()
 	{
 		PVP_WORLD.broadcastPacket(new ExShowScreenMessage("Blue: " + BLUE_SCORE + " - Red: " + RED_SCORE, ExShowScreenMessage.BOTTOM_RIGHT, 15000, 0, true, false));
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 7c498a2c12..5dd31705f3 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
@@ -495,7 +495,7 @@ public class TvT extends Event
 		{
 			if (event.contains("Warning"))
 			{
-				player.sendPacket(new ExShowScreenMessage("You have been marked as inactive!", ExShowScreenMessage.TOP_CENTER, 10000, 0, true, false));
+				sendScreenMessage(player, "You have been marked as inactive!", 10);
 			}
 			else
 			{
@@ -558,12 +558,12 @@ public class TvT extends Event
 			if ((zone == BLUE_PEACE_ZONE) && (character.getTeam() == Team.RED))
 			{
 				character.teleToLocation(RED_SPAWN_LOC, PVP_WORLD);
-				character.getActingPlayer().sendPacket(new ExShowScreenMessage("Entering the enemy headquarters is prohibited!", ExShowScreenMessage.TOP_CENTER, 10000, 0, true, false));
+				sendScreenMessage(character.getActingPlayer(), "Entering the enemy headquarters is prohibited!", 10);
 			}
 			if ((zone == RED_PEACE_ZONE) && (character.getTeam() == Team.BLUE))
 			{
 				character.teleToLocation(BLUE_SPAWN_LOC, PVP_WORLD);
-				character.getActingPlayer().sendPacket(new ExShowScreenMessage("Entering the enemy headquarters is prohibited!", ExShowScreenMessage.TOP_CENTER, 10000, 0, true, false));
+				sendScreenMessage(character.getActingPlayer(), "Entering the enemy headquarters is prohibited!", 10);
 			}
 			// Start inactivity check.
 			if (character.isPlayer() && //
@@ -670,9 +670,9 @@ public class TvT extends Event
 		return true;
 	}
 	
-	private void broadcastScreenMessageWithEffect(String message, int duration)
+	private void sendScreenMessage(L2PcInstance player, String message, int duration)
 	{
-		PVP_WORLD.broadcastPacket(new ExShowScreenMessage(message, ExShowScreenMessage.TOP_CENTER, duration * 1000, 0, true, true));
+		player.sendPacket(new ExShowScreenMessage(message, ExShowScreenMessage.TOP_CENTER, duration * 1000, 0, true, false));
 	}
 	
 	private void broadcastScreenMessage(String message, int duration)
@@ -680,6 +680,11 @@ public class TvT extends Event
 		PVP_WORLD.broadcastPacket(new ExShowScreenMessage(message, ExShowScreenMessage.TOP_CENTER, duration * 1000, 0, true, false));
 	}
 	
+	private void broadcastScreenMessageWithEffect(String message, int duration)
+	{
+		PVP_WORLD.broadcastPacket(new ExShowScreenMessage(message, ExShowScreenMessage.TOP_CENTER, duration * 1000, 0, true, true));
+	}
+	
 	private void broadcastScoreMessage()
 	{
 		PVP_WORLD.broadcastPacket(new ExShowScreenMessage("Blue: " + BLUE_SCORE + " - Red: " + RED_SCORE, ExShowScreenMessage.BOTTOM_RIGHT, 15000, 0, true, false));
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 d96b491fbf..6fa205cbd4 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
@@ -497,7 +497,7 @@ public class TvT extends Event
 		{
 			if (event.contains("Warning"))
 			{
-				player.sendPacket(new ExShowScreenMessage("You have been marked as inactive!", ExShowScreenMessage.TOP_CENTER, 10000, 0, true, false));
+				sendScreenMessage(player, "You have been marked as inactive!", 10);
 			}
 			else
 			{
@@ -560,12 +560,12 @@ public class TvT extends Event
 			if ((zone == BLUE_PEACE_ZONE) && (character.getTeam() == Team.RED))
 			{
 				character.teleToLocation(RED_SPAWN_LOC, PVP_WORLD);
-				character.getActingPlayer().sendPacket(new ExShowScreenMessage("Entering the enemy headquarters is prohibited!", ExShowScreenMessage.TOP_CENTER, 10000, 0, true, false));
+				sendScreenMessage(character.getActingPlayer(), "Entering the enemy headquarters is prohibited!", 10);
 			}
 			if ((zone == RED_PEACE_ZONE) && (character.getTeam() == Team.BLUE))
 			{
 				character.teleToLocation(BLUE_SPAWN_LOC, PVP_WORLD);
-				character.getActingPlayer().sendPacket(new ExShowScreenMessage("Entering the enemy headquarters is prohibited!", ExShowScreenMessage.TOP_CENTER, 10000, 0, true, false));
+				sendScreenMessage(character.getActingPlayer(), "Entering the enemy headquarters is prohibited!", 10);
 			}
 			// Start inactivity check.
 			if (character.isPlayer() && //
@@ -672,9 +672,9 @@ public class TvT extends Event
 		return true;
 	}
 	
-	private void broadcastScreenMessageWithEffect(String message, int duration)
+	private void sendScreenMessage(L2PcInstance player, String message, int duration)
 	{
-		PVP_WORLD.broadcastPacket(new ExShowScreenMessage(message, ExShowScreenMessage.TOP_CENTER, duration * 1000, 0, true, true));
+		player.sendPacket(new ExShowScreenMessage(message, ExShowScreenMessage.TOP_CENTER, duration * 1000, 0, true, false));
 	}
 	
 	private void broadcastScreenMessage(String message, int duration)
@@ -682,6 +682,11 @@ public class TvT extends Event
 		PVP_WORLD.broadcastPacket(new ExShowScreenMessage(message, ExShowScreenMessage.TOP_CENTER, duration * 1000, 0, true, false));
 	}
 	
+	private void broadcastScreenMessageWithEffect(String message, int duration)
+	{
+		PVP_WORLD.broadcastPacket(new ExShowScreenMessage(message, ExShowScreenMessage.TOP_CENTER, duration * 1000, 0, true, true));
+	}
+	
 	private void broadcastScoreMessage()
 	{
 		PVP_WORLD.broadcastPacket(new ExShowScreenMessage("Blue: " + BLUE_SCORE + " - Red: " + RED_SCORE, ExShowScreenMessage.BOTTOM_RIGHT, 15000, 0, true, false));