Update to both server and client to resolve some issues. Also implemented the combat for multi player games and refactored message.