From 741cb757b6762e0f0b0125c4965a48c6c5148817 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Fri, 2 Jul 2021 22:19:44 +0000
Subject: [PATCH] Fixed skills not been casted in instances. Contributed by
 nasseka.

---
 .../dist/game/data/scripts/handlers/targethandlers/Ground.java | 2 +-
 .../dist/game/data/instances/AshenShadowRevolutionaries.xml    | 1 +
 .../dist/game/data/scripts/handlers/targethandlers/Ground.java | 2 +-
 .../dist/game/data/instances/AshenShadowRevolutionaries.xml    | 1 +
 .../dist/game/data/scripts/handlers/targethandlers/Ground.java | 2 +-
 .../dist/game/data/instances/AshenShadowRevolutionaries.xml    | 1 +
 .../dist/game/data/scripts/handlers/targethandlers/Ground.java | 2 +-
 .../dist/game/data/instances/AshenShadowRevolutionaries.xml    | 1 +
 .../dist/game/data/scripts/handlers/targethandlers/Ground.java | 2 +-
 .../dist/game/data/instances/AshenShadowRevolutionaries.xml    | 1 +
 .../dist/game/data/scripts/handlers/targethandlers/Ground.java | 2 +-
 .../dist/game/data/instances/AshenShadowRevolutionaries.xml    | 1 +
 .../dist/game/data/scripts/handlers/targethandlers/Ground.java | 2 +-
 .../dist/game/data/instances/AshenShadowRevolutionaries.xml    | 1 +
 .../dist/game/data/scripts/handlers/targethandlers/Ground.java | 2 +-
 .../dist/game/data/instances/AshenShadowRevolutionaries.xml    | 3 ++-
 .../dist/game/data/scripts/handlers/targethandlers/Ground.java | 2 +-
 .../dist/game/data/instances/AshenShadowRevolutionaries.xml    | 3 ++-
 .../dist/game/data/scripts/handlers/targethandlers/Ground.java | 2 +-
 .../dist/game/data/instances/AshenShadowRevolutionaries.xml    | 3 ++-
 .../dist/game/data/scripts/handlers/targethandlers/Ground.java | 2 +-
 .../java/org/l2jmobius/gameserver/model/actor/Creature.java    | 2 +-
 .../java/org/l2jmobius/gameserver/model/actor/Creature.java    | 2 +-
 .../dist/game/data/scripts/handlers/targethandlers/Ground.java | 2 +-
 .../dist/game/data/scripts/handlers/targethandlers/Ground.java | 2 +-
 .../dist/game/data/scripts/handlers/targethandlers/Ground.java | 2 +-
 .../dist/game/data/scripts/handlers/targethandlers/Ground.java | 2 +-
 .../dist/game/data/scripts/handlers/targethandlers/Ground.java | 2 +-
 .../dist/game/data/scripts/handlers/targethandlers/Ground.java | 2 +-
 .../dist/game/data/scripts/handlers/targethandlers/Ground.java | 2 +-
 .../dist/game/data/scripts/handlers/targethandlers/Ground.java | 2 +-
 .../dist/game/data/scripts/handlers/targethandlers/Ground.java | 2 +-
 .../dist/game/data/scripts/handlers/targethandlers/Ground.java | 2 +-
 33 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/Ground.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/Ground.java
index 2d4b94e385..ca061d55f8 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/Ground.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/Ground.java
@@ -62,7 +62,7 @@ public class Ground implements ITargetTypeHandler
 				}
 				
 				final ZoneRegion zoneRegion = ZoneManager.getInstance().getRegion(creature);
-				if (skill.isBad() && !zoneRegion.checkEffectRangeInsidePeaceZone(skill, worldPosition.getX(), worldPosition.getY(), worldPosition.getZ()))
+				if (skill.isBad() && !creature.isInInstance() && !zoneRegion.checkEffectRangeInsidePeaceZone(skill, worldPosition.getX(), worldPosition.getY(), worldPosition.getZ()))
 				{
 					if (sendMessage)
 					{
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/instances/AshenShadowRevolutionaries.xml b/L2J_Mobius_2.5_Underground/dist/game/data/instances/AshenShadowRevolutionaries.xml
index 8228010699..2d50271f26 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/instances/AshenShadowRevolutionaries.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/instances/AshenShadowRevolutionaries.xml
@@ -2,6 +2,7 @@
 <!-- Ashen Shadow Revolutionaries -->
 <instance id="260" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
 	<time duration="120" empty="5" />
+	<misc isPvP="true" />
 	<locations>
 		<enter type="FIXED">
 			<location x="-77684" y="155984" z="-3194" />
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/targethandlers/Ground.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/targethandlers/Ground.java
index 2d4b94e385..ca061d55f8 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/targethandlers/Ground.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/targethandlers/Ground.java
@@ -62,7 +62,7 @@ public class Ground implements ITargetTypeHandler
 				}
 				
 				final ZoneRegion zoneRegion = ZoneManager.getInstance().getRegion(creature);
-				if (skill.isBad() && !zoneRegion.checkEffectRangeInsidePeaceZone(skill, worldPosition.getX(), worldPosition.getY(), worldPosition.getZ()))
+				if (skill.isBad() && !creature.isInInstance() && !zoneRegion.checkEffectRangeInsidePeaceZone(skill, worldPosition.getX(), worldPosition.getY(), worldPosition.getZ()))
 				{
 					if (sendMessage)
 					{
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/instances/AshenShadowRevolutionaries.xml b/L2J_Mobius_3.0_Helios/dist/game/data/instances/AshenShadowRevolutionaries.xml
index 8228010699..2d50271f26 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/instances/AshenShadowRevolutionaries.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/instances/AshenShadowRevolutionaries.xml
@@ -2,6 +2,7 @@
 <!-- Ashen Shadow Revolutionaries -->
 <instance id="260" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
 	<time duration="120" empty="5" />
+	<misc isPvP="true" />
 	<locations>
 		<enter type="FIXED">
 			<location x="-77684" y="155984" z="-3194" />
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/targethandlers/Ground.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/targethandlers/Ground.java
index 2d4b94e385..ca061d55f8 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/targethandlers/Ground.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/targethandlers/Ground.java
@@ -62,7 +62,7 @@ public class Ground implements ITargetTypeHandler
 				}
 				
 				final ZoneRegion zoneRegion = ZoneManager.getInstance().getRegion(creature);
-				if (skill.isBad() && !zoneRegion.checkEffectRangeInsidePeaceZone(skill, worldPosition.getX(), worldPosition.getY(), worldPosition.getZ()))
+				if (skill.isBad() && !creature.isInInstance() && !zoneRegion.checkEffectRangeInsidePeaceZone(skill, worldPosition.getX(), worldPosition.getY(), worldPosition.getZ()))
 				{
 					if (sendMessage)
 					{
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/instances/AshenShadowRevolutionaries.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/instances/AshenShadowRevolutionaries.xml
index 8228010699..2d50271f26 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/instances/AshenShadowRevolutionaries.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/instances/AshenShadowRevolutionaries.xml
@@ -2,6 +2,7 @@
 <!-- Ashen Shadow Revolutionaries -->
 <instance id="260" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
 	<time duration="120" empty="5" />
+	<misc isPvP="true" />
 	<locations>
 		<enter type="FIXED">
 			<location x="-77684" y="155984" z="-3194" />
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/Ground.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/Ground.java
index 1328ff01b5..0a19d48140 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/Ground.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/Ground.java
@@ -62,7 +62,7 @@ public class Ground implements ITargetTypeHandler
 				}
 				
 				final ZoneRegion zoneRegion = ZoneManager.getInstance().getRegion(creature);
-				if (skill.isBad() && !zoneRegion.checkEffectRangeInsidePeaceZone(skill, worldPosition.getX(), worldPosition.getY(), worldPosition.getZ()))
+				if (skill.isBad() && !creature.isInInstance() && !zoneRegion.checkEffectRangeInsidePeaceZone(skill, worldPosition.getX(), worldPosition.getY(), worldPosition.getZ()))
 				{
 					if (sendMessage)
 					{
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/instances/AshenShadowRevolutionaries.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/instances/AshenShadowRevolutionaries.xml
index 8228010699..2d50271f26 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/instances/AshenShadowRevolutionaries.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/instances/AshenShadowRevolutionaries.xml
@@ -2,6 +2,7 @@
 <!-- Ashen Shadow Revolutionaries -->
 <instance id="260" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
 	<time duration="120" empty="5" />
+	<misc isPvP="true" />
 	<locations>
 		<enter type="FIXED">
 			<location x="-77684" y="155984" z="-3194" />
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/targethandlers/Ground.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/targethandlers/Ground.java
index 1328ff01b5..0a19d48140 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/targethandlers/Ground.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/targethandlers/Ground.java
@@ -62,7 +62,7 @@ public class Ground implements ITargetTypeHandler
 				}
 				
 				final ZoneRegion zoneRegion = ZoneManager.getInstance().getRegion(creature);
-				if (skill.isBad() && !zoneRegion.checkEffectRangeInsidePeaceZone(skill, worldPosition.getX(), worldPosition.getY(), worldPosition.getZ()))
+				if (skill.isBad() && !creature.isInInstance() && !zoneRegion.checkEffectRangeInsidePeaceZone(skill, worldPosition.getX(), worldPosition.getY(), worldPosition.getZ()))
 				{
 					if (sendMessage)
 					{
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/instances/AshenShadowRevolutionaries.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/instances/AshenShadowRevolutionaries.xml
index 8228010699..2d50271f26 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/instances/AshenShadowRevolutionaries.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/instances/AshenShadowRevolutionaries.xml
@@ -2,6 +2,7 @@
 <!-- Ashen Shadow Revolutionaries -->
 <instance id="260" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
 	<time duration="120" empty="5" />
+	<misc isPvP="true" />
 	<locations>
 		<enter type="FIXED">
 			<location x="-77684" y="155984" z="-3194" />
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/Ground.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/Ground.java
index 1328ff01b5..0a19d48140 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/Ground.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/Ground.java
@@ -62,7 +62,7 @@ public class Ground implements ITargetTypeHandler
 				}
 				
 				final ZoneRegion zoneRegion = ZoneManager.getInstance().getRegion(creature);
-				if (skill.isBad() && !zoneRegion.checkEffectRangeInsidePeaceZone(skill, worldPosition.getX(), worldPosition.getY(), worldPosition.getZ()))
+				if (skill.isBad() && !creature.isInInstance() && !zoneRegion.checkEffectRangeInsidePeaceZone(skill, worldPosition.getX(), worldPosition.getY(), worldPosition.getZ()))
 				{
 					if (sendMessage)
 					{
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/instances/AshenShadowRevolutionaries.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/instances/AshenShadowRevolutionaries.xml
index 8228010699..2d50271f26 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/instances/AshenShadowRevolutionaries.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/instances/AshenShadowRevolutionaries.xml
@@ -2,6 +2,7 @@
 <!-- Ashen Shadow Revolutionaries -->
 <instance id="260" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
 	<time duration="120" empty="5" />
+	<misc isPvP="true" />
 	<locations>
 		<enter type="FIXED">
 			<location x="-77684" y="155984" z="-3194" />
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/Ground.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/Ground.java
index 1328ff01b5..0a19d48140 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/Ground.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/Ground.java
@@ -62,7 +62,7 @@ public class Ground implements ITargetTypeHandler
 				}
 				
 				final ZoneRegion zoneRegion = ZoneManager.getInstance().getRegion(creature);
-				if (skill.isBad() && !zoneRegion.checkEffectRangeInsidePeaceZone(skill, worldPosition.getX(), worldPosition.getY(), worldPosition.getZ()))
+				if (skill.isBad() && !creature.isInInstance() && !zoneRegion.checkEffectRangeInsidePeaceZone(skill, worldPosition.getX(), worldPosition.getY(), worldPosition.getZ()))
 				{
 					if (sendMessage)
 					{
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/AshenShadowRevolutionaries.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/AshenShadowRevolutionaries.xml
index 8228010699..2d50271f26 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/AshenShadowRevolutionaries.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/AshenShadowRevolutionaries.xml
@@ -2,6 +2,7 @@
 <!-- Ashen Shadow Revolutionaries -->
 <instance id="260" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
 	<time duration="120" empty="5" />
+	<misc isPvP="true" />
 	<locations>
 		<enter type="FIXED">
 			<location x="-77684" y="155984" z="-3194" />
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/Ground.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/Ground.java
index 1328ff01b5..0a19d48140 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/Ground.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/Ground.java
@@ -62,7 +62,7 @@ public class Ground implements ITargetTypeHandler
 				}
 				
 				final ZoneRegion zoneRegion = ZoneManager.getInstance().getRegion(creature);
-				if (skill.isBad() && !zoneRegion.checkEffectRangeInsidePeaceZone(skill, worldPosition.getX(), worldPosition.getY(), worldPosition.getZ()))
+				if (skill.isBad() && !creature.isInInstance() && !zoneRegion.checkEffectRangeInsidePeaceZone(skill, worldPosition.getX(), worldPosition.getY(), worldPosition.getZ()))
 				{
 					if (sendMessage)
 					{
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/instances/AshenShadowRevolutionaries.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/instances/AshenShadowRevolutionaries.xml
index 13e373fb34..4c06ac1d72 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/instances/AshenShadowRevolutionaries.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/instances/AshenShadowRevolutionaries.xml
@@ -2,6 +2,7 @@
 <!-- Ashen Shadow Revolutionaries -->
 <instance id="260" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
 	<time duration="120" empty="5" />
+	<misc isPvP="true" />
 	<locations>
 		<enter type="FIXED">
 			<location x="-77684" y="155984" z="-3194" />
@@ -21,7 +22,7 @@
 		</condition>
 		<condition type="Level" showMessageAndHtml="true">
 			<param name="html" value="condNoLevel.html" />
-			<param name="min" value="99" />
+			<param name="min" value="105" />
 		</condition>
 		<condition type="Distance" />
 		<condition type="Reenter" />
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/targethandlers/Ground.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/targethandlers/Ground.java
index 1328ff01b5..0a19d48140 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/targethandlers/Ground.java
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/targethandlers/Ground.java
@@ -62,7 +62,7 @@ public class Ground implements ITargetTypeHandler
 				}
 				
 				final ZoneRegion zoneRegion = ZoneManager.getInstance().getRegion(creature);
-				if (skill.isBad() && !zoneRegion.checkEffectRangeInsidePeaceZone(skill, worldPosition.getX(), worldPosition.getY(), worldPosition.getZ()))
+				if (skill.isBad() && !creature.isInInstance() && !zoneRegion.checkEffectRangeInsidePeaceZone(skill, worldPosition.getX(), worldPosition.getY(), worldPosition.getZ()))
 				{
 					if (sendMessage)
 					{
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/instances/AshenShadowRevolutionaries.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/instances/AshenShadowRevolutionaries.xml
index 13e373fb34..4c06ac1d72 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/instances/AshenShadowRevolutionaries.xml
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/instances/AshenShadowRevolutionaries.xml
@@ -2,6 +2,7 @@
 <!-- Ashen Shadow Revolutionaries -->
 <instance id="260" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
 	<time duration="120" empty="5" />
+	<misc isPvP="true" />
 	<locations>
 		<enter type="FIXED">
 			<location x="-77684" y="155984" z="-3194" />
@@ -21,7 +22,7 @@
 		</condition>
 		<condition type="Level" showMessageAndHtml="true">
 			<param name="html" value="condNoLevel.html" />
-			<param name="min" value="99" />
+			<param name="min" value="105" />
 		</condition>
 		<condition type="Distance" />
 		<condition type="Reenter" />
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/targethandlers/Ground.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/targethandlers/Ground.java
index 1328ff01b5..0a19d48140 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/targethandlers/Ground.java
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/targethandlers/Ground.java
@@ -62,7 +62,7 @@ public class Ground implements ITargetTypeHandler
 				}
 				
 				final ZoneRegion zoneRegion = ZoneManager.getInstance().getRegion(creature);
-				if (skill.isBad() && !zoneRegion.checkEffectRangeInsidePeaceZone(skill, worldPosition.getX(), worldPosition.getY(), worldPosition.getZ()))
+				if (skill.isBad() && !creature.isInInstance() && !zoneRegion.checkEffectRangeInsidePeaceZone(skill, worldPosition.getX(), worldPosition.getY(), worldPosition.getZ()))
 				{
 					if (sendMessage)
 					{
diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/instances/AshenShadowRevolutionaries.xml b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/instances/AshenShadowRevolutionaries.xml
index 13e373fb34..4c06ac1d72 100644
--- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/instances/AshenShadowRevolutionaries.xml
+++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/instances/AshenShadowRevolutionaries.xml
@@ -2,6 +2,7 @@
 <!-- Ashen Shadow Revolutionaries -->
 <instance id="260" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
 	<time duration="120" empty="5" />
+	<misc isPvP="true" />
 	<locations>
 		<enter type="FIXED">
 			<location x="-77684" y="155984" z="-3194" />
@@ -21,7 +22,7 @@
 		</condition>
 		<condition type="Level" showMessageAndHtml="true">
 			<param name="html" value="condNoLevel.html" />
-			<param name="min" value="99" />
+			<param name="min" value="105" />
 		</condition>
 		<condition type="Distance" />
 		<condition type="Reenter" />
diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/scripts/handlers/targethandlers/Ground.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/scripts/handlers/targethandlers/Ground.java
index 1328ff01b5..0a19d48140 100644
--- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/scripts/handlers/targethandlers/Ground.java
+++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/scripts/handlers/targethandlers/Ground.java
@@ -62,7 +62,7 @@ public class Ground implements ITargetTypeHandler
 				}
 				
 				final ZoneRegion zoneRegion = ZoneManager.getInstance().getRegion(creature);
-				if (skill.isBad() && !zoneRegion.checkEffectRangeInsidePeaceZone(skill, worldPosition.getX(), worldPosition.getY(), worldPosition.getZ()))
+				if (skill.isBad() && !creature.isInInstance() && !zoneRegion.checkEffectRangeInsidePeaceZone(skill, worldPosition.getX(), worldPosition.getY(), worldPosition.getZ()))
 				{
 					if (sendMessage)
 					{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 0d86cacf8b..08956116b7 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -2036,7 +2036,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 		
 		// prevent casting signets to peace zone
-		if (skill.isChanneling() && (skill.getChannelingSkillId() > 0))
+		if (skill.isChanneling() && (skill.getChannelingSkillId() > 0) && (getInstanceId() == 0))
 		{
 			final ZoneRegion zoneRegion = ZoneManager.getInstance().getRegion(this);
 			boolean canCast = true;
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java
index c96117ecf0..48a2745a37 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -2038,7 +2038,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		}
 		
 		// prevent casting signets to peace zone
-		if (skill.isChanneling() && (skill.getChannelingSkillId() > 0))
+		if (skill.isChanneling() && (skill.getChannelingSkillId() > 0) && (getInstanceId() == 0))
 		{
 			final ZoneRegion zoneRegion = ZoneManager.getInstance().getRegion(this);
 			boolean canCast = true;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/Ground.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/Ground.java
index 2d4b94e385..ca061d55f8 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/Ground.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/Ground.java
@@ -62,7 +62,7 @@ public class Ground implements ITargetTypeHandler
 				}
 				
 				final ZoneRegion zoneRegion = ZoneManager.getInstance().getRegion(creature);
-				if (skill.isBad() && !zoneRegion.checkEffectRangeInsidePeaceZone(skill, worldPosition.getX(), worldPosition.getY(), worldPosition.getZ()))
+				if (skill.isBad() && !creature.isInInstance() && !zoneRegion.checkEffectRangeInsidePeaceZone(skill, worldPosition.getX(), worldPosition.getY(), worldPosition.getZ()))
 				{
 					if (sendMessage)
 					{
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/targethandlers/Ground.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/targethandlers/Ground.java
index d8c73627f5..19da89f654 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/targethandlers/Ground.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/targethandlers/Ground.java
@@ -62,7 +62,7 @@ public class Ground implements ITargetTypeHandler
 				}
 				
 				final ZoneRegion zoneRegion = ZoneManager.getInstance().getRegion(creature);
-				if (skill.isBad() && !zoneRegion.checkEffectRangeInsidePeaceZone(skill, worldPosition.getX(), worldPosition.getY(), worldPosition.getZ()))
+				if (skill.isBad() && !creature.isInInstance() && !zoneRegion.checkEffectRangeInsidePeaceZone(skill, worldPosition.getX(), worldPosition.getY(), worldPosition.getZ()))
 				{
 					if (sendMessage)
 					{
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/targethandlers/Ground.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/targethandlers/Ground.java
index d8c73627f5..19da89f654 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/targethandlers/Ground.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/targethandlers/Ground.java
@@ -62,7 +62,7 @@ public class Ground implements ITargetTypeHandler
 				}
 				
 				final ZoneRegion zoneRegion = ZoneManager.getInstance().getRegion(creature);
-				if (skill.isBad() && !zoneRegion.checkEffectRangeInsidePeaceZone(skill, worldPosition.getX(), worldPosition.getY(), worldPosition.getZ()))
+				if (skill.isBad() && !creature.isInInstance() && !zoneRegion.checkEffectRangeInsidePeaceZone(skill, worldPosition.getX(), worldPosition.getY(), worldPosition.getZ()))
 				{
 					if (sendMessage)
 					{
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/targethandlers/Ground.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/targethandlers/Ground.java
index d8c73627f5..19da89f654 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/targethandlers/Ground.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/targethandlers/Ground.java
@@ -62,7 +62,7 @@ public class Ground implements ITargetTypeHandler
 				}
 				
 				final ZoneRegion zoneRegion = ZoneManager.getInstance().getRegion(creature);
-				if (skill.isBad() && !zoneRegion.checkEffectRangeInsidePeaceZone(skill, worldPosition.getX(), worldPosition.getY(), worldPosition.getZ()))
+				if (skill.isBad() && !creature.isInInstance() && !zoneRegion.checkEffectRangeInsidePeaceZone(skill, worldPosition.getX(), worldPosition.getY(), worldPosition.getZ()))
 				{
 					if (sendMessage)
 					{
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/Ground.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/Ground.java
index d8c73627f5..19da89f654 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/Ground.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/Ground.java
@@ -62,7 +62,7 @@ public class Ground implements ITargetTypeHandler
 				}
 				
 				final ZoneRegion zoneRegion = ZoneManager.getInstance().getRegion(creature);
-				if (skill.isBad() && !zoneRegion.checkEffectRangeInsidePeaceZone(skill, worldPosition.getX(), worldPosition.getY(), worldPosition.getZ()))
+				if (skill.isBad() && !creature.isInInstance() && !zoneRegion.checkEffectRangeInsidePeaceZone(skill, worldPosition.getX(), worldPosition.getY(), worldPosition.getZ()))
 				{
 					if (sendMessage)
 					{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/Ground.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/Ground.java
index d8c73627f5..19da89f654 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/Ground.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/Ground.java
@@ -62,7 +62,7 @@ public class Ground implements ITargetTypeHandler
 				}
 				
 				final ZoneRegion zoneRegion = ZoneManager.getInstance().getRegion(creature);
-				if (skill.isBad() && !zoneRegion.checkEffectRangeInsidePeaceZone(skill, worldPosition.getX(), worldPosition.getY(), worldPosition.getZ()))
+				if (skill.isBad() && !creature.isInInstance() && !zoneRegion.checkEffectRangeInsidePeaceZone(skill, worldPosition.getX(), worldPosition.getY(), worldPosition.getZ()))
 				{
 					if (sendMessage)
 					{
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/Ground.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/Ground.java
index d8c73627f5..19da89f654 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/Ground.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/Ground.java
@@ -62,7 +62,7 @@ public class Ground implements ITargetTypeHandler
 				}
 				
 				final ZoneRegion zoneRegion = ZoneManager.getInstance().getRegion(creature);
-				if (skill.isBad() && !zoneRegion.checkEffectRangeInsidePeaceZone(skill, worldPosition.getX(), worldPosition.getY(), worldPosition.getZ()))
+				if (skill.isBad() && !creature.isInInstance() && !zoneRegion.checkEffectRangeInsidePeaceZone(skill, worldPosition.getX(), worldPosition.getY(), worldPosition.getZ()))
 				{
 					if (sendMessage)
 					{
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/targethandlers/Ground.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/targethandlers/Ground.java
index d8c73627f5..19da89f654 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/targethandlers/Ground.java
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/targethandlers/Ground.java
@@ -62,7 +62,7 @@ public class Ground implements ITargetTypeHandler
 				}
 				
 				final ZoneRegion zoneRegion = ZoneManager.getInstance().getRegion(creature);
-				if (skill.isBad() && !zoneRegion.checkEffectRangeInsidePeaceZone(skill, worldPosition.getX(), worldPosition.getY(), worldPosition.getZ()))
+				if (skill.isBad() && !creature.isInInstance() && !zoneRegion.checkEffectRangeInsidePeaceZone(skill, worldPosition.getX(), worldPosition.getY(), worldPosition.getZ()))
 				{
 					if (sendMessage)
 					{
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/targethandlers/Ground.java b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/targethandlers/Ground.java
index d8c73627f5..19da89f654 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/targethandlers/Ground.java
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/targethandlers/Ground.java
@@ -62,7 +62,7 @@ public class Ground implements ITargetTypeHandler
 				}
 				
 				final ZoneRegion zoneRegion = ZoneManager.getInstance().getRegion(creature);
-				if (skill.isBad() && !zoneRegion.checkEffectRangeInsidePeaceZone(skill, worldPosition.getX(), worldPosition.getY(), worldPosition.getZ()))
+				if (skill.isBad() && !creature.isInInstance() && !zoneRegion.checkEffectRangeInsidePeaceZone(skill, worldPosition.getX(), worldPosition.getY(), worldPosition.getZ()))
 				{
 					if (sendMessage)
 					{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/targethandlers/Ground.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/targethandlers/Ground.java
index d8c73627f5..19da89f654 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/targethandlers/Ground.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/targethandlers/Ground.java
@@ -62,7 +62,7 @@ public class Ground implements ITargetTypeHandler
 				}
 				
 				final ZoneRegion zoneRegion = ZoneManager.getInstance().getRegion(creature);
-				if (skill.isBad() && !zoneRegion.checkEffectRangeInsidePeaceZone(skill, worldPosition.getX(), worldPosition.getY(), worldPosition.getZ()))
+				if (skill.isBad() && !creature.isInInstance() && !zoneRegion.checkEffectRangeInsidePeaceZone(skill, worldPosition.getX(), worldPosition.getY(), worldPosition.getZ()))
 				{
 					if (sendMessage)
 					{