Merge pull request #6 from HimaJyun/vault-init-bug

fix: Vault initialize
HimaJyun · Apr 20, 2019 · 5cd8d39 · 5cd8d39
2 parents 540062a + de02ff6
commit 5cd8d39
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -48,7 +48,7 @@ Economy base plugin for Bukkit/Spigot
     <dependency>
         <groupId>jp.jyn</groupId>
         <artifactId>Jecon</artifactId>
-        <version>2.0.1</version>
+        <version>2.0.2</version>
         <scope>provided</scope>
     </dependency>
 </dependencies>

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>jp.jyn</groupId>
     <artifactId>Jecon</artifactId>
-    <version>2.0.1</version>
+    <version>2.0.2</version>
     <url>https://github.com/HimaJyun/Jecon</url>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/src/main/java/jp/jyn/jecon/Jecon.java b/src/main/java/jp/jyn/jecon/Jecon.java
@@ -40,6 +40,7 @@ public class Jecon extends JavaPlugin {
 
     private ConfigLoader config;
     private BalanceRepository repository;
+    private VaultEconomy economy;
 
     // Stack(LIFO)
     private final Deque<Runnable> destructor = new ArrayDeque<>();
@@ -74,13 +75,17 @@ public void onEnable() {
         });
 
         // register vault
-        Plugin vault = getServer().getPluginManager().getPlugin("Vault");
-        if (vault != null) {
-            if (vault.isEnabled()) {
-                vaultHook(registry);
-            } else {
-                getServer().getPluginManager().registerEvents(new VaultRegister(registry), this);
+        if (economy == null) {
+            Plugin vault = getServer().getPluginManager().getPlugin("Vault");
+            if (vault != null) {
+                if (vault.isEnabled()) {
+                    vaultHook(registry);
+                } else {
+                    getServer().getPluginManager().registerEvents(new VaultRegister(registry), this);
+                }
             }
+        } else {
+            economy.init(main, registry, repository);
         }
 
         // register events
@@ -112,13 +117,12 @@ public void onEnable() {
     }
 
     private void vaultHook(UUIDRegistry registry) {
-        getServer().getServicesManager().register(
-            Economy.class,
-            new VaultEconomy(config.getMainConfig(), registry, repository),
-            this,
-            ServicePriority.Normal
-        );
-        this.destructor.addFirst(() -> getServer().getServicesManager().unregisterAll(this));
+        if (economy != null) {
+            return;
+        }
+
+        economy = new VaultEconomy(config.getMainConfig(), registry, repository);
+        getServer().getServicesManager().register(Economy.class, economy, this, ServicePriority.Normal);
         getLogger().info("Hooked Vault");
     }
 

diff --git a/src/main/java/jp/jyn/jecon/VaultEconomy.java b/src/main/java/jp/jyn/jecon/VaultEconomy.java
@@ -17,14 +17,19 @@
 
 @PackagePrivate
 class VaultEconomy implements Economy {
-    private final BigDecimal defaultBalance;
+    private BigDecimal defaultBalance;
 
-    private final UUIDRegistry registry;
-    private final MainConfig config;
-    private final BalanceRepository repository;
+    private UUIDRegistry registry;
+    private MainConfig config;
+    private BalanceRepository repository;
 
     @PackagePrivate
     VaultEconomy(MainConfig config, UUIDRegistry registry, BalanceRepository repository) {
+        this.init(config, registry, repository);
+    }
+
+    @PackagePrivate
+    void init(MainConfig config, UUIDRegistry registry, BalanceRepository repository) {
         this.registry = registry;
         this.config = config;
         this.repository = repository;