Fixed skills not been casted in instances.
Contributed by nasseka.
This commit is contained in:
@@ -62,7 +62,7 @@ public class Ground implements ITargetTypeHandler
|
|||||||
}
|
}
|
||||||
|
|
||||||
final ZoneRegion zoneRegion = ZoneManager.getInstance().getRegion(creature);
|
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)
|
if (sendMessage)
|
||||||
{
|
{
|
||||||
|
@@ -2,6 +2,7 @@
|
|||||||
<!-- Ashen Shadow Revolutionaries -->
|
<!-- Ashen Shadow Revolutionaries -->
|
||||||
<instance id="260" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
|
<instance id="260" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
|
||||||
<time duration="120" empty="5" />
|
<time duration="120" empty="5" />
|
||||||
|
<misc isPvP="true" />
|
||||||
<locations>
|
<locations>
|
||||||
<enter type="FIXED">
|
<enter type="FIXED">
|
||||||
<location x="-77684" y="155984" z="-3194" />
|
<location x="-77684" y="155984" z="-3194" />
|
||||||
|
@@ -62,7 +62,7 @@ public class Ground implements ITargetTypeHandler
|
|||||||
}
|
}
|
||||||
|
|
||||||
final ZoneRegion zoneRegion = ZoneManager.getInstance().getRegion(creature);
|
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)
|
if (sendMessage)
|
||||||
{
|
{
|
||||||
|
@@ -2,6 +2,7 @@
|
|||||||
<!-- Ashen Shadow Revolutionaries -->
|
<!-- Ashen Shadow Revolutionaries -->
|
||||||
<instance id="260" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
|
<instance id="260" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
|
||||||
<time duration="120" empty="5" />
|
<time duration="120" empty="5" />
|
||||||
|
<misc isPvP="true" />
|
||||||
<locations>
|
<locations>
|
||||||
<enter type="FIXED">
|
<enter type="FIXED">
|
||||||
<location x="-77684" y="155984" z="-3194" />
|
<location x="-77684" y="155984" z="-3194" />
|
||||||
|
@@ -62,7 +62,7 @@ public class Ground implements ITargetTypeHandler
|
|||||||
}
|
}
|
||||||
|
|
||||||
final ZoneRegion zoneRegion = ZoneManager.getInstance().getRegion(creature);
|
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)
|
if (sendMessage)
|
||||||
{
|
{
|
||||||
|
@@ -2,6 +2,7 @@
|
|||||||
<!-- Ashen Shadow Revolutionaries -->
|
<!-- Ashen Shadow Revolutionaries -->
|
||||||
<instance id="260" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
|
<instance id="260" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
|
||||||
<time duration="120" empty="5" />
|
<time duration="120" empty="5" />
|
||||||
|
<misc isPvP="true" />
|
||||||
<locations>
|
<locations>
|
||||||
<enter type="FIXED">
|
<enter type="FIXED">
|
||||||
<location x="-77684" y="155984" z="-3194" />
|
<location x="-77684" y="155984" z="-3194" />
|
||||||
|
@@ -62,7 +62,7 @@ public class Ground implements ITargetTypeHandler
|
|||||||
}
|
}
|
||||||
|
|
||||||
final ZoneRegion zoneRegion = ZoneManager.getInstance().getRegion(creature);
|
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)
|
if (sendMessage)
|
||||||
{
|
{
|
||||||
|
@@ -2,6 +2,7 @@
|
|||||||
<!-- Ashen Shadow Revolutionaries -->
|
<!-- Ashen Shadow Revolutionaries -->
|
||||||
<instance id="260" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
|
<instance id="260" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
|
||||||
<time duration="120" empty="5" />
|
<time duration="120" empty="5" />
|
||||||
|
<misc isPvP="true" />
|
||||||
<locations>
|
<locations>
|
||||||
<enter type="FIXED">
|
<enter type="FIXED">
|
||||||
<location x="-77684" y="155984" z="-3194" />
|
<location x="-77684" y="155984" z="-3194" />
|
||||||
|
@@ -62,7 +62,7 @@ public class Ground implements ITargetTypeHandler
|
|||||||
}
|
}
|
||||||
|
|
||||||
final ZoneRegion zoneRegion = ZoneManager.getInstance().getRegion(creature);
|
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)
|
if (sendMessage)
|
||||||
{
|
{
|
||||||
|
@@ -2,6 +2,7 @@
|
|||||||
<!-- Ashen Shadow Revolutionaries -->
|
<!-- Ashen Shadow Revolutionaries -->
|
||||||
<instance id="260" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
|
<instance id="260" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
|
||||||
<time duration="120" empty="5" />
|
<time duration="120" empty="5" />
|
||||||
|
<misc isPvP="true" />
|
||||||
<locations>
|
<locations>
|
||||||
<enter type="FIXED">
|
<enter type="FIXED">
|
||||||
<location x="-77684" y="155984" z="-3194" />
|
<location x="-77684" y="155984" z="-3194" />
|
||||||
|
@@ -62,7 +62,7 @@ public class Ground implements ITargetTypeHandler
|
|||||||
}
|
}
|
||||||
|
|
||||||
final ZoneRegion zoneRegion = ZoneManager.getInstance().getRegion(creature);
|
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)
|
if (sendMessage)
|
||||||
{
|
{
|
||||||
|
@@ -2,6 +2,7 @@
|
|||||||
<!-- Ashen Shadow Revolutionaries -->
|
<!-- Ashen Shadow Revolutionaries -->
|
||||||
<instance id="260" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
|
<instance id="260" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
|
||||||
<time duration="120" empty="5" />
|
<time duration="120" empty="5" />
|
||||||
|
<misc isPvP="true" />
|
||||||
<locations>
|
<locations>
|
||||||
<enter type="FIXED">
|
<enter type="FIXED">
|
||||||
<location x="-77684" y="155984" z="-3194" />
|
<location x="-77684" y="155984" z="-3194" />
|
||||||
|
@@ -62,7 +62,7 @@ public class Ground implements ITargetTypeHandler
|
|||||||
}
|
}
|
||||||
|
|
||||||
final ZoneRegion zoneRegion = ZoneManager.getInstance().getRegion(creature);
|
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)
|
if (sendMessage)
|
||||||
{
|
{
|
||||||
|
@@ -2,6 +2,7 @@
|
|||||||
<!-- Ashen Shadow Revolutionaries -->
|
<!-- Ashen Shadow Revolutionaries -->
|
||||||
<instance id="260" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
|
<instance id="260" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
|
||||||
<time duration="120" empty="5" />
|
<time duration="120" empty="5" />
|
||||||
|
<misc isPvP="true" />
|
||||||
<locations>
|
<locations>
|
||||||
<enter type="FIXED">
|
<enter type="FIXED">
|
||||||
<location x="-77684" y="155984" z="-3194" />
|
<location x="-77684" y="155984" z="-3194" />
|
||||||
|
@@ -62,7 +62,7 @@ public class Ground implements ITargetTypeHandler
|
|||||||
}
|
}
|
||||||
|
|
||||||
final ZoneRegion zoneRegion = ZoneManager.getInstance().getRegion(creature);
|
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)
|
if (sendMessage)
|
||||||
{
|
{
|
||||||
|
@@ -2,6 +2,7 @@
|
|||||||
<!-- Ashen Shadow Revolutionaries -->
|
<!-- Ashen Shadow Revolutionaries -->
|
||||||
<instance id="260" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
|
<instance id="260" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
|
||||||
<time duration="120" empty="5" />
|
<time duration="120" empty="5" />
|
||||||
|
<misc isPvP="true" />
|
||||||
<locations>
|
<locations>
|
||||||
<enter type="FIXED">
|
<enter type="FIXED">
|
||||||
<location x="-77684" y="155984" z="-3194" />
|
<location x="-77684" y="155984" z="-3194" />
|
||||||
@@ -21,7 +22,7 @@
|
|||||||
</condition>
|
</condition>
|
||||||
<condition type="Level" showMessageAndHtml="true">
|
<condition type="Level" showMessageAndHtml="true">
|
||||||
<param name="html" value="condNoLevel.html" />
|
<param name="html" value="condNoLevel.html" />
|
||||||
<param name="min" value="99" />
|
<param name="min" value="105" />
|
||||||
</condition>
|
</condition>
|
||||||
<condition type="Distance" />
|
<condition type="Distance" />
|
||||||
<condition type="Reenter" />
|
<condition type="Reenter" />
|
||||||
|
@@ -62,7 +62,7 @@ public class Ground implements ITargetTypeHandler
|
|||||||
}
|
}
|
||||||
|
|
||||||
final ZoneRegion zoneRegion = ZoneManager.getInstance().getRegion(creature);
|
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)
|
if (sendMessage)
|
||||||
{
|
{
|
||||||
|
@@ -2,6 +2,7 @@
|
|||||||
<!-- Ashen Shadow Revolutionaries -->
|
<!-- Ashen Shadow Revolutionaries -->
|
||||||
<instance id="260" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
|
<instance id="260" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
|
||||||
<time duration="120" empty="5" />
|
<time duration="120" empty="5" />
|
||||||
|
<misc isPvP="true" />
|
||||||
<locations>
|
<locations>
|
||||||
<enter type="FIXED">
|
<enter type="FIXED">
|
||||||
<location x="-77684" y="155984" z="-3194" />
|
<location x="-77684" y="155984" z="-3194" />
|
||||||
@@ -21,7 +22,7 @@
|
|||||||
</condition>
|
</condition>
|
||||||
<condition type="Level" showMessageAndHtml="true">
|
<condition type="Level" showMessageAndHtml="true">
|
||||||
<param name="html" value="condNoLevel.html" />
|
<param name="html" value="condNoLevel.html" />
|
||||||
<param name="min" value="99" />
|
<param name="min" value="105" />
|
||||||
</condition>
|
</condition>
|
||||||
<condition type="Distance" />
|
<condition type="Distance" />
|
||||||
<condition type="Reenter" />
|
<condition type="Reenter" />
|
||||||
|
@@ -62,7 +62,7 @@ public class Ground implements ITargetTypeHandler
|
|||||||
}
|
}
|
||||||
|
|
||||||
final ZoneRegion zoneRegion = ZoneManager.getInstance().getRegion(creature);
|
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)
|
if (sendMessage)
|
||||||
{
|
{
|
||||||
|
@@ -2,6 +2,7 @@
|
|||||||
<!-- Ashen Shadow Revolutionaries -->
|
<!-- Ashen Shadow Revolutionaries -->
|
||||||
<instance id="260" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
|
<instance id="260" maxWorlds="50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
|
||||||
<time duration="120" empty="5" />
|
<time duration="120" empty="5" />
|
||||||
|
<misc isPvP="true" />
|
||||||
<locations>
|
<locations>
|
||||||
<enter type="FIXED">
|
<enter type="FIXED">
|
||||||
<location x="-77684" y="155984" z="-3194" />
|
<location x="-77684" y="155984" z="-3194" />
|
||||||
@@ -21,7 +22,7 @@
|
|||||||
</condition>
|
</condition>
|
||||||
<condition type="Level" showMessageAndHtml="true">
|
<condition type="Level" showMessageAndHtml="true">
|
||||||
<param name="html" value="condNoLevel.html" />
|
<param name="html" value="condNoLevel.html" />
|
||||||
<param name="min" value="99" />
|
<param name="min" value="105" />
|
||||||
</condition>
|
</condition>
|
||||||
<condition type="Distance" />
|
<condition type="Distance" />
|
||||||
<condition type="Reenter" />
|
<condition type="Reenter" />
|
||||||
|
@@ -62,7 +62,7 @@ public class Ground implements ITargetTypeHandler
|
|||||||
}
|
}
|
||||||
|
|
||||||
final ZoneRegion zoneRegion = ZoneManager.getInstance().getRegion(creature);
|
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)
|
if (sendMessage)
|
||||||
{
|
{
|
||||||
|
@@ -2036,7 +2036,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
|||||||
}
|
}
|
||||||
|
|
||||||
// prevent casting signets to peace zone
|
// 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);
|
final ZoneRegion zoneRegion = ZoneManager.getInstance().getRegion(this);
|
||||||
boolean canCast = true;
|
boolean canCast = true;
|
||||||
|
@@ -2038,7 +2038,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
|||||||
}
|
}
|
||||||
|
|
||||||
// prevent casting signets to peace zone
|
// 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);
|
final ZoneRegion zoneRegion = ZoneManager.getInstance().getRegion(this);
|
||||||
boolean canCast = true;
|
boolean canCast = true;
|
||||||
|
@@ -62,7 +62,7 @@ public class Ground implements ITargetTypeHandler
|
|||||||
}
|
}
|
||||||
|
|
||||||
final ZoneRegion zoneRegion = ZoneManager.getInstance().getRegion(creature);
|
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)
|
if (sendMessage)
|
||||||
{
|
{
|
||||||
|
@@ -62,7 +62,7 @@ public class Ground implements ITargetTypeHandler
|
|||||||
}
|
}
|
||||||
|
|
||||||
final ZoneRegion zoneRegion = ZoneManager.getInstance().getRegion(creature);
|
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)
|
if (sendMessage)
|
||||||
{
|
{
|
||||||
|
@@ -62,7 +62,7 @@ public class Ground implements ITargetTypeHandler
|
|||||||
}
|
}
|
||||||
|
|
||||||
final ZoneRegion zoneRegion = ZoneManager.getInstance().getRegion(creature);
|
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)
|
if (sendMessage)
|
||||||
{
|
{
|
||||||
|
@@ -62,7 +62,7 @@ public class Ground implements ITargetTypeHandler
|
|||||||
}
|
}
|
||||||
|
|
||||||
final ZoneRegion zoneRegion = ZoneManager.getInstance().getRegion(creature);
|
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)
|
if (sendMessage)
|
||||||
{
|
{
|
||||||
|
@@ -62,7 +62,7 @@ public class Ground implements ITargetTypeHandler
|
|||||||
}
|
}
|
||||||
|
|
||||||
final ZoneRegion zoneRegion = ZoneManager.getInstance().getRegion(creature);
|
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)
|
if (sendMessage)
|
||||||
{
|
{
|
||||||
|
@@ -62,7 +62,7 @@ public class Ground implements ITargetTypeHandler
|
|||||||
}
|
}
|
||||||
|
|
||||||
final ZoneRegion zoneRegion = ZoneManager.getInstance().getRegion(creature);
|
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)
|
if (sendMessage)
|
||||||
{
|
{
|
||||||
|
@@ -62,7 +62,7 @@ public class Ground implements ITargetTypeHandler
|
|||||||
}
|
}
|
||||||
|
|
||||||
final ZoneRegion zoneRegion = ZoneManager.getInstance().getRegion(creature);
|
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)
|
if (sendMessage)
|
||||||
{
|
{
|
||||||
|
@@ -62,7 +62,7 @@ public class Ground implements ITargetTypeHandler
|
|||||||
}
|
}
|
||||||
|
|
||||||
final ZoneRegion zoneRegion = ZoneManager.getInstance().getRegion(creature);
|
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)
|
if (sendMessage)
|
||||||
{
|
{
|
||||||
|
@@ -62,7 +62,7 @@ public class Ground implements ITargetTypeHandler
|
|||||||
}
|
}
|
||||||
|
|
||||||
final ZoneRegion zoneRegion = ZoneManager.getInstance().getRegion(creature);
|
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)
|
if (sendMessage)
|
||||||
{
|
{
|
||||||
|
@@ -62,7 +62,7 @@ public class Ground implements ITargetTypeHandler
|
|||||||
}
|
}
|
||||||
|
|
||||||
final ZoneRegion zoneRegion = ZoneManager.getInstance().getRegion(creature);
|
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)
|
if (sendMessage)
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user