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

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