From cc4e27390a2288d6dd0ebf52d5f98965c9f31fe3 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 29 Jan 2019 15:32:40 +0000
Subject: [PATCH] Interrupt summon skill casting when unsummoning.

---
 .../java/com/l2jmobius/gameserver/model/actor/L2Summon.java | 6 ++++++
 .../java/com/l2jmobius/gameserver/model/actor/L2Summon.java | 6 ++++++
 .../java/com/l2jmobius/gameserver/model/actor/L2Summon.java | 6 ++++++
 .../java/com/l2jmobius/gameserver/model/actor/L2Summon.java | 6 ++++++
 .../java/com/l2jmobius/gameserver/model/actor/L2Summon.java | 6 ++++++
 .../java/com/l2jmobius/gameserver/model/actor/L2Summon.java | 6 ++++++
 .../java/com/l2jmobius/gameserver/model/actor/L2Summon.java | 6 ++++++
 .../java/com/l2jmobius/gameserver/model/actor/L2Summon.java | 6 ++++++
 .../java/com/l2jmobius/gameserver/model/actor/L2Summon.java | 6 ++++++
 .../java/com/l2jmobius/gameserver/model/actor/L2Summon.java | 6 ++++++
 10 files changed, 60 insertions(+)

diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Summon.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
index 7c027233c9..7463bb4eff 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
@@ -424,6 +424,12 @@ public abstract class L2Summon extends L2Playable
 				getAI().stopAITask(); // Calls stopFollow as well.
 			}
 			
+			// Cancel running skill casters.
+			for (SkillCaster skillCaster : getSkillCasters())
+			{
+				skillCaster.stopCasting(true);
+			}
+			
 			stopAllEffects();
 			stopHpMpRegeneration();
 			
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Summon.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
index 7c027233c9..7463bb4eff 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
@@ -424,6 +424,12 @@ public abstract class L2Summon extends L2Playable
 				getAI().stopAITask(); // Calls stopFollow as well.
 			}
 			
+			// Cancel running skill casters.
+			for (SkillCaster skillCaster : getSkillCasters())
+			{
+				skillCaster.stopCasting(true);
+			}
+			
 			stopAllEffects();
 			stopHpMpRegeneration();
 			
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Summon.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
index 5dd9e1ca65..c0bacbfc77 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
@@ -424,6 +424,12 @@ public abstract class L2Summon extends L2Playable
 				getAI().stopAITask(); // Calls stopFollow as well.
 			}
 			
+			// Cancel running skill casters.
+			for (SkillCaster skillCaster : getSkillCasters())
+			{
+				skillCaster.stopCasting(true);
+			}
+			
 			stopAllEffects();
 			stopHpMpRegeneration();
 			
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Summon.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
index 5dd9e1ca65..c0bacbfc77 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
@@ -424,6 +424,12 @@ public abstract class L2Summon extends L2Playable
 				getAI().stopAITask(); // Calls stopFollow as well.
 			}
 			
+			// Cancel running skill casters.
+			for (SkillCaster skillCaster : getSkillCasters())
+			{
+				skillCaster.stopCasting(true);
+			}
+			
 			stopAllEffects();
 			stopHpMpRegeneration();
 			
diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/L2Summon.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
index 5dd9e1ca65..c0bacbfc77 100644
--- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
+++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
@@ -424,6 +424,12 @@ public abstract class L2Summon extends L2Playable
 				getAI().stopAITask(); // Calls stopFollow as well.
 			}
 			
+			// Cancel running skill casters.
+			for (SkillCaster skillCaster : getSkillCasters())
+			{
+				skillCaster.stopCasting(true);
+			}
+			
 			stopAllEffects();
 			stopHpMpRegeneration();
 			
diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/L2Summon.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
index 5dd9e1ca65..c0bacbfc77 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
@@ -424,6 +424,12 @@ public abstract class L2Summon extends L2Playable
 				getAI().stopAITask(); // Calls stopFollow as well.
 			}
 			
+			// Cancel running skill casters.
+			for (SkillCaster skillCaster : getSkillCasters())
+			{
+				skillCaster.stopCasting(true);
+			}
+			
 			stopAllEffects();
 			stopHpMpRegeneration();
 			
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Summon.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
index ba13396e5c..f5196e7f37 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
@@ -424,6 +424,12 @@ public abstract class L2Summon extends L2Playable
 				getAI().stopAITask(); // Calls stopFollow as well.
 			}
 			
+			// Cancel running skill casters.
+			for (SkillCaster skillCaster : getSkillCasters())
+			{
+				skillCaster.stopCasting(true);
+			}
+			
 			stopAllEffects();
 			stopHpMpRegeneration();
 			
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Summon.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
index ba13396e5c..f5196e7f37 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
@@ -424,6 +424,12 @@ public abstract class L2Summon extends L2Playable
 				getAI().stopAITask(); // Calls stopFollow as well.
 			}
 			
+			// Cancel running skill casters.
+			for (SkillCaster skillCaster : getSkillCasters())
+			{
+				skillCaster.stopCasting(true);
+			}
+			
 			stopAllEffects();
 			stopHpMpRegeneration();
 			
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Summon.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
index ba13396e5c..f5196e7f37 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
@@ -424,6 +424,12 @@ public abstract class L2Summon extends L2Playable
 				getAI().stopAITask(); // Calls stopFollow as well.
 			}
 			
+			// Cancel running skill casters.
+			for (SkillCaster skillCaster : getSkillCasters())
+			{
+				skillCaster.stopCasting(true);
+			}
+			
 			stopAllEffects();
 			stopHpMpRegeneration();
 			
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/actor/L2Summon.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
index ba13396e5c..f5196e7f37 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
@@ -424,6 +424,12 @@ public abstract class L2Summon extends L2Playable
 				getAI().stopAITask(); // Calls stopFollow as well.
 			}
 			
+			// Cancel running skill casters.
+			for (SkillCaster skillCaster : getSkillCasters())
+			{
+				skillCaster.stopCasting(true);
+			}
+			
 			stopAllEffects();
 			stopHpMpRegeneration();