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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Playable.java
View File

@ -203,20 +203,12 @@ public abstract class L2Playable extends L2Character
{ {
final L2PcInstance player = getActingPlayer(); final L2PcInstance player = getActingPlayer();
if ((player == null) || (target == null) || (player == target)) if ((player == null) //
{ || (target == null) //
return true; || (player == target) //
} || (target.getReputation() < 0) //
|| (target.getPvpFlag() > 0) //
if (target.isOnDarkSide()) || target.isOnDarkSide())
{
return true;
}
else if (target.getReputation() < 0)
{
return true;
}
else if ((player.getPvpFlag() > 0) && (target.getPvpFlag() > 0))
{ {
return true; return true;
} }

4
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@ -5296,11 +5296,10 @@ public final class L2PcInstance extends L2Playable
return; return;
} }
if ((isInDuel() && (player_target.getDuelId() == getDuelId()))) if (isInDuel() && (player_target.getDuelId() == getDuelId()))
{ {
return; return;
} }
if ((!isInsideZone(ZoneId.PVP) || !player_target.isInsideZone(ZoneId.PVP)) && (player_target.getReputation() >= 0)) if ((!isInsideZone(ZoneId.PVP) || !player_target.isInsideZone(ZoneId.PVP)) && (player_target.getReputation() >= 0))
{ {
if (checkIfPvP(player_target)) if (checkIfPvP(player_target))
@ -5311,7 +5310,6 @@ public final class L2PcInstance extends L2Playable
{ {
setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME);
} }
if (getPvpFlag() == 0) if (getPvpFlag() == 0)
{ {
startPvPFlag(); startPvPFlag();

20
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Playable.java
View File

@ -203,20 +203,12 @@ public abstract class L2Playable extends L2Character
{ {
final L2PcInstance player = getActingPlayer(); final L2PcInstance player = getActingPlayer();
if ((player == null) || (target == null) || (player == target)) if ((player == null) //
{ || (target == null) //
return true; || (player == target) //
} || (target.getReputation() < 0) //
|| (target.getPvpFlag() > 0) //
if (target.isOnDarkSide()) || target.isOnDarkSide())
{
return true;
}
else if (target.getReputation() < 0)
{
return true;
}
else if ((player.getPvpFlag() > 0) && (target.getPvpFlag() > 0))
{ {
return true; return true;
} }

4
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@ -5302,11 +5302,10 @@ public final class L2PcInstance extends L2Playable
return; return;
} }
if ((isInDuel() && (player_target.getDuelId() == getDuelId()))) if (isInDuel() && (player_target.getDuelId() == getDuelId()))
{ {
return; return;
} }
if ((!isInsideZone(ZoneId.PVP) || !player_target.isInsideZone(ZoneId.PVP)) && (player_target.getReputation() >= 0)) if ((!isInsideZone(ZoneId.PVP) || !player_target.isInsideZone(ZoneId.PVP)) && (player_target.getReputation() >= 0))
{ {
if (checkIfPvP(player_target)) if (checkIfPvP(player_target))
@ -5317,7 +5316,6 @@ public final class L2PcInstance extends L2Playable
{ {
setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME);
} }
if (getPvpFlag() == 0) if (getPvpFlag() == 0)
{ {
startPvPFlag(); startPvPFlag();

20
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Playable.java
View File

@ -203,20 +203,12 @@ public abstract class L2Playable extends L2Character
{ {
final L2PcInstance player = getActingPlayer(); final L2PcInstance player = getActingPlayer();
if ((player == null) || (target == null) || (player == target)) if ((player == null) //
{ || (target == null) //
return true; || (player == target) //
} || (target.getReputation() < 0) //
|| (target.getPvpFlag() > 0) //
if (target.isOnDarkSide()) || target.isOnDarkSide())
{
return true;
}
else if (target.getReputation() < 0)
{
return true;
}
else if ((player.getPvpFlag() > 0) && (target.getPvpFlag() > 0))
{ {
return true; return true;
} }

4
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@ -5304,11 +5304,10 @@ public final class L2PcInstance extends L2Playable
return; return;
} }
if ((isInDuel() && (player_target.getDuelId() == getDuelId()))) if (isInDuel() && (player_target.getDuelId() == getDuelId()))
{ {
return; return;
} }
if ((!isInsideZone(ZoneId.PVP) || !player_target.isInsideZone(ZoneId.PVP)) && (player_target.getReputation() >= 0)) if ((!isInsideZone(ZoneId.PVP) || !player_target.isInsideZone(ZoneId.PVP)) && (player_target.getReputation() >= 0))
{ {
if (checkIfPvP(player_target)) if (checkIfPvP(player_target))
@ -5319,7 +5318,6 @@ public final class L2PcInstance extends L2Playable
{ {
setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME);
} }
if (getPvpFlag() == 0) if (getPvpFlag() == 0)
{ {
startPvPFlag(); startPvPFlag();

20
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Playable.java
View File

@ -203,20 +203,12 @@ public abstract class L2Playable extends L2Character
{ {
final L2PcInstance player = getActingPlayer(); final L2PcInstance player = getActingPlayer();
if ((player == null) || (target == null) || (player == target)) if ((player == null) //
{ || (target == null) //
return true; || (player == target) //
} || (target.getReputation() < 0) //
|| (target.getPvpFlag() > 0) //
if (target.isOnDarkSide()) || target.isOnDarkSide())
{
return true;
}
else if (target.getReputation() < 0)
{
return true;
}
else if ((player.getPvpFlag() > 0) && (target.getPvpFlag() > 0))
{ {
return true; return true;
} }

4
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@ -5301,11 +5301,10 @@ public final class L2PcInstance extends L2Playable
return; return;
} }
if ((isInDuel() && (player_target.getDuelId() == getDuelId()))) if (isInDuel() && (player_target.getDuelId() == getDuelId()))
{ {
return; return;
} }
if ((!isInsideZone(ZoneId.PVP) || !player_target.isInsideZone(ZoneId.PVP)) && (player_target.getReputation() >= 0)) if ((!isInsideZone(ZoneId.PVP) || !player_target.isInsideZone(ZoneId.PVP)) && (player_target.getReputation() >= 0))
{ {
if (checkIfPvP(player_target)) if (checkIfPvP(player_target))
@ -5316,7 +5315,6 @@ public final class L2PcInstance extends L2Playable
{ {
setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME);
} }
if (getPvpFlag() == 0) if (getPvpFlag() == 0)
{ {
startPvPFlag(); startPvPFlag();

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 return false; // Target is null
} }
if (target == this) if (target == this)
{ {
return false; // Target is self return false; // Target is self
} }
if (!target.isPlayable()) if (!target.isPlayable())
{ {
return false; // Target is not a L2Playable return false; // Target is not a L2Playable
@ -230,30 +232,18 @@ public abstract class L2Playable extends L2Character
{ {
return false; // Target player is self return false; // Target player is self
} }
if (targetPlayer.getKarma() != 0) if (targetPlayer.getKarma() != 0)
{ {
return false; // Target player has karma return false; // Target player has karma
} }
if (targetPlayer.getPvpFlag() == 0) if (targetPlayer.getPvpFlag() == 0)
{ {
return false; return false; // Target player is not flagged
} }
return true; 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) public void updatePvPStatus(L2Character target)
{ {
final L2PcInstance player_target = target.getActingPlayer(); final L2PcInstance player_target = target.getActingPlayer();
if (player_target == null) if (player_target == null)
{ {
return; return;

20
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Playable.java
View File

@ -203,20 +203,12 @@ public abstract class L2Playable extends L2Character
{ {
final L2PcInstance player = getActingPlayer(); final L2PcInstance player = getActingPlayer();
if ((player == null) || (target == null) || (player == target)) if ((player == null) //
{ || (target == null) //
return true; || (player == target) //
} || (target.getReputation() < 0) //
|| (target.getPvpFlag() > 0) //
if (target.isOnDarkSide()) || target.isOnDarkSide())
{
return true;
}
else if (target.getReputation() < 0)
{
return true;
}
else if ((player.getPvpFlag() > 0) && (target.getPvpFlag() > 0))
{ {
return true; return true;
} }

4
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@ -5269,11 +5269,10 @@ public final class L2PcInstance extends L2Playable
return; return;
} }
if ((isInDuel() && (player_target.getDuelId() == getDuelId()))) if (isInDuel() && (player_target.getDuelId() == getDuelId()))
{ {
return; return;
} }
if ((!isInsideZone(ZoneId.PVP) || !player_target.isInsideZone(ZoneId.PVP)) && (player_target.getReputation() >= 0)) if ((!isInsideZone(ZoneId.PVP) || !player_target.isInsideZone(ZoneId.PVP)) && (player_target.getReputation() >= 0))
{ {
if (checkIfPvP(player_target)) if (checkIfPvP(player_target))
@ -5284,7 +5283,6 @@ public final class L2PcInstance extends L2Playable
{ {
setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME);
} }
if (getPvpFlag() == 0) if (getPvpFlag() == 0)
{ {
startPvPFlag(); startPvPFlag();

20
L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Playable.java
View File

@ -203,20 +203,12 @@ public abstract class L2Playable extends L2Character
{ {
final L2PcInstance player = getActingPlayer(); final L2PcInstance player = getActingPlayer();
if ((player == null) || (target == null) || (player == target)) if ((player == null) //
{ || (target == null) //
return true; || (player == target) //
} || (target.getReputation() < 0) //
|| (target.getPvpFlag() > 0) //
if (target.isOnDarkSide()) || target.isOnDarkSide())
{
return true;
}
else if (target.getReputation() < 0)
{
return true;
}
else if ((player.getPvpFlag() > 0) && (target.getPvpFlag() > 0))
{ {
return true; return true;
} }

4
L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@ -5269,11 +5269,10 @@ public final class L2PcInstance extends L2Playable
return; return;
} }
if ((isInDuel() && (player_target.getDuelId() == getDuelId()))) if (isInDuel() && (player_target.getDuelId() == getDuelId()))
{ {
return; return;
} }
if ((!isInsideZone(ZoneId.PVP) || !player_target.isInsideZone(ZoneId.PVP)) && (player_target.getReputation() >= 0)) if ((!isInsideZone(ZoneId.PVP) || !player_target.isInsideZone(ZoneId.PVP)) && (player_target.getReputation() >= 0))
{ {
if (checkIfPvP(player_target)) if (checkIfPvP(player_target))
@ -5284,7 +5283,6 @@ public final class L2PcInstance extends L2Playable
{ {
setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME); setPvpFlagLasts(System.currentTimeMillis() + Config.PVP_NORMAL_TIME);
} }
if (getPvpFlag() == 0) if (getPvpFlag() == 0)
{ {
startPvPFlag(); startPvPFlag();