Correctly saving combatData to the database

fixes #218