From 7bc87406f0cc820be886432169868112e8711a6e Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Wed, 4 Mar 2020 17:26:35 +0000
Subject: [PATCH] Fixed RequestTargetCanceld clientpacket.

---
 .../clientpackets/RequestTargetCanceld.java   | 21 ++++++++-----------
 .../clientpackets/RequestTargetCanceld.java   | 21 ++++++++-----------
 .../clientpackets/RequestTargetCanceld.java   | 21 ++++++++-----------
 .../clientpackets/RequestTargetCanceld.java   | 21 ++++++++-----------
 .../clientpackets/RequestTargetCanceld.java   | 21 ++++++++-----------
 .../clientpackets/RequestTargetCanceld.java   | 21 ++++++++-----------
 .../clientpackets/RequestTargetCanceld.java   | 21 ++++++++-----------
 .../clientpackets/RequestTargetCanceld.java   | 21 ++++++++-----------
 .../clientpackets/RequestTargetCanceld.java   | 21 ++++++++-----------
 .../clientpackets/RequestTargetCanceld.java   | 21 ++++++++-----------
 .../clientpackets/RequestTargetCanceld.java   | 21 ++++++++-----------
 .../clientpackets/RequestTargetCanceld.java   | 21 ++++++++-----------
 .../clientpackets/RequestTargetCanceld.java   | 21 ++++++++-----------
 .../clientpackets/RequestTargetCanceld.java   | 21 ++++++++-----------
 .../clientpackets/RequestTargetCanceld.java   | 21 ++++++++-----------
 15 files changed, 135 insertions(+), 180 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
index cbb99923f9..59f6e96364 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
@@ -23,16 +23,16 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.TargetUnselected;
 
 /**
- * @version $Revision: 1.3.4.2 $ $Date: 2005/03/27 15:29:30 $
+ * @author Mobius
  */
 public class RequestTargetCanceld implements IClientIncomingPacket
 {
-	private int _unselect;
+	private boolean _targetLost;
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
 	{
-		_unselect = packet.readH();
+		_targetLost = packet.readH() != 0;
 		return true;
 	}
 	
@@ -51,20 +51,17 @@ public class RequestTargetCanceld implements IClientIncomingPacket
 			return;
 		}
 		
-		if (_unselect == 0)
+		if (player.isCastingNow())
 		{
-			// Try to abort cast, if that fails, then cancel target.
-			final boolean castAborted = player.abortCast();
-			if (!castAborted && (player.getTarget() != null))
-			{
-				player.setTarget(null);
-			}
+			player.abortAllSkillCasters();
 		}
-		else if (player.getTarget() != null)
+		
+		if (_targetLost)
 		{
 			player.setTarget(null);
 		}
-		else if (player.isInAirShip())
+		
+		if (player.isInAirShip())
 		{
 			player.broadcastPacket(new TargetUnselected(player));
 		}
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
index cbb99923f9..59f6e96364 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
@@ -23,16 +23,16 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.TargetUnselected;
 
 /**
- * @version $Revision: 1.3.4.2 $ $Date: 2005/03/27 15:29:30 $
+ * @author Mobius
  */
 public class RequestTargetCanceld implements IClientIncomingPacket
 {
-	private int _unselect;
+	private boolean _targetLost;
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
 	{
-		_unselect = packet.readH();
+		_targetLost = packet.readH() != 0;
 		return true;
 	}
 	
@@ -51,20 +51,17 @@ public class RequestTargetCanceld implements IClientIncomingPacket
 			return;
 		}
 		
-		if (_unselect == 0)
+		if (player.isCastingNow())
 		{
-			// Try to abort cast, if that fails, then cancel target.
-			final boolean castAborted = player.abortCast();
-			if (!castAborted && (player.getTarget() != null))
-			{
-				player.setTarget(null);
-			}
+			player.abortAllSkillCasters();
 		}
-		else if (player.getTarget() != null)
+		
+		if (_targetLost)
 		{
 			player.setTarget(null);
 		}
-		else if (player.isInAirShip())
+		
+		if (player.isInAirShip())
 		{
 			player.broadcastPacket(new TargetUnselected(player));
 		}
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
index cbb99923f9..59f6e96364 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
@@ -23,16 +23,16 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.TargetUnselected;
 
 /**
- * @version $Revision: 1.3.4.2 $ $Date: 2005/03/27 15:29:30 $
+ * @author Mobius
  */
 public class RequestTargetCanceld implements IClientIncomingPacket
 {
-	private int _unselect;
+	private boolean _targetLost;
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
 	{
-		_unselect = packet.readH();
+		_targetLost = packet.readH() != 0;
 		return true;
 	}
 	
@@ -51,20 +51,17 @@ public class RequestTargetCanceld implements IClientIncomingPacket
 			return;
 		}
 		
-		if (_unselect == 0)
+		if (player.isCastingNow())
 		{
-			// Try to abort cast, if that fails, then cancel target.
-			final boolean castAborted = player.abortCast();
-			if (!castAborted && (player.getTarget() != null))
-			{
-				player.setTarget(null);
-			}
+			player.abortAllSkillCasters();
 		}
-		else if (player.getTarget() != null)
+		
+		if (_targetLost)
 		{
 			player.setTarget(null);
 		}
-		else if (player.isInAirShip())
+		
+		if (player.isInAirShip())
 		{
 			player.broadcastPacket(new TargetUnselected(player));
 		}
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
index cbb99923f9..59f6e96364 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
@@ -23,16 +23,16 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.TargetUnselected;
 
 /**
- * @version $Revision: 1.3.4.2 $ $Date: 2005/03/27 15:29:30 $
+ * @author Mobius
  */
 public class RequestTargetCanceld implements IClientIncomingPacket
 {
-	private int _unselect;
+	private boolean _targetLost;
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
 	{
-		_unselect = packet.readH();
+		_targetLost = packet.readH() != 0;
 		return true;
 	}
 	
@@ -51,20 +51,17 @@ public class RequestTargetCanceld implements IClientIncomingPacket
 			return;
 		}
 		
-		if (_unselect == 0)
+		if (player.isCastingNow())
 		{
-			// Try to abort cast, if that fails, then cancel target.
-			final boolean castAborted = player.abortCast();
-			if (!castAborted && (player.getTarget() != null))
-			{
-				player.setTarget(null);
-			}
+			player.abortAllSkillCasters();
 		}
-		else if (player.getTarget() != null)
+		
+		if (_targetLost)
 		{
 			player.setTarget(null);
 		}
-		else if (player.isInAirShip())
+		
+		if (player.isInAirShip())
 		{
 			player.broadcastPacket(new TargetUnselected(player));
 		}
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
index cbb99923f9..59f6e96364 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
@@ -23,16 +23,16 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.TargetUnselected;
 
 /**
- * @version $Revision: 1.3.4.2 $ $Date: 2005/03/27 15:29:30 $
+ * @author Mobius
  */
 public class RequestTargetCanceld implements IClientIncomingPacket
 {
-	private int _unselect;
+	private boolean _targetLost;
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
 	{
-		_unselect = packet.readH();
+		_targetLost = packet.readH() != 0;
 		return true;
 	}
 	
@@ -51,20 +51,17 @@ public class RequestTargetCanceld implements IClientIncomingPacket
 			return;
 		}
 		
-		if (_unselect == 0)
+		if (player.isCastingNow())
 		{
-			// Try to abort cast, if that fails, then cancel target.
-			final boolean castAborted = player.abortCast();
-			if (!castAborted && (player.getTarget() != null))
-			{
-				player.setTarget(null);
-			}
+			player.abortAllSkillCasters();
 		}
-		else if (player.getTarget() != null)
+		
+		if (_targetLost)
 		{
 			player.setTarget(null);
 		}
-		else if (player.isInAirShip())
+		
+		if (player.isInAirShip())
 		{
 			player.broadcastPacket(new TargetUnselected(player));
 		}
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
index cbb99923f9..59f6e96364 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
@@ -23,16 +23,16 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.TargetUnselected;
 
 /**
- * @version $Revision: 1.3.4.2 $ $Date: 2005/03/27 15:29:30 $
+ * @author Mobius
  */
 public class RequestTargetCanceld implements IClientIncomingPacket
 {
-	private int _unselect;
+	private boolean _targetLost;
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
 	{
-		_unselect = packet.readH();
+		_targetLost = packet.readH() != 0;
 		return true;
 	}
 	
@@ -51,20 +51,17 @@ public class RequestTargetCanceld implements IClientIncomingPacket
 			return;
 		}
 		
-		if (_unselect == 0)
+		if (player.isCastingNow())
 		{
-			// Try to abort cast, if that fails, then cancel target.
-			final boolean castAborted = player.abortCast();
-			if (!castAborted && (player.getTarget() != null))
-			{
-				player.setTarget(null);
-			}
+			player.abortAllSkillCasters();
 		}
-		else if (player.getTarget() != null)
+		
+		if (_targetLost)
 		{
 			player.setTarget(null);
 		}
-		else if (player.isInAirShip())
+		
+		if (player.isInAirShip())
 		{
 			player.broadcastPacket(new TargetUnselected(player));
 		}
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
index cbb99923f9..59f6e96364 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
@@ -23,16 +23,16 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.TargetUnselected;
 
 /**
- * @version $Revision: 1.3.4.2 $ $Date: 2005/03/27 15:29:30 $
+ * @author Mobius
  */
 public class RequestTargetCanceld implements IClientIncomingPacket
 {
-	private int _unselect;
+	private boolean _targetLost;
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
 	{
-		_unselect = packet.readH();
+		_targetLost = packet.readH() != 0;
 		return true;
 	}
 	
@@ -51,20 +51,17 @@ public class RequestTargetCanceld implements IClientIncomingPacket
 			return;
 		}
 		
-		if (_unselect == 0)
+		if (player.isCastingNow())
 		{
-			// Try to abort cast, if that fails, then cancel target.
-			final boolean castAborted = player.abortCast();
-			if (!castAborted && (player.getTarget() != null))
-			{
-				player.setTarget(null);
-			}
+			player.abortAllSkillCasters();
 		}
-		else if (player.getTarget() != null)
+		
+		if (_targetLost)
 		{
 			player.setTarget(null);
 		}
-		else if (player.isInAirShip())
+		
+		if (player.isInAirShip())
 		{
 			player.broadcastPacket(new TargetUnselected(player));
 		}
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
index cbb99923f9..59f6e96364 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
@@ -23,16 +23,16 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.TargetUnselected;
 
 /**
- * @version $Revision: 1.3.4.2 $ $Date: 2005/03/27 15:29:30 $
+ * @author Mobius
  */
 public class RequestTargetCanceld implements IClientIncomingPacket
 {
-	private int _unselect;
+	private boolean _targetLost;
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
 	{
-		_unselect = packet.readH();
+		_targetLost = packet.readH() != 0;
 		return true;
 	}
 	
@@ -51,20 +51,17 @@ public class RequestTargetCanceld implements IClientIncomingPacket
 			return;
 		}
 		
-		if (_unselect == 0)
+		if (player.isCastingNow())
 		{
-			// Try to abort cast, if that fails, then cancel target.
-			final boolean castAborted = player.abortCast();
-			if (!castAborted && (player.getTarget() != null))
-			{
-				player.setTarget(null);
-			}
+			player.abortAllSkillCasters();
 		}
-		else if (player.getTarget() != null)
+		
+		if (_targetLost)
 		{
 			player.setTarget(null);
 		}
-		else if (player.isInAirShip())
+		
+		if (player.isInAirShip())
 		{
 			player.broadcastPacket(new TargetUnselected(player));
 		}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
index cbb99923f9..59f6e96364 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
@@ -23,16 +23,16 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.TargetUnselected;
 
 /**
- * @version $Revision: 1.3.4.2 $ $Date: 2005/03/27 15:29:30 $
+ * @author Mobius
  */
 public class RequestTargetCanceld implements IClientIncomingPacket
 {
-	private int _unselect;
+	private boolean _targetLost;
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
 	{
-		_unselect = packet.readH();
+		_targetLost = packet.readH() != 0;
 		return true;
 	}
 	
@@ -51,20 +51,17 @@ public class RequestTargetCanceld implements IClientIncomingPacket
 			return;
 		}
 		
-		if (_unselect == 0)
+		if (player.isCastingNow())
 		{
-			// Try to abort cast, if that fails, then cancel target.
-			final boolean castAborted = player.abortCast();
-			if (!castAborted && (player.getTarget() != null))
-			{
-				player.setTarget(null);
-			}
+			player.abortAllSkillCasters();
 		}
-		else if (player.getTarget() != null)
+		
+		if (_targetLost)
 		{
 			player.setTarget(null);
 		}
-		else if (player.isInAirShip())
+		
+		if (player.isInAirShip())
 		{
 			player.broadcastPacket(new TargetUnselected(player));
 		}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
index cbb99923f9..59f6e96364 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
@@ -23,16 +23,16 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.TargetUnselected;
 
 /**
- * @version $Revision: 1.3.4.2 $ $Date: 2005/03/27 15:29:30 $
+ * @author Mobius
  */
 public class RequestTargetCanceld implements IClientIncomingPacket
 {
-	private int _unselect;
+	private boolean _targetLost;
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
 	{
-		_unselect = packet.readH();
+		_targetLost = packet.readH() != 0;
 		return true;
 	}
 	
@@ -51,20 +51,17 @@ public class RequestTargetCanceld implements IClientIncomingPacket
 			return;
 		}
 		
-		if (_unselect == 0)
+		if (player.isCastingNow())
 		{
-			// Try to abort cast, if that fails, then cancel target.
-			final boolean castAborted = player.abortCast();
-			if (!castAborted && (player.getTarget() != null))
-			{
-				player.setTarget(null);
-			}
+			player.abortAllSkillCasters();
 		}
-		else if (player.getTarget() != null)
+		
+		if (_targetLost)
 		{
 			player.setTarget(null);
 		}
-		else if (player.isInAirShip())
+		
+		if (player.isInAirShip())
 		{
 			player.broadcastPacket(new TargetUnselected(player));
 		}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
index cbb99923f9..59f6e96364 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
@@ -23,16 +23,16 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.TargetUnselected;
 
 /**
- * @version $Revision: 1.3.4.2 $ $Date: 2005/03/27 15:29:30 $
+ * @author Mobius
  */
 public class RequestTargetCanceld implements IClientIncomingPacket
 {
-	private int _unselect;
+	private boolean _targetLost;
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
 	{
-		_unselect = packet.readH();
+		_targetLost = packet.readH() != 0;
 		return true;
 	}
 	
@@ -51,20 +51,17 @@ public class RequestTargetCanceld implements IClientIncomingPacket
 			return;
 		}
 		
-		if (_unselect == 0)
+		if (player.isCastingNow())
 		{
-			// Try to abort cast, if that fails, then cancel target.
-			final boolean castAborted = player.abortCast();
-			if (!castAborted && (player.getTarget() != null))
-			{
-				player.setTarget(null);
-			}
+			player.abortAllSkillCasters();
 		}
-		else if (player.getTarget() != null)
+		
+		if (_targetLost)
 		{
 			player.setTarget(null);
 		}
-		else if (player.isInAirShip())
+		
+		if (player.isInAirShip())
 		{
 			player.broadcastPacket(new TargetUnselected(player));
 		}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
index cbb99923f9..59f6e96364 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
@@ -23,16 +23,16 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.TargetUnselected;
 
 /**
- * @version $Revision: 1.3.4.2 $ $Date: 2005/03/27 15:29:30 $
+ * @author Mobius
  */
 public class RequestTargetCanceld implements IClientIncomingPacket
 {
-	private int _unselect;
+	private boolean _targetLost;
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
 	{
-		_unselect = packet.readH();
+		_targetLost = packet.readH() != 0;
 		return true;
 	}
 	
@@ -51,20 +51,17 @@ public class RequestTargetCanceld implements IClientIncomingPacket
 			return;
 		}
 		
-		if (_unselect == 0)
+		if (player.isCastingNow())
 		{
-			// Try to abort cast, if that fails, then cancel target.
-			final boolean castAborted = player.abortCast();
-			if (!castAborted && (player.getTarget() != null))
-			{
-				player.setTarget(null);
-			}
+			player.abortAllSkillCasters();
 		}
-		else if (player.getTarget() != null)
+		
+		if (_targetLost)
 		{
 			player.setTarget(null);
 		}
-		else if (player.isInAirShip())
+		
+		if (player.isInAirShip())
 		{
 			player.broadcastPacket(new TargetUnselected(player));
 		}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
index cbb99923f9..59f6e96364 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
@@ -23,16 +23,16 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.TargetUnselected;
 
 /**
- * @version $Revision: 1.3.4.2 $ $Date: 2005/03/27 15:29:30 $
+ * @author Mobius
  */
 public class RequestTargetCanceld implements IClientIncomingPacket
 {
-	private int _unselect;
+	private boolean _targetLost;
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
 	{
-		_unselect = packet.readH();
+		_targetLost = packet.readH() != 0;
 		return true;
 	}
 	
@@ -51,20 +51,17 @@ public class RequestTargetCanceld implements IClientIncomingPacket
 			return;
 		}
 		
-		if (_unselect == 0)
+		if (player.isCastingNow())
 		{
-			// Try to abort cast, if that fails, then cancel target.
-			final boolean castAborted = player.abortCast();
-			if (!castAborted && (player.getTarget() != null))
-			{
-				player.setTarget(null);
-			}
+			player.abortAllSkillCasters();
 		}
-		else if (player.getTarget() != null)
+		
+		if (_targetLost)
 		{
 			player.setTarget(null);
 		}
-		else if (player.isInAirShip())
+		
+		if (player.isInAirShip())
 		{
 			player.broadcastPacket(new TargetUnselected(player));
 		}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
index cbb99923f9..59f6e96364 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
@@ -23,16 +23,16 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.TargetUnselected;
 
 /**
- * @version $Revision: 1.3.4.2 $ $Date: 2005/03/27 15:29:30 $
+ * @author Mobius
  */
 public class RequestTargetCanceld implements IClientIncomingPacket
 {
-	private int _unselect;
+	private boolean _targetLost;
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
 	{
-		_unselect = packet.readH();
+		_targetLost = packet.readH() != 0;
 		return true;
 	}
 	
@@ -51,20 +51,17 @@ public class RequestTargetCanceld implements IClientIncomingPacket
 			return;
 		}
 		
-		if (_unselect == 0)
+		if (player.isCastingNow())
 		{
-			// Try to abort cast, if that fails, then cancel target.
-			final boolean castAborted = player.abortCast();
-			if (!castAborted && (player.getTarget() != null))
-			{
-				player.setTarget(null);
-			}
+			player.abortAllSkillCasters();
 		}
-		else if (player.getTarget() != null)
+		
+		if (_targetLost)
 		{
 			player.setTarget(null);
 		}
-		else if (player.isInAirShip())
+		
+		if (player.isInAirShip())
 		{
 			player.broadcastPacket(new TargetUnselected(player));
 		}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
index cbb99923f9..59f6e96364 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestTargetCanceld.java
@@ -23,16 +23,16 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.TargetUnselected;
 
 /**
- * @version $Revision: 1.3.4.2 $ $Date: 2005/03/27 15:29:30 $
+ * @author Mobius
  */
 public class RequestTargetCanceld implements IClientIncomingPacket
 {
-	private int _unselect;
+	private boolean _targetLost;
 	
 	@Override
 	public boolean read(GameClient client, PacketReader packet)
 	{
-		_unselect = packet.readH();
+		_targetLost = packet.readH() != 0;
 		return true;
 	}
 	
@@ -51,20 +51,17 @@ public class RequestTargetCanceld implements IClientIncomingPacket
 			return;
 		}
 		
-		if (_unselect == 0)
+		if (player.isCastingNow())
 		{
-			// Try to abort cast, if that fails, then cancel target.
-			final boolean castAborted = player.abortCast();
-			if (!castAborted && (player.getTarget() != null))
-			{
-				player.setTarget(null);
-			}
+			player.abortAllSkillCasters();
 		}
-		else if (player.getTarget() != null)
+		
+		if (_targetLost)
 		{
 			player.setTarget(null);
 		}
-		else if (player.isInAirShip())
+		
+		if (player.isInAirShip())
 		{
 			player.broadcastPacket(new TargetUnselected(player));
 		}