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

Force use for summon skills.

Browse Source
This commit is contained in:
MobiusDev 2019-01-27 14:37:37 +00:00
parent 0a2dbf9de3
commit dac640e17c
20 changed files with 960 additions and 860 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

163
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java vendored
View File

@ -45,92 +45,89 @@ public class NotFriend implements IAffectObjectHandler
final L2PcInstance player = activeChar.getActingPlayer();
final L2PcInstance targetPlayer = target.getActingPlayer();
if (player != null)
if ((player != null) && (targetPlayer != null))
{
if (targetPlayer != null)
// Same player.
if (player == targetPlayer)
{
// Same player.
if (player == targetPlayer)
{
return false;
}
// Peace Zone.
if (target.isInsidePeaceZone(player) && !player.getAccessLevel().allowPeaceAttack())
{
return false;
}
// Party (command channel doesn't make you friends).
final L2Party party = player.getParty();
final L2Party targetParty = targetPlayer.getParty();
if ((party != null) && (targetParty != null) && (party.getLeaderObjectId() == targetParty.getLeaderObjectId()))
{
return false;
}
// Arena.
if (activeChar.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{
return true;
}
// Duel.
if (player.isInDuel() && targetPlayer.isInDuel() && (player.getDuelId() == targetPlayer.getDuelId()))
{
return true;
}
// Olympiad.
if (player.isInOlympiadMode() && targetPlayer.isInOlympiadMode() && (player.getOlympiadGameId() == targetPlayer.getOlympiadGameId()))
{
return true;
}
// Clan.
final L2Clan clan = player.getClan();
final L2Clan targetClan = targetPlayer.getClan();
if (clan != null)
{
if (clan == targetClan)
{
return false;
}
// War
if ((targetClan != null) && clan.isAtWarWith(targetClan) && targetClan.isAtWarWith(clan))
{
return true;
}
}
// Alliance.
if ((player.getAllyId() != 0) && (player.getAllyId() == targetPlayer.getAllyId()))
{
return false;
}
// Siege.
if (target.isInsideZone(ZoneId.SIEGE))
{
// Players in the same siege side at the same castle are considered friends.
if ((player.getSiegeState() > 0) && (player.getSiegeState() == targetPlayer.getSiegeState()) && (player.getSiegeSide() == targetPlayer.getSiegeSide()))
{
return false;
}
return true;
}
// At this point summon should be prevented from attacking friendly targets.
if (activeChar.isSummon() && (target == activeChar.getTarget()))
{
return true;
}
// By default any flagged/PK player is considered enemy.
return (target.getActingPlayer().getPvpFlag() > 0) || (target.getActingPlayer().getReputation() < 0);
return false;
}
// Peace Zone.
if (target.isInsidePeaceZone(player) && !player.getAccessLevel().allowPeaceAttack())
{
return false;
}
// Party (command channel doesn't make you friends).
final L2Party party = player.getParty();
final L2Party targetParty = targetPlayer.getParty();
if ((party != null) && (targetParty != null) && (party.getLeaderObjectId() == targetParty.getLeaderObjectId()))
{
return false;
}
// Arena.
if (activeChar.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{
return true;
}
// Duel.
if (player.isInDuel() && targetPlayer.isInDuel() && (player.getDuelId() == targetPlayer.getDuelId()))
{
return true;
}
// Olympiad.
if (player.isInOlympiadMode() && targetPlayer.isInOlympiadMode() && (player.getOlympiadGameId() == targetPlayer.getOlympiadGameId()))
{
return true;
}
// Clan.
final L2Clan clan = player.getClan();
final L2Clan targetClan = targetPlayer.getClan();
if (clan != null)
{
if (clan == targetClan)
{
return false;
}
// War
if ((targetClan != null) && clan.isAtWarWith(targetClan) && targetClan.isAtWarWith(clan))
{
return true;
}
}
// Alliance.
if ((player.getAllyId() != 0) && (player.getAllyId() == targetPlayer.getAllyId()))
{
return false;
}
// Siege.
if (target.isInsideZone(ZoneId.SIEGE))
{
// Players in the same siege side at the same castle are considered friends.
if ((player.getSiegeState() > 0) && (player.getSiegeState() == targetPlayer.getSiegeState()) && (player.getSiegeSide() == targetPlayer.getSiegeSide()))
{
return false;
}
return true;
}
// At this point summon should be prevented from attacking friendly targets.
if (activeChar.isSummon() && (target == activeChar.getTarget()))
{
return true;
}
// By default any flagged/PK player is considered enemy.
return (target.getActingPlayer().getPvpFlag() > 0) || (target.getActingPlayer().getReputation() < 0);
}
return target.isAutoAttackable(activeChar);

19
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
View File

@ -631,7 +631,20 @@ public abstract class L2Summon extends L2Playable
else
{
final L2Object currentTarget = _owner.getTarget();
target = skill.getTarget(this, skill.isBad() && (currentTarget != null) && (!currentTarget.isPlayable() || !currentTarget.isInsideZone(ZoneId.PEACE)), dontMove, false);
if (currentTarget != null)
{
target = skill.getTarget(this, forceUse && (!currentTarget.isPlayable() || !currentTarget.isInsideZone(ZoneId.PEACE)), dontMove, false);
final L2PcInstance currentTargetPlayer = currentTarget.getActingPlayer();
if (!forceUse && (currentTargetPlayer != null) && !currentTargetPlayer.isAutoAttackable(_owner))
{
sendPacket(SystemMessageId.INVALID_TARGET);
return false;
}
}
else
{
target = skill.getTarget(this, forceUse, dontMove, false);
}
}
// Check the validity of the target
@ -780,7 +793,7 @@ public abstract class L2Summon extends L2Playable
@Override
public void doCast(Skill skill)
{
if ((skill.getTarget(this, skill.isBad(), false, false) == null) && !_owner.getAccessLevel().allowPeaceAttack())
if ((skill.getTarget(this, false, false, false) == null) && !_owner.getAccessLevel().allowPeaceAttack())
{
// Send a System Message to the L2PcInstance
_owner.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
@ -790,7 +803,7 @@ public abstract class L2Summon extends L2Playable
return;
}
doCast(skill, null, skill.isBad(), false);
super.doCast(skill);
}
@Override

163
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java vendored
View File

@ -45,92 +45,89 @@ public class NotFriend implements IAffectObjectHandler
final L2PcInstance player = activeChar.getActingPlayer();
final L2PcInstance targetPlayer = target.getActingPlayer();
if (player != null)
if ((player != null) && (targetPlayer != null))
{
if (targetPlayer != null)
// Same player.
if (player == targetPlayer)
{
// Same player.
if (player == targetPlayer)
{
return false;
}
// Peace Zone.
if (target.isInsidePeaceZone(player) && !player.getAccessLevel().allowPeaceAttack())
{
return false;
}
// Party (command channel doesn't make you friends).
final L2Party party = player.getParty();
final L2Party targetParty = targetPlayer.getParty();
if ((party != null) && (targetParty != null) && (party.getLeaderObjectId() == targetParty.getLeaderObjectId()))
{
return false;
}
// Arena.
if (activeChar.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{
return true;
}
// Duel.
if (player.isInDuel() && targetPlayer.isInDuel() && (player.getDuelId() == targetPlayer.getDuelId()))
{
return true;
}
// Olympiad.
if (player.isInOlympiadMode() && targetPlayer.isInOlympiadMode() && (player.getOlympiadGameId() == targetPlayer.getOlympiadGameId()))
{
return true;
}
// Clan.
final L2Clan clan = player.getClan();
final L2Clan targetClan = targetPlayer.getClan();
if (clan != null)
{
if (clan == targetClan)
{
return false;
}
// War
if ((targetClan != null) && clan.isAtWarWith(targetClan) && targetClan.isAtWarWith(clan))
{
return true;
}
}
// Alliance.
if ((player.getAllyId() != 0) && (player.getAllyId() == targetPlayer.getAllyId()))
{
return false;
}
// Siege.
if (target.isInsideZone(ZoneId.SIEGE))
{
// Players in the same siege side at the same castle are considered friends.
if ((player.getSiegeState() > 0) && (player.getSiegeState() == targetPlayer.getSiegeState()) && (player.getSiegeSide() == targetPlayer.getSiegeSide()))
{
return false;
}
return true;
}
// At this point summon should be prevented from attacking friendly targets.
if (activeChar.isSummon() && (target == activeChar.getTarget()))
{
return true;
}
// By default any flagged/PK player is considered enemy.
return (target.getActingPlayer().getPvpFlag() > 0) || (target.getActingPlayer().getReputation() < 0);
return false;
}
// Peace Zone.
if (target.isInsidePeaceZone(player) && !player.getAccessLevel().allowPeaceAttack())
{
return false;
}
// Party (command channel doesn't make you friends).
final L2Party party = player.getParty();
final L2Party targetParty = targetPlayer.getParty();
if ((party != null) && (targetParty != null) && (party.getLeaderObjectId() == targetParty.getLeaderObjectId()))
{
return false;
}
// Arena.
if (activeChar.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{
return true;
}
// Duel.
if (player.isInDuel() && targetPlayer.isInDuel() && (player.getDuelId() == targetPlayer.getDuelId()))
{
return true;
}
// Olympiad.
if (player.isInOlympiadMode() && targetPlayer.isInOlympiadMode() && (player.getOlympiadGameId() == targetPlayer.getOlympiadGameId()))
{
return true;
}
// Clan.
final L2Clan clan = player.getClan();
final L2Clan targetClan = targetPlayer.getClan();
if (clan != null)
{
if (clan == targetClan)
{
return false;
}
// War
if ((targetClan != null) && clan.isAtWarWith(targetClan) && targetClan.isAtWarWith(clan))
{
return true;
}
}
// Alliance.
if ((player.getAllyId() != 0) && (player.getAllyId() == targetPlayer.getAllyId()))
{
return false;
}
// Siege.
if (target.isInsideZone(ZoneId.SIEGE))
{
// Players in the same siege side at the same castle are considered friends.
if ((player.getSiegeState() > 0) && (player.getSiegeState() == targetPlayer.getSiegeState()) && (player.getSiegeSide() == targetPlayer.getSiegeSide()))
{
return false;
}
return true;
}
// At this point summon should be prevented from attacking friendly targets.
if (activeChar.isSummon() && (target == activeChar.getTarget()))
{
return true;
}
// By default any flagged/PK player is considered enemy.
return (target.getActingPlayer().getPvpFlag() > 0) || (target.getActingPlayer().getReputation() < 0);
}
return target.isAutoAttackable(activeChar);

19
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
View File

@ -631,7 +631,20 @@ public abstract class L2Summon extends L2Playable
else
{
final L2Object currentTarget = _owner.getTarget();
target = skill.getTarget(this, skill.isBad() && (currentTarget != null) && (!currentTarget.isPlayable() || !currentTarget.isInsideZone(ZoneId.PEACE)), dontMove, false);
if (currentTarget != null)
{
target = skill.getTarget(this, forceUse && (!currentTarget.isPlayable() || !currentTarget.isInsideZone(ZoneId.PEACE)), dontMove, false);
final L2PcInstance currentTargetPlayer = currentTarget.getActingPlayer();
if (!forceUse && (currentTargetPlayer != null) && !currentTargetPlayer.isAutoAttackable(_owner))
{
sendPacket(SystemMessageId.INVALID_TARGET);
return false;
}
}
else
{
target = skill.getTarget(this, forceUse, dontMove, false);
}
}
// Check the validity of the target
@ -780,7 +793,7 @@ public abstract class L2Summon extends L2Playable
@Override
public void doCast(Skill skill)
{
if ((skill.getTarget(this, skill.isBad(), false, false) == null) && !_owner.getAccessLevel().allowPeaceAttack())
if ((skill.getTarget(this, false, false, false) == null) && !_owner.getAccessLevel().allowPeaceAttack())
{
// Send a System Message to the L2PcInstance
_owner.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
@ -790,7 +803,7 @@ public abstract class L2Summon extends L2Playable
return;
}
doCast(skill, null, skill.isBad(), false);
super.doCast(skill);
}
@Override

163
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java vendored
View File

@ -45,92 +45,89 @@ public class NotFriend implements IAffectObjectHandler
final L2PcInstance player = activeChar.getActingPlayer();
final L2PcInstance targetPlayer = target.getActingPlayer();
if (player != null)
if ((player != null) && (targetPlayer != null))
{
if (targetPlayer != null)
// Same player.
if (player == targetPlayer)
{
// Same player.
if (player == targetPlayer)
{
return false;
}
// Peace Zone.
if (target.isInsidePeaceZone(player) && !player.getAccessLevel().allowPeaceAttack())
{
return false;
}
// Party (command channel doesn't make you friends).
final L2Party party = player.getParty();
final L2Party targetParty = targetPlayer.getParty();
if ((party != null) && (targetParty != null) && (party.getLeaderObjectId() == targetParty.getLeaderObjectId()))
{
return false;
}
// Arena.
if (activeChar.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{
return true;
}
// Duel.
if (player.isInDuel() && targetPlayer.isInDuel() && (player.getDuelId() == targetPlayer.getDuelId()))
{
return true;
}
// Olympiad.
if (player.isInOlympiadMode() && targetPlayer.isInOlympiadMode() && (player.getOlympiadGameId() == targetPlayer.getOlympiadGameId()))
{
return true;
}
// Clan.
final L2Clan clan = player.getClan();
final L2Clan targetClan = targetPlayer.getClan();
if (clan != null)
{
if (clan == targetClan)
{
return false;
}
// War
if ((targetClan != null) && clan.isAtWarWith(targetClan) && targetClan.isAtWarWith(clan))
{
return true;
}
}
// Alliance.
if ((player.getAllyId() != 0) && (player.getAllyId() == targetPlayer.getAllyId()))
{
return false;
}
// Siege.
if (target.isInsideZone(ZoneId.SIEGE))
{
// Players in the same siege side at the same castle are considered friends.
if ((player.getSiegeState() > 0) && (player.getSiegeState() == targetPlayer.getSiegeState()) && (player.getSiegeSide() == targetPlayer.getSiegeSide()))
{
return false;
}
return true;
}
// At this point summon should be prevented from attacking friendly targets.
if (activeChar.isSummon() && (target == activeChar.getTarget()))
{
return true;
}
// By default any flagged/PK player is considered enemy.
return (target.getActingPlayer().getPvpFlag() > 0) || (target.getActingPlayer().getReputation() < 0);
return false;
}
// Peace Zone.
if (target.isInsidePeaceZone(player) && !player.getAccessLevel().allowPeaceAttack())
{
return false;
}
// Party (command channel doesn't make you friends).
final L2Party party = player.getParty();
final L2Party targetParty = targetPlayer.getParty();
if ((party != null) && (targetParty != null) && (party.getLeaderObjectId() == targetParty.getLeaderObjectId()))
{
return false;
}
// Arena.
if (activeChar.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{
return true;
}
// Duel.
if (player.isInDuel() && targetPlayer.isInDuel() && (player.getDuelId() == targetPlayer.getDuelId()))
{
return true;
}
// Olympiad.
if (player.isInOlympiadMode() && targetPlayer.isInOlympiadMode() && (player.getOlympiadGameId() == targetPlayer.getOlympiadGameId()))
{
return true;
}
// Clan.
final L2Clan clan = player.getClan();
final L2Clan targetClan = targetPlayer.getClan();
if (clan != null)
{
if (clan == targetClan)
{
return false;
}
// War
if ((targetClan != null) && clan.isAtWarWith(targetClan) && targetClan.isAtWarWith(clan))
{
return true;
}
}
// Alliance.
if ((player.getAllyId() != 0) && (player.getAllyId() == targetPlayer.getAllyId()))
{
return false;
}
// Siege.
if (target.isInsideZone(ZoneId.SIEGE))
{
// Players in the same siege side at the same castle are considered friends.
if ((player.getSiegeState() > 0) && (player.getSiegeState() == targetPlayer.getSiegeState()) && (player.getSiegeSide() == targetPlayer.getSiegeSide()))
{
return false;
}
return true;
}
// At this point summon should be prevented from attacking friendly targets.
if (activeChar.isSummon() && (target == activeChar.getTarget()))
{
return true;
}
// By default any flagged/PK player is considered enemy.
return (target.getActingPlayer().getPvpFlag() > 0) || (target.getActingPlayer().getReputation() < 0);
}
return target.isAutoAttackable(activeChar);

19
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
View File

@ -631,7 +631,20 @@ public abstract class L2Summon extends L2Playable
else
{
final L2Object currentTarget = _owner.getTarget();
target = skill.getTarget(this, skill.isBad() && (currentTarget != null) && (!currentTarget.isPlayable() || !currentTarget.isInsideZone(ZoneId.PEACE)), dontMove, false);
if (currentTarget != null)
{
target = skill.getTarget(this, forceUse && (!currentTarget.isPlayable() || !currentTarget.isInsideZone(ZoneId.PEACE)), dontMove, false);
final L2PcInstance currentTargetPlayer = currentTarget.getActingPlayer();
if (!forceUse && (currentTargetPlayer != null) && !currentTargetPlayer.isAutoAttackable(_owner))
{
sendPacket(SystemMessageId.INVALID_TARGET);
return false;
}
}
else
{
target = skill.getTarget(this, forceUse, dontMove, false);
}
}
// Check the validity of the target
@ -780,7 +793,7 @@ public abstract class L2Summon extends L2Playable
@Override
public void doCast(Skill skill)
{
if ((skill.getTarget(this, skill.isBad(), false, false) == null) && !_owner.getAccessLevel().allowPeaceAttack())
if ((skill.getTarget(this, false, false, false) == null) && !_owner.getAccessLevel().allowPeaceAttack())
{
// Send a System Message to the L2PcInstance
_owner.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
@ -790,7 +803,7 @@ public abstract class L2Summon extends L2Playable
return;
}
doCast(skill, null, skill.isBad(), false);
super.doCast(skill);
}
@Override

163
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java vendored
View File

@ -45,92 +45,89 @@ public class NotFriend implements IAffectObjectHandler
final L2PcInstance player = activeChar.getActingPlayer();
final L2PcInstance targetPlayer = target.getActingPlayer();
if (player != null)
if ((player != null) && (targetPlayer != null))
{
if (targetPlayer != null)
// Same player.
if (player == targetPlayer)
{
// Same player.
if (player == targetPlayer)
{
return false;
}
// Peace Zone.
if (target.isInsidePeaceZone(player) && !player.getAccessLevel().allowPeaceAttack())
{
return false;
}
// Party (command channel doesn't make you friends).
final L2Party party = player.getParty();
final L2Party targetParty = targetPlayer.getParty();
if ((party != null) && (targetParty != null) && (party.getLeaderObjectId() == targetParty.getLeaderObjectId()))
{
return false;
}
// Arena.
if (activeChar.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{
return true;
}
// Duel.
if (player.isInDuel() && targetPlayer.isInDuel() && (player.getDuelId() == targetPlayer.getDuelId()))
{
return true;
}
// Olympiad.
if (player.isInOlympiadMode() && targetPlayer.isInOlympiadMode() && (player.getOlympiadGameId() == targetPlayer.getOlympiadGameId()))
{
return true;
}
// Clan.
final L2Clan clan = player.getClan();
final L2Clan targetClan = targetPlayer.getClan();
if (clan != null)
{
if (clan == targetClan)
{
return false;
}
// War
if ((targetClan != null) && clan.isAtWarWith(targetClan) && targetClan.isAtWarWith(clan))
{
return true;
}
}
// Alliance.
if ((player.getAllyId() != 0) && (player.getAllyId() == targetPlayer.getAllyId()))
{
return false;
}
// Siege.
if (target.isInsideZone(ZoneId.SIEGE))
{
// Players in the same siege side at the same castle are considered friends.
if ((player.getSiegeState() > 0) && (player.getSiegeState() == targetPlayer.getSiegeState()) && (player.getSiegeSide() == targetPlayer.getSiegeSide()))
{
return false;
}
return true;
}
// At this point summon should be prevented from attacking friendly targets.
if (activeChar.isSummon() && (target == activeChar.getTarget()))
{
return true;
}
// By default any flagged/PK player is considered enemy.
return (target.getActingPlayer().getPvpFlag() > 0) || (target.getActingPlayer().getReputation() < 0);
return false;
}
// Peace Zone.
if (target.isInsidePeaceZone(player) && !player.getAccessLevel().allowPeaceAttack())
{
return false;
}
// Party (command channel doesn't make you friends).
final L2Party party = player.getParty();
final L2Party targetParty = targetPlayer.getParty();
if ((party != null) && (targetParty != null) && (party.getLeaderObjectId() == targetParty.getLeaderObjectId()))
{
return false;
}
// Arena.
if (activeChar.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{
return true;
}
// Duel.
if (player.isInDuel() && targetPlayer.isInDuel() && (player.getDuelId() == targetPlayer.getDuelId()))
{
return true;
}
// Olympiad.
if (player.isInOlympiadMode() && targetPlayer.isInOlympiadMode() && (player.getOlympiadGameId() == targetPlayer.getOlympiadGameId()))
{
return true;
}
// Clan.
final L2Clan clan = player.getClan();
final L2Clan targetClan = targetPlayer.getClan();
if (clan != null)
{
if (clan == targetClan)
{
return false;
}
// War
if ((targetClan != null) && clan.isAtWarWith(targetClan) && targetClan.isAtWarWith(clan))
{
return true;
}
}
// Alliance.
if ((player.getAllyId() != 0) && (player.getAllyId() == targetPlayer.getAllyId()))
{
return false;
}
// Siege.
if (target.isInsideZone(ZoneId.SIEGE))
{
// Players in the same siege side at the same castle are considered friends.
if ((player.getSiegeState() > 0) && (player.getSiegeState() == targetPlayer.getSiegeState()) && (player.getSiegeSide() == targetPlayer.getSiegeSide()))
{
return false;
}
return true;
}
// At this point summon should be prevented from attacking friendly targets.
if (activeChar.isSummon() && (target == activeChar.getTarget()))
{
return true;
}
// By default any flagged/PK player is considered enemy.
return (target.getActingPlayer().getPvpFlag() > 0) || (target.getActingPlayer().getReputation() < 0);
}
return target.isAutoAttackable(activeChar);

19
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
View File

@ -631,7 +631,20 @@ public abstract class L2Summon extends L2Playable
else
{
final L2Object currentTarget = _owner.getTarget();
target = skill.getTarget(this, skill.isBad() && (currentTarget != null) && (!currentTarget.isPlayable() || !currentTarget.isInsideZone(ZoneId.PEACE)), dontMove, false);
if (currentTarget != null)
{
target = skill.getTarget(this, forceUse && (!currentTarget.isPlayable() || !currentTarget.isInsideZone(ZoneId.PEACE)), dontMove, false);
final L2PcInstance currentTargetPlayer = currentTarget.getActingPlayer();
if (!forceUse && (currentTargetPlayer != null) && !currentTargetPlayer.isAutoAttackable(_owner))
{
sendPacket(SystemMessageId.INVALID_TARGET);
return false;
}
}
else
{
target = skill.getTarget(this, forceUse, dontMove, false);
}
}
// Check the validity of the target
@ -780,7 +793,7 @@ public abstract class L2Summon extends L2Playable
@Override
public void doCast(Skill skill)
{
if ((skill.getTarget(this, skill.isBad(), false, false) == null) && !_owner.getAccessLevel().allowPeaceAttack())
if ((skill.getTarget(this, false, false, false) == null) && !_owner.getAccessLevel().allowPeaceAttack())
{
// Send a System Message to the L2PcInstance
_owner.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
@ -790,7 +803,7 @@ public abstract class L2Summon extends L2Playable
return;
}
doCast(skill, null, skill.isBad(), false);
super.doCast(skill);
}
@Override

163
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java vendored
View File

@ -45,92 +45,89 @@ public class NotFriend implements IAffectObjectHandler
final L2PcInstance player = activeChar.getActingPlayer();
final L2PcInstance targetPlayer = target.getActingPlayer();
if (player != null)
if ((player != null) && (targetPlayer != null))
{
if (targetPlayer != null)
// Same player.
if (player == targetPlayer)
{
// Same player.
if (player == targetPlayer)
{
return false;
}
// Peace Zone.
if (target.isInsidePeaceZone(player) && !player.getAccessLevel().allowPeaceAttack())
{
return false;
}
// Party (command channel doesn't make you friends).
final L2Party party = player.getParty();
final L2Party targetParty = targetPlayer.getParty();
if ((party != null) && (targetParty != null) && (party.getLeaderObjectId() == targetParty.getLeaderObjectId()))
{
return false;
}
// Arena.
if (activeChar.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{
return true;
}
// Duel.
if (player.isInDuel() && targetPlayer.isInDuel() && (player.getDuelId() == targetPlayer.getDuelId()))
{
return true;
}
// Olympiad.
if (player.isInOlympiadMode() && targetPlayer.isInOlympiadMode() && (player.getOlympiadGameId() == targetPlayer.getOlympiadGameId()))
{
return true;
}
// Clan.
final L2Clan clan = player.getClan();
final L2Clan targetClan = targetPlayer.getClan();
if (clan != null)
{
if (clan == targetClan)
{
return false;
}
// War
if ((targetClan != null) && clan.isAtWarWith(targetClan) && targetClan.isAtWarWith(clan))
{
return true;
}
}
// Alliance.
if ((player.getAllyId() != 0) && (player.getAllyId() == targetPlayer.getAllyId()))
{
return false;
}
// Siege.
if (target.isInsideZone(ZoneId.SIEGE))
{
// Players in the same siege side at the same castle are considered friends.
if ((player.getSiegeState() > 0) && (player.getSiegeState() == targetPlayer.getSiegeState()) && (player.getSiegeSide() == targetPlayer.getSiegeSide()))
{
return false;
}
return true;
}
// At this point summon should be prevented from attacking friendly targets.
if (activeChar.isSummon() && (target == activeChar.getTarget()))
{
return true;
}
// By default any flagged/PK player is considered enemy.
return (target.getActingPlayer().getPvpFlag() > 0) || (target.getActingPlayer().getReputation() < 0);
return false;
}
// Peace Zone.
if (target.isInsidePeaceZone(player) && !player.getAccessLevel().allowPeaceAttack())
{
return false;
}
// Party (command channel doesn't make you friends).
final L2Party party = player.getParty();
final L2Party targetParty = targetPlayer.getParty();
if ((party != null) && (targetParty != null) && (party.getLeaderObjectId() == targetParty.getLeaderObjectId()))
{
return false;
}
// Arena.
if (activeChar.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{
return true;
}
// Duel.
if (player.isInDuel() && targetPlayer.isInDuel() && (player.getDuelId() == targetPlayer.getDuelId()))
{
return true;
}
// Olympiad.
if (player.isInOlympiadMode() && targetPlayer.isInOlympiadMode() && (player.getOlympiadGameId() == targetPlayer.getOlympiadGameId()))
{
return true;
}
// Clan.
final L2Clan clan = player.getClan();
final L2Clan targetClan = targetPlayer.getClan();
if (clan != null)
{
if (clan == targetClan)
{
return false;
}
// War
if ((targetClan != null) && clan.isAtWarWith(targetClan) && targetClan.isAtWarWith(clan))
{
return true;
}
}
// Alliance.
if ((player.getAllyId() != 0) && (player.getAllyId() == targetPlayer.getAllyId()))
{
return false;
}
// Siege.
if (target.isInsideZone(ZoneId.SIEGE))
{
// Players in the same siege side at the same castle are considered friends.
if ((player.getSiegeState() > 0) && (player.getSiegeState() == targetPlayer.getSiegeState()) && (player.getSiegeSide() == targetPlayer.getSiegeSide()))
{
return false;
}
return true;
}
// At this point summon should be prevented from attacking friendly targets.
if (activeChar.isSummon() && (target == activeChar.getTarget()))
{
return true;
}
// By default any flagged/PK player is considered enemy.
return (target.getActingPlayer().getPvpFlag() > 0) || (target.getActingPlayer().getReputation() < 0);
}
return target.isAutoAttackable(activeChar);

19
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
View File

@ -631,7 +631,20 @@ public abstract class L2Summon extends L2Playable
else
{
final L2Object currentTarget = _owner.getTarget();
target = skill.getTarget(this, skill.isBad() && (currentTarget != null) && (!currentTarget.isPlayable() || !currentTarget.isInsideZone(ZoneId.PEACE)), dontMove, false);
if (currentTarget != null)
{
target = skill.getTarget(this, forceUse && (!currentTarget.isPlayable() || !currentTarget.isInsideZone(ZoneId.PEACE)), dontMove, false);
final L2PcInstance currentTargetPlayer = currentTarget.getActingPlayer();
if (!forceUse && (currentTargetPlayer != null) && !currentTargetPlayer.isAutoAttackable(_owner))
{
sendPacket(SystemMessageId.INVALID_TARGET);
return false;
}
}
else
{
target = skill.getTarget(this, forceUse, dontMove, false);
}
}
// Check the validity of the target
@ -780,7 +793,7 @@ public abstract class L2Summon extends L2Playable
@Override
public void doCast(Skill skill)
{
if ((skill.getTarget(this, skill.isBad(), false, false) == null) && !_owner.getAccessLevel().allowPeaceAttack())
if ((skill.getTarget(this, false, false, false) == null) && !_owner.getAccessLevel().allowPeaceAttack())
{
// Send a System Message to the L2PcInstance
_owner.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
@ -790,7 +803,7 @@ public abstract class L2Summon extends L2Playable
return;
}
doCast(skill, null, skill.isBad(), false);
super.doCast(skill);
}
@Override

163
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java vendored
View File

@ -45,92 +45,89 @@ public class NotFriend implements IAffectObjectHandler
final L2PcInstance player = activeChar.getActingPlayer();
final L2PcInstance targetPlayer = target.getActingPlayer();
if (player != null)
if ((player != null) && (targetPlayer != null))
{
if (targetPlayer != null)
// Same player.
if (player == targetPlayer)
{
// Same player.
if (player == targetPlayer)
{
return false;
}
// Peace Zone.
if (target.isInsidePeaceZone(player) && !player.getAccessLevel().allowPeaceAttack())
{
return false;
}
// Party (command channel doesn't make you friends).
final L2Party party = player.getParty();
final L2Party targetParty = targetPlayer.getParty();
if ((party != null) && (targetParty != null) && (party.getLeaderObjectId() == targetParty.getLeaderObjectId()))
{
return false;
}
// Arena.
if (activeChar.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{
return true;
}
// Duel.
if (player.isInDuel() && targetPlayer.isInDuel() && (player.getDuelId() == targetPlayer.getDuelId()))
{
return true;
}
// Olympiad.
if (player.isInOlympiadMode() && targetPlayer.isInOlympiadMode() && (player.getOlympiadGameId() == targetPlayer.getOlympiadGameId()))
{
return true;
}
// Clan.
final L2Clan clan = player.getClan();
final L2Clan targetClan = targetPlayer.getClan();
if (clan != null)
{
if (clan == targetClan)
{
return false;
}
// War
if ((targetClan != null) && clan.isAtWarWith(targetClan) && targetClan.isAtWarWith(clan))
{
return true;
}
}
// Alliance.
if ((player.getAllyId() != 0) && (player.getAllyId() == targetPlayer.getAllyId()))
{
return false;
}
// Siege.
if (target.isInsideZone(ZoneId.SIEGE))
{
// Players in the same siege side at the same castle are considered friends.
if ((player.getSiegeState() > 0) && (player.getSiegeState() == targetPlayer.getSiegeState()) && (player.getSiegeSide() == targetPlayer.getSiegeSide()))
{
return false;
}
return true;
}
// At this point summon should be prevented from attacking friendly targets.
if (activeChar.isSummon() && (target == activeChar.getTarget()))
{
return true;
}
// By default any flagged/PK player is considered enemy.
return (target.getActingPlayer().getPvpFlag() > 0) || (target.getActingPlayer().getReputation() < 0);
return false;
}
// Peace Zone.
if (target.isInsidePeaceZone(player) && !player.getAccessLevel().allowPeaceAttack())
{
return false;
}
// Party (command channel doesn't make you friends).
final L2Party party = player.getParty();
final L2Party targetParty = targetPlayer.getParty();
if ((party != null) && (targetParty != null) && (party.getLeaderObjectId() == targetParty.getLeaderObjectId()))
{
return false;
}
// Arena.
if (activeChar.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{
return true;
}
// Duel.
if (player.isInDuel() && targetPlayer.isInDuel() && (player.getDuelId() == targetPlayer.getDuelId()))
{
return true;
}
// Olympiad.
if (player.isInOlympiadMode() && targetPlayer.isInOlympiadMode() && (player.getOlympiadGameId() == targetPlayer.getOlympiadGameId()))
{
return true;
}
// Clan.
final L2Clan clan = player.getClan();
final L2Clan targetClan = targetPlayer.getClan();
if (clan != null)
{
if (clan == targetClan)
{
return false;
}
// War
if ((targetClan != null) && clan.isAtWarWith(targetClan) && targetClan.isAtWarWith(clan))
{
return true;
}
}
// Alliance.
if ((player.getAllyId() != 0) && (player.getAllyId() == targetPlayer.getAllyId()))
{
return false;
}
// Siege.
if (target.isInsideZone(ZoneId.SIEGE))
{
// Players in the same siege side at the same castle are considered friends.
if ((player.getSiegeState() > 0) && (player.getSiegeState() == targetPlayer.getSiegeState()) && (player.getSiegeSide() == targetPlayer.getSiegeSide()))
{
return false;
}
return true;
}
// At this point summon should be prevented from attacking friendly targets.
if (activeChar.isSummon() && (target == activeChar.getTarget()))
{
return true;
}
// By default any flagged/PK player is considered enemy.
return (target.getActingPlayer().getPvpFlag() > 0) || (target.getActingPlayer().getReputation() < 0);
}
return target.isAutoAttackable(activeChar);

19
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
View File

@ -631,7 +631,20 @@ public abstract class L2Summon extends L2Playable
else
{
final L2Object currentTarget = _owner.getTarget();
target = skill.getTarget(this, skill.isBad() && (currentTarget != null) && (!currentTarget.isPlayable() || !currentTarget.isInsideZone(ZoneId.PEACE)), dontMove, false);
if (currentTarget != null)
{
target = skill.getTarget(this, forceUse && (!currentTarget.isPlayable() || !currentTarget.isInsideZone(ZoneId.PEACE)), dontMove, false);
final L2PcInstance currentTargetPlayer = currentTarget.getActingPlayer();
if (!forceUse && (currentTargetPlayer != null) && !currentTargetPlayer.isAutoAttackable(_owner))
{
sendPacket(SystemMessageId.INVALID_TARGET);
return false;
}
}
else
{
target = skill.getTarget(this, forceUse, dontMove, false);
}
}
// Check the validity of the target
@ -780,7 +793,7 @@ public abstract class L2Summon extends L2Playable
@Override
public void doCast(Skill skill)
{
if ((skill.getTarget(this, skill.isBad(), false, false) == null) && !_owner.getAccessLevel().allowPeaceAttack())
if ((skill.getTarget(this, false, false, false) == null) && !_owner.getAccessLevel().allowPeaceAttack())
{
// Send a System Message to the L2PcInstance
_owner.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
@ -790,7 +803,7 @@ public abstract class L2Summon extends L2Playable
return;
}
doCast(skill, null, skill.isBad(), false);
super.doCast(skill);
}
@Override

163
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java vendored
View File

@ -45,92 +45,89 @@ public class NotFriend implements IAffectObjectHandler
final L2PcInstance player = activeChar.getActingPlayer();
final L2PcInstance targetPlayer = target.getActingPlayer();
if (player != null)
if ((player != null) && (targetPlayer != null))
{
if (targetPlayer != null)
// Same player.
if (player == targetPlayer)
{
// Same player.
if (player == targetPlayer)
{
return false;
}
// Peace Zone.
if (target.isInsidePeaceZone(player) && !player.getAccessLevel().allowPeaceAttack())
{
return false;
}
// Party (command channel doesn't make you friends).
final L2Party party = player.getParty();
final L2Party targetParty = targetPlayer.getParty();
if ((party != null) && (targetParty != null) && (party.getLeaderObjectId() == targetParty.getLeaderObjectId()))
{
return false;
}
// Arena.
if (activeChar.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{
return true;
}
// Duel.
if (player.isInDuel() && targetPlayer.isInDuel() && (player.getDuelId() == targetPlayer.getDuelId()))
{
return true;
}
// Olympiad.
if (player.isInOlympiadMode() && targetPlayer.isInOlympiadMode() && (player.getOlympiadGameId() == targetPlayer.getOlympiadGameId()))
{
return true;
}
// Clan.
final L2Clan clan = player.getClan();
final L2Clan targetClan = targetPlayer.getClan();
if (clan != null)
{
if (clan == targetClan)
{
return false;
}
// War
if ((targetClan != null) && clan.isAtWarWith(targetClan) && targetClan.isAtWarWith(clan))
{
return true;
}
}
// Alliance.
if ((player.getAllyId() != 0) && (player.getAllyId() == targetPlayer.getAllyId()))
{
return false;
}
// Siege.
if (target.isInsideZone(ZoneId.SIEGE))
{
// Players in the same siege side at the same castle are considered friends.
if ((player.getSiegeState() > 0) && (player.getSiegeState() == targetPlayer.getSiegeState()) && (player.getSiegeSide() == targetPlayer.getSiegeSide()))
{
return false;
}
return true;
}
// At this point summon should be prevented from attacking friendly targets.
if (activeChar.isSummon() && (target == activeChar.getTarget()))
{
return true;
}
// By default any flagged/PK player is considered enemy.
return (target.getActingPlayer().getPvpFlag() > 0) || (target.getActingPlayer().getReputation() < 0);
return false;
}
// Peace Zone.
if (target.isInsidePeaceZone(player) && !player.getAccessLevel().allowPeaceAttack())
{
return false;
}
// Party (command channel doesn't make you friends).
final L2Party party = player.getParty();
final L2Party targetParty = targetPlayer.getParty();
if ((party != null) && (targetParty != null) && (party.getLeaderObjectId() == targetParty.getLeaderObjectId()))
{
return false;
}
// Arena.
if (activeChar.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{
return true;
}
// Duel.
if (player.isInDuel() && targetPlayer.isInDuel() && (player.getDuelId() == targetPlayer.getDuelId()))
{
return true;
}
// Olympiad.
if (player.isInOlympiadMode() && targetPlayer.isInOlympiadMode() && (player.getOlympiadGameId() == targetPlayer.getOlympiadGameId()))
{
return true;
}
// Clan.
final L2Clan clan = player.getClan();
final L2Clan targetClan = targetPlayer.getClan();
if (clan != null)
{
if (clan == targetClan)
{
return false;
}
// War
if ((targetClan != null) && clan.isAtWarWith(targetClan) && targetClan.isAtWarWith(clan))
{
return true;
}
}
// Alliance.
if ((player.getAllyId() != 0) && (player.getAllyId() == targetPlayer.getAllyId()))
{
return false;
}
// Siege.
if (target.isInsideZone(ZoneId.SIEGE))
{
// Players in the same siege side at the same castle are considered friends.
if ((player.getSiegeState() > 0) && (player.getSiegeState() == targetPlayer.getSiegeState()) && (player.getSiegeSide() == targetPlayer.getSiegeSide()))
{
return false;
}
return true;
}
// At this point summon should be prevented from attacking friendly targets.
if (activeChar.isSummon() && (target == activeChar.getTarget()))
{
return true;
}
// By default any flagged/PK player is considered enemy.
return (target.getActingPlayer().getPvpFlag() > 0) || (target.getActingPlayer().getReputation() < 0);
}
return target.isAutoAttackable(activeChar);

19
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
View File

@ -631,7 +631,20 @@ public abstract class L2Summon extends L2Playable
else
{
final L2Object currentTarget = _owner.getTarget();
target = skill.getTarget(this, skill.isBad() && (currentTarget != null) && (!currentTarget.isPlayable() || !currentTarget.isInsideZone(ZoneId.PEACE)), dontMove, false);
if (currentTarget != null)
{
target = skill.getTarget(this, forceUse && (!currentTarget.isPlayable() || !currentTarget.isInsideZone(ZoneId.PEACE)), dontMove, false);
final L2PcInstance currentTargetPlayer = currentTarget.getActingPlayer();
if (!forceUse && (currentTargetPlayer != null) && !currentTargetPlayer.isAutoAttackable(_owner))
{
sendPacket(SystemMessageId.INVALID_TARGET);
return false;
}
}
else
{
target = skill.getTarget(this, forceUse, dontMove, false);
}
}
// Check the validity of the target
@ -780,7 +793,7 @@ public abstract class L2Summon extends L2Playable
@Override
public void doCast(Skill skill)
{
if ((skill.getTarget(this, skill.isBad(), false, false) == null) && !_owner.getAccessLevel().allowPeaceAttack())
if ((skill.getTarget(this, false, false, false) == null) && !_owner.getAccessLevel().allowPeaceAttack())
{
// Send a System Message to the L2PcInstance
_owner.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
@ -790,7 +803,7 @@ public abstract class L2Summon extends L2Playable
return;
}
doCast(skill, null, skill.isBad(), false);
super.doCast(skill);
}
@Override

163
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java vendored
View File

@ -45,92 +45,89 @@ public class NotFriend implements IAffectObjectHandler
final L2PcInstance player = activeChar.getActingPlayer();
final L2PcInstance targetPlayer = target.getActingPlayer();
if (player != null)
if ((player != null) && (targetPlayer != null))
{
if (targetPlayer != null)
// Same player.
if (player == targetPlayer)
{
// Same player.
if (player == targetPlayer)
{
return false;
}
// Peace Zone.
if (target.isInsidePeaceZone(player) && !player.getAccessLevel().allowPeaceAttack())
{
return false;
}
// Party (command channel doesn't make you friends).
final L2Party party = player.getParty();
final L2Party targetParty = targetPlayer.getParty();
if ((party != null) && (targetParty != null) && (party.getLeaderObjectId() == targetParty.getLeaderObjectId()))
{
return false;
}
// Arena.
if (activeChar.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{
return true;
}
// Duel.
if (player.isInDuel() && targetPlayer.isInDuel() && (player.getDuelId() == targetPlayer.getDuelId()))
{
return true;
}
// Olympiad.
if (player.isInOlympiadMode() && targetPlayer.isInOlympiadMode() && (player.getOlympiadGameId() == targetPlayer.getOlympiadGameId()))
{
return true;
}
// Clan.
final L2Clan clan = player.getClan();
final L2Clan targetClan = targetPlayer.getClan();
if (clan != null)
{
if (clan == targetClan)
{
return false;
}
// War
if ((targetClan != null) && clan.isAtWarWith(targetClan) && targetClan.isAtWarWith(clan))
{
return true;
}
}
// Alliance.
if ((player.getAllyId() != 0) && (player.getAllyId() == targetPlayer.getAllyId()))
{
return false;
}
// Siege.
if (target.isInsideZone(ZoneId.SIEGE))
{
// Players in the same siege side at the same castle are considered friends.
if ((player.getSiegeState() > 0) && (player.getSiegeState() == targetPlayer.getSiegeState()) && (player.getSiegeSide() == targetPlayer.getSiegeSide()))
{
return false;
}
return true;
}
// At this point summon should be prevented from attacking friendly targets.
if (activeChar.isSummon() && (target == activeChar.getTarget()))
{
return true;
}
// By default any flagged/PK player is considered enemy.
return (target.getActingPlayer().getPvpFlag() > 0) || (target.getActingPlayer().getReputation() < 0);
return false;
}
// Peace Zone.
if (target.isInsidePeaceZone(player) && !player.getAccessLevel().allowPeaceAttack())
{
return false;
}
// Party (command channel doesn't make you friends).
final L2Party party = player.getParty();
final L2Party targetParty = targetPlayer.getParty();
if ((party != null) && (targetParty != null) && (party.getLeaderObjectId() == targetParty.getLeaderObjectId()))
{
return false;
}
// Arena.
if (activeChar.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{
return true;
}
// Duel.
if (player.isInDuel() && targetPlayer.isInDuel() && (player.getDuelId() == targetPlayer.getDuelId()))
{
return true;
}
// Olympiad.
if (player.isInOlympiadMode() && targetPlayer.isInOlympiadMode() && (player.getOlympiadGameId() == targetPlayer.getOlympiadGameId()))
{
return true;
}
// Clan.
final L2Clan clan = player.getClan();
final L2Clan targetClan = targetPlayer.getClan();
if (clan != null)
{
if (clan == targetClan)
{
return false;
}
// War
if ((targetClan != null) && clan.isAtWarWith(targetClan) && targetClan.isAtWarWith(clan))
{
return true;
}
}
// Alliance.
if ((player.getAllyId() != 0) && (player.getAllyId() == targetPlayer.getAllyId()))
{
return false;
}
// Siege.
if (target.isInsideZone(ZoneId.SIEGE))
{
// Players in the same siege side at the same castle are considered friends.
if ((player.getSiegeState() > 0) && (player.getSiegeState() == targetPlayer.getSiegeState()) && (player.getSiegeSide() == targetPlayer.getSiegeSide()))
{
return false;
}
return true;
}
// At this point summon should be prevented from attacking friendly targets.
if (activeChar.isSummon() && (target == activeChar.getTarget()))
{
return true;
}
// By default any flagged/PK player is considered enemy.
return (target.getActingPlayer().getPvpFlag() > 0) || (target.getActingPlayer().getReputation() < 0);
}
return target.isAutoAttackable(activeChar);

19
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
View File

@ -631,7 +631,20 @@ public abstract class L2Summon extends L2Playable
else
{
final L2Object currentTarget = _owner.getTarget();
target = skill.getTarget(this, skill.isBad() && (currentTarget != null) && (!currentTarget.isPlayable() || !currentTarget.isInsideZone(ZoneId.PEACE)), dontMove, false);
if (currentTarget != null)
{
target = skill.getTarget(this, forceUse && (!currentTarget.isPlayable() || !currentTarget.isInsideZone(ZoneId.PEACE)), dontMove, false);
final L2PcInstance currentTargetPlayer = currentTarget.getActingPlayer();
if (!forceUse && (currentTargetPlayer != null) && !currentTargetPlayer.isAutoAttackable(_owner))
{
sendPacket(SystemMessageId.INVALID_TARGET);
return false;
}
}
else
{
target = skill.getTarget(this, forceUse, dontMove, false);
}
}
// Check the validity of the target
@ -780,7 +793,7 @@ public abstract class L2Summon extends L2Playable
@Override
public void doCast(Skill skill)
{
if ((skill.getTarget(this, skill.isBad(), false, false) == null) && !_owner.getAccessLevel().allowPeaceAttack())
if ((skill.getTarget(this, false, false, false) == null) && !_owner.getAccessLevel().allowPeaceAttack())
{
// Send a System Message to the L2PcInstance
_owner.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
@ -790,7 +803,7 @@ public abstract class L2Summon extends L2Playable
return;
}
doCast(skill, null, skill.isBad(), false);
super.doCast(skill);
}
@Override

163
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java vendored
View File

@ -45,92 +45,89 @@ public class NotFriend implements IAffectObjectHandler
final L2PcInstance player = activeChar.getActingPlayer();
final L2PcInstance targetPlayer = target.getActingPlayer();
if (player != null)
if ((player != null) && (targetPlayer != null))
{
if (targetPlayer != null)
// Same player.
if (player == targetPlayer)
{
// Same player.
if (player == targetPlayer)
{
return false;
}
// Peace Zone.
if (target.isInsidePeaceZone(player) && !player.getAccessLevel().allowPeaceAttack())
{
return false;
}
// Party (command channel doesn't make you friends).
final L2Party party = player.getParty();
final L2Party targetParty = targetPlayer.getParty();
if ((party != null) && (targetParty != null) && (party.getLeaderObjectId() == targetParty.getLeaderObjectId()))
{
return false;
}
// Arena.
if (activeChar.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{
return true;
}
// Duel.
if (player.isInDuel() && targetPlayer.isInDuel() && (player.getDuelId() == targetPlayer.getDuelId()))
{
return true;
}
// Olympiad.
if (player.isInOlympiadMode() && targetPlayer.isInOlympiadMode() && (player.getOlympiadGameId() == targetPlayer.getOlympiadGameId()))
{
return true;
}
// Clan.
final L2Clan clan = player.getClan();
final L2Clan targetClan = targetPlayer.getClan();
if (clan != null)
{
if (clan == targetClan)
{
return false;
}
// War
if ((targetClan != null) && clan.isAtWarWith(targetClan) && targetClan.isAtWarWith(clan))
{
return true;
}
}
// Alliance.
if ((player.getAllyId() != 0) && (player.getAllyId() == targetPlayer.getAllyId()))
{
return false;
}
// Siege.
if (target.isInsideZone(ZoneId.SIEGE))
{
// Players in the same siege side at the same castle are considered friends.
if ((player.getSiegeState() > 0) && (player.getSiegeState() == targetPlayer.getSiegeState()) && (player.getSiegeSide() == targetPlayer.getSiegeSide()))
{
return false;
}
return true;
}
// At this point summon should be prevented from attacking friendly targets.
if (activeChar.isSummon() && (target == activeChar.getTarget()))
{
return true;
}
// By default any flagged/PK player is considered enemy.
return (target.getActingPlayer().getPvpFlag() > 0) || (target.getActingPlayer().getReputation() < 0);
return false;
}
// Peace Zone.
if (target.isInsidePeaceZone(player) && !player.getAccessLevel().allowPeaceAttack())
{
return false;
}
// Party (command channel doesn't make you friends).
final L2Party party = player.getParty();
final L2Party targetParty = targetPlayer.getParty();
if ((party != null) && (targetParty != null) && (party.getLeaderObjectId() == targetParty.getLeaderObjectId()))
{
return false;
}
// Arena.
if (activeChar.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{
return true;
}
// Duel.
if (player.isInDuel() && targetPlayer.isInDuel() && (player.getDuelId() == targetPlayer.getDuelId()))
{
return true;
}
// Olympiad.
if (player.isInOlympiadMode() && targetPlayer.isInOlympiadMode() && (player.getOlympiadGameId() == targetPlayer.getOlympiadGameId()))
{
return true;
}
// Clan.
final L2Clan clan = player.getClan();
final L2Clan targetClan = targetPlayer.getClan();
if (clan != null)
{
if (clan == targetClan)
{
return false;
}
// War
if ((targetClan != null) && clan.isAtWarWith(targetClan) && targetClan.isAtWarWith(clan))
{
return true;
}
}
// Alliance.
if ((player.getAllyId() != 0) && (player.getAllyId() == targetPlayer.getAllyId()))
{
return false;
}
// Siege.
if (target.isInsideZone(ZoneId.SIEGE))
{
// Players in the same siege side at the same castle are considered friends.
if ((player.getSiegeState() > 0) && (player.getSiegeState() == targetPlayer.getSiegeState()) && (player.getSiegeSide() == targetPlayer.getSiegeSide()))
{
return false;
}
return true;
}
// At this point summon should be prevented from attacking friendly targets.
if (activeChar.isSummon() && (target == activeChar.getTarget()))
{
return true;
}
// By default any flagged/PK player is considered enemy.
return (target.getActingPlayer().getPvpFlag() > 0) || (target.getActingPlayer().getReputation() < 0);
}
return target.isAutoAttackable(activeChar);

19
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
View File

@ -631,7 +631,20 @@ public abstract class L2Summon extends L2Playable
else
{
final L2Object currentTarget = _owner.getTarget();
target = skill.getTarget(this, skill.isBad() && (currentTarget != null) && (!currentTarget.isPlayable() || !currentTarget.isInsideZone(ZoneId.PEACE)), dontMove, false);
if (currentTarget != null)
{
target = skill.getTarget(this, forceUse && (!currentTarget.isPlayable() || !currentTarget.isInsideZone(ZoneId.PEACE)), dontMove, false);
final L2PcInstance currentTargetPlayer = currentTarget.getActingPlayer();
if (!forceUse && (currentTargetPlayer != null) && !currentTargetPlayer.isAutoAttackable(_owner))
{
sendPacket(SystemMessageId.INVALID_TARGET);
return false;
}
}
else
{
target = skill.getTarget(this, forceUse, dontMove, false);
}
}
// Check the validity of the target
@ -780,7 +793,7 @@ public abstract class L2Summon extends L2Playable
@Override
public void doCast(Skill skill)
{
if ((skill.getTarget(this, skill.isBad(), false, false) == null) && !_owner.getAccessLevel().allowPeaceAttack())
if ((skill.getTarget(this, false, false, false) == null) && !_owner.getAccessLevel().allowPeaceAttack())
{
// Send a System Message to the L2PcInstance
_owner.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
@ -790,7 +803,7 @@ public abstract class L2Summon extends L2Playable
return;
}
doCast(skill, null, skill.isBad(), false);
super.doCast(skill);
}
@Override

163
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectobject/NotFriend.java vendored
View File

@ -45,92 +45,89 @@ public class NotFriend implements IAffectObjectHandler
final L2PcInstance player = activeChar.getActingPlayer();
final L2PcInstance targetPlayer = target.getActingPlayer();
if (player != null)
if ((player != null) && (targetPlayer != null))
{
if (targetPlayer != null)
// Same player.
if (player == targetPlayer)
{
// Same player.
if (player == targetPlayer)
{
return false;
}
// Peace Zone.
if (target.isInsidePeaceZone(player) && !player.getAccessLevel().allowPeaceAttack())
{
return false;
}
// Party (command channel doesn't make you friends).
final L2Party party = player.getParty();
final L2Party targetParty = targetPlayer.getParty();
if ((party != null) && (targetParty != null) && (party.getLeaderObjectId() == targetParty.getLeaderObjectId()))
{
return false;
}
// Arena.
if (activeChar.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{
return true;
}
// Duel.
if (player.isInDuel() && targetPlayer.isInDuel() && (player.getDuelId() == targetPlayer.getDuelId()))
{
return true;
}
// Olympiad.
if (player.isInOlympiadMode() && targetPlayer.isInOlympiadMode() && (player.getOlympiadGameId() == targetPlayer.getOlympiadGameId()))
{
return true;
}
// Clan.
final L2Clan clan = player.getClan();
final L2Clan targetClan = targetPlayer.getClan();
if (clan != null)
{
if (clan == targetClan)
{
return false;
}
// War
if ((targetClan != null) && clan.isAtWarWith(targetClan) && targetClan.isAtWarWith(clan))
{
return true;
}
}
// Alliance.
if ((player.getAllyId() != 0) && (player.getAllyId() == targetPlayer.getAllyId()))
{
return false;
}
// Siege.
if (target.isInsideZone(ZoneId.SIEGE))
{
// Players in the same siege side at the same castle are considered friends.
if ((player.getSiegeState() > 0) && (player.getSiegeState() == targetPlayer.getSiegeState()) && (player.getSiegeSide() == targetPlayer.getSiegeSide()))
{
return false;
}
return true;
}
// At this point summon should be prevented from attacking friendly targets.
if (activeChar.isSummon() && (target == activeChar.getTarget()))
{
return true;
}
// By default any flagged/PK player is considered enemy.
return (target.getActingPlayer().getPvpFlag() > 0) || (target.getActingPlayer().getReputation() < 0);
return false;
}
// Peace Zone.
if (target.isInsidePeaceZone(player) && !player.getAccessLevel().allowPeaceAttack())
{
return false;
}
// Party (command channel doesn't make you friends).
final L2Party party = player.getParty();
final L2Party targetParty = targetPlayer.getParty();
if ((party != null) && (targetParty != null) && (party.getLeaderObjectId() == targetParty.getLeaderObjectId()))
{
return false;
}
// Arena.
if (activeChar.isInsideZone(ZoneId.PVP) && target.isInsideZone(ZoneId.PVP))
{
return true;
}
// Duel.
if (player.isInDuel() && targetPlayer.isInDuel() && (player.getDuelId() == targetPlayer.getDuelId()))
{
return true;
}
// Olympiad.
if (player.isInOlympiadMode() && targetPlayer.isInOlympiadMode() && (player.getOlympiadGameId() == targetPlayer.getOlympiadGameId()))
{
return true;
}
// Clan.
final L2Clan clan = player.getClan();
final L2Clan targetClan = targetPlayer.getClan();
if (clan != null)
{
if (clan == targetClan)
{
return false;
}
// War
if ((targetClan != null) && clan.isAtWarWith(targetClan) && targetClan.isAtWarWith(clan))
{
return true;
}
}
// Alliance.
if ((player.getAllyId() != 0) && (player.getAllyId() == targetPlayer.getAllyId()))
{
return false;
}
// Siege.
if (target.isInsideZone(ZoneId.SIEGE))
{
// Players in the same siege side at the same castle are considered friends.
if ((player.getSiegeState() > 0) && (player.getSiegeState() == targetPlayer.getSiegeState()) && (player.getSiegeSide() == targetPlayer.getSiegeSide()))
{
return false;
}
return true;
}
// At this point summon should be prevented from attacking friendly targets.
if (activeChar.isSummon() && (target == activeChar.getTarget()))
{
return true;
}
// By default any flagged/PK player is considered enemy.
return (target.getActingPlayer().getPvpFlag() > 0) || (target.getActingPlayer().getReputation() < 0);
}
return target.isAutoAttackable(activeChar);

19
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
View File

@ -631,7 +631,20 @@ public abstract class L2Summon extends L2Playable
else
{
final L2Object currentTarget = _owner.getTarget();
target = skill.getTarget(this, skill.isBad() && (currentTarget != null) && (!currentTarget.isPlayable() || !currentTarget.isInsideZone(ZoneId.PEACE)), dontMove, false);
if (currentTarget != null)
{
target = skill.getTarget(this, forceUse && (!currentTarget.isPlayable() || !currentTarget.isInsideZone(ZoneId.PEACE)), dontMove, false);
final L2PcInstance currentTargetPlayer = currentTarget.getActingPlayer();
if (!forceUse && (currentTargetPlayer != null) && !currentTargetPlayer.isAutoAttackable(_owner))
{
sendPacket(SystemMessageId.INVALID_TARGET);
return false;
}
}
else
{
target = skill.getTarget(this, forceUse, dontMove, false);
}
}
// Check the validity of the target
@ -780,7 +793,7 @@ public abstract class L2Summon extends L2Playable
@Override
public void doCast(Skill skill)
{
if ((skill.getTarget(this, skill.isBad(), false, false) == null) && !_owner.getAccessLevel().allowPeaceAttack())
if ((skill.getTarget(this, false, false, false) == null) && !_owner.getAccessLevel().allowPeaceAttack())
{
// Send a System Message to the L2PcInstance
_owner.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
@ -790,7 +803,7 @@ public abstract class L2Summon extends L2Playable
return;
}
doCast(skill, null, skill.isBad(), false);
super.doCast(skill);
}
@Override