Load JoinEvent properly on Paper

Andre601 · Apr 26, 2023 · 2bd59ff · 2bd59ff
1 parent 53157a7
commit 2bd59ff
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/bukkit/src/main/java/ch/andre601/advancedserverlist/bukkit/events/JoinEvent.java b/bukkit/src/main/java/ch/andre601/advancedserverlist/bukkit/events/JoinEvent.java
@@ -39,7 +39,7 @@ public class JoinEvent<F> implements Listener{
 
     private final BukkitCore<F> plugin;
 
-    public JoinEvent(BukkitCore<F> plugin){
+    private JoinEvent(BukkitCore<F> plugin){
         this.plugin = plugin;
         Bukkit.getPluginManager().registerEvents(this, plugin);
     }

diff --git a/bukkit/src/main/java/ch/andre601/advancedserverlist/paper/PaperCore.java b/bukkit/src/main/java/ch/andre601/advancedserverlist/paper/PaperCore.java
@@ -78,8 +78,8 @@ public void loadCommands(){
 
     @Override
     public void loadEvents(){
-        new JoinEvent(this);
-        new PaperPingEvent(this);
+        JoinEvent.init(this);
+        PaperPingEvent.init(this);
     }
 
     @Override

diff --git a/bukkit/src/main/java/ch/andre601/advancedserverlist/paper/events/PaperPingEvent.java b/bukkit/src/main/java/ch/andre601/advancedserverlist/paper/events/PaperPingEvent.java
@@ -35,11 +35,15 @@ public class PaperPingEvent implements Listener{
 
     private final PaperCore plugin;
 
-    public PaperPingEvent(PaperCore plugin){
+    private PaperPingEvent(PaperCore plugin){
         this.plugin = plugin;
         plugin.getServer().getPluginManager().registerEvents(this, plugin);
     }
 
+    public static void init(PaperCore plugin){
+        new PaperPingEvent(plugin);
+    }
+
     @EventHandler
     public void onPaperServerListPing(PaperServerListPingEvent event){
         PingEventHandler.handleEvent(new PaperEventWrapper(plugin, event));