Disabled spawn protection messages in peace zones.

L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java

@@ -10266,7 +10266,10 @@ public final class L2PcInstance extends L2Playable
 		if (isSpawnProtected())
 		{
 			setProtection(false);
+			if (!isInsideZone(ZoneId.PEACE))
+			{
 				sendPacket(SystemMessageId.YOU_ARE_NO_LONGER_PROTECTED_FROM_AGGRESSIVE_MONSTERS);
+			}
 			if (Config.RESTORE_SERVITOR_ON_RECONNECT && !hasSummon() && CharSummonTable.getInstance().getServitors().containsKey(getObjectId()))
 			{
 				CharSummonTable.getInstance().restoreServitor(this);
@@ -10279,9 +10282,12 @@ public final class L2PcInstance extends L2Playable
 		if (isTeleportProtected())
 		{
 			setTeleportProtection(false);
+			if (!isInsideZone(ZoneId.PEACE))
+			{
 				sendMessage("Teleport spawn protection ended.");
 			}
 		}
+	}
 	
 	/**
 	 * Expertise of the L2PcInstance (None=0, D=1, C=2, B=3, A=4, S=5, S80=6, S84=7)

L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java

@@ -10273,7 +10273,10 @@ public final class L2PcInstance extends L2Playable
 		if (isSpawnProtected())
 		{
 			setProtection(false);
+			if (!isInsideZone(ZoneId.PEACE))
+			{
 				sendPacket(SystemMessageId.YOU_ARE_NO_LONGER_PROTECTED_FROM_AGGRESSIVE_MONSTERS);
+			}
 			if (Config.RESTORE_SERVITOR_ON_RECONNECT && !hasSummon() && CharSummonTable.getInstance().getServitors().containsKey(getObjectId()))
 			{
 				CharSummonTable.getInstance().restoreServitor(this);
@@ -10286,9 +10289,12 @@ public final class L2PcInstance extends L2Playable
 		if (isTeleportProtected())
 		{
 			setTeleportProtection(false);
+			if (!isInsideZone(ZoneId.PEACE))
+			{
 				sendMessage("Teleport spawn protection ended.");
 			}
 		}
+	}
 	
 	/**
 	 * Expertise of the L2PcInstance (None=0, D=1, C=2, B=3, A=4, S=5, S80=6, S84=7)

L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java

@@ -10283,7 +10283,10 @@ public final class L2PcInstance extends L2Playable
 		if (isSpawnProtected())
 		{
 			setProtection(false);
+			if (!isInsideZone(ZoneId.PEACE))
+			{
 				sendPacket(SystemMessageId.YOU_ARE_NO_LONGER_PROTECTED_FROM_AGGRESSIVE_MONSTERS);
+			}
 			if (Config.RESTORE_SERVITOR_ON_RECONNECT && !hasSummon() && CharSummonTable.getInstance().getServitors().containsKey(getObjectId()))
 			{
 				CharSummonTable.getInstance().restoreServitor(this);
@@ -10296,9 +10299,12 @@ public final class L2PcInstance extends L2Playable
 		if (isTeleportProtected())
 		{
 			setTeleportProtection(false);
+			if (!isInsideZone(ZoneId.PEACE))
+			{
 				sendMessage("Teleport spawn protection ended.");
 			}
 		}
+	}
 	
 	/**
 	 * Expertise of the L2PcInstance (None=0, D=1, C=2, B=3, A=4, S=5, S80=6, S84=7)

L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java

@@ -10276,7 +10276,10 @@ public final class L2PcInstance extends L2Playable
 		if (isSpawnProtected())
 		{
 			setProtection(false);
+			if (!isInsideZone(ZoneId.PEACE))
+			{
 				sendPacket(SystemMessageId.YOU_ARE_NO_LONGER_PROTECTED_FROM_AGGRESSIVE_MONSTERS);
+			}
 			if (Config.RESTORE_SERVITOR_ON_RECONNECT && !hasSummon() && CharSummonTable.getInstance().getServitors().containsKey(getObjectId()))
 			{
 				CharSummonTable.getInstance().restoreServitor(this);
@@ -10289,9 +10292,12 @@ public final class L2PcInstance extends L2Playable
 		if (isTeleportProtected())
 		{
 			setTeleportProtection(false);
+			if (!isInsideZone(ZoneId.PEACE))
+			{
 				sendMessage("Teleport spawn protection ended.");
 			}
 		}
+	}
 	
 	/**
 	 * Expertise of the L2PcInstance (None=0, D=1, C=2, B=3, A=4, S=5, S80=6, S84=7, R=8, R95=9, R99=10)

L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java

@@ -15293,27 +15293,21 @@ public final class L2PcInstance extends L2Playable
 	 */
 	public void onActionRequest()
 	{
-		/*
-		 * Important: dont send here a broadcast like removeAbnornalstatus cause they will create mass lag on pvp
-		 */
-		
 		if (isSpawnProtected())
-		{
-			sendMessage("The effect of Spawn Protection has been removed.");
-		}
-		else if (isTeleportProtected())
-		{
-			sendMessage("The effect of Teleport Spawn Protection has been removed.");
-		}
-		
-		if (Config.PLAYER_SPAWN_PROTECTION > 0)
 		{
 			setProtection(false);
+			if (!isInsideZone(ZoneId.PEACE))
+			{
+				sendMessage("You are no longer protected from aggressive monsters.");
 			}
-		
+		}
-		if (Config.PLAYER_TELEPORT_PROTECTION > 0)
+		if (isTeleportProtected())
 		{
 			setTeleportProtection(false);
+			if (!isInsideZone(ZoneId.PEACE))
+			{
+				sendMessage("Teleport spawn protection ended.");
+			}
 		}
 	}
 	

L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java

@@ -10605,9 +10605,12 @@ public final class L2PcInstance extends L2Playable
 	public void onActionRequest()
 	{
 		if (isSpawnProtected())
+		{
+			setProtection(false);
+			if (!isInsideZone(ZoneId.PEACE))
 			{
 				sendPacket(SystemMessageId.YOU_ARE_NO_LONGER_PROTECTED_FROM_AGGRESSIVE_MONSTERS);
-			
+			}
 			if (Config.RESTORE_SERVITOR_ON_RECONNECT && !hasSummon() && CharSummonTable.getInstance().getServitors().containsKey(getObjectId()))
 			{
 				CharSummonTable.getInstance().restoreServitor(this);
@@ -10618,11 +10621,13 @@ public final class L2PcInstance extends L2Playable
 			}
 		}
 		if (isTeleportProtected())
+		{
+			setTeleportProtection(false);
+			if (!isInsideZone(ZoneId.PEACE))
 			{
 				sendMessage("Teleport spawn protection ended.");
 			}
-		setProtection(false);
+		}
-		setTeleportProtection(false);
 	}
 	
 	/**

L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java

@@ -10211,7 +10211,10 @@ public final class L2PcInstance extends L2Playable
 		if (isSpawnProtected())
 		{
 			setProtection(false);
+			if (!isInsideZone(ZoneId.PEACE))
+			{
 				sendPacket(SystemMessageId.YOU_ARE_NO_LONGER_PROTECTED_FROM_AGGRESSIVE_MONSTERS);
+			}
 			if (Config.RESTORE_SERVITOR_ON_RECONNECT && !hasSummon() && CharSummonTable.getInstance().getServitors().containsKey(getObjectId()))
 			{
 				CharSummonTable.getInstance().restoreServitor(this);
@@ -10224,9 +10227,12 @@ public final class L2PcInstance extends L2Playable
 		if (isTeleportProtected())
 		{
 			setTeleportProtection(false);
+			if (!isInsideZone(ZoneId.PEACE))
+			{
 				sendMessage("Teleport spawn protection ended.");
 			}
 		}
+	}
 	
 	/**
 	 * Expertise of the L2PcInstance (None=0, D=1, C=2, B=3, A=4, S=5, S80=6, S84=7)

L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java

@@ -10211,7 +10211,10 @@ public final class L2PcInstance extends L2Playable
 		if (isSpawnProtected())
 		{
 			setProtection(false);
+			if (!isInsideZone(ZoneId.PEACE))
+			{
 				sendPacket(SystemMessageId.YOU_ARE_NO_LONGER_PROTECTED_FROM_AGGRESSIVE_MONSTERS);
+			}
 			if (Config.RESTORE_SERVITOR_ON_RECONNECT && !hasSummon() && CharSummonTable.getInstance().getServitors().containsKey(getObjectId()))
 			{
 				CharSummonTable.getInstance().restoreServitor(this);
@@ -10224,9 +10227,12 @@ public final class L2PcInstance extends L2Playable
 		if (isTeleportProtected())
 		{
 			setTeleportProtection(false);
+			if (!isInsideZone(ZoneId.PEACE))
+			{
 				sendMessage("Teleport spawn protection ended.");
 			}
 		}
+	}
 	
 	/**
 	 * Expertise of the L2PcInstance (None=0, D=1, C=2, B=3, A=4, S=5, S80=6, S84=7)