TvT fixes and improvements.

L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java

@@ -175,6 +175,10 @@ public class TvT extends Event
 			}
 			case "CancelParticipation":
 			{
+				if (player.isOnEvent())
+				{
+					return null;
+				}
 				// Remove the player from the IP count
 				if (Config.DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP > 0)
 				{
@@ -256,6 +260,8 @@ public class TvT extends Event
 				boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes.
 				for (Player participant : PLAYER_LIST)
 				{
+					participant.setOnEvent(true);
+					participant.setRegisteredOnEvent(false);
 					if (team)
 					{
 						BLUE_TEAM.add(participant);
@@ -275,7 +281,6 @@ public class TvT extends Event
 						team = true;
 					}
 					addDeathListener(participant);
-					participant.setOnEvent(true);
 				}
 				// Make Blue CC.
 				if (BLUE_TEAM.size() > 1)
@@ -896,6 +901,7 @@ public class TvT extends Event
 			removeListeners(participant);
 			participant.setTeam(Team.NONE);
 			participant.setRegisteredOnEvent(false);
+			participant.setOnEvent(false);
 		}
 		if (PVP_WORLD != null)
 		{

L2J_Mobius_02.5_Underground/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java

@@ -175,6 +175,10 @@ public class TvT extends Event
 			}
 			case "CancelParticipation":
 			{
+				if (player.isOnEvent())
+				{
+					return null;
+				}
 				// Remove the player from the IP count
 				if (Config.DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP > 0)
 				{
@@ -256,6 +260,8 @@ public class TvT extends Event
 				boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes.
 				for (Player participant : PLAYER_LIST)
 				{
+					participant.setOnEvent(true);
+					participant.setRegisteredOnEvent(false);
 					if (team)
 					{
 						BLUE_TEAM.add(participant);
@@ -275,7 +281,6 @@ public class TvT extends Event
 						team = true;
 					}
 					addDeathListener(participant);
-					participant.setOnEvent(true);
 				}
 				// Make Blue CC.
 				if (BLUE_TEAM.size() > 1)
@@ -896,6 +901,7 @@ public class TvT extends Event
 			removeListeners(participant);
 			participant.setTeam(Team.NONE);
 			participant.setRegisteredOnEvent(false);
+			participant.setOnEvent(false);
 		}
 		if (PVP_WORLD != null)
 		{

L2J_Mobius_03.0_Helios/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java

@@ -175,6 +175,10 @@ public class TvT extends Event
 			}
 			case "CancelParticipation":
 			{
+				if (player.isOnEvent())
+				{
+					return null;
+				}
 				// Remove the player from the IP count
 				if (Config.DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP > 0)
 				{
@@ -256,6 +260,8 @@ public class TvT extends Event
 				boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes.
 				for (Player participant : PLAYER_LIST)
 				{
+					participant.setOnEvent(true);
+					participant.setRegisteredOnEvent(false);
 					if (team)
 					{
 						BLUE_TEAM.add(participant);
@@ -275,7 +281,6 @@ public class TvT extends Event
 						team = true;
 					}
 					addDeathListener(participant);
-					participant.setOnEvent(true);
 				}
 				// Make Blue CC.
 				if (BLUE_TEAM.size() > 1)
@@ -896,6 +901,7 @@ public class TvT extends Event
 			removeListeners(participant);
 			participant.setTeam(Team.NONE);
 			participant.setRegisteredOnEvent(false);
+			participant.setOnEvent(false);
 		}
 		if (PVP_WORLD != null)
 		{

L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java

@@ -175,6 +175,10 @@ public class TvT extends Event
 			}
 			case "CancelParticipation":
 			{
+				if (player.isOnEvent())
+				{
+					return null;
+				}
 				// Remove the player from the IP count
 				if (Config.DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP > 0)
 				{
@@ -256,6 +260,8 @@ public class TvT extends Event
 				boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes.
 				for (Player participant : PLAYER_LIST)
 				{
+					participant.setOnEvent(true);
+					participant.setRegisteredOnEvent(false);
 					if (team)
 					{
 						BLUE_TEAM.add(participant);
@@ -275,7 +281,6 @@ public class TvT extends Event
 						team = true;
 					}
 					addDeathListener(participant);
-					participant.setOnEvent(true);
 				}
 				// Make Blue CC.
 				if (BLUE_TEAM.size() > 1)
@@ -896,6 +901,7 @@ public class TvT extends Event
 			removeListeners(participant);
 			participant.setTeam(Team.NONE);
 			participant.setRegisteredOnEvent(false);
+			participant.setOnEvent(false);
 		}
 		if (PVP_WORLD != null)
 		{

L2J_Mobius_05.0_Salvation/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java

@@ -173,6 +173,10 @@ public class TvT extends Event
 			}
 			case "CancelParticipation":
 			{
+				if (player.isOnEvent())
+				{
+					return null;
+				}
 				// Remove the player from the IP count
 				if (Config.DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP > 0)
 				{
@@ -254,6 +258,8 @@ public class TvT extends Event
 				boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes.
 				for (Player participant : PLAYER_LIST)
 				{
+					participant.setOnEvent(true);
+					participant.setRegisteredOnEvent(false);
 					if (team)
 					{
 						BLUE_TEAM.add(participant);
@@ -273,7 +279,6 @@ public class TvT extends Event
 						team = true;
 					}
 					addDeathListener(participant);
-					participant.setOnEvent(true);
 				}
 				// Make Blue CC.
 				if (BLUE_TEAM.size() > 1)
@@ -894,6 +899,7 @@ public class TvT extends Event
 			removeListeners(participant);
 			participant.setTeam(Team.NONE);
 			participant.setRegisteredOnEvent(false);
+			participant.setOnEvent(false);
 		}
 		if (PVP_WORLD != null)
 		{

L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java

@@ -173,6 +173,10 @@ public class TvT extends Event
 			}
 			case "CancelParticipation":
 			{
+				if (player.isOnEvent())
+				{
+					return null;
+				}
 				// Remove the player from the IP count
 				if (Config.DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP > 0)
 				{
@@ -254,6 +258,8 @@ public class TvT extends Event
 				boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes.
 				for (Player participant : PLAYER_LIST)
 				{
+					participant.setOnEvent(true);
+					participant.setRegisteredOnEvent(false);
 					if (team)
 					{
 						BLUE_TEAM.add(participant);
@@ -273,7 +279,6 @@ public class TvT extends Event
 						team = true;
 					}
 					addDeathListener(participant);
-					participant.setOnEvent(true);
 				}
 				// Make Blue CC.
 				if (BLUE_TEAM.size() > 1)
@@ -894,6 +899,7 @@ public class TvT extends Event
 			removeListeners(participant);
 			participant.setTeam(Team.NONE);
 			participant.setRegisteredOnEvent(false);
+			participant.setOnEvent(false);
 		}
 		if (PVP_WORLD != null)
 		{

L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java

@@ -173,6 +173,10 @@ public class TvT extends Event
 			}
 			case "CancelParticipation":
 			{
+				if (player.isOnEvent())
+				{
+					return null;
+				}
 				// Remove the player from the IP count
 				if (Config.DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP > 0)
 				{
@@ -254,6 +258,8 @@ public class TvT extends Event
 				boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes.
 				for (Player participant : PLAYER_LIST)
 				{
+					participant.setOnEvent(true);
+					participant.setRegisteredOnEvent(false);
 					if (team)
 					{
 						BLUE_TEAM.add(participant);
@@ -273,7 +279,6 @@ public class TvT extends Event
 						team = true;
 					}
 					addDeathListener(participant);
-					participant.setOnEvent(true);
 				}
 				// Make Blue CC.
 				if (BLUE_TEAM.size() > 1)
@@ -894,6 +899,7 @@ public class TvT extends Event
 			removeListeners(participant);
 			participant.setTeam(Team.NONE);
 			participant.setRegisteredOnEvent(false);
+			participant.setOnEvent(false);
 		}
 		if (PVP_WORLD != null)
 		{

L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java

@@ -173,6 +173,10 @@ public class TvT extends Event
 			}
 			case "CancelParticipation":
 			{
+				if (player.isOnEvent())
+				{
+					return null;
+				}
 				// Remove the player from the IP count
 				if (Config.DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP > 0)
 				{
@@ -254,6 +258,8 @@ public class TvT extends Event
 				boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes.
 				for (Player participant : PLAYER_LIST)
 				{
+					participant.setOnEvent(true);
+					participant.setRegisteredOnEvent(false);
 					if (team)
 					{
 						BLUE_TEAM.add(participant);
@@ -273,7 +279,6 @@ public class TvT extends Event
 						team = true;
 					}
 					addDeathListener(participant);
-					participant.setOnEvent(true);
 				}
 				// Make Blue CC.
 				if (BLUE_TEAM.size() > 1)
@@ -894,6 +899,7 @@ public class TvT extends Event
 			removeListeners(participant);
 			participant.setTeam(Team.NONE);
 			participant.setRegisteredOnEvent(false);
+			participant.setOnEvent(false);
 		}
 		if (PVP_WORLD != null)
 		{

L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java

@@ -173,6 +173,10 @@ public class TvT extends Event
 			}
 			case "CancelParticipation":
 			{
+				if (player.isOnEvent())
+				{
+					return null;
+				}
 				// Remove the player from the IP count
 				if (Config.DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP > 0)
 				{
@@ -254,6 +258,8 @@ public class TvT extends Event
 				boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes.
 				for (Player participant : PLAYER_LIST)
 				{
+					participant.setOnEvent(true);
+					participant.setRegisteredOnEvent(false);
 					if (team)
 					{
 						BLUE_TEAM.add(participant);
@@ -273,7 +279,6 @@ public class TvT extends Event
 						team = true;
 					}
 					addDeathListener(participant);
-					participant.setOnEvent(true);
 				}
 				// Make Blue CC.
 				if (BLUE_TEAM.size() > 1)
@@ -894,6 +899,7 @@ public class TvT extends Event
 			removeListeners(participant);
 			participant.setTeam(Team.NONE);
 			participant.setRegisteredOnEvent(false);
+			participant.setOnEvent(false);
 		}
 		if (PVP_WORLD != null)
 		{

L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java

@@ -173,6 +173,10 @@ public class TvT extends Event
 			}
 			case "CancelParticipation":
 			{
+				if (player.isOnEvent())
+				{
+					return null;
+				}
 				// Remove the player from the IP count
 				if (Config.DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP > 0)
 				{
@@ -254,6 +258,8 @@ public class TvT extends Event
 				boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes.
 				for (Player participant : PLAYER_LIST)
 				{
+					participant.setOnEvent(true);
+					participant.setRegisteredOnEvent(false);
 					if (team)
 					{
 						BLUE_TEAM.add(participant);
@@ -273,7 +279,6 @@ public class TvT extends Event
 						team = true;
 					}
 					addDeathListener(participant);
-					participant.setOnEvent(true);
 				}
 				// Make Blue CC.
 				if (BLUE_TEAM.size() > 1)
@@ -894,6 +899,7 @@ public class TvT extends Event
 			removeListeners(participant);
 			participant.setTeam(Team.NONE);
 			participant.setRegisteredOnEvent(false);
+			participant.setOnEvent(false);
 		}
 		if (PVP_WORLD != null)
 		{

L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java

@@ -173,6 +173,10 @@ public class TvT extends Event
 			}
 			case "CancelParticipation":
 			{
+				if (player.isOnEvent())
+				{
+					return null;
+				}
 				// Remove the player from the IP count
 				if (Config.DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP > 0)
 				{
@@ -254,6 +258,8 @@ public class TvT extends Event
 				boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes.
 				for (Player participant : PLAYER_LIST)
 				{
+					participant.setOnEvent(true);
+					participant.setRegisteredOnEvent(false);
 					if (team)
 					{
 						BLUE_TEAM.add(participant);
@@ -273,7 +279,6 @@ public class TvT extends Event
 						team = true;
 					}
 					addDeathListener(participant);
-					participant.setOnEvent(true);
 				}
 				// Make Blue CC.
 				if (BLUE_TEAM.size() > 1)
@@ -894,6 +899,7 @@ public class TvT extends Event
 			removeListeners(participant);
 			participant.setTeam(Team.NONE);
 			participant.setRegisteredOnEvent(false);
+			participant.setOnEvent(false);
 		}
 		if (PVP_WORLD != null)
 		{

L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java

@@ -173,6 +173,10 @@ public class TvT extends Event
 			}
 			case "CancelParticipation":
 			{
+				if (player.isOnEvent())
+				{
+					return null;
+				}
 				// Remove the player from the IP count
 				if (Config.DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP > 0)
 				{
@@ -254,6 +258,8 @@ public class TvT extends Event
 				boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes.
 				for (Player participant : PLAYER_LIST)
 				{
+					participant.setOnEvent(true);
+					participant.setRegisteredOnEvent(false);
 					if (team)
 					{
 						BLUE_TEAM.add(participant);
@@ -273,7 +279,6 @@ public class TvT extends Event
 						team = true;
 					}
 					addDeathListener(participant);
-					participant.setOnEvent(true);
 				}
 				// Make Blue CC.
 				if (BLUE_TEAM.size() > 1)
@@ -894,6 +899,7 @@ public class TvT extends Event
 			removeListeners(participant);
 			participant.setTeam(Team.NONE);
 			participant.setRegisteredOnEvent(false);
+			participant.setOnEvent(false);
 		}
 		if (PVP_WORLD != null)
 		{

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java

@@ -179,6 +179,10 @@ public class TvT extends Event
 			}
 			case "CancelParticipation":
 			{
+				if (player.isOnEvent())
+				{
+					return null;
+				}
 				// Remove the player from the IP count
 				if (Config.DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP > 0)
 				{
@@ -258,6 +262,8 @@ public class TvT extends Event
 				boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes.
 				for (Player participant : PLAYER_LIST)
 				{
+					participant.setOnEvent(true);
+					participant.setRegisteredOnEvent(false);
 					if (team)
 					{
 						BLUE_TEAM.add(participant);
@@ -277,7 +283,6 @@ public class TvT extends Event
 						team = true;
 					}
 					addDeathListener(participant);
-					participant.setOnEvent(true);
 				}
 				// Make Blue CC.
 				if (BLUE_TEAM.size() > 1)
@@ -898,6 +903,7 @@ public class TvT extends Event
 			removeListeners(participant);
 			participant.setTeam(Team.NONE);
 			participant.setRegisteredOnEvent(false);
+			participant.setOnEvent(false);
 		}
 		if (PVP_WORLD != null)
 		{

L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java

@@ -179,6 +179,10 @@ public class TvT extends Event
 			}
 			case "CancelParticipation":
 			{
+				if (player.isOnEvent())
+				{
+					return null;
+				}
 				// Remove the player from the IP count
 				if (Config.DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP > 0)
 				{
@@ -258,6 +262,8 @@ public class TvT extends Event
 				boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes.
 				for (Player participant : PLAYER_LIST)
 				{
+					participant.setOnEvent(true);
+					participant.setRegisteredOnEvent(false);
 					if (team)
 					{
 						BLUE_TEAM.add(participant);
@@ -277,7 +283,6 @@ public class TvT extends Event
 						team = true;
 					}
 					addDeathListener(participant);
-					participant.setOnEvent(true);
 				}
 				// Make Blue CC.
 				if (BLUE_TEAM.size() > 1)
@@ -898,6 +903,7 @@ public class TvT extends Event
 			removeListeners(participant);
 			participant.setTeam(Team.NONE);
 			participant.setRegisteredOnEvent(false);
+			participant.setOnEvent(false);
 		}
 		if (PVP_WORLD != null)
 		{

L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java

@@ -179,6 +179,10 @@ public class TvT extends Event
 			}
 			case "CancelParticipation":
 			{
+				if (player.isOnEvent())
+				{
+					return null;
+				}
 				// Remove the player from the IP count
 				if (Config.DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP > 0)
 				{
@@ -258,6 +262,8 @@ public class TvT extends Event
 				boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes.
 				for (Player participant : PLAYER_LIST)
 				{
+					participant.setOnEvent(true);
+					participant.setRegisteredOnEvent(false);
 					if (team)
 					{
 						BLUE_TEAM.add(participant);
@@ -277,7 +283,6 @@ public class TvT extends Event
 						team = true;
 					}
 					addDeathListener(participant);
-					participant.setOnEvent(true);
 				}
 				// Make Blue CC.
 				if (BLUE_TEAM.size() > 1)
@@ -898,6 +903,7 @@ public class TvT extends Event
 			removeListeners(participant);
 			participant.setTeam(Team.NONE);
 			participant.setRegisteredOnEvent(false);
+			participant.setOnEvent(false);
 		}
 		if (PVP_WORLD != null)
 		{

L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java

@@ -179,6 +179,10 @@ public class TvT extends Event
 			}
 			case "CancelParticipation":
 			{
+				if (player.isOnEvent())
+				{
+					return null;
+				}
 				// Remove the player from the IP count
 				if (Config.DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP > 0)
 				{
@@ -258,6 +262,8 @@ public class TvT extends Event
 				boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes.
 				for (Player participant : PLAYER_LIST)
 				{
+					participant.setOnEvent(true);
+					participant.setRegisteredOnEvent(false);
 					if (team)
 					{
 						BLUE_TEAM.add(participant);
@@ -277,7 +283,6 @@ public class TvT extends Event
 						team = true;
 					}
 					addDeathListener(participant);
-					participant.setOnEvent(true);
 				}
 				// Make Blue CC.
 				if (BLUE_TEAM.size() > 1)
@@ -898,6 +903,7 @@ public class TvT extends Event
 			removeListeners(participant);
 			participant.setTeam(Team.NONE);
 			participant.setRegisteredOnEvent(false);
+			participant.setOnEvent(false);
 		}
 		if (PVP_WORLD != null)
 		{

L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java

@@ -179,6 +179,10 @@ public class TvT extends Event
 			}
 			case "CancelParticipation":
 			{
+				if (player.isOnEvent())
+				{
+					return null;
+				}
 				// Remove the player from the IP count
 				if (Config.DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP > 0)
 				{
@@ -258,6 +262,8 @@ public class TvT extends Event
 				boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes.
 				for (Player participant : PLAYER_LIST)
 				{
+					participant.setOnEvent(true);
+					participant.setRegisteredOnEvent(false);
 					if (team)
 					{
 						BLUE_TEAM.add(participant);
@@ -277,7 +283,6 @@ public class TvT extends Event
 						team = true;
 					}
 					addDeathListener(participant);
-					participant.setOnEvent(true);
 				}
 				// Make Blue CC.
 				if (BLUE_TEAM.size() > 1)
@@ -898,6 +903,7 @@ public class TvT extends Event
 			removeListeners(participant);
 			participant.setTeam(Team.NONE);
 			participant.setRegisteredOnEvent(false);
+			participant.setOnEvent(false);
 		}
 		if (PVP_WORLD != null)
 		{

L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java

@@ -179,6 +179,10 @@ public class TvT extends Event
 			}
 			case "CancelParticipation":
 			{
+				if (player.isOnEvent())
+				{
+					return null;
+				}
 				// Remove the player from the IP count
 				if (Config.DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP > 0)
 				{
@@ -258,6 +262,8 @@ public class TvT extends Event
 				boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes.
 				for (Player participant : PLAYER_LIST)
 				{
+					participant.setOnEvent(true);
+					participant.setRegisteredOnEvent(false);
 					if (team)
 					{
 						BLUE_TEAM.add(participant);
@@ -277,7 +283,6 @@ public class TvT extends Event
 						team = true;
 					}
 					addDeathListener(participant);
-					participant.setOnEvent(true);
 				}
 				// Make Blue CC.
 				if (BLUE_TEAM.size() > 1)
@@ -898,6 +903,7 @@ public class TvT extends Event
 			removeListeners(participant);
 			participant.setTeam(Team.NONE);
 			participant.setRegisteredOnEvent(false);
+			participant.setOnEvent(false);
 		}
 		if (PVP_WORLD != null)
 		{

L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java

@@ -179,6 +179,10 @@ public class TvT extends Event
 			}
 			case "CancelParticipation":
 			{
+				if (player.isOnEvent())
+				{
+					return null;
+				}
 				// Remove the player from the IP count
 				if (Config.DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP > 0)
 				{
@@ -258,6 +262,8 @@ public class TvT extends Event
 				boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes.
 				for (Player participant : PLAYER_LIST)
 				{
+					participant.setOnEvent(true);
+					participant.setRegisteredOnEvent(false);
 					if (team)
 					{
 						BLUE_TEAM.add(participant);
@@ -277,7 +283,6 @@ public class TvT extends Event
 						team = true;
 					}
 					addDeathListener(participant);
-					participant.setOnEvent(true);
 				}
 				// Make Blue CC.
 				if (BLUE_TEAM.size() > 1)
@@ -898,6 +903,7 @@ public class TvT extends Event
 			removeListeners(participant);
 			participant.setTeam(Team.NONE);
 			participant.setRegisteredOnEvent(false);
+			participant.setOnEvent(false);
 		}
 		if (PVP_WORLD != null)
 		{

L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java

@@ -179,6 +179,10 @@ public class TvT extends Event
 			}
 			case "CancelParticipation":
 			{
+				if (player.isOnEvent())
+				{
+					return null;
+				}
 				// Remove the player from the IP count
 				if (Config.DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP > 0)
 				{
@@ -258,6 +262,8 @@ public class TvT extends Event
 				boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes.
 				for (Player participant : PLAYER_LIST)
 				{
+					participant.setOnEvent(true);
+					participant.setRegisteredOnEvent(false);
 					if (team)
 					{
 						BLUE_TEAM.add(participant);
@@ -277,7 +283,6 @@ public class TvT extends Event
 						team = true;
 					}
 					addDeathListener(participant);
-					participant.setOnEvent(true);
 				}
 				// Make Blue CC.
 				if (BLUE_TEAM.size() > 1)
@@ -898,6 +903,7 @@ public class TvT extends Event
 			removeListeners(participant);
 			participant.setTeam(Team.NONE);
 			participant.setRegisteredOnEvent(false);
+			participant.setOnEvent(false);
 		}
 		if (PVP_WORLD != null)
 		{

L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java

@@ -179,6 +179,10 @@ public class TvT extends Event
 			}
 			case "CancelParticipation":
 			{
+				if (player.isOnEvent())
+				{
+					return null;
+				}
 				// Remove the player from the IP count
 				if (Config.DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP > 0)
 				{
@@ -258,6 +262,8 @@ public class TvT extends Event
 				boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes.
 				for (Player participant : PLAYER_LIST)
 				{
+					participant.setOnEvent(true);
+					participant.setRegisteredOnEvent(false);
 					if (team)
 					{
 						BLUE_TEAM.add(participant);
@@ -277,7 +283,6 @@ public class TvT extends Event
 						team = true;
 					}
 					addDeathListener(participant);
-					participant.setOnEvent(true);
 				}
 				// Make Blue CC.
 				if (BLUE_TEAM.size() > 1)
@@ -898,6 +903,7 @@ public class TvT extends Event
 			removeListeners(participant);
 			participant.setTeam(Team.NONE);
 			participant.setRegisteredOnEvent(false);
+			participant.setOnEvent(false);
 		}
 		if (PVP_WORLD != null)
 		{

L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java

@@ -179,6 +179,10 @@ public class TvT extends Event
 			}
 			case "CancelParticipation":
 			{
+				if (player.isOnEvent())
+				{
+					return null;
+				}
 				// Remove the player from the IP count
 				if (Config.DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP > 0)
 				{
@@ -258,6 +262,8 @@ public class TvT extends Event
 				boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes.
 				for (Player participant : PLAYER_LIST)
 				{
+					participant.setOnEvent(true);
+					participant.setRegisteredOnEvent(false);
 					if (team)
 					{
 						BLUE_TEAM.add(participant);
@@ -277,7 +283,6 @@ public class TvT extends Event
 						team = true;
 					}
 					addDeathListener(participant);
-					participant.setOnEvent(true);
 				}
 				// Make Blue CC.
 				if (BLUE_TEAM.size() > 1)
@@ -898,6 +903,7 @@ public class TvT extends Event
 			removeListeners(participant);
 			participant.setTeam(Team.NONE);
 			participant.setRegisteredOnEvent(false);
+			participant.setOnEvent(false);
 		}
 		if (PVP_WORLD != null)
 		{

L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/custom/events/TeamVsTeam/TvT.java

@@ -179,6 +179,10 @@ public class TvT extends Event
 			}
 			case "CancelParticipation":
 			{
+				if (player.isOnEvent())
+				{
+					return null;
+				}
 				// Remove the player from the IP count
 				if (Config.DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP > 0)
 				{
@@ -258,6 +262,8 @@ public class TvT extends Event
 				boolean team = getRandomBoolean(); // If teams are not even, randomize where extra player goes.
 				for (Player participant : PLAYER_LIST)
 				{
+					participant.setOnEvent(true);
+					participant.setRegisteredOnEvent(false);
 					if (team)
 					{
 						BLUE_TEAM.add(participant);
@@ -277,7 +283,6 @@ public class TvT extends Event
 						team = true;
 					}
 					addDeathListener(participant);
-					participant.setOnEvent(true);
 				}
 				// Make Blue CC.
 				if (BLUE_TEAM.size() > 1)
@@ -898,6 +903,7 @@ public class TvT extends Event
 			removeListeners(participant);
 			participant.setTeam(Team.NONE);
 			participant.setRegisteredOnEvent(false);
+			participant.setOnEvent(false);
 		}
 		if (PVP_WORLD != null)
 		{