Minor refactoring to bukkit code. Fixing issue with config on bungee version.