Improve bungee support and clean up async login patches
Revert unnecessary change to LoginListener