Moved code from Combat to GameMaster