Cleaner fix for out-of-order PlayerQuitEvent. Can restore some of the previous simplicity.