Fix NPE
Convert to use UUIDs instead of player names + add conversion method