lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed skills not been casted in instances.

Browse Source 
Contributed by nasseka.
This commit is contained in:
MobiusDevelopment 2021-07-02 22:19:44 +00:00
parent 24ddd39590
commit 741cb757b6
33 changed files with 36 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/Ground.java vendored
View File

@ -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)
{

1
L2J_Mobius_2.5_Underground/dist/game/data/instances/AshenShadowRevolutionaries.xml vendored
View File

@ -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" />

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/targethandlers/Ground.java vendored
View File

@ -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)
{

1
L2J_Mobius_3.0_Helios/dist/game/data/instances/AshenShadowRevolutionaries.xml vendored
View File

@ -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" />

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/targethandlers/Ground.java vendored
View File

@ -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)
{

1
L2J_Mobius_4.0_GrandCrusade/dist/game/data/instances/AshenShadowRevolutionaries.xml vendored
View File

@ -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" />

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/Ground.java vendored
View File

@ -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)
{

1
L2J_Mobius_5.0_Salvation/dist/game/data/instances/AshenShadowRevolutionaries.xml vendored
View File

@ -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" />

2
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/targethandlers/Ground.java vendored
View File

@ -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)
{

1
L2J_Mobius_5.5_EtinasFate/dist/game/data/instances/AshenShadowRevolutionaries.xml vendored
View File

@ -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" />

2
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/Ground.java vendored
View File

@ -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)
{

1
L2J_Mobius_6.0_Fafurion/dist/game/data/instances/AshenShadowRevolutionaries.xml vendored
View File

@ -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" />

2
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/Ground.java vendored
View File

@ -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)
{

1
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/instances/AshenShadowRevolutionaries.xml vendored
View File

@ -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" />

2
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/Ground.java vendored
View File

@ -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)
{

3
L2J_Mobius_8.0_Homunculus/dist/game/data/instances/AshenShadowRevolutionaries.xml vendored
View File

@ -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" />

2
L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/targethandlers/Ground.java vendored
View File

@ -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)
{

3
L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/instances/AshenShadowRevolutionaries.xml vendored
View File

@ -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" />

2
L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/targethandlers/Ground.java vendored
View File

@ -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)
{

3
L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/instances/AshenShadowRevolutionaries.xml vendored
View File

@ -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" />

2
L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/scripts/handlers/targethandlers/Ground.java vendored
View File

@ -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)
{

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

@ -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;

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

@ -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;

2
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/Ground.java vendored
View File

@ -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)
{

2
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/targethandlers/Ground.java vendored
View File

@ -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)
{

2
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/targethandlers/Ground.java vendored
View File

@ -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)
{

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/targethandlers/Ground.java vendored
View File

@ -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)
{

2
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/Ground.java vendored
View File

@ -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)
{

2
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/Ground.java vendored
View File

@ -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)
{

2
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/Ground.java vendored
View File

@ -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)
{

2
L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/targethandlers/Ground.java vendored
View File

@ -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)
{

2
L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/targethandlers/Ground.java vendored
View File

@ -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)
{

2
L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/targethandlers/Ground.java vendored
View File

@ -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)
{