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

Changed order of some checkPvpSkill checks.

Browse Source
This commit is contained in:
MobiusDev
2015-10-20 21:14:07 +00:00
parent 320e7abdb1
commit 9497505950
1 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java
View File

@ -9199,7 +9199,6 @@ public final class L2PcInstance extends L2Playable
if (skill.isDebuff() || skill.hasEffectType(L2EffectType.STEAL_ABNORMAL) || skill.isBad()) if (skill.isDebuff() || skill.hasEffectType(L2EffectType.STEAL_ABNORMAL) || skill.isBad())
{ {
final L2PcInstance targetPlayer = target.getActingPlayer(); final L2PcInstance targetPlayer = target.getActingPlayer();
if ((targetPlayer == null) || (this == target)) if ((targetPlayer == null) || (this == target))
@ -9207,9 +9206,25 @@ public final class L2PcInstance extends L2Playable
return false; return false;
} }
final boolean isCtrlPressed = (getCurrentSkill() != null) && getCurrentSkill().isCtrlPressed(); // Duel
if (isInDuel() && targetPlayer.isInDuel())
{
if (getDuelId() == targetPlayer.getDuelId())
{
return true;
}
}
// Pece Zone // Olympiad
if (isInOlympiadMode() && targetPlayer.isInOlympiadMode())
{
if (getOlympiadGameId() == targetPlayer.getOlympiadGameId())
{
return true;
}
}
// Peace Zone
if (target.isInsideZone(ZoneId.PEACE)) if (target.isInsideZone(ZoneId.PEACE))
{ {
return false; return false;
@ -9231,14 +9246,7 @@ public final class L2PcInstance extends L2Playable
} }
// Duel final boolean isCtrlPressed = (getCurrentSkill() != null) && getCurrentSkill().isCtrlPressed();
if (isInDuel() && targetPlayer.isInDuel())
{
if (getDuelId() == targetPlayer.getDuelId())
{
return true;
}
}
// Party // Party
if (isInParty() && targetPlayer.isInParty()) if (isInParty() && targetPlayer.isInParty())
@ -9274,15 +9282,6 @@ public final class L2PcInstance extends L2Playable
return true; return true;
} }
// Olympiad
if (isInOlympiadMode() && targetPlayer.isInOlympiadMode())
{
if (getOlympiadGameId() == targetPlayer.getOlympiadGameId())
{
return true;
}
}
final L2Clan aClan = getClan(); final L2Clan aClan = getClan();
final L2Clan tClan = targetPlayer.getClan(); final L2Clan tClan = targetPlayer.getClan();
@ -9291,11 +9290,7 @@ public final class L2PcInstance extends L2Playable
if (aClan.isAtWarWith(tClan.getId()) && tClan.isAtWarWith(aClan.getId())) if (aClan.isAtWarWith(tClan.getId()) && tClan.isAtWarWith(aClan.getId()))
{ {
// Check if skill can do dmg // Check if skill can do dmg
if ((skill.isAOE() && (skill.getEffectRange() > 0)) && isCtrlPressed && (getTarget() == target)) return true; // Always return true at war.
{
return true;
}
return isCtrlPressed;
} }
else if ((getClanId() == targetPlayer.getClanId()) || ((getAllyId() > 0) && (getAllyId() == targetPlayer.getAllyId()))) else if ((getClanId() == targetPlayer.getClanId()) || ((getAllyId() > 0) && (getAllyId() == targetPlayer.getAllyId())))
{ {