diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java
index b4a3ed2d37..43f582c164 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java
@@ -31,7 +31,7 @@ public class AutoUseSettingsHolder
 	private final Collection<Integer> _autoActions = ConcurrentHashMap.newKeySet();
 	private final Collection<Integer> _autoBuffs = ConcurrentHashMap.newKeySet();
 	private final List<Integer> _autoSkills = new CopyOnWriteArrayList<>();
-	private int _skillIndex = -1;
+	private int _skillIndex = 0;
 	
 	public AutoUseSettingsHolder()
 	{
@@ -57,7 +57,7 @@ public class AutoUseSettingsHolder
 		return _autoBuffs;
 	}
 	
-	public Collection<Integer> getAutoSkills()
+	public List<Integer> getAutoSkills()
 	{
 		return _autoSkills;
 	}
@@ -67,15 +67,14 @@ public class AutoUseSettingsHolder
 		return _autoSkills.contains(skillId) || _autoBuffs.contains(skillId);
 	}
 	
-	public int getNextSkillId()
+	public Integer getNextSkillId()
 	{
-		_skillIndex++;
 		if (_skillIndex >= _autoSkills.size())
 		{
 			_skillIndex = 0;
 		}
 		
-		int skillId = 0;
+		Integer skillId = Integer.MIN_VALUE;
 		try
 		{
 			skillId = _autoSkills.get(_skillIndex);
@@ -88,9 +87,14 @@ public class AutoUseSettingsHolder
 		return skillId;
 	}
 	
+	public void incrementSkillOrder()
+	{
+		_skillIndex++;
+	}
+	
 	public void resetSkillOrder()
 	{
-		_skillIndex = -1;
+		_skillIndex = 0;
 	}
 	
 	public boolean isEmpty()
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 87ad4da3af..91ed956955 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -229,11 +229,12 @@ public class AutoUseTaskManager implements Runnable
 					}
 					
 					// Acquire next skill.
-					final int skillId = player.getAutoUseSettings().getNextSkillId();
-					final Skill skill = player.getKnownSkill(skillId);
+					final Integer skillId = player.getAutoUseSettings().getNextSkillId();
+					final Skill skill = player.getKnownSkill(skillId.intValue());
 					if (skill == null)
 					{
 						player.getAutoUseSettings().getAutoSkills().remove(skillId);
+						player.getAutoUseSettings().resetSkillOrder();
 						break SKILLS;
 					}
 					
@@ -256,9 +257,9 @@ public class AutoUseTaskManager implements Runnable
 						break SKILLS;
 					}
 					
-					if (canUseMagic(player, target, skill))
+					if (canUseMagic(player, target, skill) && player.useMagic(skill, null, true, false))
 					{
-						player.useMagic(skill, null, true, false);
+						player.getAutoUseSettings().incrementSkillOrder();
 					}
 				}
 				
@@ -394,19 +395,19 @@ public class AutoUseTaskManager implements Runnable
 		stopAutoUseTask(player);
 	}
 	
-	public void addAutoSkill(PlayerInstance player, int skillId)
+	public void addAutoSkill(PlayerInstance player, Integer skillId)
 	{
 		player.getAutoUseSettings().getAutoSkills().add(skillId);
 		startAutoUseTask(player);
 	}
 	
-	public void removeAutoSkill(PlayerInstance player, int skillId)
+	public void removeAutoSkill(PlayerInstance player, Integer skillId)
 	{
 		player.getAutoUseSettings().getAutoSkills().remove(skillId);
 		stopAutoUseTask(player);
 	}
 	
-	public void addAutoAction(PlayerInstance player, Integer actionId)
+	public void addAutoAction(PlayerInstance player, int actionId)
 	{
 		player.getAutoUseSettings().getAutoActions().add(actionId);
 		startAutoUseTask(player);
diff --git a/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java b/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java
index b4a3ed2d37..43f582c164 100644
--- a/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java
+++ b/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java
@@ -31,7 +31,7 @@ public class AutoUseSettingsHolder
 	private final Collection<Integer> _autoActions = ConcurrentHashMap.newKeySet();
 	private final Collection<Integer> _autoBuffs = ConcurrentHashMap.newKeySet();
 	private final List<Integer> _autoSkills = new CopyOnWriteArrayList<>();
-	private int _skillIndex = -1;
+	private int _skillIndex = 0;
 	
 	public AutoUseSettingsHolder()
 	{
@@ -57,7 +57,7 @@ public class AutoUseSettingsHolder
 		return _autoBuffs;
 	}
 	
-	public Collection<Integer> getAutoSkills()
+	public List<Integer> getAutoSkills()
 	{
 		return _autoSkills;
 	}
@@ -67,15 +67,14 @@ public class AutoUseSettingsHolder
 		return _autoSkills.contains(skillId) || _autoBuffs.contains(skillId);
 	}
 	
-	public int getNextSkillId()
+	public Integer getNextSkillId()
 	{
-		_skillIndex++;
 		if (_skillIndex >= _autoSkills.size())
 		{
 			_skillIndex = 0;
 		}
 		
-		int skillId = 0;
+		Integer skillId = Integer.MIN_VALUE;
 		try
 		{
 			skillId = _autoSkills.get(_skillIndex);
@@ -88,9 +87,14 @@ public class AutoUseSettingsHolder
 		return skillId;
 	}
 	
+	public void incrementSkillOrder()
+	{
+		_skillIndex++;
+	}
+	
 	public void resetSkillOrder()
 	{
-		_skillIndex = -1;
+		_skillIndex = 0;
 	}
 	
 	public boolean isEmpty()
diff --git a/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 87ad4da3af..91ed956955 100644
--- a/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -229,11 +229,12 @@ public class AutoUseTaskManager implements Runnable
 					}
 					
 					// Acquire next skill.
-					final int skillId = player.getAutoUseSettings().getNextSkillId();
-					final Skill skill = player.getKnownSkill(skillId);
+					final Integer skillId = player.getAutoUseSettings().getNextSkillId();
+					final Skill skill = player.getKnownSkill(skillId.intValue());
 					if (skill == null)
 					{
 						player.getAutoUseSettings().getAutoSkills().remove(skillId);
+						player.getAutoUseSettings().resetSkillOrder();
 						break SKILLS;
 					}
 					
@@ -256,9 +257,9 @@ public class AutoUseTaskManager implements Runnable
 						break SKILLS;
 					}
 					
-					if (canUseMagic(player, target, skill))
+					if (canUseMagic(player, target, skill) && player.useMagic(skill, null, true, false))
 					{
-						player.useMagic(skill, null, true, false);
+						player.getAutoUseSettings().incrementSkillOrder();
 					}
 				}
 				
@@ -394,19 +395,19 @@ public class AutoUseTaskManager implements Runnable
 		stopAutoUseTask(player);
 	}
 	
-	public void addAutoSkill(PlayerInstance player, int skillId)
+	public void addAutoSkill(PlayerInstance player, Integer skillId)
 	{
 		player.getAutoUseSettings().getAutoSkills().add(skillId);
 		startAutoUseTask(player);
 	}
 	
-	public void removeAutoSkill(PlayerInstance player, int skillId)
+	public void removeAutoSkill(PlayerInstance player, Integer skillId)
 	{
 		player.getAutoUseSettings().getAutoSkills().remove(skillId);
 		stopAutoUseTask(player);
 	}
 	
-	public void addAutoAction(PlayerInstance player, Integer actionId)
+	public void addAutoAction(PlayerInstance player, int actionId)
 	{
 		player.getAutoUseSettings().getAutoActions().add(actionId);
 		startAutoUseTask(player);
diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java
index b4a3ed2d37..43f582c164 100644
--- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java
+++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java
@@ -31,7 +31,7 @@ public class AutoUseSettingsHolder
 	private final Collection<Integer> _autoActions = ConcurrentHashMap.newKeySet();
 	private final Collection<Integer> _autoBuffs = ConcurrentHashMap.newKeySet();
 	private final List<Integer> _autoSkills = new CopyOnWriteArrayList<>();
-	private int _skillIndex = -1;
+	private int _skillIndex = 0;
 	
 	public AutoUseSettingsHolder()
 	{
@@ -57,7 +57,7 @@ public class AutoUseSettingsHolder
 		return _autoBuffs;
 	}
 	
-	public Collection<Integer> getAutoSkills()
+	public List<Integer> getAutoSkills()
 	{
 		return _autoSkills;
 	}
@@ -67,15 +67,14 @@ public class AutoUseSettingsHolder
 		return _autoSkills.contains(skillId) || _autoBuffs.contains(skillId);
 	}
 	
-	public int getNextSkillId()
+	public Integer getNextSkillId()
 	{
-		_skillIndex++;
 		if (_skillIndex >= _autoSkills.size())
 		{
 			_skillIndex = 0;
 		}
 		
-		int skillId = 0;
+		Integer skillId = Integer.MIN_VALUE;
 		try
 		{
 			skillId = _autoSkills.get(_skillIndex);
@@ -88,9 +87,14 @@ public class AutoUseSettingsHolder
 		return skillId;
 	}
 	
+	public void incrementSkillOrder()
+	{
+		_skillIndex++;
+	}
+	
 	public void resetSkillOrder()
 	{
-		_skillIndex = -1;
+		_skillIndex = 0;
 	}
 	
 	public boolean isEmpty()
diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 87ad4da3af..91ed956955 100644
--- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -229,11 +229,12 @@ public class AutoUseTaskManager implements Runnable
 					}
 					
 					// Acquire next skill.
-					final int skillId = player.getAutoUseSettings().getNextSkillId();
-					final Skill skill = player.getKnownSkill(skillId);
+					final Integer skillId = player.getAutoUseSettings().getNextSkillId();
+					final Skill skill = player.getKnownSkill(skillId.intValue());
 					if (skill == null)
 					{
 						player.getAutoUseSettings().getAutoSkills().remove(skillId);
+						player.getAutoUseSettings().resetSkillOrder();
 						break SKILLS;
 					}
 					
@@ -256,9 +257,9 @@ public class AutoUseTaskManager implements Runnable
 						break SKILLS;
 					}
 					
-					if (canUseMagic(player, target, skill))
+					if (canUseMagic(player, target, skill) && player.useMagic(skill, null, true, false))
 					{
-						player.useMagic(skill, null, true, false);
+						player.getAutoUseSettings().incrementSkillOrder();
 					}
 				}
 				
@@ -394,19 +395,19 @@ public class AutoUseTaskManager implements Runnable
 		stopAutoUseTask(player);
 	}
 	
-	public void addAutoSkill(PlayerInstance player, int skillId)
+	public void addAutoSkill(PlayerInstance player, Integer skillId)
 	{
 		player.getAutoUseSettings().getAutoSkills().add(skillId);
 		startAutoUseTask(player);
 	}
 	
-	public void removeAutoSkill(PlayerInstance player, int skillId)
+	public void removeAutoSkill(PlayerInstance player, Integer skillId)
 	{
 		player.getAutoUseSettings().getAutoSkills().remove(skillId);
 		stopAutoUseTask(player);
 	}
 	
-	public void addAutoAction(PlayerInstance player, Integer actionId)
+	public void addAutoAction(PlayerInstance player, int actionId)
 	{
 		player.getAutoUseSettings().getAutoActions().add(actionId);
 		startAutoUseTask(player);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java
index b4a3ed2d37..43f582c164 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java
@@ -31,7 +31,7 @@ public class AutoUseSettingsHolder
 	private final Collection<Integer> _autoActions = ConcurrentHashMap.newKeySet();
 	private final Collection<Integer> _autoBuffs = ConcurrentHashMap.newKeySet();
 	private final List<Integer> _autoSkills = new CopyOnWriteArrayList<>();
-	private int _skillIndex = -1;
+	private int _skillIndex = 0;
 	
 	public AutoUseSettingsHolder()
 	{
@@ -57,7 +57,7 @@ public class AutoUseSettingsHolder
 		return _autoBuffs;
 	}
 	
-	public Collection<Integer> getAutoSkills()
+	public List<Integer> getAutoSkills()
 	{
 		return _autoSkills;
 	}
@@ -67,15 +67,14 @@ public class AutoUseSettingsHolder
 		return _autoSkills.contains(skillId) || _autoBuffs.contains(skillId);
 	}
 	
-	public int getNextSkillId()
+	public Integer getNextSkillId()
 	{
-		_skillIndex++;
 		if (_skillIndex >= _autoSkills.size())
 		{
 			_skillIndex = 0;
 		}
 		
-		int skillId = 0;
+		Integer skillId = Integer.MIN_VALUE;
 		try
 		{
 			skillId = _autoSkills.get(_skillIndex);
@@ -88,9 +87,14 @@ public class AutoUseSettingsHolder
 		return skillId;
 	}
 	
+	public void incrementSkillOrder()
+	{
+		_skillIndex++;
+	}
+	
 	public void resetSkillOrder()
 	{
-		_skillIndex = -1;
+		_skillIndex = 0;
 	}
 	
 	public boolean isEmpty()
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 87ad4da3af..91ed956955 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
@@ -229,11 +229,12 @@ public class AutoUseTaskManager implements Runnable
 					}
 					
 					// Acquire next skill.
-					final int skillId = player.getAutoUseSettings().getNextSkillId();
-					final Skill skill = player.getKnownSkill(skillId);
+					final Integer skillId = player.getAutoUseSettings().getNextSkillId();
+					final Skill skill = player.getKnownSkill(skillId.intValue());
 					if (skill == null)
 					{
 						player.getAutoUseSettings().getAutoSkills().remove(skillId);
+						player.getAutoUseSettings().resetSkillOrder();
 						break SKILLS;
 					}
 					
@@ -256,9 +257,9 @@ public class AutoUseTaskManager implements Runnable
 						break SKILLS;
 					}
 					
-					if (canUseMagic(player, target, skill))
+					if (canUseMagic(player, target, skill) && player.useMagic(skill, null, true, false))
 					{
-						player.useMagic(skill, null, true, false);
+						player.getAutoUseSettings().incrementSkillOrder();
 					}
 				}
 				
@@ -394,19 +395,19 @@ public class AutoUseTaskManager implements Runnable
 		stopAutoUseTask(player);
 	}
 	
-	public void addAutoSkill(PlayerInstance player, int skillId)
+	public void addAutoSkill(PlayerInstance player, Integer skillId)
 	{
 		player.getAutoUseSettings().getAutoSkills().add(skillId);
 		startAutoUseTask(player);
 	}
 	
-	public void removeAutoSkill(PlayerInstance player, int skillId)
+	public void removeAutoSkill(PlayerInstance player, Integer skillId)
 	{
 		player.getAutoUseSettings().getAutoSkills().remove(skillId);
 		stopAutoUseTask(player);
 	}
 	
-	public void addAutoAction(PlayerInstance player, Integer actionId)
+	public void addAutoAction(PlayerInstance player, int actionId)
 	{
 		player.getAutoUseSettings().getAutoActions().add(actionId);
 		startAutoUseTask(player);
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java
index b4a3ed2d37..43f582c164 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java
@@ -31,7 +31,7 @@ public class AutoUseSettingsHolder
 	private final Collection<Integer> _autoActions = ConcurrentHashMap.newKeySet();
 	private final Collection<Integer> _autoBuffs = ConcurrentHashMap.newKeySet();
 	private final List<Integer> _autoSkills = new CopyOnWriteArrayList<>();
-	private int _skillIndex = -1;
+	private int _skillIndex = 0;
 	
 	public AutoUseSettingsHolder()
 	{
@@ -57,7 +57,7 @@ public class AutoUseSettingsHolder
 		return _autoBuffs;
 	}
 	
-	public Collection<Integer> getAutoSkills()
+	public List<Integer> getAutoSkills()
 	{
 		return _autoSkills;
 	}
@@ -67,15 +67,14 @@ public class AutoUseSettingsHolder
 		return _autoSkills.contains(skillId) || _autoBuffs.contains(skillId);
 	}
 	
-	public int getNextSkillId()
+	public Integer getNextSkillId()
 	{
-		_skillIndex++;
 		if (_skillIndex >= _autoSkills.size())
 		{
 			_skillIndex = 0;
 		}
 		
-		int skillId = 0;
+		Integer skillId = Integer.MIN_VALUE;
 		try
 		{
 			skillId = _autoSkills.get(_skillIndex);
@@ -88,9 +87,14 @@ public class AutoUseSettingsHolder
 		return skillId;
 	}
 	
+	public void incrementSkillOrder()
+	{
+		_skillIndex++;
+	}
+	
 	public void resetSkillOrder()
 	{
-		_skillIndex = -1;
+		_skillIndex = 0;
 	}
 	
 	public boolean isEmpty()
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 87ad4da3af..91ed956955 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
@@ -229,11 +229,12 @@ public class AutoUseTaskManager implements Runnable
 					}
 					
 					// Acquire next skill.
-					final int skillId = player.getAutoUseSettings().getNextSkillId();
-					final Skill skill = player.getKnownSkill(skillId);
+					final Integer skillId = player.getAutoUseSettings().getNextSkillId();
+					final Skill skill = player.getKnownSkill(skillId.intValue());
 					if (skill == null)
 					{
 						player.getAutoUseSettings().getAutoSkills().remove(skillId);
+						player.getAutoUseSettings().resetSkillOrder();
 						break SKILLS;
 					}
 					
@@ -256,9 +257,9 @@ public class AutoUseTaskManager implements Runnable
 						break SKILLS;
 					}
 					
-					if (canUseMagic(player, target, skill))
+					if (canUseMagic(player, target, skill) && player.useMagic(skill, null, true, false))
 					{
-						player.useMagic(skill, null, true, false);
+						player.getAutoUseSettings().incrementSkillOrder();
 					}
 				}
 				
@@ -394,19 +395,19 @@ public class AutoUseTaskManager implements Runnable
 		stopAutoUseTask(player);
 	}
 	
-	public void addAutoSkill(PlayerInstance player, int skillId)
+	public void addAutoSkill(PlayerInstance player, Integer skillId)
 	{
 		player.getAutoUseSettings().getAutoSkills().add(skillId);
 		startAutoUseTask(player);
 	}
 	
-	public void removeAutoSkill(PlayerInstance player, int skillId)
+	public void removeAutoSkill(PlayerInstance player, Integer skillId)
 	{
 		player.getAutoUseSettings().getAutoSkills().remove(skillId);
 		stopAutoUseTask(player);
 	}
 	
-	public void addAutoAction(PlayerInstance player, Integer actionId)
+	public void addAutoAction(PlayerInstance player, int actionId)
 	{
 		player.getAutoUseSettings().getAutoActions().add(actionId);
 		startAutoUseTask(player);
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java
index b4a3ed2d37..43f582c164 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/AutoUseSettingsHolder.java
@@ -31,7 +31,7 @@ public class AutoUseSettingsHolder
 	private final Collection<Integer> _autoActions = ConcurrentHashMap.newKeySet();
 	private final Collection<Integer> _autoBuffs = ConcurrentHashMap.newKeySet();
 	private final List<Integer> _autoSkills = new CopyOnWriteArrayList<>();
-	private int _skillIndex = -1;
+	private int _skillIndex = 0;
 	
 	public AutoUseSettingsHolder()
 	{
@@ -57,7 +57,7 @@ public class AutoUseSettingsHolder
 		return _autoBuffs;
 	}
 	
-	public Collection<Integer> getAutoSkills()
+	public List<Integer> getAutoSkills()
 	{
 		return _autoSkills;
 	}
@@ -67,15 +67,14 @@ public class AutoUseSettingsHolder
 		return _autoSkills.contains(skillId) || _autoBuffs.contains(skillId);
 	}
 	
-	public int getNextSkillId()
+	public Integer getNextSkillId()
 	{
-		_skillIndex++;
 		if (_skillIndex >= _autoSkills.size())
 		{
 			_skillIndex = 0;
 		}
 		
-		int skillId = 0;
+		Integer skillId = Integer.MIN_VALUE;
 		try
 		{
 			skillId = _autoSkills.get(_skillIndex);
@@ -88,9 +87,14 @@ public class AutoUseSettingsHolder
 		return skillId;
 	}
 	
+	public void incrementSkillOrder()
+	{
+		_skillIndex++;
+	}
+	
 	public void resetSkillOrder()
 	{
-		_skillIndex = -1;
+		_skillIndex = 0;
 	}
 	
 	public boolean isEmpty()
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 87ad4da3af..91ed956955 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
@@ -229,11 +229,12 @@ public class AutoUseTaskManager implements Runnable
 					}
 					
 					// Acquire next skill.
-					final int skillId = player.getAutoUseSettings().getNextSkillId();
-					final Skill skill = player.getKnownSkill(skillId);
+					final Integer skillId = player.getAutoUseSettings().getNextSkillId();
+					final Skill skill = player.getKnownSkill(skillId.intValue());
 					if (skill == null)
 					{
 						player.getAutoUseSettings().getAutoSkills().remove(skillId);
+						player.getAutoUseSettings().resetSkillOrder();
 						break SKILLS;
 					}
 					
@@ -256,9 +257,9 @@ public class AutoUseTaskManager implements Runnable
 						break SKILLS;
 					}
 					
-					if (canUseMagic(player, target, skill))
+					if (canUseMagic(player, target, skill) && player.useMagic(skill, null, true, false))
 					{
-						player.useMagic(skill, null, true, false);
+						player.getAutoUseSettings().incrementSkillOrder();
 					}
 				}
 				
@@ -394,19 +395,19 @@ public class AutoUseTaskManager implements Runnable
 		stopAutoUseTask(player);
 	}
 	
-	public void addAutoSkill(PlayerInstance player, int skillId)
+	public void addAutoSkill(PlayerInstance player, Integer skillId)
 	{
 		player.getAutoUseSettings().getAutoSkills().add(skillId);
 		startAutoUseTask(player);
 	}
 	
-	public void removeAutoSkill(PlayerInstance player, int skillId)
+	public void removeAutoSkill(PlayerInstance player, Integer skillId)
 	{
 		player.getAutoUseSettings().getAutoSkills().remove(skillId);
 		stopAutoUseTask(player);
 	}
 	
-	public void addAutoAction(PlayerInstance player, Integer actionId)
+	public void addAutoAction(PlayerInstance player, int actionId)
 	{
 		player.getAutoUseSettings().getAutoActions().add(actionId);
 		startAutoUseTask(player);