@ -68,7 +68,7 @@ public class AttackCmdMsgHandler extends AbstractClientMsgHandler {
return true; // cannot attack a null target
}
if (playerCharacter.getCombatTarget().equals(target))
if (playerCharacter.isCombat() && playerCharacter.getCombatTarget().equals(target))
return true;
//set sources target