Correct if statement style

Statements on separate lines from the condition should be enclosed.
Merge branch 'patch-1' of https://github.com/Relados/Pokemon-Showdown into patch-1