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

into develop

Conflicts:
	pom.xml

src/main/java/world/bentobox/bskyblock/BSkyBlock.java

@@ -42,7 +42,6 @@ public class BSkyBlock extends GameModeAddon {
             logError("BSkyBlock settings could not load! Addon disabled.");
             setState(State.DISABLED);
         }
-
     }
 
     @Override

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

@@ -31,7 +31,6 @@ import world.bentobox.bentobox.database.objects.adapters.FlagSerializer2;
 @ConfigComment("This config file is dynamic and saved when the server is shutdown.")
 @ConfigComment("You cannot edit it while the server is running because changes will")
 @ConfigComment("be lost! Use in-game settings GUI or edit when server is offline.")
-@ConfigComment("")
 public class Settings implements DataObject, WorldSettings {
 
     /*      WORLD       */

src/main/java/world/bentobox/bskyblock/commands/AdminCommand.java

@@ -9,6 +9,7 @@ import world.bentobox.bentobox.api.commands.admin.AdminInfoCommand;
 import world.bentobox.bentobox.api.commands.admin.AdminRegisterCommand;
 import world.bentobox.bentobox.api.commands.admin.AdminReloadCommand;
 import world.bentobox.bentobox.api.commands.admin.AdminSetrankCommand;
+import world.bentobox.bentobox.api.commands.admin.AdminSetspawnCommand;
 import world.bentobox.bentobox.api.commands.admin.AdminTeleportCommand;
 import world.bentobox.bentobox.api.commands.admin.AdminUnregisterCommand;
 import world.bentobox.bentobox.api.commands.admin.AdminVersionCommand;
@@ -67,6 +68,8 @@ public class AdminCommand extends CompositeCommand {
         new AdminDeathsCommand(this);
         // Reload
         new AdminReloadCommand(this);
+        // Spawn
+        new AdminSetspawnCommand(this);
     }
 
     @Override

src/main/java/world/bentobox/bskyblock/commands/IslandCommand.java

@@ -15,6 +15,7 @@ import world.bentobox.bentobox.api.commands.island.IslandResetnameCommand;
 import world.bentobox.bentobox.api.commands.island.IslandSethomeCommand;
 import world.bentobox.bentobox.api.commands.island.IslandSetnameCommand;
 import world.bentobox.bentobox.api.commands.island.IslandSettingsCommand;
+import world.bentobox.bentobox.api.commands.island.IslandSpawnCommand;
 import world.bentobox.bentobox.api.commands.island.IslandUnbanCommand;
 import world.bentobox.bentobox.api.commands.island.team.IslandTeamCommand;
 import world.bentobox.bentobox.api.localization.TextVariables;
@@ -41,6 +42,7 @@ public class IslandCommand extends CompositeCommand {
         new IslandInfoCommand(this);
         new IslandCreateCommand(this);
         new IslandGoCommand(this);
+        new IslandSpawnCommand(this);
         new IslandResetCommand(this);
         new IslandSetnameCommand(this);
         new IslandResetnameCommand(this);
@@ -72,7 +74,5 @@ public class IslandCommand extends CompositeCommand {
         }
         user.sendMessage("general.errors.unknown-command", TextVariables.LABEL, getTopLabel());
         return false;
-
     }
-
 }

src/main/resources/addon.yml

@@ -1,6 +1,7 @@
 name: BSkyBlock
 main: world.bentobox.bskyblock.BSkyBlock
 version: ${version}
+metrics: true
 
 authors: tastybento
 
@@ -20,9 +21,6 @@ permissions:
   bskyblock.island.info:
     description: Let the player check their island level
     default: true
-  bskyblock.island.sethome:
-    description: Let the player set their island teleport point
-    default: true
   bskyblock.island.lock:
     description: Allows island locking
     default: false

src/main/resources/config.yml

@@ -1,8 +1,7 @@
-# BSkyBlock Configuration 1.0
+# BSkyBlock Configuration 1.1
 # This config file is dynamic and saved when the server is shutdown.
 # You cannot edit it while the server is running because changes will
 # be lost! Use in-game settings GUI or edit when server is offline.
-#
 world:
   # Friendly name for this world. Used in admin commands. Must be a single word
   friendly-name: BSkyBlock
@@ -82,10 +81,10 @@ world:
     dragon-spawn: false
   # Mob white list - these mobs will NOT be removed when logging in or doing /island
   remove-mobs-whitelist:
+    - WITHER
+    - PIG_ZOMBIE
     - ENDERMAN
     - ZOMBIE_VILLAGER
-    - PIG_ZOMBIE
-    - WITHER
   # World flags. These are boolean settings for various flags for this world
   flags:
     CREEPER_DAMAGE: true
@@ -149,19 +148,20 @@ world:
     CRAFTING: 0
     ENCHANTING: 0
     SHEARING: 500
-    SPAWN_EGGS: 500
     BED: 500
+    SPAWN_EGGS: 500
     MILKING: 0
     DISPENSER: 500
     GATE: 0
     EXPERIENCE_PICKUP: 500
     HOPPER: 500
     LEASH: 500
-    BREAK_BLOCKS: 500
     MOUNT_INVENTORY: 500
+    BREAK_BLOCKS: 500
     CHORUS_FRUIT: 500
     CONTAINER: 500
     JUKEBOX: 500
+    POTION_THROWING: 500
   # These are the default settings for new islands
   default-island-settings:
     PVP_END: false