Fix NPE on player changed world
Fixes #17