From bc688478fcd67dc7bd3080bdf093549ed847a13b Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Wed, 21 Dec 2022 22:33:27 +0000
Subject: [PATCH] AutoUseTaskManager increment skill order when pet skill is
 disabled. Contributed by petryxa.

---
 .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java | 5 +++++
 .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java | 5 +++++
 .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java | 5 +++++
 .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java | 5 +++++
 .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java | 5 +++++
 .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java | 5 +++++
 .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java | 5 +++++
 .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java | 5 +++++
 .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java | 5 +++++
 .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java | 5 +++++
 .../l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java | 5 +++++
 11 files changed, 55 insertions(+)

diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index dd1a4ae427..b28043d4e6 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -307,6 +307,11 @@ public class AutoUseTaskManager
 							{
 								pet = player.getPet();
 								skill = pet.getKnownSkill(skillId.intValue());
+								if (pet.isSkillDisabled(skill))
+								{
+									player.getAutoUseSettings().incrementSkillOrder();
+									break SKILLS;
+								}
 							}
 							if (skill == null)
 							{
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index dd1a4ae427..b28043d4e6 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -307,6 +307,11 @@ public class AutoUseTaskManager
 							{
 								pet = player.getPet();
 								skill = pet.getKnownSkill(skillId.intValue());
+								if (pet.isSkillDisabled(skill))
+								{
+									player.getAutoUseSettings().incrementSkillOrder();
+									break SKILLS;
+								}
 							}
 							if (skill == null)
 							{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index dd1a4ae427..b28043d4e6 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -307,6 +307,11 @@ public class AutoUseTaskManager
 							{
 								pet = player.getPet();
 								skill = pet.getKnownSkill(skillId.intValue());
+								if (pet.isSkillDisabled(skill))
+								{
+									player.getAutoUseSettings().incrementSkillOrder();
+									break SKILLS;
+								}
 							}
 							if (skill == null)
 							{
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index dd1a4ae427..b28043d4e6 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -307,6 +307,11 @@ public class AutoUseTaskManager
 							{
 								pet = player.getPet();
 								skill = pet.getKnownSkill(skillId.intValue());
+								if (pet.isSkillDisabled(skill))
+								{
+									player.getAutoUseSettings().incrementSkillOrder();
+									break SKILLS;
+								}
 							}
 							if (skill == null)
 							{
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index dd1a4ae427..b28043d4e6 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -307,6 +307,11 @@ public class AutoUseTaskManager
 							{
 								pet = player.getPet();
 								skill = pet.getKnownSkill(skillId.intValue());
+								if (pet.isSkillDisabled(skill))
+								{
+									player.getAutoUseSettings().incrementSkillOrder();
+									break SKILLS;
+								}
 							}
 							if (skill == null)
 							{
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index dd1a4ae427..b28043d4e6 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -307,6 +307,11 @@ public class AutoUseTaskManager
 							{
 								pet = player.getPet();
 								skill = pet.getKnownSkill(skillId.intValue());
+								if (pet.isSkillDisabled(skill))
+								{
+									player.getAutoUseSettings().incrementSkillOrder();
+									break SKILLS;
+								}
 							}
 							if (skill == null)
 							{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index dd1a4ae427..b28043d4e6 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -307,6 +307,11 @@ public class AutoUseTaskManager
 							{
 								pet = player.getPet();
 								skill = pet.getKnownSkill(skillId.intValue());
+								if (pet.isSkillDisabled(skill))
+								{
+									player.getAutoUseSettings().incrementSkillOrder();
+									break SKILLS;
+								}
 							}
 							if (skill == null)
 							{
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 1f926bdb91..94e451f0fc 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -340,6 +340,11 @@ public class AutoUseTaskManager
 							{
 								pet = player.getPet();
 								skill = pet.getKnownSkill(skillId.intValue());
+								if (pet.isSkillDisabled(skill))
+								{
+									player.getAutoUseSettings().incrementSkillOrder();
+									break SKILLS;
+								}
 							}
 							if (skill == null)
 							{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 1f926bdb91..94e451f0fc 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -340,6 +340,11 @@ public class AutoUseTaskManager
 							{
 								pet = player.getPet();
 								skill = pet.getKnownSkill(skillId.intValue());
+								if (pet.isSkillDisabled(skill))
+								{
+									player.getAutoUseSettings().incrementSkillOrder();
+									break SKILLS;
+								}
 							}
 							if (skill == null)
 							{
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 1f926bdb91..94e451f0fc 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -340,6 +340,11 @@ public class AutoUseTaskManager
 							{
 								pet = player.getPet();
 								skill = pet.getKnownSkill(skillId.intValue());
+								if (pet.isSkillDisabled(skill))
+								{
+									player.getAutoUseSettings().incrementSkillOrder();
+									break SKILLS;
+								}
 							}
 							if (skill == null)
 							{
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 1f926bdb91..94e451f0fc 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -340,6 +340,11 @@ public class AutoUseTaskManager
 							{
 								pet = player.getPet();
 								skill = pet.getKnownSkill(skillId.intValue());
+								if (pet.isSkillDisabled(skill))
+								{
+									player.getAutoUseSettings().incrementSkillOrder();
+									break SKILLS;
+								}
 							}
 							if (skill == null)
 							{