From 3130d9ed4298a3c2b595d53f14ed1ae590120915 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sat, 23 Apr 2022 21:48:03 +0000
Subject: [PATCH] Fixed pet magic attack not switch to desired target.

---
 .../gameserver/network/clientpackets/RequestMagicSkillUse.java   | 1 +
 .../gameserver/network/clientpackets/RequestMagicSkillUse.java   | 1 +
 .../gameserver/network/clientpackets/RequestMagicSkillUse.java   | 1 +
 .../gameserver/network/clientpackets/RequestMagicSkillUse.java   | 1 +
 .../gameserver/network/clientpackets/RequestMagicSkillUse.java   | 1 +
 .../gameserver/network/clientpackets/RequestMagicSkillUse.java   | 1 +
 .../gameserver/network/clientpackets/RequestMagicSkillUse.java   | 1 +
 .../gameserver/network/clientpackets/RequestMagicSkillUse.java   | 1 +
 .../gameserver/network/clientpackets/RequestMagicSkillUse.java   | 1 +
 .../gameserver/network/clientpackets/RequestMagicSkillUse.java   | 1 +
 10 files changed, 10 insertions(+)

diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java
index 742bda718f..81aa7694f6 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java
@@ -83,6 +83,7 @@ public class RequestMagicSkillUse implements IClientIncomingPacket
 				if ((skill != null) && (pet != null))
 				{
 					player.onActionRequest();
+					pet.setTarget(null);
 					pet.useMagic(skill, null, _ctrlPressed, false);
 					return;
 				}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java
index 742bda718f..81aa7694f6 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java
@@ -83,6 +83,7 @@ public class RequestMagicSkillUse implements IClientIncomingPacket
 				if ((skill != null) && (pet != null))
 				{
 					player.onActionRequest();
+					pet.setTarget(null);
 					pet.useMagic(skill, null, _ctrlPressed, false);
 					return;
 				}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java
index 742bda718f..81aa7694f6 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java
@@ -83,6 +83,7 @@ public class RequestMagicSkillUse implements IClientIncomingPacket
 				if ((skill != null) && (pet != null))
 				{
 					player.onActionRequest();
+					pet.setTarget(null);
 					pet.useMagic(skill, null, _ctrlPressed, false);
 					return;
 				}
diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java
index 742bda718f..81aa7694f6 100644
--- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java
+++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java
@@ -83,6 +83,7 @@ public class RequestMagicSkillUse implements IClientIncomingPacket
 				if ((skill != null) && (pet != null))
 				{
 					player.onActionRequest();
+					pet.setTarget(null);
 					pet.useMagic(skill, null, _ctrlPressed, false);
 					return;
 				}
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java
index 742bda718f..81aa7694f6 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java
@@ -83,6 +83,7 @@ public class RequestMagicSkillUse implements IClientIncomingPacket
 				if ((skill != null) && (pet != null))
 				{
 					player.onActionRequest();
+					pet.setTarget(null);
 					pet.useMagic(skill, null, _ctrlPressed, false);
 					return;
 				}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java
index 742bda718f..81aa7694f6 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java
@@ -83,6 +83,7 @@ public class RequestMagicSkillUse implements IClientIncomingPacket
 				if ((skill != null) && (pet != null))
 				{
 					player.onActionRequest();
+					pet.setTarget(null);
 					pet.useMagic(skill, null, _ctrlPressed, false);
 					return;
 				}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java
index 742bda718f..81aa7694f6 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java
@@ -83,6 +83,7 @@ public class RequestMagicSkillUse implements IClientIncomingPacket
 				if ((skill != null) && (pet != null))
 				{
 					player.onActionRequest();
+					pet.setTarget(null);
 					pet.useMagic(skill, null, _ctrlPressed, false);
 					return;
 				}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java
index 742bda718f..81aa7694f6 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java
@@ -83,6 +83,7 @@ public class RequestMagicSkillUse implements IClientIncomingPacket
 				if ((skill != null) && (pet != null))
 				{
 					player.onActionRequest();
+					pet.setTarget(null);
 					pet.useMagic(skill, null, _ctrlPressed, false);
 					return;
 				}
diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java
index 742bda718f..81aa7694f6 100644
--- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java
+++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java
@@ -83,6 +83,7 @@ public class RequestMagicSkillUse implements IClientIncomingPacket
 				if ((skill != null) && (pet != null))
 				{
 					player.onActionRequest();
+					pet.setTarget(null);
 					pet.useMagic(skill, null, _ctrlPressed, false);
 					return;
 				}
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java
index 742bda718f..81aa7694f6 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java
@@ -83,6 +83,7 @@ public class RequestMagicSkillUse implements IClientIncomingPacket
 				if ((skill != null) && (pet != null))
 				{
 					player.onActionRequest();
+					pet.setTarget(null);
 					pet.useMagic(skill, null, _ctrlPressed, false);
 					return;
 				}