From 61c6617bae65792e02ff288493f8cec5fb495453 Mon Sep 17 00:00:00 2001
From: andylizi <andylizi666@gmail.com>
Date: Sat, 12 Mar 2022 12:15:59 +0800
Subject: [PATCH] Fix BC listener

---
 .../haproxydetector/bukkit/BukkitMain.java    | 25 +++++++++--------
 .../haproxydetector/bungee/BungeeMain.java    | 27 +++++++++----------
 2 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/src/main/java/net/andylizi/haproxydetector/bukkit/BukkitMain.java b/src/main/java/net/andylizi/haproxydetector/bukkit/BukkitMain.java
index ba2b0a5..6ade075 100644
--- a/src/main/java/net/andylizi/haproxydetector/bukkit/BukkitMain.java
+++ b/src/main/java/net/andylizi/haproxydetector/bukkit/BukkitMain.java
@@ -74,20 +74,7 @@ public void onEnable() {
         }
 
         try {
-            class TrackingStatsListener implements Listener {
-                @EventHandler
-                public void onLogin(PlayerLoginEvent event) {
-                    ConnectionStats.trackLogin(event.getPlayer().getAddress());
-                }
-
-                @EventHandler
-                public void onDisconnect(PlayerQuitEvent event) {
-                    ConnectionStats.trackDisconnect(event.getPlayer().getAddress());
-                }
-            }
-
             getServer().getPluginManager().registerEvents(new TrackingStatsListener(), this);
-
             Metrics metrics = new Metrics(this, 12604);
             ConnectionStats.createCharts().forEach(metrics::addCustomChart);
         } catch (Throwable t) {
@@ -95,6 +82,18 @@ public void onDisconnect(PlayerQuitEvent event) {
         }
     }
 
+    public static class TrackingStatsListener implements Listener {
+        @EventHandler
+        public void onLogin(PlayerLoginEvent event) {
+            ConnectionStats.trackLogin(event.getPlayer().getAddress());
+        }
+
+        @EventHandler
+        public void onDisconnect(PlayerQuitEvent event) {
+            ConnectionStats.trackDisconnect(event.getPlayer().getAddress());
+        }
+    }
+
     @Override
     public void onDisable() {
         if (injectorFactoryField != null && injector != null && oldFactory != null) {
diff --git a/src/main/java/net/andylizi/haproxydetector/bungee/BungeeMain.java b/src/main/java/net/andylizi/haproxydetector/bungee/BungeeMain.java
index e5f81f7..2cb03cd 100644
--- a/src/main/java/net/andylizi/haproxydetector/bungee/BungeeMain.java
+++ b/src/main/java/net/andylizi/haproxydetector/bungee/BungeeMain.java
@@ -72,7 +72,7 @@ public void onLoad() {
     }
 
     @Override
-    @SuppressWarnings({ "unchecked", "deprecation" })
+    @SuppressWarnings("unchecked")
     public void onEnable() {
         try {
             Path path = this.getDataFolder().toPath().resolve("whitelist.conf");
@@ -121,20 +121,7 @@ public void onEnable() {
         }
 
         try {
-            class TrackingStatsListener implements Listener {
-                @EventHandler
-                public void onLogin(PostLoginEvent event) {
-                    ConnectionStats.trackLogin(event.getPlayer().getSocketAddress());
-                }
-
-                @EventHandler
-                public void onDisconnect(PlayerDisconnectEvent event) {
-                    ConnectionStats.trackDisconnect(event.getPlayer().getSocketAddress());
-                }
-            }
-
             ProxyServer.getInstance().getPluginManager().registerListener(this, new TrackingStatsListener());
-
             Metrics metrics = new Metrics(this, 12605);
             ConnectionStats.createCharts().forEach(metrics::addCustomChart);
         } catch (Throwable t) {
@@ -142,6 +129,18 @@ public void onDisconnect(PlayerDisconnectEvent event) {
         }
     }
 
+    public static class TrackingStatsListener implements Listener {
+        @EventHandler
+        public void onLogin(PostLoginEvent event) {
+            ConnectionStats.trackLogin(event.getPlayer().getSocketAddress());
+        }
+
+        @EventHandler
+        public void onDisconnect(PlayerDisconnectEvent event) {
+            ConnectionStats.trackDisconnect(event.getPlayer().getSocketAddress());
+        }
+    }
+
     @Override
     public void onDisable() {
         if (serverChildField != null && originalChildInitializer != null) {