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

Skill queue related adjustments.

Browse Source 
Contributed by paparas21.
This commit is contained in:
MobiusDevelopment
2021-09-14 21:34:05 +00:00
parent 59abc32291
commit 7af362f30a
38 changed files with 456 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/PlayerAI.java
View File

@@ -263,21 +263,27 @@ public class PlayerAI extends PlayableAI
private void thinkAttack()
{
final SkillUseHolder queuedSkill = _actor.getActingPlayer().getQueuedSkill();
if ((queuedSkill != null))
if (queuedSkill != null)
{
// Abort attack.
_actor.abortAttack();
// Recharge shots.
if (!_actor.isChargedShot(ShotType.SOULSHOTS) && !_actor.isChargedShot(ShotType.BLESSED_SOULSHOTS))
{
_actor.rechargeShots(true, false, false);
}
// Use queued skill.
_actor.getActingPlayer().useMagic(queuedSkill.getSkill(), queuedSkill.getItem(), queuedSkill.isCtrlPressed(), queuedSkill.isShiftPressed());
// Remove the skill from queue.
_actor.getActingPlayer().setQueuedSkill(null, null, false, false);
return;
// Check if player has the needed MP for the queued skill.
if (_actor.getCurrentMp() >= _actor.getStat().getMpInitialConsume(queuedSkill.getSkill()))
{
// Abort attack.
_actor.abortAttack();
// Recharge shots.
if (!_actor.isChargedShot(ShotType.SOULSHOTS) && !_actor.isChargedShot(ShotType.BLESSED_SOULSHOTS))
{
_actor.rechargeShots(true, false, false);
}
// Use queued skill.
_actor.getActingPlayer().useMagic(queuedSkill.getSkill(), queuedSkill.getItem(), queuedSkill.isCtrlPressed(), queuedSkill.isShiftPressed());
return;
}
}
final WorldObject target = getTarget();

5
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
View File

@@ -51,6 +51,11 @@ public class RequestTargetCanceld implements IClientIncomingPacket
return;
}
if (player.getQueuedSkill() != null)
{
player.setQueuedSkill(null, null, false, false);
}
if (player.isCastingNow())
{
player.abortAllSkillCasters();