diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 1743d569d5..ce91d7544e 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -258,7 +258,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	// set by the start of attack, in game ticks
 	private volatile long _attackEndTime;
 	private volatile long _disableRangedAttackEndTime;
-	private volatile ScheduledFuture<?> _enableRangedAttackTask;
 	
 	private CreatureAI _ai = null;
 	
@@ -1016,14 +1015,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					{
 						if (isPlayer())
 						{
-							if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
-							{
-								_enableRangedAttackTask = ThreadPool.schedule(() ->
-								{
-									new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
-									_enableRangedAttackTask = null;
-								}, 300);
-							}
+							ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 300);
 							sendPacket(ActionFailed.STATIC_PACKET);
 						}
 						return;
@@ -1062,14 +1054,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 						if (_status.getCurrentMp() < mpConsume)
 						{
 							// If PlayerInstance doesn't have enough MP, stop the attack
-							if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
-							{
-								_enableRangedAttackTask = ThreadPool.schedule(() ->
-								{
-									new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
-									_enableRangedAttackTask = null;
-								}, 1000);
-							}
+							ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000);
 							sendPacket(SystemMessageId.NOT_ENOUGH_MP);
 							sendPacket(ActionFailed.STATIC_PACKET);
 							return;
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 1743d569d5..ce91d7544e 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -258,7 +258,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	// set by the start of attack, in game ticks
 	private volatile long _attackEndTime;
 	private volatile long _disableRangedAttackEndTime;
-	private volatile ScheduledFuture<?> _enableRangedAttackTask;
 	
 	private CreatureAI _ai = null;
 	
@@ -1016,14 +1015,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					{
 						if (isPlayer())
 						{
-							if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
-							{
-								_enableRangedAttackTask = ThreadPool.schedule(() ->
-								{
-									new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
-									_enableRangedAttackTask = null;
-								}, 300);
-							}
+							ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 300);
 							sendPacket(ActionFailed.STATIC_PACKET);
 						}
 						return;
@@ -1062,14 +1054,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 						if (_status.getCurrentMp() < mpConsume)
 						{
 							// If PlayerInstance doesn't have enough MP, stop the attack
-							if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
-							{
-								_enableRangedAttackTask = ThreadPool.schedule(() ->
-								{
-									new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
-									_enableRangedAttackTask = null;
-								}, 1000);
-							}
+							ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000);
 							sendPacket(SystemMessageId.NOT_ENOUGH_MP);
 							sendPacket(ActionFailed.STATIC_PACKET);
 							return;
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 38758d4142..b6286ceca5 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -258,7 +258,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	// set by the start of attack, in game ticks
 	private volatile long _attackEndTime;
 	private volatile long _disableRangedAttackEndTime;
-	private volatile ScheduledFuture<?> _enableRangedAttackTask;
 	
 	private CreatureAI _ai = null;
 	
@@ -1016,14 +1015,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					{
 						if (isPlayer())
 						{
-							if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
-							{
-								_enableRangedAttackTask = ThreadPool.schedule(() ->
-								{
-									new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
-									_enableRangedAttackTask = null;
-								}, 300);
-							}
+							ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 300);
 							sendPacket(ActionFailed.STATIC_PACKET);
 						}
 						return;
@@ -1062,14 +1054,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 						if (_status.getCurrentMp() < mpConsume)
 						{
 							// If PlayerInstance doesn't have enough MP, stop the attack
-							if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
-							{
-								_enableRangedAttackTask = ThreadPool.schedule(() ->
-								{
-									new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
-									_enableRangedAttackTask = null;
-								}, 1000);
-							}
+							ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000);
 							sendPacket(SystemMessageId.NOT_ENOUGH_MP);
 							sendPacket(ActionFailed.STATIC_PACKET);
 							return;
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 38758d4142..b6286ceca5 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -258,7 +258,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	// set by the start of attack, in game ticks
 	private volatile long _attackEndTime;
 	private volatile long _disableRangedAttackEndTime;
-	private volatile ScheduledFuture<?> _enableRangedAttackTask;
 	
 	private CreatureAI _ai = null;
 	
@@ -1016,14 +1015,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					{
 						if (isPlayer())
 						{
-							if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
-							{
-								_enableRangedAttackTask = ThreadPool.schedule(() ->
-								{
-									new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
-									_enableRangedAttackTask = null;
-								}, 300);
-							}
+							ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 300);
 							sendPacket(ActionFailed.STATIC_PACKET);
 						}
 						return;
@@ -1062,14 +1054,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 						if (_status.getCurrentMp() < mpConsume)
 						{
 							// If PlayerInstance doesn't have enough MP, stop the attack
-							if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
-							{
-								_enableRangedAttackTask = ThreadPool.schedule(() ->
-								{
-									new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
-									_enableRangedAttackTask = null;
-								}, 1000);
-							}
+							ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000);
 							sendPacket(SystemMessageId.NOT_ENOUGH_MP);
 							sendPacket(ActionFailed.STATIC_PACKET);
 							return;
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 72df32dfc4..5c9ec6e44e 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -258,7 +258,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	// set by the start of attack, in game ticks
 	private volatile long _attackEndTime;
 	private volatile long _disableRangedAttackEndTime;
-	private volatile ScheduledFuture<?> _enableRangedAttackTask;
 	
 	private CreatureAI _ai = null;
 	
@@ -1016,14 +1015,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					{
 						if (isPlayer())
 						{
-							if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
-							{
-								_enableRangedAttackTask = ThreadPool.schedule(() ->
-								{
-									new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
-									_enableRangedAttackTask = null;
-								}, 300);
-							}
+							ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 300);
 							sendPacket(ActionFailed.STATIC_PACKET);
 						}
 						return;
@@ -1062,14 +1054,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 						if (_status.getCurrentMp() < mpConsume)
 						{
 							// If PlayerInstance doesn't have enough MP, stop the attack
-							if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
-							{
-								_enableRangedAttackTask = ThreadPool.schedule(() ->
-								{
-									new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
-									_enableRangedAttackTask = null;
-								}, 1000);
-							}
+							ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000);
 							sendPacket(SystemMessageId.NOT_ENOUGH_MP);
 							sendPacket(ActionFailed.STATIC_PACKET);
 							return;
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 72df32dfc4..5c9ec6e44e 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -258,7 +258,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	// set by the start of attack, in game ticks
 	private volatile long _attackEndTime;
 	private volatile long _disableRangedAttackEndTime;
-	private volatile ScheduledFuture<?> _enableRangedAttackTask;
 	
 	private CreatureAI _ai = null;
 	
@@ -1016,14 +1015,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					{
 						if (isPlayer())
 						{
-							if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
-							{
-								_enableRangedAttackTask = ThreadPool.schedule(() ->
-								{
-									new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
-									_enableRangedAttackTask = null;
-								}, 300);
-							}
+							ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 300);
 							sendPacket(ActionFailed.STATIC_PACKET);
 						}
 						return;
@@ -1062,14 +1054,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 						if (_status.getCurrentMp() < mpConsume)
 						{
 							// If PlayerInstance doesn't have enough MP, stop the attack
-							if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
-							{
-								_enableRangedAttackTask = ThreadPool.schedule(() ->
-								{
-									new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
-									_enableRangedAttackTask = null;
-								}, 1000);
-							}
+							ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000);
 							sendPacket(SystemMessageId.NOT_ENOUGH_MP);
 							sendPacket(ActionFailed.STATIC_PACKET);
 							return;
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 72df32dfc4..5c9ec6e44e 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -258,7 +258,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	// set by the start of attack, in game ticks
 	private volatile long _attackEndTime;
 	private volatile long _disableRangedAttackEndTime;
-	private volatile ScheduledFuture<?> _enableRangedAttackTask;
 	
 	private CreatureAI _ai = null;
 	
@@ -1016,14 +1015,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					{
 						if (isPlayer())
 						{
-							if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
-							{
-								_enableRangedAttackTask = ThreadPool.schedule(() ->
-								{
-									new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
-									_enableRangedAttackTask = null;
-								}, 300);
-							}
+							ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 300);
 							sendPacket(ActionFailed.STATIC_PACKET);
 						}
 						return;
@@ -1062,14 +1054,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 						if (_status.getCurrentMp() < mpConsume)
 						{
 							// If PlayerInstance doesn't have enough MP, stop the attack
-							if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
-							{
-								_enableRangedAttackTask = ThreadPool.schedule(() ->
-								{
-									new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
-									_enableRangedAttackTask = null;
-								}, 1000);
-							}
+							ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000);
 							sendPacket(SystemMessageId.NOT_ENOUGH_MP);
 							sendPacket(ActionFailed.STATIC_PACKET);
 							return;
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 09dbff373e..2584316e7c 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -258,7 +258,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	// set by the start of attack, in game ticks
 	private volatile long _attackEndTime;
 	private volatile long _disableRangedAttackEndTime;
-	private volatile ScheduledFuture<?> _enableRangedAttackTask;
 	
 	private CreatureAI _ai = null;
 	
@@ -1016,14 +1015,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					{
 						if (isPlayer())
 						{
-							if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
-							{
-								_enableRangedAttackTask = ThreadPool.schedule(() ->
-								{
-									new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
-									_enableRangedAttackTask = null;
-								}, 300);
-							}
+							ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 300);
 							sendPacket(ActionFailed.STATIC_PACKET);
 						}
 						return;
@@ -1062,14 +1054,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 						if (_status.getCurrentMp() < mpConsume)
 						{
 							// If PlayerInstance doesn't have enough MP, stop the attack
-							if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
-							{
-								_enableRangedAttackTask = ThreadPool.schedule(() ->
-								{
-									new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
-									_enableRangedAttackTask = null;
-								}, 1000);
-							}
+							ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000);
 							sendPacket(SystemMessageId.NOT_ENOUGH_MP);
 							sendPacket(ActionFailed.STATIC_PACKET);
 							return;
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java
index f8c758576e..a41e892485 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -258,7 +258,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	// set by the start of attack, in game ticks
 	private volatile long _attackEndTime;
 	private volatile long _disableRangedAttackEndTime;
-	private volatile ScheduledFuture<?> _enableRangedAttackTask;
 	
 	private CreatureAI _ai = null;
 	
@@ -1016,14 +1015,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					{
 						if (isPlayer())
 						{
-							if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
-							{
-								_enableRangedAttackTask = ThreadPool.schedule(() ->
-								{
-									new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
-									_enableRangedAttackTask = null;
-								}, 300);
-							}
+							ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 300);
 							sendPacket(ActionFailed.STATIC_PACKET);
 						}
 						return;
@@ -1062,14 +1054,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 						if (_status.getCurrentMp() < mpConsume)
 						{
 							// If PlayerInstance doesn't have enough MP, stop the attack
-							if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
-							{
-								_enableRangedAttackTask = ThreadPool.schedule(() ->
-								{
-									new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
-									_enableRangedAttackTask = null;
-								}, 1000);
-							}
+							ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000);
 							sendPacket(SystemMessageId.NOT_ENOUGH_MP);
 							sendPacket(ActionFailed.STATIC_PACKET);
 							return;
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java
index f8c758576e..a41e892485 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -258,7 +258,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	// set by the start of attack, in game ticks
 	private volatile long _attackEndTime;
 	private volatile long _disableRangedAttackEndTime;
-	private volatile ScheduledFuture<?> _enableRangedAttackTask;
 	
 	private CreatureAI _ai = null;
 	
@@ -1016,14 +1015,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					{
 						if (isPlayer())
 						{
-							if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
-							{
-								_enableRangedAttackTask = ThreadPool.schedule(() ->
-								{
-									new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
-									_enableRangedAttackTask = null;
-								}, 300);
-							}
+							ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 300);
 							sendPacket(ActionFailed.STATIC_PACKET);
 						}
 						return;
@@ -1062,14 +1054,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 						if (_status.getCurrentMp() < mpConsume)
 						{
 							// If PlayerInstance doesn't have enough MP, stop the attack
-							if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
-							{
-								_enableRangedAttackTask = ThreadPool.schedule(() ->
-								{
-									new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
-									_enableRangedAttackTask = null;
-								}, 1000);
-							}
+							ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000);
 							sendPacket(SystemMessageId.NOT_ENOUGH_MP);
 							sendPacket(ActionFailed.STATIC_PACKET);
 							return;
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java
index c6a33a9ed9..2e6341f7c8 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -258,7 +258,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	// set by the start of attack, in game ticks
 	private volatile long _attackEndTime;
 	private volatile long _disableRangedAttackEndTime;
-	private volatile ScheduledFuture<?> _enableRangedAttackTask;
 	
 	private CreatureAI _ai = null;
 	
@@ -1016,14 +1015,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					{
 						if (isPlayer())
 						{
-							if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
-							{
-								_enableRangedAttackTask = ThreadPool.schedule(() ->
-								{
-									new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
-									_enableRangedAttackTask = null;
-								}, 300);
-							}
+							ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 300);
 							sendPacket(ActionFailed.STATIC_PACKET);
 						}
 						return;
@@ -1062,14 +1054,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 						if (_status.getCurrentMp() < mpConsume)
 						{
 							// If PlayerInstance doesn't have enough MP, stop the attack
-							if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
-							{
-								_enableRangedAttackTask = ThreadPool.schedule(() ->
-								{
-									new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
-									_enableRangedAttackTask = null;
-								}, 1000);
-							}
+							ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000);
 							sendPacket(SystemMessageId.NOT_ENOUGH_MP);
 							sendPacket(ActionFailed.STATIC_PACKET);
 							return;
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 7c0bea176d..6649cf1e7c 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -259,7 +259,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	// set by the start of attack, in game ticks
 	private volatile long _attackEndTime;
 	private volatile long _disableRangedAttackEndTime;
-	private volatile ScheduledFuture<?> _enableRangedAttackTask;
 	
 	private CreatureAI _ai = null;
 	
@@ -1017,14 +1016,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					{
 						if (isPlayer())
 						{
-							if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
-							{
-								_enableRangedAttackTask = ThreadPool.schedule(() ->
-								{
-									new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
-									_enableRangedAttackTask = null;
-								}, 300);
-							}
+							ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 300);
 							sendPacket(ActionFailed.STATIC_PACKET);
 						}
 						return;
@@ -1063,14 +1055,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 						if (_status.getCurrentMp() < mpConsume)
 						{
 							// If PlayerInstance doesn't have enough MP, stop the attack
-							if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
-							{
-								_enableRangedAttackTask = ThreadPool.schedule(() ->
-								{
-									new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
-									_enableRangedAttackTask = null;
-								}, 1000);
-							}
+							ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000);
 							sendPacket(SystemMessageId.NOT_ENOUGH_MP);
 							sendPacket(ActionFailed.STATIC_PACKET);
 							return;
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 7c0bea176d..6649cf1e7c 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -259,7 +259,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	// set by the start of attack, in game ticks
 	private volatile long _attackEndTime;
 	private volatile long _disableRangedAttackEndTime;
-	private volatile ScheduledFuture<?> _enableRangedAttackTask;
 	
 	private CreatureAI _ai = null;
 	
@@ -1017,14 +1016,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					{
 						if (isPlayer())
 						{
-							if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
-							{
-								_enableRangedAttackTask = ThreadPool.schedule(() ->
-								{
-									new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
-									_enableRangedAttackTask = null;
-								}, 300);
-							}
+							ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 300);
 							sendPacket(ActionFailed.STATIC_PACKET);
 						}
 						return;
@@ -1063,14 +1055,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 						if (_status.getCurrentMp() < mpConsume)
 						{
 							// If PlayerInstance doesn't have enough MP, stop the attack
-							if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
-							{
-								_enableRangedAttackTask = ThreadPool.schedule(() ->
-								{
-									new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
-									_enableRangedAttackTask = null;
-								}, 1000);
-							}
+							ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000);
 							sendPacket(SystemMessageId.NOT_ENOUGH_MP);
 							sendPacket(ActionFailed.STATIC_PACKET);
 							return;
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 1dc6b4507a..4c9a190714 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -259,7 +259,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	// set by the start of attack, in game ticks
 	private volatile long _attackEndTime;
 	private volatile long _disableRangedAttackEndTime;
-	private volatile ScheduledFuture<?> _enableRangedAttackTask;
 	
 	private CreatureAI _ai = null;
 	
@@ -1017,14 +1016,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					{
 						if (isPlayer())
 						{
-							if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
-							{
-								_enableRangedAttackTask = ThreadPool.schedule(() ->
-								{
-									new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
-									_enableRangedAttackTask = null;
-								}, 300);
-							}
+							ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 300);
 							sendPacket(ActionFailed.STATIC_PACKET);
 						}
 						return;
@@ -1063,14 +1055,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 						if (_status.getCurrentMp() < mpConsume)
 						{
 							// If PlayerInstance doesn't have enough MP, stop the attack
-							if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
-							{
-								_enableRangedAttackTask = ThreadPool.schedule(() ->
-								{
-									new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
-									_enableRangedAttackTask = null;
-								}, 1000);
-							}
+							ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000);
 							sendPacket(SystemMessageId.NOT_ENOUGH_MP);
 							sendPacket(ActionFailed.STATIC_PACKET);
 							return;
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
index f8c758576e..a41e892485 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -258,7 +258,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	// set by the start of attack, in game ticks
 	private volatile long _attackEndTime;
 	private volatile long _disableRangedAttackEndTime;
-	private volatile ScheduledFuture<?> _enableRangedAttackTask;
 	
 	private CreatureAI _ai = null;
 	
@@ -1016,14 +1015,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 					{
 						if (isPlayer())
 						{
-							if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
-							{
-								_enableRangedAttackTask = ThreadPool.schedule(() ->
-								{
-									new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
-									_enableRangedAttackTask = null;
-								}, 300);
-							}
+							ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 300);
 							sendPacket(ActionFailed.STATIC_PACKET);
 						}
 						return;
@@ -1062,14 +1054,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 						if (_status.getCurrentMp() < mpConsume)
 						{
 							// If PlayerInstance doesn't have enough MP, stop the attack
-							if ((_enableRangedAttackTask == null) || _enableRangedAttackTask.isDone() || _enableRangedAttackTask.isCancelled())
-							{
-								_enableRangedAttackTask = ThreadPool.schedule(() ->
-								{
-									new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT);
-									_enableRangedAttackTask = null;
-								}, 1000);
-							}
+							ThreadPool.schedule(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 1000);
 							sendPacket(SystemMessageId.NOT_ENOUGH_MP);
 							sendPacket(ActionFailed.STATIC_PACKET);
 							return;