diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
index 6fe3864b52..1a95ac29be 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
@@ -85,7 +85,7 @@ public class NotFriend implements IAffectObjectHandler
 			}
 			
 			// Arena.
-			if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
+			if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
index 6a9c0e6445..27adfc38e6 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
@@ -85,7 +85,7 @@ public class NotFriendPc implements IAffectObjectHandler
 			}
 			
 			// Arena.
-			if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
+			if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
index 9dd9181a16..161c07a3f7 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
@@ -86,7 +86,7 @@ public class NotFriend implements IAffectObjectHandler
 			}
 			
 			// Arena.
-			if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
+			if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
index 28d25b3646..95effcbc90 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
@@ -86,7 +86,7 @@ public class NotFriendPc implements IAffectObjectHandler
 			}
 			
 			// Arena.
-			if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
+			if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
index 9dd9181a16..161c07a3f7 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
@@ -86,7 +86,7 @@ public class NotFriend implements IAffectObjectHandler
 			}
 			
 			// Arena.
-			if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
+			if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
index 28d25b3646..95effcbc90 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
@@ -86,7 +86,7 @@ public class NotFriendPc implements IAffectObjectHandler
 			}
 			
 			// Arena.
-			if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
+			if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
index 6fe3864b52..1a95ac29be 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
@@ -85,7 +85,7 @@ public class NotFriend implements IAffectObjectHandler
 			}
 			
 			// Arena.
-			if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
+			if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
index 6a9c0e6445..27adfc38e6 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
@@ -85,7 +85,7 @@ public class NotFriendPc implements IAffectObjectHandler
 			}
 			
 			// Arena.
-			if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
+			if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
index 6fe3864b52..1a95ac29be 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
@@ -85,7 +85,7 @@ public class NotFriend implements IAffectObjectHandler
 			}
 			
 			// Arena.
-			if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
+			if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
index 6a9c0e6445..27adfc38e6 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
@@ -85,7 +85,7 @@ public class NotFriendPc implements IAffectObjectHandler
 			}
 			
 			// Arena.
-			if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
+			if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
index 6fe3864b52..1a95ac29be 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
@@ -85,7 +85,7 @@ public class NotFriend implements IAffectObjectHandler
 			}
 			
 			// Arena.
-			if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
+			if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
index 6a9c0e6445..27adfc38e6 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
@@ -85,7 +85,7 @@ public class NotFriendPc implements IAffectObjectHandler
 			}
 			
 			// Arena.
-			if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
+			if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
index 6fe3864b52..1a95ac29be 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
@@ -85,7 +85,7 @@ public class NotFriend implements IAffectObjectHandler
 			}
 			
 			// Arena.
-			if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
+			if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
index 6a9c0e6445..27adfc38e6 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
@@ -85,7 +85,7 @@ public class NotFriendPc implements IAffectObjectHandler
 			}
 			
 			// Arena.
-			if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
+			if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
index 6fe3864b52..1a95ac29be 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
@@ -85,7 +85,7 @@ public class NotFriend implements IAffectObjectHandler
 			}
 			
 			// Arena.
-			if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
+			if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
index 6a9c0e6445..27adfc38e6 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
@@ -85,7 +85,7 @@ public class NotFriendPc implements IAffectObjectHandler
 			}
 			
 			// Arena.
-			if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
+			if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
index 6fe3864b52..1a95ac29be 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
@@ -85,7 +85,7 @@ public class NotFriend implements IAffectObjectHandler
 			}
 			
 			// Arena.
-			if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
+			if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
index 6a9c0e6445..27adfc38e6 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
@@ -85,7 +85,7 @@ public class NotFriendPc implements IAffectObjectHandler
 			}
 			
 			// Arena.
-			if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
+			if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
index 6fe3864b52..1a95ac29be 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
@@ -85,7 +85,7 @@ public class NotFriend implements IAffectObjectHandler
 			}
 			
 			// Arena.
-			if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
+			if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
index 6a9c0e6445..27adfc38e6 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
@@ -85,7 +85,7 @@ public class NotFriendPc implements IAffectObjectHandler
 			}
 			
 			// Arena.
-			if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
+			if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
index 6fe3864b52..1a95ac29be 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
@@ -85,7 +85,7 @@ public class NotFriend implements IAffectObjectHandler
 			}
 			
 			// Arena.
-			if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
+			if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
index 6a9c0e6445..27adfc38e6 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
@@ -85,7 +85,7 @@ public class NotFriendPc implements IAffectObjectHandler
 			}
 			
 			// Arena.
-			if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
+			if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
index 6fe3864b52..1a95ac29be 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
@@ -85,7 +85,7 @@ public class NotFriend implements IAffectObjectHandler
 			}
 			
 			// Arena.
-			if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
+			if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
index 6a9c0e6445..27adfc38e6 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
@@ -85,7 +85,7 @@ public class NotFriendPc implements IAffectObjectHandler
 			}
 			
 			// Arena.
-			if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
+			if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
index 6fe3864b52..1a95ac29be 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
@@ -85,7 +85,7 @@ public class NotFriend implements IAffectObjectHandler
 			}
 			
 			// Arena.
-			if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
+			if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
index 6a9c0e6445..27adfc38e6 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
@@ -85,7 +85,7 @@ public class NotFriendPc implements IAffectObjectHandler
 			}
 			
 			// Arena.
-			if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
+			if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
index 6fe3864b52..1a95ac29be 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
@@ -85,7 +85,7 @@ public class NotFriend implements IAffectObjectHandler
 			}
 			
 			// Arena.
-			if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
+			if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
index 6a9c0e6445..27adfc38e6 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
@@ -85,7 +85,7 @@ public class NotFriendPc implements IAffectObjectHandler
 			}
 			
 			// Arena.
-			if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
+			if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
index 6fe3864b52..1a95ac29be 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
@@ -85,7 +85,7 @@ public class NotFriend implements IAffectObjectHandler
 			}
 			
 			// Arena.
-			if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
+			if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
index 6a9c0e6445..27adfc38e6 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
@@ -85,7 +85,7 @@ public class NotFriendPc implements IAffectObjectHandler
 			}
 			
 			// Arena.
-			if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
+			if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
index 6fe3864b52..1a95ac29be 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
@@ -85,7 +85,7 @@ public class NotFriend implements IAffectObjectHandler
 			}
 			
 			// Arena.
-			if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
+			if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
index 6a9c0e6445..27adfc38e6 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
@@ -85,7 +85,7 @@ public class NotFriendPc implements IAffectObjectHandler
 			}
 			
 			// Arena.
-			if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
+			if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
index 6fe3864b52..1a95ac29be 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
@@ -85,7 +85,7 @@ public class NotFriend implements IAffectObjectHandler
 			}
 			
 			// Arena.
-			if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
+			if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
index 6a9c0e6445..27adfc38e6 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
@@ -85,7 +85,7 @@ public class NotFriendPc implements IAffectObjectHandler
 			}
 			
 			// Arena.
-			if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
+			if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
index 6fe3864b52..1a95ac29be 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
@@ -85,7 +85,7 @@ public class NotFriend implements IAffectObjectHandler
 			}
 			
 			// Arena.
-			if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
+			if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
index 6a9c0e6445..27adfc38e6 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
@@ -85,7 +85,7 @@ public class NotFriendPc implements IAffectObjectHandler
 			}
 			
 			// Arena.
-			if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
+			if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
index 6fe3864b52..1a95ac29be 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
@@ -85,7 +85,7 @@ public class NotFriend implements IAffectObjectHandler
 			}
 			
 			// Arena.
-			if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
+			if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
index 6a9c0e6445..27adfc38e6 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
@@ -85,7 +85,7 @@ public class NotFriendPc implements IAffectObjectHandler
 			}
 			
 			// Arena.
-			if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
+			if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
index 6fe3864b52..1a95ac29be 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
@@ -85,7 +85,7 @@ public class NotFriend implements IAffectObjectHandler
 			}
 			
 			// Arena.
-			if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
+			if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
index 6a9c0e6445..27adfc38e6 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
@@ -85,7 +85,7 @@ public class NotFriendPc implements IAffectObjectHandler
 			}
 			
 			// Arena.
-			if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
+			if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
index 6fe3864b52..1a95ac29be 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java
@@ -85,7 +85,7 @@ public class NotFriend implements IAffectObjectHandler
 			}
 			
 			// Arena.
-			if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
+			if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
 			{
 				return true;
 			}
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
index 6a9c0e6445..27adfc38e6 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriendPc.java
@@ -85,7 +85,7 @@ public class NotFriendPc implements IAffectObjectHandler
 			}
 			
 			// Arena.
-			if (creature.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
+			if (creature.isInsideZone(ZoneId.PVP) && !creature.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.PVP) && !target.isInsideZone(ZoneId.SIEGE))
 			{
 				return true;
 			}