Prevent players from flagging in PvP zones.

Contributed by Iris.

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1211,7 +1211,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			
 			// Flag the attacker if it's a PlayerInstance outside a PvP area
 			final PlayerInstance player = getActingPlayer();
-			if (player != null)
+			if ((player != null) && !player.isInsideZone(ZoneId.PVP) && (player != target)) // Prevent players from flagging in PvP Zones.
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1211,7 +1211,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			
 			// Flag the attacker if it's a PlayerInstance outside a PvP area
 			final PlayerInstance player = getActingPlayer();
-			if (player != null)
+			if ((player != null) && !player.isInsideZone(ZoneId.PVP) && (player != target)) // Prevent players from flagging in PvP Zones.
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1211,7 +1211,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			
 			// Flag the attacker if it's a PlayerInstance outside a PvP area
 			final PlayerInstance player = getActingPlayer();
-			if (player != null)
+			if ((player != null) && !player.isInsideZone(ZoneId.PVP) && (player != target)) // Prevent players from flagging in PvP Zones.
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1211,7 +1211,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			
 			// Flag the attacker if it's a PlayerInstance outside a PvP area
 			final PlayerInstance player = getActingPlayer();
-			if (player != null)
+			if ((player != null) && !player.isInsideZone(ZoneId.PVP) && (player != target)) // Prevent players from flagging in PvP Zones.
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1211,7 +1211,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			
 			// Flag the attacker if it's a PlayerInstance outside a PvP area
 			final PlayerInstance player = getActingPlayer();
-			if (player != null)
+			if ((player != null) && !player.isInsideZone(ZoneId.PVP) && (player != target)) // Prevent players from flagging in PvP Zones.
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1211,7 +1211,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			
 			// Flag the attacker if it's a PlayerInstance outside a PvP area
 			final PlayerInstance player = getActingPlayer();
-			if (player != null)
+			if ((player != null) && !player.isInsideZone(ZoneId.PVP) && (player != target)) // Prevent players from flagging in PvP Zones.
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1211,7 +1211,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			
 			// Flag the attacker if it's a PlayerInstance outside a PvP area
 			final PlayerInstance player = getActingPlayer();
-			if (player != null)
+			if ((player != null) && !player.isInsideZone(ZoneId.PVP) && (player != target)) // Prevent players from flagging in PvP Zones.
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1211,7 +1211,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			
 			// Flag the attacker if it's a PlayerInstance outside a PvP area
 			final PlayerInstance player = getActingPlayer();
-			if (player != null)
+			if ((player != null) && !player.isInsideZone(ZoneId.PVP) && (player != target)) // Prevent players from flagging in PvP Zones.
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);

L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1211,7 +1211,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			
 			// Flag the attacker if it's a PlayerInstance outside a PvP area
 			final PlayerInstance player = getActingPlayer();
-			if (player != null)
+			if ((player != null) && !player.isInsideZone(ZoneId.PVP) && (player != target)) // Prevent players from flagging in PvP Zones.
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);

L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1211,7 +1211,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			
 			// Flag the attacker if it's a PlayerInstance outside a PvP area
 			final PlayerInstance player = getActingPlayer();
-			if (player != null)
+			if ((player != null) && !player.isInsideZone(ZoneId.PVP) && (player != target)) // Prevent players from flagging in PvP Zones.
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1098,7 +1098,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			
 			// Flag the attacker if it's a PlayerInstance outside a PvP area
 			final PlayerInstance player = getActingPlayer();
-			if (player != null)
+			if ((player != null) && !player.isInsideZone(ZoneId.PVP) && (player != target)) // Prevent players from flagging in PvP Zones.
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				if (player.getSummon() != target)

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1099,7 +1099,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			
 			// Flag the attacker if it's a PlayerInstance outside a PvP area
 			final PlayerInstance player = getActingPlayer();
-			if (player != null)
+			if ((player != null) && !player.isInsideZone(ZoneId.PVP) && (player != target)) // Prevent players from flagging in PvP Zones.
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				if (player.getSummon() != target)

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1211,7 +1211,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			
 			// Flag the attacker if it's a PlayerInstance outside a PvP area
 			final PlayerInstance player = getActingPlayer();
-			if (player != null)
+			if ((player != null) && !player.isInsideZone(ZoneId.PVP) && (player != target)) // Prevent players from flagging in PvP Zones.
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1211,7 +1211,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			
 			// Flag the attacker if it's a PlayerInstance outside a PvP area
 			final PlayerInstance player = getActingPlayer();
-			if (player != null)
+			if ((player != null) && !player.isInsideZone(ZoneId.PVP) && (player != target)) // Prevent players from flagging in PvP Zones.
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1211,7 +1211,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			
 			// Flag the attacker if it's a PlayerInstance outside a PvP area
 			final PlayerInstance player = getActingPlayer();
-			if (player != null)
+			if ((player != null) && !player.isInsideZone(ZoneId.PVP) && (player != target)) // Prevent players from flagging in PvP Zones.
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1212,7 +1212,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			
 			// Flag the attacker if it's a PlayerInstance outside a PvP area
 			final PlayerInstance player = getActingPlayer();
-			if (player != null)
+			if ((player != null) && !player.isInsideZone(ZoneId.PVP) && (player != target)) // Prevent players from flagging in PvP Zones.
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1212,7 +1212,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			
 			// Flag the attacker if it's a PlayerInstance outside a PvP area
 			final PlayerInstance player = getActingPlayer();
-			if (player != null)
+			if ((player != null) && !player.isInsideZone(ZoneId.PVP) && (player != target)) // Prevent players from flagging in PvP Zones.
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1212,7 +1212,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			
 			// Flag the attacker if it's a PlayerInstance outside a PvP area
 			final PlayerInstance player = getActingPlayer();
-			if (player != null)
+			if ((player != null) && !player.isInsideZone(ZoneId.PVP) && (player != target)) // Prevent players from flagging in PvP Zones.
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1211,7 +1211,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			
 			// Flag the attacker if it's a PlayerInstance outside a PvP area
 			final PlayerInstance player = getActingPlayer();
-			if (player != null)
+			if ((player != null) && !player.isInsideZone(ZoneId.PVP) && (player != target)) // Prevent players from flagging in PvP Zones.
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);

L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1215,7 +1215,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			
 			// Flag the attacker if it's a PlayerInstance outside a PvP area
 			final PlayerInstance player = getActingPlayer();
-			if (player != null)
+			if ((player != null) && !player.isInsideZone(ZoneId.PVP) && (player != target)) // Prevent players from flagging in PvP Zones.
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);

L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -1222,7 +1222,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 			
 			// Flag the attacker if it's a PlayerInstance outside a PvP area
 			final PlayerInstance player = getActingPlayer();
-			if (player != null)
+			if ((player != null) && !player.isInsideZone(ZoneId.PVP) && (player != target)) // Prevent players from flagging in PvP Zones.
 			{
 				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
 				player.updatePvPStatus(target);