Fix plugin init (#15)

4 files changed, 9 insertions, 5 deletions

diff --git a/spark-bukkit/src/main/java/me/lucko/spark/bukkit/SparkBukkitPlugin.java b/spark-bukkit/src/main/java/me/lucko/spark/bukkit/SparkBukkitPlugin.java
index ad6fa56..fac03af 100644
--- a/spark-bukkit/src/main/java/me/lucko/spark/bukkit/SparkBukkitPlugin.java
+++ b/spark-bukkit/src/main/java/me/lucko/spark/bukkit/SparkBukkitPlugin.java
@@ -38,11 +38,12 @@ import java.util.stream.Collectors;
 
 public class SparkBukkitPlugin extends JavaPlugin implements SparkPlugin {
 
-    private final SparkPlatform platform = new SparkPlatform(this);
     private CommandExecutor tpsCommand = null;
+    private SparkPlatform platform;
 
     @Override
     public void onEnable() {
+        this.platform = new SparkPlatform(this);
         this.platform.enable();
 
         // override Spigot's TPS command with our own.
diff --git a/spark-bungeecord/src/main/java/me/lucko/spark/bungeecord/SparkBungeeCordPlugin.java b/spark-bungeecord/src/main/java/me/lucko/spark/bungeecord/SparkBungeeCordPlugin.java
index 193ae06..121a678 100644
--- a/spark-bungeecord/src/main/java/me/lucko/spark/bungeecord/SparkBungeeCordPlugin.java
+++ b/spark-bungeecord/src/main/java/me/lucko/spark/bungeecord/SparkBungeeCordPlugin.java
@@ -37,10 +37,11 @@ import java.util.stream.Collectors;
 
 public class SparkBungeeCordPlugin extends Plugin implements SparkPlugin {
 
-    private final SparkPlatform platform = new SparkPlatform(this);
+    private SparkPlatform platform;
 
     @Override
     public void onEnable() {
+        this.platform = new SparkPlatform(this);
         this.platform.enable();
         getProxy().getPluginManager().registerCommand(this, new SparkCommand(this));
     }
diff --git a/spark-sponge/src/main/java/me/lucko/spark/sponge/SparkSpongePlugin.java b/spark-sponge/src/main/java/me/lucko/spark/sponge/SparkSpongePlugin.java
index 537bfea..0e42379 100644
--- a/spark-sponge/src/main/java/me/lucko/spark/sponge/SparkSpongePlugin.java
+++ b/spark-sponge/src/main/java/me/lucko/spark/sponge/SparkSpongePlugin.java
@@ -67,7 +67,7 @@ public class SparkSpongePlugin implements SparkPlugin {
     private final Path configDirectory;
     private final SpongeExecutorService asyncExecutor;
 
-    private final SparkPlatform platform = new SparkPlatform(this);
+    private SparkPlatform platform;
 
     @Inject
     public SparkSpongePlugin(Game game, @ConfigDir(sharedRoot = false) Path configDirectory, @AsynchronousExecutor SpongeExecutorService asyncExecutor) {
@@ -78,6 +78,7 @@ public class SparkSpongePlugin implements SparkPlugin {
 
     @Listener
     public void onEnable(GameStartedServerEvent event) {
+        this.platform = new SparkPlatform(this);
         this.platform.enable();
         this.game.getCommandManager().register(this, new SparkCommand(this), "spark");
     }
diff --git a/spark-velocity/src/main/java/me/lucko/spark/velocity/SparkVelocityPlugin.java b/spark-velocity/src/main/java/me/lucko/spark/velocity/SparkVelocityPlugin.java
index 4a5f500..7cf345a 100644
--- a/spark-velocity/src/main/java/me/lucko/spark/velocity/SparkVelocityPlugin.java
+++ b/spark-velocity/src/main/java/me/lucko/spark/velocity/SparkVelocityPlugin.java
@@ -53,11 +53,11 @@ import java.util.stream.Collectors;
 )
 public class SparkVelocityPlugin implements SparkPlugin, Command {
 
-    private final SparkPlatform platform = new SparkPlatform(this);
-
     private final ProxyServer proxy;
     private final Path configDirectory;
 
+    private SparkPlatform platform;
+
     @Inject
     public SparkVelocityPlugin(ProxyServer proxy, @DataDirectory Path configDirectory) {
         this.proxy = proxy;
@@ -66,6 +66,7 @@ public class SparkVelocityPlugin implements SparkPlugin, Command {
 
     @Subscribe(order = PostOrder.FIRST)
     public void onEnable(ProxyInitializeEvent e) {
+        this.platform = new SparkPlatform(this);
         this.platform.enable();
         this.proxy.getCommandManager().register(this, "sparkv", "sparkvelocity");
     }