Counter Attack now only activates when the player is blocking

Closes #1018