Simplifed if logic

The new code is functionally the same but is a lot smaller.
GetPlayerById is now simplified
Merge pull request #20 from Decagon/patch-logic-simplification

Patch logic simplification