Water and Swamp zones should not broadcast info on teleport.

Contributed by Sahar.

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java

@@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
 				{
 					creature.sendPacket(new OnEventTrigger(_eventId, false));
 				}
-				creature.getActingPlayer().broadcastUserInfo();
+				if (!creature.isTeleporting())
+				{
+					creature.getActingPlayer().broadcastUserInfo();
+				}
 			}
 		}
 	}

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java

@@ -84,7 +84,10 @@ public class WaterZone extends ZoneType
 			{
 				((PlayerInstance) creature).stopWaterTask();
 			}
-			creature.getActingPlayer().broadcastUserInfo();
+			if (!creature.isTeleporting())
+			{
+				creature.getActingPlayer().broadcastUserInfo();
+			}
 		}
 		else if (creature.isNpc())
 		{

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java

@@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
 				{
 					creature.sendPacket(new OnEventTrigger(_eventId, false));
 				}
-				creature.getActingPlayer().broadcastUserInfo();
+				if (!creature.isTeleporting())
+				{
+					creature.getActingPlayer().broadcastUserInfo();
+				}
 			}
 		}
 	}

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java

@@ -84,7 +84,10 @@ public class WaterZone extends ZoneType
 			{
 				((PlayerInstance) creature).stopWaterTask();
 			}
-			creature.getActingPlayer().broadcastUserInfo();
+			if (!creature.isTeleporting())
+			{
+				creature.getActingPlayer().broadcastUserInfo();
+			}
 		}
 		else if (creature.isNpc())
 		{

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java

@@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
 				{
 					creature.sendPacket(new OnEventTrigger(_eventId, false));
 				}
-				creature.getActingPlayer().broadcastUserInfo();
+				if (!creature.isTeleporting())
+				{
+					creature.getActingPlayer().broadcastUserInfo();
+				}
 			}
 		}
 	}

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java

@@ -84,7 +84,10 @@ public class WaterZone extends ZoneType
 			{
 				((PlayerInstance) creature).stopWaterTask();
 			}
-			creature.getActingPlayer().broadcastUserInfo();
+			if (!creature.isTeleporting())
+			{
+				creature.getActingPlayer().broadcastUserInfo();
+			}
 		}
 		else if (creature.isNpc())
 		{

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java

@@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
 				{
 					creature.sendPacket(new OnEventTrigger(_eventId, false));
 				}
-				creature.getActingPlayer().broadcastUserInfo();
+				if (!creature.isTeleporting())
+				{
+					creature.getActingPlayer().broadcastUserInfo();
+				}
 			}
 		}
 	}

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java

@@ -84,7 +84,10 @@ public class WaterZone extends ZoneType
 			{
 				((PlayerInstance) creature).stopWaterTask();
 			}
-			creature.getActingPlayer().broadcastUserInfo();
+			if (!creature.isTeleporting())
+			{
+				creature.getActingPlayer().broadcastUserInfo();
+			}
 		}
 		else if (creature.isNpc())
 		{

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java

@@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
 				{
 					creature.sendPacket(new OnEventTrigger(_eventId, false));
 				}
-				creature.getActingPlayer().broadcastUserInfo();
+				if (!creature.isTeleporting())
+				{
+					creature.getActingPlayer().broadcastUserInfo();
+				}
 			}
 		}
 	}

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java

@@ -84,7 +84,10 @@ public class WaterZone extends ZoneType
 			{
 				((PlayerInstance) creature).stopWaterTask();
 			}
-			creature.getActingPlayer().broadcastUserInfo();
+			if (!creature.isTeleporting())
+			{
+				creature.getActingPlayer().broadcastUserInfo();
+			}
 		}
 		else if (creature.isNpc())
 		{

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java

@@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
 				{
 					creature.sendPacket(new OnEventTrigger(_eventId, false));
 				}
-				creature.getActingPlayer().broadcastUserInfo();
+				if (!creature.isTeleporting())
+				{
+					creature.getActingPlayer().broadcastUserInfo();
+				}
 			}
 		}
 	}

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java

@@ -84,7 +84,10 @@ public class WaterZone extends ZoneType
 			{
 				((PlayerInstance) creature).stopWaterTask();
 			}
-			creature.getActingPlayer().broadcastUserInfo();
+			if (!creature.isTeleporting())
+			{
+				creature.getActingPlayer().broadcastUserInfo();
+			}
 		}
 		else if (creature.isNpc())
 		{

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java

@@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
 				{
 					creature.sendPacket(new OnEventTrigger(_eventId, false));
 				}
-				creature.getActingPlayer().broadcastUserInfo();
+				if (!creature.isTeleporting())
+				{
+					creature.getActingPlayer().broadcastUserInfo();
+				}
 			}
 		}
 	}

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java

@@ -84,7 +84,10 @@ public class WaterZone extends ZoneType
 			{
 				((PlayerInstance) creature).stopWaterTask();
 			}
-			creature.getActingPlayer().broadcastUserInfo();
+			if (!creature.isTeleporting())
+			{
+				creature.getActingPlayer().broadcastUserInfo();
+			}
 		}
 		else if (creature.isNpc())
 		{

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java

@@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
 				{
 					creature.sendPacket(new OnEventTrigger(_eventId, false));
 				}
-				creature.getActingPlayer().broadcastUserInfo();
+				if (!creature.isTeleporting())
+				{
+					creature.getActingPlayer().broadcastUserInfo();
+				}
 			}
 		}
 	}

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java

@@ -84,7 +84,10 @@ public class WaterZone extends ZoneType
 			{
 				((PlayerInstance) creature).stopWaterTask();
 			}
-			creature.getActingPlayer().broadcastUserInfo();
+			if (!creature.isTeleporting())
+			{
+				creature.getActingPlayer().broadcastUserInfo();
+			}
 		}
 		else if (creature.isNpc())
 		{

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java

@@ -64,7 +64,7 @@ public class SwampZone extends ZoneType
 	protected void onExit(Creature creature)
 	{
 		creature.setInsideZone(ZoneId.SWAMP, false);
-		if (creature instanceof PlayerInstance)
+		if (!creature.isTeleporting() && (creature instanceof PlayerInstance))
 		{
 			((PlayerInstance) creature).broadcastUserInfo();
 		}

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java

@@ -64,7 +64,10 @@ public class WaterZone extends ZoneType
 			{
 				((PlayerInstance) creature).stopWaterTask();
 			}
-			((PlayerInstance) creature).broadcastUserInfo();
+			if (!creature.isTeleporting())
+			{
+				((PlayerInstance) creature).broadcastUserInfo();
+			}
 		}
 		else if (creature instanceof NpcInstance)
 		{

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java

@@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
 				{
 					creature.sendPacket(new OnEventTrigger(_eventId, false));
 				}
-				creature.getActingPlayer().broadcastUserInfo();
+				if (!creature.isTeleporting())
+				{
+					creature.getActingPlayer().broadcastUserInfo();
+				}
 			}
 		}
 	}

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java

@@ -84,7 +84,10 @@ public class WaterZone extends ZoneType
 			{
 				((PlayerInstance) creature).stopWaterTask();
 			}
-			creature.getActingPlayer().broadcastUserInfo();
+			if (!creature.isTeleporting())
+			{
+				creature.getActingPlayer().broadcastUserInfo();
+			}
 		}
 		else if (creature.isNpc())
 		{

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java

@@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
 				{
 					creature.sendPacket(new OnEventTrigger(_eventId, false));
 				}
-				creature.getActingPlayer().broadcastUserInfo();
+				if (!creature.isTeleporting())
+				{
+					creature.getActingPlayer().broadcastUserInfo();
+				}
 			}
 		}
 	}

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java

@@ -84,7 +84,10 @@ public class WaterZone extends ZoneType
 			{
 				((PlayerInstance) creature).stopWaterTask();
 			}
-			creature.getActingPlayer().broadcastUserInfo();
+			if (!creature.isTeleporting())
+			{
+				creature.getActingPlayer().broadcastUserInfo();
+			}
 		}
 		else if (creature.isNpc())
 		{

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java

@@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
 				{
 					creature.sendPacket(new OnEventTrigger(_eventId, false));
 				}
-				creature.getActingPlayer().broadcastUserInfo();
+				if (!creature.isTeleporting())
+				{
+					creature.getActingPlayer().broadcastUserInfo();
+				}
 			}
 		}
 	}

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java

@@ -84,7 +84,10 @@ public class WaterZone extends ZoneType
 			{
 				((PlayerInstance) creature).stopWaterTask();
 			}
-			creature.getActingPlayer().broadcastUserInfo();
+			if (!creature.isTeleporting())
+			{
+				creature.getActingPlayer().broadcastUserInfo();
+			}
 		}
 		else if (creature.isNpc())
 		{

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java

@@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
 				{
 					creature.sendPacket(new OnEventTrigger(_eventId, false));
 				}
-				creature.getActingPlayer().broadcastUserInfo();
+				if (!creature.isTeleporting())
+				{
+					creature.getActingPlayer().broadcastUserInfo();
+				}
 			}
 		}
 	}

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java

@@ -84,7 +84,10 @@ public class WaterZone extends ZoneType
 			{
 				((PlayerInstance) creature).stopWaterTask();
 			}
-			creature.getActingPlayer().broadcastUserInfo();
+			if (!creature.isTeleporting())
+			{
+				creature.getActingPlayer().broadcastUserInfo();
+			}
 		}
 		else if (creature.isNpc())
 		{

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java

@@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
 				{
 					creature.sendPacket(new OnEventTrigger(_eventId, false));
 				}
-				creature.getActingPlayer().broadcastUserInfo();
+				if (!creature.isTeleporting())
+				{
+					creature.getActingPlayer().broadcastUserInfo();
+				}
 			}
 		}
 	}

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java

@@ -84,7 +84,10 @@ public class WaterZone extends ZoneType
 			{
 				((PlayerInstance) creature).stopWaterTask();
 			}
-			creature.getActingPlayer().broadcastUserInfo();
+			if (!creature.isTeleporting())
+			{
+				creature.getActingPlayer().broadcastUserInfo();
+			}
 		}
 		else if (creature.isNpc())
 		{

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java

@@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
 				{
 					creature.sendPacket(new OnEventTrigger(_eventId, false));
 				}
-				creature.getActingPlayer().broadcastUserInfo();
+				if (!creature.isTeleporting())
+				{
+					creature.getActingPlayer().broadcastUserInfo();
+				}
 			}
 		}
 	}

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java

@@ -84,7 +84,10 @@ public class WaterZone extends ZoneType
 			{
 				((PlayerInstance) creature).stopWaterTask();
 			}
-			creature.getActingPlayer().broadcastUserInfo();
+			if (!creature.isTeleporting())
+			{
+				creature.getActingPlayer().broadcastUserInfo();
+			}
 		}
 		else if (creature.isNpc())
 		{

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java

@@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
 				{
 					creature.sendPacket(new OnEventTrigger(_eventId, false));
 				}
-				creature.getActingPlayer().broadcastUserInfo();
+				if (!creature.isTeleporting())
+				{
+					creature.getActingPlayer().broadcastUserInfo();
+				}
 			}
 		}
 	}

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java

@@ -84,7 +84,10 @@ public class WaterZone extends ZoneType
 			{
 				((PlayerInstance) creature).stopWaterTask();
 			}
-			creature.getActingPlayer().broadcastUserInfo();
+			if (!creature.isTeleporting())
+			{
+				creature.getActingPlayer().broadcastUserInfo();
+			}
 		}
 		else if (creature.isNpc())
 		{

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java

@@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
 				{
 					creature.sendPacket(new OnEventTrigger(_eventId, false));
 				}
-				creature.getActingPlayer().broadcastUserInfo();
+				if (!creature.isTeleporting())
+				{
+					creature.getActingPlayer().broadcastUserInfo();
+				}
 			}
 		}
 	}

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java

@@ -84,7 +84,10 @@ public class WaterZone extends ZoneType
 			{
 				((PlayerInstance) creature).stopWaterTask();
 			}
-			creature.getActingPlayer().broadcastUserInfo();
+			if (!creature.isTeleporting())
+			{
+				creature.getActingPlayer().broadcastUserInfo();
+			}
 		}
 		else if (creature.isNpc())
 		{

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/zone/type/SwampZone.java

@@ -124,7 +124,10 @@ public class SwampZone extends ZoneType
 				{
 					creature.sendPacket(new OnEventTrigger(_eventId, false));
 				}
-				creature.getActingPlayer().broadcastUserInfo();
+				if (!creature.isTeleporting())
+				{
+					creature.getActingPlayer().broadcastUserInfo();
+				}
 			}
 		}
 	}

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/zone/type/WaterZone.java

@@ -84,7 +84,10 @@ public class WaterZone extends ZoneType
 			{
 				((PlayerInstance) creature).stopWaterTask();
 			}
-			creature.getActingPlayer().broadcastUserInfo();
+			if (!creature.isTeleporting())
+			{
+				creature.getActingPlayer().broadcastUserInfo();
+			}
 		}
 		else if (creature.isNpc())
 		{