code refactor
added armor check for new right click behavior in 1.5