Add calls to getOrCreatePlayer() in the correct place