Don't Break Lock-On in Aiming Mode#816

This is primarily a suggestion meant to aid Shield builds, who are forced to drop their lock whenever they attempt to block, making melee combat very clunky when using a shield. Instead of breaking the lock, Aiming Mode should track the current locked target, if available.