From bb648e3354549c01e153072e77c72cb37951b716 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Thu, 23 Sep 2021 12:14:20 +0000
Subject: [PATCH] Fixed switching between main and dual class not turning off
 autoskills. Contributed by nasseka.

---
 .../gameserver/model/actor/instance/PlayerInstance.java          | 1 +
 .../gameserver/model/actor/instance/PlayerInstance.java          | 1 +
 .../gameserver/model/actor/instance/PlayerInstance.java          | 1 +
 .../gameserver/model/actor/instance/PlayerInstance.java          | 1 +
 .../gameserver/model/actor/instance/PlayerInstance.java          | 1 +
 .../gameserver/model/actor/instance/PlayerInstance.java          | 1 +
 6 files changed, 6 insertions(+)

diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 3bb661b5c7..6c8c01f659 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -9894,6 +9894,7 @@ public class PlayerInstance extends Playable
 			// 9. Resend a class change animation effect to broadcast to all nearby players.
 			for (Skill oldSkill : getAllSkills())
 			{
+				AutoUseTaskManager.getInstance().removeAutoSkill(this, oldSkill.getId());
 				removeSkill(oldSkill, false, true);
 			}
 			
diff --git a/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 3f65bd4d7a..36069fa180 100644
--- a/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -9996,6 +9996,7 @@ public class PlayerInstance extends Playable
 			// 9. Resend a class change animation effect to broadcast to all nearby players.
 			for (Skill oldSkill : getAllSkills())
 			{
+				AutoUseTaskManager.getInstance().removeAutoSkill(this, oldSkill.getId());
 				removeSkill(oldSkill, false, true);
 			}
 			
diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index da40d72c9a..7287ff56e3 100644
--- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -10022,6 +10022,7 @@ public class PlayerInstance extends Playable
 			// 9. Resend a class change animation effect to broadcast to all nearby players.
 			for (Skill oldSkill : getAllSkills())
 			{
+				AutoUseTaskManager.getInstance().removeAutoSkill(this, oldSkill.getId());
 				removeSkill(oldSkill, false, true);
 			}
 			
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 1d022ab686..70b0ae4faf 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -9753,6 +9753,7 @@ public class PlayerInstance extends Playable
 			// 9. Resend a class change animation effect to broadcast to all nearby players.
 			for (Skill oldSkill : getAllSkills())
 			{
+				AutoUseTaskManager.getInstance().removeAutoSkill(this, oldSkill.getId());
 				removeSkill(oldSkill, false, true);
 			}
 			
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index afa4e1910d..61ea86f8bf 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -9906,6 +9906,7 @@ public class PlayerInstance extends Playable
 			// 9. Resend a class change animation effect to broadcast to all nearby players.
 			for (Skill oldSkill : getAllSkills())
 			{
+				AutoUseTaskManager.getInstance().removeAutoSkill(this, oldSkill.getId());
 				removeSkill(oldSkill, false, true);
 			}
 			
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index ceabce3e09..5115bf7efe 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -9972,6 +9972,7 @@ public class PlayerInstance extends Playable
 			// 9. Resend a class change animation effect to broadcast to all nearby players.
 			for (Skill oldSkill : getAllSkills())
 			{
+				AutoUseTaskManager.getInstance().removeAutoSkill(this, oldSkill.getId());
 				removeSkill(oldSkill, false, true);
 			}