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

Improved checkIfPvP method.

Browse Source
This commit is contained in:
MobiusDev
2018-04-12 16:30:25 +00:00
parent 7c9ca42499
commit 198f42c0a7
14 changed files with 47 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Playable.java
View File

@@ -200,10 +200,12 @@ public abstract class L2Playable extends L2Character
{
return false; // Target is null
}
if (target == this)
{
return false; // Target is self
}
if (!target.isPlayable())
{
return false; // Target is not a L2Playable
@@ -230,30 +232,18 @@ public abstract class L2Playable extends L2Character
{
return false; // Target player is self
}
if (targetPlayer.getKarma() != 0)
{
return false; // Target player has karma
}
if (targetPlayer.getPvpFlag() == 0)
{
return false;
return false; // Target player is not flagged
}
return true;
// Even at war, there should be PvP flag
// if(
// player.getClan() == null ||
// targetPlayer.getClan() == null ||
// (
// !targetPlayer.getClan().isAtWarWith(player.getClanId()) &&
// targetPlayer.getWantsPeace() == 0 &&
// player.getWantsPeace() == 0
// )
// )
// {
// return true;
// }
// return false;
}
/**

1
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@@ -5450,7 +5450,6 @@ public final class L2PcInstance extends L2Playable
public void updatePvPStatus(L2Character target)
{
final L2PcInstance player_target = target.getActingPlayer();
if (player_target == null)
{
return;