Index: java/net/sf/l2j/gameserver/clientpackets/RequestTargetCanceld.java
===================================================================
--- java/net/sf/l2j/gameserver/clientpackets/RequestTargetCanceld.java	(revision 2154)
+++ java/net/sf/l2j/gameserver/clientpackets/RequestTargetCanceld.java	(working copy)
@@ -57,12 +57,16 @@
         {
             if (activeChar.getTarget() != null)
             {
-                sendPacket(new TargetUnselected(activeChar));
-        
-                activeChar.setTarget(null);
+                if (activeChar.isCastingNow())
+                	activeChar.abortCast();
+                else if (activeChar.isAttackingNow())
+                	activeChar.abortAttack();
+                else
+                {
+                	sendPacket(new TargetUnselected(activeChar));
+                	activeChar.setTarget(null);
+                }                
             }
-	    activeChar.abortAttack();
-	    activeChar.abortCast();
 	    
 	    CtrlIntention intention = activeChar.getAI().getIntention();
 	    if (