Fixed issue with second instance of combat not inited properly

fixes #290