Fix for Bungee servers and when switching worlds