Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	pom.xml

pom.xml

@@ -45,7 +45,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
 		<!-- More visible way how to change dependency versions -->
-		<spigot.version>1.14-R0.1-SNAPSHOT</spigot.version>
+		<spigot.version>1.13.2-R0.1-SNAPSHOT</spigot.version>
 		<bentobox.version>1.5.0-SNAPSHOT</bentobox.version>
 		<!-- Revision variable removes warning about dynamic version -->
 		<revision>${build.version}-SNAPSHOT</revision>

src/main/java/world/bentobox/caveblock/Settings.java

@@ -31,26 +31,13 @@ import world.bentobox.bentobox.database.objects.adapters.FlagSerializer2;
  */
 @StoreAt(filename="config.yml", path="addons/CaveBlock")
 @ConfigComment("CaveBlock Configuration [version]")
-@ConfigComment("This config file is dynamic and saved when the server is shutdown.")
-@ConfigComment("If you edit it while the server is running use /cbadmin reload")
-@ConfigComment("otherwise your settings will be lost.")
-public class Settings implements DataObject, WorldSettings
+public class Settings implements WorldSettings
 {
     // ---------------------------------------------------------------------
     // Section: Getters
     // ---------------------------------------------------------------------
 
 
-    /**
-     * @return the uniqueId
-     */
-    @Override
-    public String getUniqueId()
-    {
-        return this.uniqueId;
-    }
-
-
     /**
      * This method returns the friendlyName object.
      * @return the friendlyName object.
@@ -793,16 +780,6 @@ public class Settings implements DataObject, WorldSettings
     // ---------------------------------------------------------------------
 
 
-    /**
-     * @param uniqueId - unique ID the uniqueId to set
-     */
-    @Override
-    public void setUniqueId(String uniqueId)
-    {
-        this.uniqueId = uniqueId;
-    }
-
-
     /**
      * This method sets the friendlyName object value.
      * @param friendlyName the friendlyName object new value.
@@ -1900,6 +1877,4 @@ public class Settings implements DataObject, WorldSettings
     @ConfigEntry(path = "do-not-edit-these-settings.reset-epoch")
     private long resetEpoch = 0;
     private boolean debug;
-
-    private String uniqueId = "config";
 }

src/main/resources/addon.yml

@@ -1,6 +1,9 @@
 name: CaveBlock
 main: world.bentobox.caveblock.CaveBlock
 version: ${version}${build.number}
+metrics: true
+repository: "BentoBoxWorld/CaveBlock"
+icon: "STONE_PICKAXE"
 
 authors: BONNe
 
@@ -136,4 +139,4 @@ permissions:
     default: op
   caveblock.skywalker:
     description: Allows player to walk over the heigh limit.
-    default: op
+    default: op

src/main/resources/config.yml

@@ -1,7 +1,4 @@
 # CaveBlock Configuration ${version}
-# This config file is dynamic and saved when the server is shutdown.
-# If you edit it while the server is running use /cbadmin reload
-# otherwise your settings will be lost.
 caveblock:
   command:
     # Cave Command. What command users will run to access their cave.