From cedf188e61b165b1ee66980ff9f367e0cdac9011 Mon Sep 17 00:00:00 2001
From: 4drian3d <adrianed2004@gmail.com>
Date: Mon, 15 Nov 2021 12:12:29 -0500
Subject: [PATCH] Fix config order initlialization

---
 .../authmevelocity/proxy/AuthMeVelocityPlugin.java  | 13 +++++++------
 .../proxy/listener/ProxyListener.java               |  4 ++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/proxy/src/main/java/com/glyart/authmevelocity/proxy/AuthMeVelocityPlugin.java b/proxy/src/main/java/com/glyart/authmevelocity/proxy/AuthMeVelocityPlugin.java
index becfff0..63366d7 100644
--- a/proxy/src/main/java/com/glyart/authmevelocity/proxy/AuthMeVelocityPlugin.java
+++ b/proxy/src/main/java/com/glyart/authmevelocity/proxy/AuthMeVelocityPlugin.java
@@ -35,15 +35,16 @@ public class AuthMeVelocityPlugin {
 
     @Subscribe
     public void onProxyInitialize(ProxyInitializeEvent event) {
+        AuthMeConfig.loadConfig(pluginDirectory, logger);
+        var config = AuthMeConfig.getConfig();
+
         proxy.getChannelRegistrar().register(
             MinecraftChannelIdentifier.create("authmevelocity", "main"));
-        proxy.getEventManager().register(this, new ProxyListener(proxy, logger));
-        if(proxy.getPluginManager().getPlugin("fastlogin").isPresent()){
-            proxy.getEventManager().register(this, new FastLoginListener(proxy));
-        }
-        AuthMeConfig.loadConfig(pluginDirectory, logger);
+        proxy.getEventManager().register(this, new ProxyListener(proxy, logger, config));
+        proxy.getPluginManager().getPlugin("fastlogin").ifPresent(fastlogin ->
+            proxy.getEventManager().register(this, new FastLoginListener(proxy)));
+
         logger.info("-- AuthMeVelocity enabled --");
-        var config = AuthMeConfig.getConfig();
         logger.info("AuthServers: {}", config.getAuthServers());
         if(config.getToServerOptions().sendToServer()){
             logger.info("LobbyServers: {}", config.getToServerOptions().getTeleportServers());
diff --git a/proxy/src/main/java/com/glyart/authmevelocity/proxy/listener/ProxyListener.java b/proxy/src/main/java/com/glyart/authmevelocity/proxy/listener/ProxyListener.java
index 4b561b8..b977329 100644
--- a/proxy/src/main/java/com/glyart/authmevelocity/proxy/listener/ProxyListener.java
+++ b/proxy/src/main/java/com/glyart/authmevelocity/proxy/listener/ProxyListener.java
@@ -31,11 +31,11 @@ public class ProxyListener {
     private final Random rm;
     private AuthMeConfig.Config config;
 
-    public ProxyListener(ProxyServer proxy, Logger logger) {
+    public ProxyListener(ProxyServer proxy, Logger logger, AuthMeConfig.Config config) {
         this.proxy = proxy;
         this.logger = logger;
         this.rm = new Random();
-        this.config = AuthMeConfig.getConfig();
+        this.config = config;
     }
 
     @Subscribe