Handle disconnecting players more gracefully
Don't cache player index