From f8032bfde50e6677af5fa5d322302f44d3987efd Mon Sep 17 00:00:00 2001 From: tastybento Date: Sat, 10 Jun 2017 16:40:43 -0700 Subject: [PATCH] Added the /island go command so you can teleport home Added some more goodies in the default chest. It's now a minimal SkyBlock! --- .../us/tastybento/bskyblock/BSkyBlock.java | 10 +++++++++- .../bskyblock/commands/IslandCommand.java | 18 +++++++++++++----- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/main/java/us/tastybento/bskyblock/BSkyBlock.java b/src/main/java/us/tastybento/bskyblock/BSkyBlock.java index 6bcbd0121..04fed9292 100755 --- a/src/main/java/us/tastybento/bskyblock/BSkyBlock.java +++ b/src/main/java/us/tastybento/bskyblock/BSkyBlock.java @@ -128,7 +128,15 @@ public class BSkyBlock extends JavaPlugin{ islandsManager.load(); // Load schematics - Settings.chestItems = new ItemStack[] {new ItemStack(Material.LAVA_BUCKET,1)}; + // TODO: load these from config.yml + Settings.chestItems = new ItemStack[] { + new ItemStack(Material.LAVA_BUCKET,1), + new ItemStack(Material.ICE,2), + new ItemStack(Material.MELON_SEEDS,1), + new ItemStack(Material.BONE,2), + new ItemStack(Material.COBBLESTONE,5), + new ItemStack(Material.SAPLING,2) + }; schematicsManager = new SchematicsMgr(plugin); getCommand("island").setExecutor(new IslandCommand(plugin)); diff --git a/src/main/java/us/tastybento/bskyblock/commands/IslandCommand.java b/src/main/java/us/tastybento/bskyblock/commands/IslandCommand.java index f8716aa01..f193af409 100755 --- a/src/main/java/us/tastybento/bskyblock/commands/IslandCommand.java +++ b/src/main/java/us/tastybento/bskyblock/commands/IslandCommand.java @@ -96,13 +96,17 @@ public class IslandCommand extends BSBCommand{ @Override public boolean canExecute(CommandSender sender, String label, String[] args) { // TODO Auto-generated method stub - return false; + return true; } @Override public void onExecute(CommandSender sender, String label, String[] args) { - // TODO Auto-generated method stub - + if (sender instanceof Player) { + Player player = (Player)sender; + if (plugin.getIslands().hasIsland(player.getUniqueId())) { + plugin.getIslands().homeTeleport(player); + } + } } @Override @@ -158,8 +162,12 @@ public class IslandCommand extends BSBCommand{ public void onExecute(CommandSender sender, String label, String[] args) { if (sender instanceof Player) { Player player = (Player)sender; - Schematic schematic = plugin.getSchematics().getSchematic("default"); - plugin.getIslands().newIsland(player, schematic); + if (!plugin.getIslands().hasIsland(player.getUniqueId())) { + Schematic schematic = plugin.getSchematics().getSchematic("default"); + plugin.getIslands().newIsland(player, schematic); + } else { + player.sendMessage(ChatColor.RED + "You already have an island!"); + } } }