From c549d969a4aad4789bdacafb15a0c0aac7c51c36 Mon Sep 17 00:00:00 2001
From: Florian CUNY <poslovitch@gmail.com>
Date: Thu, 3 Jan 2019 16:17:01 +0100
Subject: [PATCH] Removed 'island.custom-ranks' from config

#432
---
 .../java/world/bentobox/bentobox/Settings.java    | 15 ---------------
 .../bentobox/bentobox/managers/RanksManager.java  | 12 ------------
 .../bentobox/managers/RanksManagerTest.java       |  9 +--------
 3 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/src/main/java/world/bentobox/bentobox/Settings.java b/src/main/java/world/bentobox/bentobox/Settings.java
index 01eaaa209..96a07b4bb 100644
--- a/src/main/java/world/bentobox/bentobox/Settings.java
+++ b/src/main/java/world/bentobox/bentobox/Settings.java
@@ -145,10 +145,6 @@ public class Settings implements DataObject {
     @ConfigEntry(path = "island.paste-speed")
     private int pasteSpeed = 1000;
 
-    // Ranks
-    @ConfigEntry(path = "island.custom-ranks", experimental = true)
-    private Map<String, Integer> customRanks = new HashMap<>();
-
     //---------------------------------------------------------------------------------------/
     @ConfigComment("These settings should not be edited")
     private String uniqueId = "config";
@@ -378,14 +374,6 @@ public class Settings implements DataObject {
         return this.pasteSpeed;
     }
 
-    public Map<String, Integer> getCustomRanks() {
-        return customRanks;
-    }
-
-    public void setCustomRanks(Map<String, Integer> customRanks) {
-        this.customRanks = customRanks;
-    }
-
     /**
      * @return the uniqueId
      */
@@ -401,7 +389,4 @@ public class Settings implements DataObject {
     public void setUniqueId(String uniqueId) {
         this.uniqueId = uniqueId;
     }
-
-
-
 }
\ No newline at end of file
diff --git a/src/main/java/world/bentobox/bentobox/managers/RanksManager.java b/src/main/java/world/bentobox/bentobox/managers/RanksManager.java
index ff886f69d..1cc8b0772 100644
--- a/src/main/java/world/bentobox/bentobox/managers/RanksManager.java
+++ b/src/main/java/world/bentobox/bentobox/managers/RanksManager.java
@@ -50,18 +50,6 @@ public class RanksManager {
         ranksPut(COOP_RANK_REF, COOP_RANK);
         ranksPut(VISITOR_RANK_REF, VISITOR_RANK);
         ranksPut(BANNED_RANK_REF, BANNED_RANK);
-        loadCustomRanks();
-    }
-
-    /**
-     * Loads the custom ranks from the settings
-     */
-    public void loadCustomRanks() {
-        for (Entry<String, Integer> en : plugin.getSettings().getCustomRanks().entrySet()) {
-            if (!addRank(en.getKey(),en.getValue())) {
-                plugin.logError("Error loading custom rank: " + en.getKey() + " " + en.getValue() + " skipping...");
-            }
-        }
     }
 
     /**
diff --git a/src/test/java/world/bentobox/bentobox/managers/RanksManagerTest.java b/src/test/java/world/bentobox/bentobox/managers/RanksManagerTest.java
index 9081a633e..6fb7aacea 100644
--- a/src/test/java/world/bentobox/bentobox/managers/RanksManagerTest.java
+++ b/src/test/java/world/bentobox/bentobox/managers/RanksManagerTest.java
@@ -32,14 +32,8 @@ public class RanksManagerTest {
     @Before
     public void setUp() throws Exception {
         BentoBox plugin = mock(BentoBox.class);
-        Settings settings = mock(Settings.class);
-        // Blank ranks for now
-        Map<String, Integer> customRanks = new HashMap<>();
-        when(plugin.getSettings()).thenReturn(settings);
-        when(settings.getCustomRanks()).thenReturn(customRanks);
-        
+
         ranksManager = new RanksManager(plugin);
-        
     }
 
     /**
@@ -118,5 +112,4 @@ public class RanksManagerTest {
         assertEquals(RanksManager.OWNER_RANK_REF, ranksManager.getRank(RanksManager.OWNER_RANK));
         assertEquals("", ranksManager.getRank(-999));
     }
-
 }