Simplify integer comparisons
Merge branch 'playersorting' into playersorting2