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

Added peace zone check for ground target type skills.

Browse Source
This commit is contained in:
MobiusDevelopment
2023-01-02 10:32:56 +00:00
parent 4aad59b940
commit 2e9110a992
6 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java
+7 -6
View File
@@ -8710,17 +8710,18 @@ public class Player extends Playable
{ {
if (usedSkill.getAffectScope() == AffectScope.FAN_PB) if (usedSkill.getAffectScope() == AffectScope.FAN_PB)
{ {
if (getCurrentMp() >= usedSkill.getMpConsume()) if (isInsideZone(ZoneId.PEACE))
{ {
if (usedSkill.checkCondition(this, target, true)) sendPacket(SystemMessageId.YOU_MAY_NOT_ATTACK_IN_A_PEACEFUL_ZONE);
{
sendPacket(new MagicSkillUse(this, this, usedSkill.getDisplayId(), usedSkill.getDisplayLevel(), 0, 0, usedSkill.getReuseDelayGroup(), -1, SkillCastingType.NORMAL, true));
} }
} else if (getCurrentMp() < usedSkill.getMpConsume())
else
{ {
sendPacket(SystemMessageId.NOT_ENOUGH_MP); sendPacket(SystemMessageId.NOT_ENOUGH_MP);
} }
else if (usedSkill.checkCondition(this, target, true))
{
sendPacket(new MagicSkillUse(this, this, usedSkill.getDisplayId(), usedSkill.getDisplayLevel(), 0, 0, usedSkill.getReuseDelayGroup(), -1, SkillCastingType.NORMAL, true));
}
} }
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return false; return false;
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
+7 -6
View File
@@ -8769,17 +8769,18 @@ public class Player extends Playable
{ {
if (usedSkill.getAffectScope() == AffectScope.FAN_PB) if (usedSkill.getAffectScope() == AffectScope.FAN_PB)
{ {
if (getCurrentMp() >= usedSkill.getMpConsume()) if (isInsideZone(ZoneId.PEACE))
{ {
if (usedSkill.checkCondition(this, target, true)) sendPacket(SystemMessageId.YOU_CANNOT_ATTACK_IN_A_PEACEFUL_ZONE);
{
sendPacket(new MagicSkillUse(this, this, usedSkill.getDisplayId(), usedSkill.getDisplayLevel(), 0, 0, usedSkill.getReuseDelayGroup(), -1, SkillCastingType.NORMAL, true));
} }
} else if (getCurrentMp() < usedSkill.getMpConsume())
else
{ {
sendPacket(SystemMessageId.NOT_ENOUGH_MP); sendPacket(SystemMessageId.NOT_ENOUGH_MP);
} }
else if (usedSkill.checkCondition(this, target, true))
{
sendPacket(new MagicSkillUse(this, this, usedSkill.getDisplayId(), usedSkill.getDisplayLevel(), 0, 0, usedSkill.getReuseDelayGroup(), -1, SkillCastingType.NORMAL, true));
}
} }
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return false; return false;
L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
+7 -6
View File
@@ -8804,17 +8804,18 @@ public class Player extends Playable
{ {
if (usedSkill.getAffectScope() == AffectScope.FAN_PB) if (usedSkill.getAffectScope() == AffectScope.FAN_PB)
{ {
if (getCurrentMp() >= usedSkill.getMpConsume()) if (isInsideZone(ZoneId.PEACE))
{ {
if (usedSkill.checkCondition(this, target, true)) sendPacket(SystemMessageId.YOU_CANNOT_ATTACK_IN_A_PEACEFUL_ZONE);
{
sendPacket(new MagicSkillUse(this, this, usedSkill.getDisplayId(), usedSkill.getDisplayLevel(), 0, 0, usedSkill.getReuseDelayGroup(), -1, SkillCastingType.NORMAL, true));
} }
} else if (getCurrentMp() < usedSkill.getMpConsume())
else
{ {
sendPacket(SystemMessageId.NOT_ENOUGH_MP); sendPacket(SystemMessageId.NOT_ENOUGH_MP);
} }
else if (usedSkill.checkCondition(this, target, true))
{
sendPacket(new MagicSkillUse(this, this, usedSkill.getDisplayId(), usedSkill.getDisplayLevel(), 0, 0, usedSkill.getReuseDelayGroup(), -1, SkillCastingType.NORMAL, true));
}
} }
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return false; return false;
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java
+7 -6
View File
@@ -8643,17 +8643,18 @@ public class Player extends Playable
{ {
if (usedSkill.getAffectScope() == AffectScope.FAN_PB) if (usedSkill.getAffectScope() == AffectScope.FAN_PB)
{ {
if (getCurrentMp() >= usedSkill.getMpConsume()) if (isInsideZone(ZoneId.PEACE))
{ {
if (usedSkill.checkCondition(this, target, true)) sendPacket(SystemMessageId.YOU_MAY_NOT_ATTACK_IN_A_PEACEFUL_ZONE);
{
sendPacket(new MagicSkillUse(this, this, usedSkill.getDisplayId(), usedSkill.getDisplayLevel(), 0, 0, usedSkill.getReuseDelayGroup(), -1, SkillCastingType.NORMAL, true));
} }
} else if (getCurrentMp() < usedSkill.getMpConsume())
else
{ {
sendPacket(SystemMessageId.NOT_ENOUGH_MP); sendPacket(SystemMessageId.NOT_ENOUGH_MP);
} }
else if (usedSkill.checkCondition(this, target, true))
{
sendPacket(new MagicSkillUse(this, this, usedSkill.getDisplayId(), usedSkill.getDisplayLevel(), 0, 0, usedSkill.getReuseDelayGroup(), -1, SkillCastingType.NORMAL, true));
}
} }
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return false; return false;
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java
+7 -6
View File
@@ -8888,17 +8888,18 @@ public class Player extends Playable
{ {
if (usedSkill.getAffectScope() == AffectScope.FAN_PB) if (usedSkill.getAffectScope() == AffectScope.FAN_PB)
{ {
if (getCurrentMp() >= usedSkill.getMpConsume()) if (isInsideZone(ZoneId.PEACE))
{ {
if (usedSkill.checkCondition(this, target, true)) sendPacket(SystemMessageId.YOU_CANNOT_ATTACK_IN_A_PEACEFUL_ZONE);
{
sendPacket(new MagicSkillUse(this, this, usedSkill.getDisplayId(), usedSkill.getDisplayLevel(), 0, 0, usedSkill.getReuseDelayGroup(), -1, SkillCastingType.NORMAL, true));
} }
} else if (getCurrentMp() < usedSkill.getMpConsume())
else
{ {
sendPacket(SystemMessageId.NOT_ENOUGH_MP); sendPacket(SystemMessageId.NOT_ENOUGH_MP);
} }
else if (usedSkill.checkCondition(this, target, true))
{
sendPacket(new MagicSkillUse(this, this, usedSkill.getDisplayId(), usedSkill.getDisplayLevel(), 0, 0, usedSkill.getReuseDelayGroup(), -1, SkillCastingType.NORMAL, true));
}
} }
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return false; return false;
L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/Player.java
+7 -6
View File
@@ -8888,17 +8888,18 @@ public class Player extends Playable
{ {
if (usedSkill.getAffectScope() == AffectScope.FAN_PB) if (usedSkill.getAffectScope() == AffectScope.FAN_PB)
{ {
if (getCurrentMp() >= usedSkill.getMpConsume()) if (isInsideZone(ZoneId.PEACE))
{ {
if (usedSkill.checkCondition(this, target, true)) sendPacket(SystemMessageId.YOU_CANNOT_ATTACK_IN_A_PEACEFUL_ZONE);
{
sendPacket(new MagicSkillUse(this, this, usedSkill.getDisplayId(), usedSkill.getDisplayLevel(), 0, 0, usedSkill.getReuseDelayGroup(), -1, SkillCastingType.NORMAL, true));
} }
} else if (getCurrentMp() < usedSkill.getMpConsume())
else
{ {
sendPacket(SystemMessageId.NOT_ENOUGH_MP); sendPacket(SystemMessageId.NOT_ENOUGH_MP);
} }
else if (usedSkill.checkCondition(this, target, true))
{
sendPacket(new MagicSkillUse(this, this, usedSkill.getDisplayId(), usedSkill.getDisplayLevel(), 0, 0, usedSkill.getReuseDelayGroup(), -1, SkillCastingType.NORMAL, true));
}
} }
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return false; return false;