Fixed bug where combat was entered multiple times on the client side

fixes #192