Fix crash when a battle isn't able to be started (e.g., server lockdown)
Fix coding style
Merge pull request #823 from kotarou3/tournaments

Fix crash when a battle isn't able to be started (e.g., server lockdown)
Merge remote-tracking branch 'upstream/master'