Fixed infinite attack speed exploit.

Contributed by Iris.

L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/playeractions/PetAttack.java

@@ -48,13 +48,6 @@ public class PetAttack implements IPlayerActionHandler
 		}
 		else if (pet.canAttack(player.getTarget(), ctrlPressed))
 		{
-			// Prevent spamming next target and attack to increase attack speed.
-			if (pet.isAttackingNow())
-			{
-				pet.abortAttack();
-				pet.abortCast();
-			}
-			
 			pet.doAttack(player.getTarget());
 		}
 	}

L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java

@@ -37,13 +37,6 @@ public class ServitorAttack implements IPlayerActionHandler
 			{
 				if (summon.canAttack(player.getTarget(), ctrlPressed))
 				{
-					// Prevent spamming next target and attack to increase attack speed.
-					if (summon.isAttackingNow())
-					{
-						summon.abortAttack();
-						summon.abortCast();
-					}
-					
 					summon.doAttack(player.getTarget());
 				}
 			}

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/ai/SummonAI.java

@@ -44,6 +44,20 @@ public class SummonAI extends PlayableAI implements Runnable
 	private volatile boolean _isDefending;
 	private Future<?> _avoidTask = null;
 	
+	// Fix: Infinite Atk. Spd. exploit
+	private IntentionCommand _nextIntention = null;
+	
+	private void saveNextIntention(CtrlIntention intention, Object arg0, Object arg1)
+	{
+		_nextIntention = new IntentionCommand(intention, arg0, arg1);
+	}
+	
+	@Override
+	public IntentionCommand getNextIntention()
+	{
+		return _nextIntention;
+	}
+	
 	public SummonAI(Summon summon)
 	{
 		super(summon);
@@ -111,6 +125,14 @@ public class SummonAI extends PlayableAI implements Runnable
 		}
 		
 		clientStopMoving(null);
+		
+		// Fix: Infinite Atk. Spd. exploit
+		if (_actor.isAttackingNow())
+		{
+			saveNextIntention(AI_INTENTION_ATTACK, attackTarget, null);
+			return;
+		}
+		
 		_actor.doAutoAttack(attackTarget);
 	}
 	

L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/playeractions/PetAttack.java

@@ -48,13 +48,6 @@ public class PetAttack implements IPlayerActionHandler
 		}
 		else if (pet.canAttack(player.getTarget(), ctrlPressed))
 		{
-			// Prevent spamming next target and attack to increase attack speed.
-			if (pet.isAttackingNow())
-			{
-				pet.abortAttack();
-				pet.abortCast();
-			}
-			
 			pet.doAttack(player.getTarget());
 		}
 	}

L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java

@@ -37,13 +37,6 @@ public class ServitorAttack implements IPlayerActionHandler
 			{
 				if (summon.canAttack(player.getTarget(), ctrlPressed))
 				{
-					// Prevent spamming next target and attack to increase attack speed.
-					if (summon.isAttackingNow())
-					{
-						summon.abortAttack();
-						summon.abortCast();
-					}
-					
 					summon.doAttack(player.getTarget());
 				}
 			}

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/ai/SummonAI.java

@@ -44,6 +44,20 @@ public class SummonAI extends PlayableAI implements Runnable
 	private volatile boolean _isDefending;
 	private Future<?> _avoidTask = null;
 	
+	// Fix: Infinite Atk. Spd. exploit
+	private IntentionCommand _nextIntention = null;
+	
+	private void saveNextIntention(CtrlIntention intention, Object arg0, Object arg1)
+	{
+		_nextIntention = new IntentionCommand(intention, arg0, arg1);
+	}
+	
+	@Override
+	public IntentionCommand getNextIntention()
+	{
+		return _nextIntention;
+	}
+	
 	public SummonAI(Summon summon)
 	{
 		super(summon);
@@ -111,6 +125,14 @@ public class SummonAI extends PlayableAI implements Runnable
 		}
 		
 		clientStopMoving(null);
+		
+		// Fix: Infinite Atk. Spd. exploit
+		if (_actor.isAttackingNow())
+		{
+			saveNextIntention(AI_INTENTION_ATTACK, attackTarget, null);
+			return;
+		}
+		
 		_actor.doAutoAttack(attackTarget);
 	}
 	

L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/playeractions/PetAttack.java

@@ -48,13 +48,6 @@ public class PetAttack implements IPlayerActionHandler
 		}
 		else if (pet.canAttack(player.getTarget(), ctrlPressed))
 		{
-			// Prevent spamming next target and attack to increase attack speed.
-			if (pet.isAttackingNow())
-			{
-				pet.abortAttack();
-				pet.abortCast();
-			}
-			
 			pet.doAttack(player.getTarget());
 		}
 	}

L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java

@@ -37,13 +37,6 @@ public class ServitorAttack implements IPlayerActionHandler
 			{
 				if (summon.canAttack(player.getTarget(), ctrlPressed))
 				{
-					// Prevent spamming next target and attack to increase attack speed.
-					if (summon.isAttackingNow())
-					{
-						summon.abortAttack();
-						summon.abortCast();
-					}
-					
 					summon.doAttack(player.getTarget());
 				}
 			}

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/ai/SummonAI.java

@@ -44,6 +44,20 @@ public class SummonAI extends PlayableAI implements Runnable
 	private volatile boolean _isDefending;
 	private Future<?> _avoidTask = null;
 	
+	// Fix: Infinite Atk. Spd. exploit
+	private IntentionCommand _nextIntention = null;
+	
+	private void saveNextIntention(CtrlIntention intention, Object arg0, Object arg1)
+	{
+		_nextIntention = new IntentionCommand(intention, arg0, arg1);
+	}
+	
+	@Override
+	public IntentionCommand getNextIntention()
+	{
+		return _nextIntention;
+	}
+	
 	public SummonAI(Summon summon)
 	{
 		super(summon);
@@ -111,6 +125,14 @@ public class SummonAI extends PlayableAI implements Runnable
 		}
 		
 		clientStopMoving(null);
+		
+		// Fix: Infinite Atk. Spd. exploit
+		if (_actor.isAttackingNow())
+		{
+			saveNextIntention(AI_INTENTION_ATTACK, attackTarget, null);
+			return;
+		}
+		
 		_actor.doAutoAttack(attackTarget);
 	}
 	

L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/playeractions/PetAttack.java

@@ -48,13 +48,6 @@ public class PetAttack implements IPlayerActionHandler
 		}
 		else if (pet.canAttack(player.getTarget(), ctrlPressed))
 		{
-			// Prevent spamming next target and attack to increase attack speed.
-			if (pet.isAttackingNow())
-			{
-				pet.abortAttack();
-				pet.abortCast();
-			}
-			
 			pet.doAttack(player.getTarget());
 		}
 	}

L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java

@@ -37,13 +37,6 @@ public class ServitorAttack implements IPlayerActionHandler
 			{
 				if (summon.canAttack(player.getTarget(), ctrlPressed))
 				{
-					// Prevent spamming next target and attack to increase attack speed.
-					if (summon.isAttackingNow())
-					{
-						summon.abortAttack();
-						summon.abortCast();
-					}
-					
 					summon.doAttack(player.getTarget());
 				}
 			}

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/SummonAI.java

@@ -44,6 +44,20 @@ public class SummonAI extends PlayableAI implements Runnable
 	private volatile boolean _isDefending;
 	private Future<?> _avoidTask = null;
 	
+	// Fix: Infinite Atk. Spd. exploit
+	private IntentionCommand _nextIntention = null;
+	
+	private void saveNextIntention(CtrlIntention intention, Object arg0, Object arg1)
+	{
+		_nextIntention = new IntentionCommand(intention, arg0, arg1);
+	}
+	
+	@Override
+	public IntentionCommand getNextIntention()
+	{
+		return _nextIntention;
+	}
+	
 	public SummonAI(Summon summon)
 	{
 		super(summon);
@@ -111,6 +125,14 @@ public class SummonAI extends PlayableAI implements Runnable
 		}
 		
 		clientStopMoving(null);
+		
+		// Fix: Infinite Atk. Spd. exploit
+		if (_actor.isAttackingNow())
+		{
+			saveNextIntention(AI_INTENTION_ATTACK, attackTarget, null);
+			return;
+		}
+		
 		_actor.doAutoAttack(attackTarget);
 	}
 	

L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/playeractions/PetAttack.java

@@ -48,13 +48,6 @@ public class PetAttack implements IPlayerActionHandler
 		}
 		else if (pet.canAttack(player.getTarget(), ctrlPressed))
 		{
-			// Prevent spamming next target and attack to increase attack speed.
-			if (pet.isAttackingNow())
-			{
-				pet.abortAttack();
-				pet.abortCast();
-			}
-			
 			pet.doAttack(player.getTarget());
 		}
 	}

L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java

@@ -37,13 +37,6 @@ public class ServitorAttack implements IPlayerActionHandler
 			{
 				if (summon.canAttack(player.getTarget(), ctrlPressed))
 				{
-					// Prevent spamming next target and attack to increase attack speed.
-					if (summon.isAttackingNow())
-					{
-						summon.abortAttack();
-						summon.abortCast();
-					}
-					
 					summon.doAttack(player.getTarget());
 				}
 			}

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/ai/SummonAI.java

@@ -44,6 +44,20 @@ public class SummonAI extends PlayableAI implements Runnable
 	private volatile boolean _isDefending;
 	private Future<?> _avoidTask = null;
 	
+	// Fix: Infinite Atk. Spd. exploit
+	private IntentionCommand _nextIntention = null;
+	
+	private void saveNextIntention(CtrlIntention intention, Object arg0, Object arg1)
+	{
+		_nextIntention = new IntentionCommand(intention, arg0, arg1);
+	}
+	
+	@Override
+	public IntentionCommand getNextIntention()
+	{
+		return _nextIntention;
+	}
+	
 	public SummonAI(Summon summon)
 	{
 		super(summon);
@@ -111,6 +125,14 @@ public class SummonAI extends PlayableAI implements Runnable
 		}
 		
 		clientStopMoving(null);
+		
+		// Fix: Infinite Atk. Spd. exploit
+		if (_actor.isAttackingNow())
+		{
+			saveNextIntention(AI_INTENTION_ATTACK, attackTarget, null);
+			return;
+		}
+		
 		_actor.doAutoAttack(attackTarget);
 	}
 	

L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/playeractions/PetAttack.java

@@ -48,13 +48,6 @@ public class PetAttack implements IPlayerActionHandler
 		}
 		else if (pet.canAttack(player.getTarget(), ctrlPressed))
 		{
-			// Prevent spamming next target and attack to increase attack speed.
-			if (pet.isAttackingNow())
-			{
-				pet.abortAttack();
-				pet.abortCast();
-			}
-			
 			pet.doAttack(player.getTarget());
 		}
 	}

L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java

@@ -37,13 +37,6 @@ public class ServitorAttack implements IPlayerActionHandler
 			{
 				if (summon.canAttack(player.getTarget(), ctrlPressed))
 				{
-					// Prevent spamming next target and attack to increase attack speed.
-					if (summon.isAttackingNow())
-					{
-						summon.abortAttack();
-						summon.abortCast();
-					}
-					
 					summon.doAttack(player.getTarget());
 				}
 			}

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/ai/SummonAI.java

@@ -44,6 +44,20 @@ public class SummonAI extends PlayableAI implements Runnable
 	private volatile boolean _isDefending;
 	private Future<?> _avoidTask = null;
 	
+	// Fix: Infinite Atk. Spd. exploit
+	private IntentionCommand _nextIntention = null;
+	
+	private void saveNextIntention(CtrlIntention intention, Object arg0, Object arg1)
+	{
+		_nextIntention = new IntentionCommand(intention, arg0, arg1);
+	}
+	
+	@Override
+	public IntentionCommand getNextIntention()
+	{
+		return _nextIntention;
+	}
+	
 	public SummonAI(Summon summon)
 	{
 		super(summon);
@@ -111,6 +125,14 @@ public class SummonAI extends PlayableAI implements Runnable
 		}
 		
 		clientStopMoving(null);
+		
+		// Fix: Infinite Atk. Spd. exploit
+		if (_actor.isAttackingNow())
+		{
+			saveNextIntention(AI_INTENTION_ATTACK, attackTarget, null);
+			return;
+		}
+		
 		_actor.doAutoAttack(attackTarget);
 	}
 	

L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/playeractions/PetAttack.java

@@ -48,13 +48,6 @@ public class PetAttack implements IPlayerActionHandler
 		}
 		else if (pet.canAttack(player.getTarget(), ctrlPressed))
 		{
-			// Prevent spamming next target and attack to increase attack speed.
-			if (pet.isAttackingNow())
-			{
-				pet.abortAttack();
-				pet.abortCast();
-			}
-			
 			pet.doAttack(player.getTarget());
 		}
 	}

L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java

@@ -37,13 +37,6 @@ public class ServitorAttack implements IPlayerActionHandler
 			{
 				if (summon.canAttack(player.getTarget(), ctrlPressed))
 				{
-					// Prevent spamming next target and attack to increase attack speed.
-					if (summon.isAttackingNow())
-					{
-						summon.abortAttack();
-						summon.abortCast();
-					}
-					
 					summon.doAttack(player.getTarget());
 				}
 			}

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/ai/SummonAI.java

@@ -44,6 +44,20 @@ public class SummonAI extends PlayableAI implements Runnable
 	private volatile boolean _isDefending;
 	private Future<?> _avoidTask = null;
 	
+	// Fix: Infinite Atk. Spd. exploit
+	private IntentionCommand _nextIntention = null;
+	
+	private void saveNextIntention(CtrlIntention intention, Object arg0, Object arg1)
+	{
+		_nextIntention = new IntentionCommand(intention, arg0, arg1);
+	}
+	
+	@Override
+	public IntentionCommand getNextIntention()
+	{
+		return _nextIntention;
+	}
+	
 	public SummonAI(Summon summon)
 	{
 		super(summon);
@@ -111,6 +125,14 @@ public class SummonAI extends PlayableAI implements Runnable
 		}
 		
 		clientStopMoving(null);
+		
+		// Fix: Infinite Atk. Spd. exploit
+		if (_actor.isAttackingNow())
+		{
+			saveNextIntention(AI_INTENTION_ATTACK, attackTarget, null);
+			return;
+		}
+		
 		_actor.doAutoAttack(attackTarget);
 	}
 	

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/PetAttack.java

@@ -48,13 +48,6 @@ public class PetAttack implements IPlayerActionHandler
 		}
 		else if (pet.canAttack(player.getTarget(), ctrlPressed))
 		{
-			// Prevent spamming next target and attack to increase attack speed.
-			if (pet.isAttackingNow())
-			{
-				pet.abortAttack();
-				pet.abortCast();
-			}
-			
 			pet.doAttack(player.getTarget());
 		}
 	}

L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java

@@ -37,13 +37,6 @@ public class ServitorAttack implements IPlayerActionHandler
 			{
 				if (summon.canAttack(player.getTarget(), ctrlPressed))
 				{
-					// Prevent spamming next target and attack to increase attack speed.
-					if (summon.isAttackingNow())
-					{
-						summon.abortAttack();
-						summon.abortCast();
-					}
-					
 					summon.doAttack(player.getTarget());
 				}
 			}

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/SummonAI.java

@@ -44,6 +44,20 @@ public class SummonAI extends PlayableAI implements Runnable
 	private volatile boolean _isDefending;
 	private Future<?> _avoidTask = null;
 	
+	// Fix: Infinite Atk. Spd. exploit
+	private IntentionCommand _nextIntention = null;
+	
+	private void saveNextIntention(CtrlIntention intention, Object arg0, Object arg1)
+	{
+		_nextIntention = new IntentionCommand(intention, arg0, arg1);
+	}
+	
+	@Override
+	public IntentionCommand getNextIntention()
+	{
+		return _nextIntention;
+	}
+	
 	public SummonAI(Summon summon)
 	{
 		super(summon);
@@ -111,6 +125,14 @@ public class SummonAI extends PlayableAI implements Runnable
 		}
 		
 		clientStopMoving(null);
+		
+		// Fix: Infinite Atk. Spd. exploit
+		if (_actor.isAttackingNow())
+		{
+			saveNextIntention(AI_INTENTION_ATTACK, attackTarget, null);
+			return;
+		}
+		
 		_actor.doAutoAttack(attackTarget);
 	}
 	

L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/playeractions/PetAttack.java

@@ -48,13 +48,6 @@ public class PetAttack implements IPlayerActionHandler
 		}
 		else if (pet.canAttack(player.getTarget(), ctrlPressed))
 		{
-			// Prevent spamming next target and attack to increase attack speed.
-			if (pet.isAttackingNow())
-			{
-				pet.abortAttack();
-				pet.abortCast();
-			}
-			
 			pet.doAttack(player.getTarget());
 		}
 	}

L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java

@@ -37,13 +37,6 @@ public class ServitorAttack implements IPlayerActionHandler
 			{
 				if (summon.canAttack(player.getTarget(), ctrlPressed))
 				{
-					// Prevent spamming next target and attack to increase attack speed.
-					if (summon.isAttackingNow())
-					{
-						summon.abortAttack();
-						summon.abortCast();
-					}
-					
 					summon.doAttack(player.getTarget());
 				}
 			}

L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/ai/SummonAI.java

@@ -44,6 +44,20 @@ public class SummonAI extends PlayableAI implements Runnable
 	private volatile boolean _isDefending;
 	private Future<?> _avoidTask = null;
 	
+	// Fix: Infinite Atk. Spd. exploit
+	private IntentionCommand _nextIntention = null;
+	
+	private void saveNextIntention(CtrlIntention intention, Object arg0, Object arg1)
+	{
+		_nextIntention = new IntentionCommand(intention, arg0, arg1);
+	}
+	
+	@Override
+	public IntentionCommand getNextIntention()
+	{
+		return _nextIntention;
+	}
+	
 	public SummonAI(Summon summon)
 	{
 		super(summon);
@@ -111,6 +125,14 @@ public class SummonAI extends PlayableAI implements Runnable
 		}
 		
 		clientStopMoving(null);
+		
+		// Fix: Infinite Atk. Spd. exploit
+		if (_actor.isAttackingNow())
+		{
+			saveNextIntention(AI_INTENTION_ATTACK, attackTarget, null);
+			return;
+		}
+		
 		_actor.doAutoAttack(attackTarget);
 	}
 	

L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/PetAttack.java

@@ -48,13 +48,6 @@ public class PetAttack implements IPlayerActionHandler
 		}
 		else if (pet.canAttack(player.getTarget(), ctrlPressed))
 		{
-			// Prevent spamming next target and attack to increase attack speed.
-			if (pet.isAttackingNow())
-			{
-				pet.abortAttack();
-				pet.abortCast();
-			}
-			
 			pet.doAttack(player.getTarget());
 		}
 	}

L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java

@@ -37,13 +37,6 @@ public class ServitorAttack implements IPlayerActionHandler
 			{
 				if (summon.canAttack(player.getTarget(), ctrlPressed))
 				{
-					// Prevent spamming next target and attack to increase attack speed.
-					if (summon.isAttackingNow())
-					{
-						summon.abortAttack();
-						summon.abortCast();
-					}
-					
 					summon.doAttack(player.getTarget());
 				}
 			}

L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/SummonAI.java

@@ -44,6 +44,20 @@ public class SummonAI extends PlayableAI implements Runnable
 	private volatile boolean _isDefending;
 	private Future<?> _avoidTask = null;
 	
+	// Fix: Infinite Atk. Spd. exploit
+	private IntentionCommand _nextIntention = null;
+	
+	private void saveNextIntention(CtrlIntention intention, Object arg0, Object arg1)
+	{
+		_nextIntention = new IntentionCommand(intention, arg0, arg1);
+	}
+	
+	@Override
+	public IntentionCommand getNextIntention()
+	{
+		return _nextIntention;
+	}
+	
 	public SummonAI(Summon summon)
 	{
 		super(summon);
@@ -111,6 +125,14 @@ public class SummonAI extends PlayableAI implements Runnable
 		}
 		
 		clientStopMoving(null);
+		
+		// Fix: Infinite Atk. Spd. exploit
+		if (_actor.isAttackingNow())
+		{
+			saveNextIntention(AI_INTENTION_ATTACK, attackTarget, null);
+			return;
+		}
+		
 		_actor.doAutoAttack(attackTarget);
 	}
 	

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/playeractions/PetAttack.java

@@ -48,13 +48,6 @@ public class PetAttack implements IPlayerActionHandler
 		}
 		else if (pet.canAttack(player.getTarget(), ctrlPressed))
 		{
-			// Prevent spamming next target and attack to increase attack speed.
-			if (pet.isAttackingNow())
-			{
-				pet.abortAttack();
-				pet.abortCast();
-			}
-			
 			pet.doAttack(player.getTarget());
 		}
 	}

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java

@@ -37,13 +37,6 @@ public class ServitorAttack implements IPlayerActionHandler
 			{
 				if (summon.canAttack(player.getTarget(), ctrlPressed))
 				{
-					// Prevent spamming next target and attack to increase attack speed.
-					if (summon.isAttackingNow())
-					{
-						summon.abortAttack();
-						summon.abortCast();
-					}
-					
 					summon.doAttack(player.getTarget());
 				}
 			}

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/ai/SummonAI.java

@@ -44,6 +44,20 @@ public class SummonAI extends PlayableAI implements Runnable
 	private volatile boolean _isDefending;
 	private Future<?> _avoidTask = null;
 	
+	// Fix: Infinite Atk. Spd. exploit
+	private IntentionCommand _nextIntention = null;
+	
+	private void saveNextIntention(CtrlIntention intention, Object arg0, Object arg1)
+	{
+		_nextIntention = new IntentionCommand(intention, arg0, arg1);
+	}
+	
+	@Override
+	public IntentionCommand getNextIntention()
+	{
+		return _nextIntention;
+	}
+	
 	public SummonAI(Summon summon)
 	{
 		super(summon);
@@ -111,6 +125,14 @@ public class SummonAI extends PlayableAI implements Runnable
 		}
 		
 		clientStopMoving(null);
+		
+		// Fix: Infinite Atk. Spd. exploit
+		if (_actor.isAttackingNow())
+		{
+			saveNextIntention(AI_INTENTION_ATTACK, attackTarget, null);
+			return;
+		}
+		
 		_actor.doAutoAttack(attackTarget);
 	}
 	

L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/playeractions/PetAttack.java

@@ -48,13 +48,6 @@ public class PetAttack implements IPlayerActionHandler
 		}
 		else if (pet.canAttack(player.getTarget(), ctrlPressed))
 		{
-			// Prevent spamming next target and attack to increase attack speed.
-			if (pet.isAttackingNow())
-			{
-				pet.abortAttack();
-				pet.abortCast();
-			}
-			
 			pet.doAttack(player.getTarget());
 		}
 	}

L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java

@@ -37,13 +37,6 @@ public class ServitorAttack implements IPlayerActionHandler
 			{
 				if (summon.canAttack(player.getTarget(), ctrlPressed))
 				{
-					// Prevent spamming next target and attack to increase attack speed.
-					if (summon.isAttackingNow())
-					{
-						summon.abortAttack();
-						summon.abortCast();
-					}
-					
 					summon.doAttack(player.getTarget());
 				}
 			}

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/ai/SummonAI.java

@@ -44,6 +44,20 @@ public class SummonAI extends PlayableAI implements Runnable
 	private volatile boolean _isDefending;
 	private Future<?> _avoidTask = null;
 	
+	// Fix: Infinite Atk. Spd. exploit
+	private IntentionCommand _nextIntention = null;
+	
+	private void saveNextIntention(CtrlIntention intention, Object arg0, Object arg1)
+	{
+		_nextIntention = new IntentionCommand(intention, arg0, arg1);
+	}
+	
+	@Override
+	public IntentionCommand getNextIntention()
+	{
+		return _nextIntention;
+	}
+	
 	public SummonAI(Summon summon)
 	{
 		super(summon);
@@ -111,6 +125,14 @@ public class SummonAI extends PlayableAI implements Runnable
 		}
 		
 		clientStopMoving(null);
+		
+		// Fix: Infinite Atk. Spd. exploit
+		if (_actor.isAttackingNow())
+		{
+			saveNextIntention(AI_INTENTION_ATTACK, attackTarget, null);
+			return;
+		}
+		
 		_actor.doAutoAttack(attackTarget);
 	}
 	

L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/playeractions/PetAttack.java

@@ -48,13 +48,6 @@ public class PetAttack implements IPlayerActionHandler
 		}
 		else if (pet.canAttack(player.getTarget(), ctrlPressed))
 		{
-			// Prevent spamming next target and attack to increase attack speed.
-			if (pet.isAttackingNow())
-			{
-				pet.abortAttack();
-				pet.abortCast();
-			}
-			
 			pet.doAttack(player.getTarget());
 		}
 	}

L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java

@@ -37,13 +37,6 @@ public class ServitorAttack implements IPlayerActionHandler
 			{
 				if (summon.canAttack(player.getTarget(), ctrlPressed))
 				{
-					// Prevent spamming next target and attack to increase attack speed.
-					if (summon.isAttackingNow())
-					{
-						summon.abortAttack();
-						summon.abortCast();
-					}
-					
 					summon.doAttack(player.getTarget());
 				}
 			}

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/ai/SummonAI.java

@@ -44,6 +44,20 @@ public class SummonAI extends PlayableAI implements Runnable
 	private volatile boolean _isDefending;
 	private Future<?> _avoidTask = null;
 	
+	// Fix: Infinite Atk. Spd. exploit
+	private IntentionCommand _nextIntention = null;
+	
+	private void saveNextIntention(CtrlIntention intention, Object arg0, Object arg1)
+	{
+		_nextIntention = new IntentionCommand(intention, arg0, arg1);
+	}
+	
+	@Override
+	public IntentionCommand getNextIntention()
+	{
+		return _nextIntention;
+	}
+	
 	public SummonAI(Summon summon)
 	{
 		super(summon);
@@ -111,6 +125,14 @@ public class SummonAI extends PlayableAI implements Runnable
 		}
 		
 		clientStopMoving(null);
+		
+		// Fix: Infinite Atk. Spd. exploit
+		if (_actor.isAttackingNow())
+		{
+			saveNextIntention(AI_INTENTION_ATTACK, attackTarget, null);
+			return;
+		}
+		
 		_actor.doAutoAttack(attackTarget);
 	}
 	

L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/playeractions/PetAttack.java

@@ -48,13 +48,6 @@ public class PetAttack implements IPlayerActionHandler
 		}
 		else if (pet.canAttack(player.getTarget(), ctrlPressed))
 		{
-			// Prevent spamming next target and attack to increase attack speed.
-			if (pet.isAttackingNow())
-			{
-				pet.abortAttack();
-				pet.abortCast();
-			}
-			
 			pet.doAttack(player.getTarget());
 		}
 	}

L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java

@@ -37,13 +37,6 @@ public class ServitorAttack implements IPlayerActionHandler
 			{
 				if (summon.canAttack(player.getTarget(), ctrlPressed))
 				{
-					// Prevent spamming next target and attack to increase attack speed.
-					if (summon.isAttackingNow())
-					{
-						summon.abortAttack();
-						summon.abortCast();
-					}
-					
 					summon.doAttack(player.getTarget());
 				}
 			}

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/ai/SummonAI.java

@@ -44,6 +44,20 @@ public class SummonAI extends PlayableAI implements Runnable
 	private volatile boolean _isDefending;
 	private Future<?> _avoidTask = null;
 	
+	// Fix: Infinite Atk. Spd. exploit
+	private IntentionCommand _nextIntention = null;
+	
+	private void saveNextIntention(CtrlIntention intention, Object arg0, Object arg1)
+	{
+		_nextIntention = new IntentionCommand(intention, arg0, arg1);
+	}
+	
+	@Override
+	public IntentionCommand getNextIntention()
+	{
+		return _nextIntention;
+	}
+	
 	public SummonAI(Summon summon)
 	{
 		super(summon);
@@ -111,6 +125,14 @@ public class SummonAI extends PlayableAI implements Runnable
 		}
 		
 		clientStopMoving(null);
+		
+		// Fix: Infinite Atk. Spd. exploit
+		if (_actor.isAttackingNow())
+		{
+			saveNextIntention(AI_INTENTION_ATTACK, attackTarget, null);
+			return;
+		}
+		
 		_actor.doAutoAttack(attackTarget);
 	}
 	

L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/playeractions/PetAttack.java

@@ -48,13 +48,6 @@ public class PetAttack implements IPlayerActionHandler
 		}
 		else if (pet.canAttack(player.getTarget(), ctrlPressed))
 		{
-			// Prevent spamming next target and attack to increase attack speed.
-			if (pet.isAttackingNow())
-			{
-				pet.abortAttack();
-				pet.abortCast();
-			}
-			
 			pet.doAttack(player.getTarget());
 		}
 	}

L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java

@@ -37,13 +37,6 @@ public class ServitorAttack implements IPlayerActionHandler
 			{
 				if (summon.canAttack(player.getTarget(), ctrlPressed))
 				{
-					// Prevent spamming next target and attack to increase attack speed.
-					if (summon.isAttackingNow())
-					{
-						summon.abortAttack();
-						summon.abortCast();
-					}
-					
 					summon.doAttack(player.getTarget());
 				}
 			}

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/ai/SummonAI.java

@@ -44,6 +44,20 @@ public class SummonAI extends PlayableAI implements Runnable
 	private volatile boolean _isDefending;
 	private Future<?> _avoidTask = null;
 	
+	// Fix: Infinite Atk. Spd. exploit
+	private IntentionCommand _nextIntention = null;
+	
+	private void saveNextIntention(CtrlIntention intention, Object arg0, Object arg1)
+	{
+		_nextIntention = new IntentionCommand(intention, arg0, arg1);
+	}
+	
+	@Override
+	public IntentionCommand getNextIntention()
+	{
+		return _nextIntention;
+	}
+	
 	public SummonAI(Summon summon)
 	{
 		super(summon);
@@ -111,6 +125,14 @@ public class SummonAI extends PlayableAI implements Runnable
 		}
 		
 		clientStopMoving(null);
+		
+		// Fix: Infinite Atk. Spd. exploit
+		if (_actor.isAttackingNow())
+		{
+			saveNextIntention(AI_INTENTION_ATTACK, attackTarget, null);
+			return;
+		}
+		
 		_actor.doAutoAttack(attackTarget);
 	}
 	

L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/PetAttack.java

@@ -48,13 +48,6 @@ public class PetAttack implements IPlayerActionHandler
 		}
 		else if (pet.canAttack(player.getTarget(), ctrlPressed))
 		{
-			// Prevent spamming next target and attack to increase attack speed.
-			if (pet.isAttackingNow())
-			{
-				pet.abortAttack();
-				pet.abortCast();
-			}
-			
 			pet.doAttack(player.getTarget());
 		}
 	}

L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java

@@ -37,13 +37,6 @@ public class ServitorAttack implements IPlayerActionHandler
 			{
 				if (summon.canAttack(player.getTarget(), ctrlPressed))
 				{
-					// Prevent spamming next target and attack to increase attack speed.
-					if (summon.isAttackingNow())
-					{
-						summon.abortAttack();
-						summon.abortCast();
-					}
-					
 					summon.doAttack(player.getTarget());
 				}
 			}

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/ai/SummonAI.java

@@ -44,6 +44,20 @@ public class SummonAI extends PlayableAI implements Runnable
 	private volatile boolean _isDefending;
 	private Future<?> _avoidTask = null;
 	
+	// Fix: Infinite Atk. Spd. exploit
+	private IntentionCommand _nextIntention = null;
+	
+	private void saveNextIntention(CtrlIntention intention, Object arg0, Object arg1)
+	{
+		_nextIntention = new IntentionCommand(intention, arg0, arg1);
+	}
+	
+	@Override
+	public IntentionCommand getNextIntention()
+	{
+		return _nextIntention;
+	}
+	
 	public SummonAI(Summon summon)
 	{
 		super(summon);
@@ -111,6 +125,14 @@ public class SummonAI extends PlayableAI implements Runnable
 		}
 		
 		clientStopMoving(null);
+		
+		// Fix: Infinite Atk. Spd. exploit
+		if (_actor.isAttackingNow())
+		{
+			saveNextIntention(AI_INTENTION_ATTACK, attackTarget, null);
+			return;
+		}
+		
 		_actor.doAutoAttack(attackTarget);
 	}
 	

L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/playeractions/PetAttack.java

@@ -48,13 +48,6 @@ public class PetAttack implements IPlayerActionHandler
 		}
 		else if (pet.canAttack(player.getTarget(), ctrlPressed))
 		{
-			// Prevent spamming next target and attack to increase attack speed.
-			if (pet.isAttackingNow())
-			{
-				pet.abortAttack();
-				pet.abortCast();
-			}
-			
 			pet.doAttack(player.getTarget());
 		}
 	}

L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java

@@ -37,13 +37,6 @@ public class ServitorAttack implements IPlayerActionHandler
 			{
 				if (summon.canAttack(player.getTarget(), ctrlPressed))
 				{
-					// Prevent spamming next target and attack to increase attack speed.
-					if (summon.isAttackingNow())
-					{
-						summon.abortAttack();
-						summon.abortCast();
-					}
-					
 					summon.doAttack(player.getTarget());
 				}
 			}

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/ai/SummonAI.java

@@ -44,6 +44,20 @@ public class SummonAI extends PlayableAI implements Runnable
 	private volatile boolean _isDefending;
 	private Future<?> _avoidTask = null;
 	
+	// Fix: Infinite Atk. Spd. exploit
+	private IntentionCommand _nextIntention = null;
+	
+	private void saveNextIntention(CtrlIntention intention, Object arg0, Object arg1)
+	{
+		_nextIntention = new IntentionCommand(intention, arg0, arg1);
+	}
+	
+	@Override
+	public IntentionCommand getNextIntention()
+	{
+		return _nextIntention;
+	}
+	
 	public SummonAI(Summon summon)
 	{
 		super(summon);
@@ -111,6 +125,14 @@ public class SummonAI extends PlayableAI implements Runnable
 		}
 		
 		clientStopMoving(null);
+		
+		// Fix: Infinite Atk. Spd. exploit
+		if (_actor.isAttackingNow())
+		{
+			saveNextIntention(AI_INTENTION_ATTACK, attackTarget, null);
+			return;
+		}
+		
 		_actor.doAutoAttack(attackTarget);
 	}
 	

L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/PetAttack.java

@@ -48,13 +48,6 @@ public class PetAttack implements IPlayerActionHandler
 		}
 		else if (pet.canAttack(player.getTarget(), ctrlPressed))
 		{
-			// Prevent spamming next target and attack to increase attack speed.
-			if (pet.isAttackingNow())
-			{
-				pet.abortAttack();
-				pet.abortCast();
-			}
-			
 			pet.doAttack(player.getTarget());
 		}
 	}

L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java

@@ -37,13 +37,6 @@ public class ServitorAttack implements IPlayerActionHandler
 			{
 				if (summon.canAttack(player.getTarget(), ctrlPressed))
 				{
-					// Prevent spamming next target and attack to increase attack speed.
-					if (summon.isAttackingNow())
-					{
-						summon.abortAttack();
-						summon.abortCast();
-					}
-					
 					summon.doAttack(player.getTarget());
 				}
 			}

L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/ai/SummonAI.java

@@ -44,6 +44,20 @@ public class SummonAI extends PlayableAI implements Runnable
 	private volatile boolean _isDefending;
 	private Future<?> _avoidTask = null;
 	
+	// Fix: Infinite Atk. Spd. exploit
+	private IntentionCommand _nextIntention = null;
+	
+	private void saveNextIntention(CtrlIntention intention, Object arg0, Object arg1)
+	{
+		_nextIntention = new IntentionCommand(intention, arg0, arg1);
+	}
+	
+	@Override
+	public IntentionCommand getNextIntention()
+	{
+		return _nextIntention;
+	}
+	
 	public SummonAI(Summon summon)
 	{
 		super(summon);
@@ -111,6 +125,14 @@ public class SummonAI extends PlayableAI implements Runnable
 		}
 		
 		clientStopMoving(null);
+		
+		// Fix: Infinite Atk. Spd. exploit
+		if (_actor.isAttackingNow())
+		{
+			saveNextIntention(AI_INTENTION_ATTACK, attackTarget, null);
+			return;
+		}
+		
 		_actor.doAutoAttack(attackTarget);
 	}
 	

L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/playeractions/PetAttack.java

@@ -48,13 +48,6 @@ public class PetAttack implements IPlayerActionHandler
 		}
 		else if (pet.canAttack(player.getTarget(), ctrlPressed))
 		{
-			// Prevent spamming next target and attack to increase attack speed.
-			if (pet.isAttackingNow())
-			{
-				pet.abortAttack();
-				pet.abortCast();
-			}
-			
 			pet.doAttack(player.getTarget());
 		}
 	}

L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java

@@ -37,13 +37,6 @@ public class ServitorAttack implements IPlayerActionHandler
 			{
 				if (summon.canAttack(player.getTarget(), ctrlPressed))
 				{
-					// Prevent spamming next target and attack to increase attack speed.
-					if (summon.isAttackingNow())
-					{
-						summon.abortAttack();
-						summon.abortCast();
-					}
-					
 					summon.doAttack(player.getTarget());
 				}
 			}

L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/ai/SummonAI.java

@@ -44,6 +44,20 @@ public class SummonAI extends PlayableAI implements Runnable
 	private volatile boolean _isDefending;
 	private Future<?> _avoidTask = null;
 	
+	// Fix: Infinite Atk. Spd. exploit
+	private IntentionCommand _nextIntention = null;
+	
+	private void saveNextIntention(CtrlIntention intention, Object arg0, Object arg1)
+	{
+		_nextIntention = new IntentionCommand(intention, arg0, arg1);
+	}
+	
+	@Override
+	public IntentionCommand getNextIntention()
+	{
+		return _nextIntention;
+	}
+	
 	public SummonAI(Summon summon)
 	{
 		super(summon);
@@ -111,6 +125,14 @@ public class SummonAI extends PlayableAI implements Runnable
 		}
 		
 		clientStopMoving(null);
+		
+		// Fix: Infinite Atk. Spd. exploit
+		if (_actor.isAttackingNow())
+		{
+			saveNextIntention(AI_INTENTION_ATTACK, attackTarget, null);
+			return;
+		}
+		
 		_actor.doAutoAttack(attackTarget);
 	}