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 5288c0930d..4ce649b1e2 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
@@ -192,10 +192,10 @@ public class AutoUseTaskManager implements Runnable
 						{
 							SUMMON_SEARCH: for (Summon summon : player.getServitors().values())
 							{
-								pet = summon;
 								skill = summon.getKnownSkill(skillId.intValue());
 								if (skill != null)
 								{
+									pet = summon;
 									break SUMMON_SEARCH;
 								}
 							}
@@ -262,10 +262,10 @@ public class AutoUseTaskManager implements Runnable
 						{
 							SUMMON_SEARCH: for (Summon summon : player.getServitors().values())
 							{
-								pet = summon;
 								skill = summon.getKnownSkill(skillId.intValue());
 								if (skill != null)
 								{
+									pet = summon;
 									break SUMMON_SEARCH;
 								}
 							}
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 5288c0930d..4ce649b1e2 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
@@ -192,10 +192,10 @@ public class AutoUseTaskManager implements Runnable
 						{
 							SUMMON_SEARCH: for (Summon summon : player.getServitors().values())
 							{
-								pet = summon;
 								skill = summon.getKnownSkill(skillId.intValue());
 								if (skill != null)
 								{
+									pet = summon;
 									break SUMMON_SEARCH;
 								}
 							}
@@ -262,10 +262,10 @@ public class AutoUseTaskManager implements Runnable
 						{
 							SUMMON_SEARCH: for (Summon summon : player.getServitors().values())
 							{
-								pet = summon;
 								skill = summon.getKnownSkill(skillId.intValue());
 								if (skill != null)
 								{
+									pet = summon;
 									break SUMMON_SEARCH;
 								}
 							}
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 5288c0930d..4ce649b1e2 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
@@ -192,10 +192,10 @@ public class AutoUseTaskManager implements Runnable
 						{
 							SUMMON_SEARCH: for (Summon summon : player.getServitors().values())
 							{
-								pet = summon;
 								skill = summon.getKnownSkill(skillId.intValue());
 								if (skill != null)
 								{
+									pet = summon;
 									break SUMMON_SEARCH;
 								}
 							}
@@ -262,10 +262,10 @@ public class AutoUseTaskManager implements Runnable
 						{
 							SUMMON_SEARCH: for (Summon summon : player.getServitors().values())
 							{
-								pet = summon;
 								skill = summon.getKnownSkill(skillId.intValue());
 								if (skill != null)
 								{
+									pet = summon;
 									break SUMMON_SEARCH;
 								}
 							}
diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 5288c0930d..4ce649b1e2 100644
--- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -192,10 +192,10 @@ public class AutoUseTaskManager implements Runnable
 						{
 							SUMMON_SEARCH: for (Summon summon : player.getServitors().values())
 							{
-								pet = summon;
 								skill = summon.getKnownSkill(skillId.intValue());
 								if (skill != null)
 								{
+									pet = summon;
 									break SUMMON_SEARCH;
 								}
 							}
@@ -262,10 +262,10 @@ public class AutoUseTaskManager implements Runnable
 						{
 							SUMMON_SEARCH: for (Summon summon : player.getServitors().values())
 							{
-								pet = summon;
 								skill = summon.getKnownSkill(skillId.intValue());
 								if (skill != null)
 								{
+									pet = summon;
 									break SUMMON_SEARCH;
 								}
 							}
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 5288c0930d..4ce649b1e2 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
@@ -192,10 +192,10 @@ public class AutoUseTaskManager implements Runnable
 						{
 							SUMMON_SEARCH: for (Summon summon : player.getServitors().values())
 							{
-								pet = summon;
 								skill = summon.getKnownSkill(skillId.intValue());
 								if (skill != null)
 								{
+									pet = summon;
 									break SUMMON_SEARCH;
 								}
 							}
@@ -262,10 +262,10 @@ public class AutoUseTaskManager implements Runnable
 						{
 							SUMMON_SEARCH: for (Summon summon : player.getServitors().values())
 							{
-								pet = summon;
 								skill = summon.getKnownSkill(skillId.intValue());
 								if (skill != null)
 								{
+									pet = summon;
 									break SUMMON_SEARCH;
 								}
 							}
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 5288c0930d..4ce649b1e2 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
@@ -192,10 +192,10 @@ public class AutoUseTaskManager implements Runnable
 						{
 							SUMMON_SEARCH: for (Summon summon : player.getServitors().values())
 							{
-								pet = summon;
 								skill = summon.getKnownSkill(skillId.intValue());
 								if (skill != null)
 								{
+									pet = summon;
 									break SUMMON_SEARCH;
 								}
 							}
@@ -262,10 +262,10 @@ public class AutoUseTaskManager implements Runnable
 						{
 							SUMMON_SEARCH: for (Summon summon : player.getServitors().values())
 							{
-								pet = summon;
 								skill = summon.getKnownSkill(skillId.intValue());
 								if (skill != null)
 								{
+									pet = summon;
 									break SUMMON_SEARCH;
 								}
 							}
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 5288c0930d..4ce649b1e2 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
@@ -192,10 +192,10 @@ public class AutoUseTaskManager implements Runnable
 						{
 							SUMMON_SEARCH: for (Summon summon : player.getServitors().values())
 							{
-								pet = summon;
 								skill = summon.getKnownSkill(skillId.intValue());
 								if (skill != null)
 								{
+									pet = summon;
 									break SUMMON_SEARCH;
 								}
 							}
@@ -262,10 +262,10 @@ public class AutoUseTaskManager implements Runnable
 						{
 							SUMMON_SEARCH: for (Summon summon : player.getServitors().values())
 							{
-								pet = summon;
 								skill = summon.getKnownSkill(skillId.intValue());
 								if (skill != null)
 								{
+									pet = summon;
 									break SUMMON_SEARCH;
 								}
 							}
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 5288c0930d..4ce649b1e2 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
@@ -192,10 +192,10 @@ public class AutoUseTaskManager implements Runnable
 						{
 							SUMMON_SEARCH: for (Summon summon : player.getServitors().values())
 							{
-								pet = summon;
 								skill = summon.getKnownSkill(skillId.intValue());
 								if (skill != null)
 								{
+									pet = summon;
 									break SUMMON_SEARCH;
 								}
 							}
@@ -262,10 +262,10 @@ public class AutoUseTaskManager implements Runnable
 						{
 							SUMMON_SEARCH: for (Summon summon : player.getServitors().values())
 							{
-								pet = summon;
 								skill = summon.getKnownSkill(skillId.intValue());
 								if (skill != null)
 								{
+									pet = summon;
 									break SUMMON_SEARCH;
 								}
 							}
diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
index 5288c0930d..4ce649b1e2 100644
--- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
+++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
@@ -192,10 +192,10 @@ public class AutoUseTaskManager implements Runnable
 						{
 							SUMMON_SEARCH: for (Summon summon : player.getServitors().values())
 							{
-								pet = summon;
 								skill = summon.getKnownSkill(skillId.intValue());
 								if (skill != null)
 								{
+									pet = summon;
 									break SUMMON_SEARCH;
 								}
 							}
@@ -262,10 +262,10 @@ public class AutoUseTaskManager implements Runnable
 						{
 							SUMMON_SEARCH: for (Summon summon : player.getServitors().values())
 							{
-								pet = summon;
 								skill = summon.getKnownSkill(skillId.intValue());
 								if (skill != null)
 								{
+									pet = summon;
 									break SUMMON_SEARCH;
 								}
 							}
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 5288c0930d..4ce649b1e2 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
@@ -192,10 +192,10 @@ public class AutoUseTaskManager implements Runnable
 						{
 							SUMMON_SEARCH: for (Summon summon : player.getServitors().values())
 							{
-								pet = summon;
 								skill = summon.getKnownSkill(skillId.intValue());
 								if (skill != null)
 								{
+									pet = summon;
 									break SUMMON_SEARCH;
 								}
 							}
@@ -262,10 +262,10 @@ public class AutoUseTaskManager implements Runnable
 						{
 							SUMMON_SEARCH: for (Summon summon : player.getServitors().values())
 							{
-								pet = summon;
 								skill = summon.getKnownSkill(skillId.intValue());
 								if (skill != null)
 								{
+									pet = summon;
 									break SUMMON_SEARCH;
 								}
 							}