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

Addition of ranged attack enable task.

Browse Source
This commit is contained in:
MobiusDevelopment 2020-06-02 21:22:08 +00:00
parent 109862e5b4
commit 4eeac28627
15 changed files with 255 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -258,6 +258,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
// set by the start of attack, in game ticks // set by the start of attack, in game ticks
private volatile long _attackEndTime; private volatile long _attackEndTime;
private volatile long _disableRangedAttackEndTime; private volatile long _disableRangedAttackEndTime;
private volatile ScheduledFuture<?> _enableRangedAttackTask;
private CreatureAI _ai = null; private CreatureAI _ai = null;
@ -1015,7 +1016,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
if (isPlayer()) if (isPlayer())
{ {
ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000); if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
{
_enableRangedAttackTask = ThreadPool.schedule(() ->
{
new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
_enableRangedAttackTask = null;
}, 300);
}
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
} }
return; return;
@ -1054,7 +1062,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
if (_status.getCurrentMp() < mpConsume) if (_status.getCurrentMp() < mpConsume)
{ {
// If PlayerInstance doesn't have enough MP, stop the attack // If PlayerInstance doesn't have enough MP, stop the attack
ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000); if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
{
_enableRangedAttackTask = ThreadPool.schedule(() ->
{
new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
_enableRangedAttackTask = null;
}, 1000);
}
sendPacket(SystemMessageId.NOT_ENOUGH_MP); sendPacket(SystemMessageId.NOT_ENOUGH_MP);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;

19
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -258,6 +258,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
// set by the start of attack, in game ticks // set by the start of attack, in game ticks
private volatile long _attackEndTime; private volatile long _attackEndTime;
private volatile long _disableRangedAttackEndTime; private volatile long _disableRangedAttackEndTime;
private volatile ScheduledFuture<?> _enableRangedAttackTask;
private CreatureAI _ai = null; private CreatureAI _ai = null;
@ -1015,7 +1016,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
if (isPlayer()) if (isPlayer())
{ {
ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000); if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
{
_enableRangedAttackTask = ThreadPool.schedule(() ->
{
new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
_enableRangedAttackTask = null;
}, 300);
}
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
} }
return; return;
@ -1054,7 +1062,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
if (_status.getCurrentMp() < mpConsume) if (_status.getCurrentMp() < mpConsume)
{ {
// If PlayerInstance doesn't have enough MP, stop the attack // If PlayerInstance doesn't have enough MP, stop the attack
ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000); if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
{
_enableRangedAttackTask = ThreadPool.schedule(() ->
{
new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
_enableRangedAttackTask = null;
}, 1000);
}
sendPacket(SystemMessageId.NOT_ENOUGH_MP); sendPacket(SystemMessageId.NOT_ENOUGH_MP);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;

19
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -258,6 +258,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
// set by the start of attack, in game ticks // set by the start of attack, in game ticks
private volatile long _attackEndTime; private volatile long _attackEndTime;
private volatile long _disableRangedAttackEndTime; private volatile long _disableRangedAttackEndTime;
private volatile ScheduledFuture<?> _enableRangedAttackTask;
private CreatureAI _ai = null; private CreatureAI _ai = null;
@ -1015,7 +1016,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
if (isPlayer()) if (isPlayer())
{ {
ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000); if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
{
_enableRangedAttackTask = ThreadPool.schedule(() ->
{
new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
_enableRangedAttackTask = null;
}, 300);
}
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
} }
return; return;
@ -1054,7 +1062,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
if (_status.getCurrentMp() < mpConsume) if (_status.getCurrentMp() < mpConsume)
{ {
// If PlayerInstance doesn't have enough MP, stop the attack // If PlayerInstance doesn't have enough MP, stop the attack
ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000); if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
{
_enableRangedAttackTask = ThreadPool.schedule(() ->
{
new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
_enableRangedAttackTask = null;
}, 1000);
}
sendPacket(SystemMessageId.NOT_ENOUGH_MP); sendPacket(SystemMessageId.NOT_ENOUGH_MP);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;

19
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -258,6 +258,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
// set by the start of attack, in game ticks // set by the start of attack, in game ticks
private volatile long _attackEndTime; private volatile long _attackEndTime;
private volatile long _disableRangedAttackEndTime; private volatile long _disableRangedAttackEndTime;
private volatile ScheduledFuture<?> _enableRangedAttackTask;
private CreatureAI _ai = null; private CreatureAI _ai = null;
@ -1015,7 +1016,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
if (isPlayer()) if (isPlayer())
{ {
ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000); if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
{
_enableRangedAttackTask = ThreadPool.schedule(() ->
{
new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
_enableRangedAttackTask = null;
}, 300);
}
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
} }
return; return;
@ -1054,7 +1062,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
if (_status.getCurrentMp() < mpConsume) if (_status.getCurrentMp() < mpConsume)
{ {
// If PlayerInstance doesn't have enough MP, stop the attack // If PlayerInstance doesn't have enough MP, stop the attack
ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000); if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
{
_enableRangedAttackTask = ThreadPool.schedule(() ->
{
new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
_enableRangedAttackTask = null;
}, 1000);
}
sendPacket(SystemMessageId.NOT_ENOUGH_MP); sendPacket(SystemMessageId.NOT_ENOUGH_MP);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;

19
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -258,6 +258,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
// set by the start of attack, in game ticks // set by the start of attack, in game ticks
private volatile long _attackEndTime; private volatile long _attackEndTime;
private volatile long _disableRangedAttackEndTime; private volatile long _disableRangedAttackEndTime;
private volatile ScheduledFuture<?> _enableRangedAttackTask;
private CreatureAI _ai = null; private CreatureAI _ai = null;
@ -1015,7 +1016,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
if (isPlayer()) if (isPlayer())
{ {
ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000); if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
{
_enableRangedAttackTask = ThreadPool.schedule(() ->
{
new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
_enableRangedAttackTask = null;
}, 300);
}
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
} }
return; return;
@ -1054,7 +1062,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
if (_status.getCurrentMp() < mpConsume) if (_status.getCurrentMp() < mpConsume)
{ {
// If PlayerInstance doesn't have enough MP, stop the attack // If PlayerInstance doesn't have enough MP, stop the attack
ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000); if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
{
_enableRangedAttackTask = ThreadPool.schedule(() ->
{
new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
_enableRangedAttackTask = null;
}, 1000);
}
sendPacket(SystemMessageId.NOT_ENOUGH_MP); sendPacket(SystemMessageId.NOT_ENOUGH_MP);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;

19
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -258,6 +258,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
// set by the start of attack, in game ticks // set by the start of attack, in game ticks
private volatile long _attackEndTime; private volatile long _attackEndTime;
private volatile long _disableRangedAttackEndTime; private volatile long _disableRangedAttackEndTime;
private volatile ScheduledFuture<?> _enableRangedAttackTask;
private CreatureAI _ai = null; private CreatureAI _ai = null;
@ -1015,7 +1016,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
if (isPlayer()) if (isPlayer())
{ {
ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000); if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
{
_enableRangedAttackTask = ThreadPool.schedule(() ->
{
new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
_enableRangedAttackTask = null;
}, 300);
}
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
} }
return; return;
@ -1054,7 +1062,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
if (_status.getCurrentMp() < mpConsume) if (_status.getCurrentMp() < mpConsume)
{ {
// If PlayerInstance doesn't have enough MP, stop the attack // If PlayerInstance doesn't have enough MP, stop the attack
ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000); if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
{
_enableRangedAttackTask = ThreadPool.schedule(() ->
{
new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
_enableRangedAttackTask = null;
}, 1000);
}
sendPacket(SystemMessageId.NOT_ENOUGH_MP); sendPacket(SystemMessageId.NOT_ENOUGH_MP);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;

19
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -258,6 +258,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
// set by the start of attack, in game ticks // set by the start of attack, in game ticks
private volatile long _attackEndTime; private volatile long _attackEndTime;
private volatile long _disableRangedAttackEndTime; private volatile long _disableRangedAttackEndTime;
private volatile ScheduledFuture<?> _enableRangedAttackTask;
private CreatureAI _ai = null; private CreatureAI _ai = null;
@ -1015,7 +1016,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
if (isPlayer()) if (isPlayer())
{ {
ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000); if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
{
_enableRangedAttackTask = ThreadPool.schedule(() ->
{
new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
_enableRangedAttackTask = null;
}, 300);
}
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
} }
return; return;
@ -1054,7 +1062,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
if (_status.getCurrentMp() < mpConsume) if (_status.getCurrentMp() < mpConsume)
{ {
// If PlayerInstance doesn't have enough MP, stop the attack // If PlayerInstance doesn't have enough MP, stop the attack
ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000); if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
{
_enableRangedAttackTask = ThreadPool.schedule(() ->
{
new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
_enableRangedAttackTask = null;
}, 1000);
}
sendPacket(SystemMessageId.NOT_ENOUGH_MP); sendPacket(SystemMessageId.NOT_ENOUGH_MP);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;

19
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -258,6 +258,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
// set by the start of attack, in game ticks // set by the start of attack, in game ticks
private volatile long _attackEndTime; private volatile long _attackEndTime;
private volatile long _disableRangedAttackEndTime; private volatile long _disableRangedAttackEndTime;
private volatile ScheduledFuture<?> _enableRangedAttackTask;
private CreatureAI _ai = null; private CreatureAI _ai = null;
@ -1015,7 +1016,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
if (isPlayer()) if (isPlayer())
{ {
ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000); if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
{
_enableRangedAttackTask = ThreadPool.schedule(() ->
{
new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
_enableRangedAttackTask = null;
}, 300);
}
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
} }
return; return;
@ -1054,7 +1062,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
if (_status.getCurrentMp() < mpConsume) if (_status.getCurrentMp() < mpConsume)
{ {
// If PlayerInstance doesn't have enough MP, stop the attack // If PlayerInstance doesn't have enough MP, stop the attack
ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000); if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
{
_enableRangedAttackTask = ThreadPool.schedule(() ->
{
new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
_enableRangedAttackTask = null;
}, 1000);
}
sendPacket(SystemMessageId.NOT_ENOUGH_MP); sendPacket(SystemMessageId.NOT_ENOUGH_MP);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;

19
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -258,6 +258,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
// set by the start of attack, in game ticks // set by the start of attack, in game ticks
private volatile long _attackEndTime; private volatile long _attackEndTime;
private volatile long _disableRangedAttackEndTime; private volatile long _disableRangedAttackEndTime;
private volatile ScheduledFuture<?> _enableRangedAttackTask;
private CreatureAI _ai = null; private CreatureAI _ai = null;
@ -1015,7 +1016,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
if (isPlayer()) if (isPlayer())
{ {
ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000); if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
{
_enableRangedAttackTask = ThreadPool.schedule(() ->
{
new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
_enableRangedAttackTask = null;
}, 300);
}
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
} }
return; return;
@ -1054,7 +1062,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
if (_status.getCurrentMp() < mpConsume) if (_status.getCurrentMp() < mpConsume)
{ {
// If PlayerInstance doesn't have enough MP, stop the attack // If PlayerInstance doesn't have enough MP, stop the attack
ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000); if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
{
_enableRangedAttackTask = ThreadPool.schedule(() ->
{
new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
_enableRangedAttackTask = null;
}, 1000);
}
sendPacket(SystemMessageId.NOT_ENOUGH_MP); sendPacket(SystemMessageId.NOT_ENOUGH_MP);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;

19
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -258,6 +258,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
// set by the start of attack, in game ticks // set by the start of attack, in game ticks
private volatile long _attackEndTime; private volatile long _attackEndTime;
private volatile long _disableRangedAttackEndTime; private volatile long _disableRangedAttackEndTime;
private volatile ScheduledFuture<?> _enableRangedAttackTask;
private CreatureAI _ai = null; private CreatureAI _ai = null;
@ -1015,7 +1016,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
if (isPlayer()) if (isPlayer())
{ {
ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000); if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
{
_enableRangedAttackTask = ThreadPool.schedule(() ->
{
new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
_enableRangedAttackTask = null;
}, 300);
}
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
} }
return; return;
@ -1054,7 +1062,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
if (_status.getCurrentMp() < mpConsume) if (_status.getCurrentMp() < mpConsume)
{ {
// If PlayerInstance doesn't have enough MP, stop the attack // If PlayerInstance doesn't have enough MP, stop the attack
ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000); if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
{
_enableRangedAttackTask = ThreadPool.schedule(() ->
{
new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
_enableRangedAttackTask = null;
}, 1000);
}
sendPacket(SystemMessageId.NOT_ENOUGH_MP); sendPacket(SystemMessageId.NOT_ENOUGH_MP);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;

19
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -258,6 +258,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
// set by the start of attack, in game ticks // set by the start of attack, in game ticks
private volatile long _attackEndTime; private volatile long _attackEndTime;
private volatile long _disableRangedAttackEndTime; private volatile long _disableRangedAttackEndTime;
private volatile ScheduledFuture<?> _enableRangedAttackTask;
private CreatureAI _ai = null; private CreatureAI _ai = null;
@ -1015,7 +1016,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
if (isPlayer()) if (isPlayer())
{ {
ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000); if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
{
_enableRangedAttackTask = ThreadPool.schedule(() ->
{
new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
_enableRangedAttackTask = null;
}, 300);
}
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
} }
return; return;
@ -1054,7 +1062,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
if (_status.getCurrentMp() < mpConsume) if (_status.getCurrentMp() < mpConsume)
{ {
// If PlayerInstance doesn't have enough MP, stop the attack // If PlayerInstance doesn't have enough MP, stop the attack
ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000); if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
{
_enableRangedAttackTask = ThreadPool.schedule(() ->
{
new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
_enableRangedAttackTask = null;
}, 1000);
}
sendPacket(SystemMessageId.NOT_ENOUGH_MP); sendPacket(SystemMessageId.NOT_ENOUGH_MP);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;

19
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -259,6 +259,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
// set by the start of attack, in game ticks // set by the start of attack, in game ticks
private volatile long _attackEndTime; private volatile long _attackEndTime;
private volatile long _disableRangedAttackEndTime; private volatile long _disableRangedAttackEndTime;
private volatile ScheduledFuture<?> _enableRangedAttackTask;
private CreatureAI _ai = null; private CreatureAI _ai = null;
@ -1016,7 +1017,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
if (isPlayer()) if (isPlayer())
{ {
ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000); if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
{
_enableRangedAttackTask = ThreadPool.schedule(() ->
{
new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
_enableRangedAttackTask = null;
}, 300);
}
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
} }
return; return;
@ -1055,7 +1063,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
if (_status.getCurrentMp() < mpConsume) if (_status.getCurrentMp() < mpConsume)
{ {
// If PlayerInstance doesn't have enough MP, stop the attack // If PlayerInstance doesn't have enough MP, stop the attack
ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000); if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
{
_enableRangedAttackTask = ThreadPool.schedule(() ->
{
new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
_enableRangedAttackTask = null;
}, 1000);
}
sendPacket(SystemMessageId.NOT_ENOUGH_MP); sendPacket(SystemMessageId.NOT_ENOUGH_MP);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;

19
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -259,6 +259,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
// set by the start of attack, in game ticks // set by the start of attack, in game ticks
private volatile long _attackEndTime; private volatile long _attackEndTime;
private volatile long _disableRangedAttackEndTime; private volatile long _disableRangedAttackEndTime;
private volatile ScheduledFuture<?> _enableRangedAttackTask;
private CreatureAI _ai = null; private CreatureAI _ai = null;
@ -1016,7 +1017,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
if (isPlayer()) if (isPlayer())
{ {
ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000); if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
{
_enableRangedAttackTask = ThreadPool.schedule(() ->
{
new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
_enableRangedAttackTask = null;
}, 300);
}
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
} }
return; return;
@ -1055,7 +1063,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
if (_status.getCurrentMp() < mpConsume) if (_status.getCurrentMp() < mpConsume)
{ {
// If PlayerInstance doesn't have enough MP, stop the attack // If PlayerInstance doesn't have enough MP, stop the attack
ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000); if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
{
_enableRangedAttackTask = ThreadPool.schedule(() ->
{
new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
_enableRangedAttackTask = null;
}, 1000);
}
sendPacket(SystemMessageId.NOT_ENOUGH_MP); sendPacket(SystemMessageId.NOT_ENOUGH_MP);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;

19
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -259,6 +259,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
// set by the start of attack, in game ticks // set by the start of attack, in game ticks
private volatile long _attackEndTime; private volatile long _attackEndTime;
private volatile long _disableRangedAttackEndTime; private volatile long _disableRangedAttackEndTime;
private volatile ScheduledFuture<?> _enableRangedAttackTask;
private CreatureAI _ai = null; private CreatureAI _ai = null;
@ -1016,7 +1017,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
if (isPlayer()) if (isPlayer())
{ {
ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000); if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
{
_enableRangedAttackTask = ThreadPool.schedule(() ->
{
new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
_enableRangedAttackTask = null;
}, 300);
}
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
} }
return; return;
@ -1055,7 +1063,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
if (_status.getCurrentMp() < mpConsume) if (_status.getCurrentMp() < mpConsume)
{ {
// If PlayerInstance doesn't have enough MP, stop the attack // If PlayerInstance doesn't have enough MP, stop the attack
ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000); if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
{
_enableRangedAttackTask = ThreadPool.schedule(() ->
{
new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
_enableRangedAttackTask = null;
}, 1000);
}
sendPacket(SystemMessageId.NOT_ENOUGH_MP); sendPacket(SystemMessageId.NOT_ENOUGH_MP);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;

19
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@ -258,6 +258,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
// set by the start of attack, in game ticks // set by the start of attack, in game ticks
private volatile long _attackEndTime; private volatile long _attackEndTime;
private volatile long _disableRangedAttackEndTime; private volatile long _disableRangedAttackEndTime;
private volatile ScheduledFuture<?> _enableRangedAttackTask;
private CreatureAI _ai = null; private CreatureAI _ai = null;
@ -1015,7 +1016,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{ {
if (isPlayer()) if (isPlayer())
{ {
ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000); if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
{
_enableRangedAttackTask = ThreadPool.schedule(() ->
{
new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
_enableRangedAttackTask = null;
}, 300);
}
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
} }
return; return;
@ -1054,7 +1062,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
if (_status.getCurrentMp() < mpConsume) if (_status.getCurrentMp() < mpConsume)
{ {
// If PlayerInstance doesn't have enough MP, stop the attack // If PlayerInstance doesn't have enough MP, stop the attack
ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000); if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
{
_enableRangedAttackTask = ThreadPool.schedule(() ->
{
new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
_enableRangedAttackTask = null;
}, 1000);
}
sendPacket(SystemMessageId.NOT_ENOUGH_MP); sendPacket(SystemMessageId.NOT_ENOUGH_MP);
sendPacket(ActionFailed.STATIC_PACKET); sendPacket(ActionFailed.STATIC_PACKET);
return; return;