Revert "Trying to fix null pointer on player join"

This reverts commit 62694f5606228de1a31b2ae108a6f4a561718f76.