Merge branch 'develop' of https://github.com/BentoBoxWorld/AOneBlock.git

into develop
BentoBoxWorld · Jul 23, 2023 · 49ad718 · 49ad718
2 parents d2b955f + 77b94ee
commit 49ad718
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/src/main/java/world/bentobox/aoneblock/AOneBlock.java b/src/main/java/world/bentobox/aoneblock/AOneBlock.java
@@ -88,8 +88,13 @@ private boolean loadSettings() {
 
     @Override
     public void onEnable() {
-        loadData();
-
+        oneBlockManager = new OneBlocksManager(this);
+        if (loadData()) {
+            // Failed to load - don't register anything
+            return;
+        }
+        blockListener = new BlockListener(this);
+        registerListener(blockListener);
         registerListener(new NoBlockHandler(this));
         registerListener(new BlockProtect(this));
         registerListener(new JoinLeaveListener(this));
@@ -106,20 +111,18 @@ public void onEnable() {
         registerListener(holoListener);
     }
 
-    //Load some of Manager
-    public void loadData() {
+    // Load phase data
+    public boolean loadData() {
         try {
-            oneBlockManager = new OneBlocksManager(this);
             oneBlockManager.loadPhases();
-            blockListener = new BlockListener(this);
         } catch (IOException e) {
             // Disable
             logError("AOneBlock settings could not load (oneblock.yml error)! Addon disabled.");
             logError(e.getMessage());
             setState(State.DISABLED);
-            return;
+            return true;
         }
-        registerListener(blockListener);
+        return false;
     }
 
     private void registerPlaceholders() {