From 3c9e84dcd36d2b0d0677c7d550ae34d0cee35614 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Wed, 17 Mar 2021 16:54:13 +0000
Subject: [PATCH] Prevent spamming next target and attack to increase attack
 speed. Contributed by Trance.

---
 .../data/scripts/handlers/playeractions/PetAttack.java     | 7 +++++++
 .../scripts/handlers/playeractions/ServitorAttack.java     | 7 +++++++
 .../data/scripts/handlers/playeractions/PetAttack.java     | 7 +++++++
 .../scripts/handlers/playeractions/ServitorAttack.java     | 7 +++++++
 .../data/scripts/handlers/playeractions/PetAttack.java     | 7 +++++++
 .../scripts/handlers/playeractions/ServitorAttack.java     | 7 +++++++
 .../data/scripts/handlers/playeractions/PetAttack.java     | 7 +++++++
 .../scripts/handlers/playeractions/ServitorAttack.java     | 7 +++++++
 .../data/scripts/handlers/playeractions/PetAttack.java     | 7 +++++++
 .../scripts/handlers/playeractions/ServitorAttack.java     | 7 +++++++
 .../data/scripts/handlers/playeractions/PetAttack.java     | 7 +++++++
 .../scripts/handlers/playeractions/ServitorAttack.java     | 7 +++++++
 .../data/scripts/handlers/playeractions/PetAttack.java     | 7 +++++++
 .../scripts/handlers/playeractions/ServitorAttack.java     | 7 +++++++
 .../data/scripts/handlers/playeractions/PetAttack.java     | 7 +++++++
 .../scripts/handlers/playeractions/ServitorAttack.java     | 7 +++++++
 .../data/scripts/handlers/playeractions/PetAttack.java     | 7 +++++++
 .../scripts/handlers/playeractions/ServitorAttack.java     | 7 +++++++
 .../data/scripts/handlers/playeractions/PetAttack.java     | 7 +++++++
 .../scripts/handlers/playeractions/ServitorAttack.java     | 7 +++++++
 .../data/scripts/handlers/playeractions/PetAttack.java     | 7 +++++++
 .../scripts/handlers/playeractions/ServitorAttack.java     | 7 +++++++
 .../data/scripts/handlers/playeractions/PetAttack.java     | 7 +++++++
 .../scripts/handlers/playeractions/ServitorAttack.java     | 7 +++++++
 .../data/scripts/handlers/playeractions/PetAttack.java     | 7 +++++++
 .../scripts/handlers/playeractions/ServitorAttack.java     | 7 +++++++
 .../data/scripts/handlers/playeractions/PetAttack.java     | 7 +++++++
 .../scripts/handlers/playeractions/ServitorAttack.java     | 7 +++++++
 .../data/scripts/handlers/playeractions/PetAttack.java     | 7 +++++++
 .../scripts/handlers/playeractions/ServitorAttack.java     | 7 +++++++
 .../data/scripts/handlers/playeractions/PetAttack.java     | 7 +++++++
 .../scripts/handlers/playeractions/ServitorAttack.java     | 7 +++++++
 .../data/scripts/handlers/playeractions/PetAttack.java     | 7 +++++++
 .../scripts/handlers/playeractions/ServitorAttack.java     | 7 +++++++
 .../data/scripts/handlers/playeractions/PetAttack.java     | 7 +++++++
 .../scripts/handlers/playeractions/ServitorAttack.java     | 7 +++++++
 .../data/scripts/handlers/playeractions/PetAttack.java     | 7 +++++++
 .../scripts/handlers/playeractions/ServitorAttack.java     | 7 +++++++
 38 files changed, 266 insertions(+)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/playeractions/PetAttack.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/playeractions/PetAttack.java
index 0ef9255493..5becfa8b61 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/playeractions/PetAttack.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/playeractions/PetAttack.java
@@ -48,6 +48,13 @@ 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());
 		}
 	}
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
index 829cf54d76..ef79e61e80 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
@@ -37,6 +37,13 @@ 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());
 				}
 			}
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/playeractions/PetAttack.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/playeractions/PetAttack.java
index 0ef9255493..5becfa8b61 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/playeractions/PetAttack.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/playeractions/PetAttack.java
@@ -48,6 +48,13 @@ 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());
 		}
 	}
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
index 829cf54d76..ef79e61e80 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
@@ -37,6 +37,13 @@ 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());
 				}
 			}
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/playeractions/PetAttack.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/playeractions/PetAttack.java
index 0ef9255493..5becfa8b61 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/playeractions/PetAttack.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/playeractions/PetAttack.java
@@ -48,6 +48,13 @@ 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());
 		}
 	}
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
index 829cf54d76..ef79e61e80 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
@@ -37,6 +37,13 @@ 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());
 				}
 			}
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/playeractions/PetAttack.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/playeractions/PetAttack.java
index 0ef9255493..5becfa8b61 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/playeractions/PetAttack.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/playeractions/PetAttack.java
@@ -48,6 +48,13 @@ 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());
 		}
 	}
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
index 829cf54d76..ef79e61e80 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
@@ -37,6 +37,13 @@ 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());
 				}
 			}
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/playeractions/PetAttack.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/playeractions/PetAttack.java
index 0ef9255493..5becfa8b61 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/playeractions/PetAttack.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/playeractions/PetAttack.java
@@ -48,6 +48,13 @@ 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());
 		}
 	}
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
index 829cf54d76..ef79e61e80 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
@@ -37,6 +37,13 @@ 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());
 				}
 			}
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/playeractions/PetAttack.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/playeractions/PetAttack.java
index 0ef9255493..5becfa8b61 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/playeractions/PetAttack.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/playeractions/PetAttack.java
@@ -48,6 +48,13 @@ 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());
 		}
 	}
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
index 829cf54d76..ef79e61e80 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
@@ -37,6 +37,13 @@ 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());
 				}
 			}
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/playeractions/PetAttack.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/playeractions/PetAttack.java
index 0ef9255493..5becfa8b61 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/playeractions/PetAttack.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/playeractions/PetAttack.java
@@ -48,6 +48,13 @@ 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());
 		}
 	}
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
index 829cf54d76..ef79e61e80 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
@@ -37,6 +37,13 @@ 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());
 				}
 			}
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/PetAttack.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/PetAttack.java
index 0ef9255493..5becfa8b61 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/PetAttack.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/PetAttack.java
@@ -48,6 +48,13 @@ 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());
 		}
 	}
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
index 829cf54d76..ef79e61e80 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
@@ -37,6 +37,13 @@ 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());
 				}
 			}
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/playeractions/PetAttack.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/playeractions/PetAttack.java
index 0ef9255493..5becfa8b61 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/playeractions/PetAttack.java
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/playeractions/PetAttack.java
@@ -48,6 +48,13 @@ 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());
 		}
 	}
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
index 829cf54d76..ef79e61e80 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
@@ -37,6 +37,13 @@ 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());
 				}
 			}
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/PetAttack.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/PetAttack.java
index 0ef9255493..5becfa8b61 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/PetAttack.java
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/PetAttack.java
@@ -48,6 +48,13 @@ 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());
 		}
 	}
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
index 829cf54d76..ef79e61e80 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
@@ -37,6 +37,13 @@ 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());
 				}
 			}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/playeractions/PetAttack.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/playeractions/PetAttack.java
index cf520843ec..ed857a6a8f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/playeractions/PetAttack.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/playeractions/PetAttack.java
@@ -48,6 +48,13 @@ 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());
 		}
 	}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
index 829cf54d76..ef79e61e80 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
@@ -37,6 +37,13 @@ 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());
 				}
 			}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/playeractions/PetAttack.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/playeractions/PetAttack.java
index cf520843ec..ed857a6a8f 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/playeractions/PetAttack.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/playeractions/PetAttack.java
@@ -48,6 +48,13 @@ 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());
 		}
 	}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
index 829cf54d76..ef79e61e80 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
@@ -37,6 +37,13 @@ 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());
 				}
 			}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/playeractions/PetAttack.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/playeractions/PetAttack.java
index cf520843ec..ed857a6a8f 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/playeractions/PetAttack.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/playeractions/PetAttack.java
@@ -48,6 +48,13 @@ 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());
 		}
 	}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
index 829cf54d76..ef79e61e80 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
@@ -37,6 +37,13 @@ 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());
 				}
 			}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/playeractions/PetAttack.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/playeractions/PetAttack.java
index cf520843ec..ed857a6a8f 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/playeractions/PetAttack.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/playeractions/PetAttack.java
@@ -48,6 +48,13 @@ 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());
 		}
 	}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
index 829cf54d76..ef79e61e80 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
@@ -37,6 +37,13 @@ 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());
 				}
 			}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/playeractions/PetAttack.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/playeractions/PetAttack.java
index cf520843ec..ed857a6a8f 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/playeractions/PetAttack.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/playeractions/PetAttack.java
@@ -48,6 +48,13 @@ 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());
 		}
 	}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
index 829cf54d76..ef79e61e80 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
@@ -37,6 +37,13 @@ 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());
 				}
 			}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/PetAttack.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/PetAttack.java
index cf520843ec..ed857a6a8f 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/PetAttack.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/PetAttack.java
@@ -48,6 +48,13 @@ 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());
 		}
 	}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
index 829cf54d76..ef79e61e80 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
@@ -37,6 +37,13 @@ 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());
 				}
 			}
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/playeractions/PetAttack.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/playeractions/PetAttack.java
index cf520843ec..ed857a6a8f 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/playeractions/PetAttack.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/playeractions/PetAttack.java
@@ -48,6 +48,13 @@ 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());
 		}
 	}
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
index 829cf54d76..ef79e61e80 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
@@ -37,6 +37,13 @@ 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());
 				}
 			}
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/PetAttack.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/PetAttack.java
index 73cab32284..b62ff0c011 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/PetAttack.java
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/PetAttack.java
@@ -48,6 +48,13 @@ 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());
 		}
 	}
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
index b1c0cea74a..5b27e90cee 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
@@ -37,6 +37,13 @@ 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());
 				}
 			}
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/playeractions/PetAttack.java b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/playeractions/PetAttack.java
index 73cab32284..b62ff0c011 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/playeractions/PetAttack.java
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/playeractions/PetAttack.java
@@ -48,6 +48,13 @@ 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());
 		}
 	}
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
index b1c0cea74a..5b27e90cee 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/playeractions/ServitorAttack.java
@@ -37,6 +37,13 @@ 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());
 				}
 			}