Fixed bug where Deflect was calculated based on the attacker, not the defender

Closes #794