Made multigames

locales/en-US.yml

@@ -19,6 +19,7 @@ warps:
     not-on-island: "&CYou must be on your island to do that!"
     duplicate: "&CDuplicate sign placed"
     no-warps-yet: "&CThere are no warps available yet"
+    your-level-is: "&cYou island level is only [level] and must be higher than [required]"
   help:
     description: "open the warps panel"
 warp:

pom.xml

@@ -59,6 +59,12 @@
             <version>0.0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>us.tastybento</groupId>
+            <artifactId>addon-acidisland</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
 	</dependencies>
 	<repositories>
 		<repository>

src/bskyblock/addon/warps/Warp.java

@@ -1,14 +1,20 @@
 package bskyblock.addon.warps;
 
+import java.util.HashSet;
 import java.util.Optional;
+import java.util.Set;
+
+import org.bukkit.World;
 
 import bskyblock.addon.warps.commands.WarpCommand;
 import bskyblock.addon.warps.commands.WarpsCommand;
 import bskyblock.addon.warps.config.PluginConfig;
 import us.tastybento.bskyblock.BSkyBlock;
-import us.tastybento.bskyblock.Constants;
 import us.tastybento.bskyblock.api.addons.Addon;
 import us.tastybento.bskyblock.api.commands.CompositeCommand;
+import us.tastybento.bskyblock.util.Util;
+
+import bskyblock.addon.acidisland.AcidIsland;
 
 /**
  * Addin to BSkyBlock that enables welcome warp signs
@@ -20,7 +26,7 @@ public class Warp extends Addon {
     private static final String BSKYBLOCK_LEVEL = "BSkyBlock-Level";
 
     // The BSkyBlock plugin instance.
-    private BSkyBlock bSkyBlock;
+    private BSkyBlock plugin;
 
     // Warp panel object
     private WarpPanelManager warpPanelManager;
@@ -31,28 +37,41 @@ public class Warp extends Addon {
     // Level addon
     private Optional<Addon> levelAddon;
 
+    private Set<World> registeredWorlds;
+
     @Override
     public void onEnable() {
         // Load the plugin's config
         new PluginConfig(this);
         // Get the BSkyBlock plugin. This will be available because this plugin depends on it in plugin.yml.
-        bSkyBlock = BSkyBlock.getInstance();
+        plugin = this.getBSkyBlock();
         // Check if it is enabled - it might be loaded, but not enabled.
-        if (!bSkyBlock.isEnabled()) {
+        if (!plugin.isEnabled()) {
             this.setEnabled(false);
             return;
         }
         // We have to wait for the worlds to load, so we do the rest 1 tick later
         getServer().getScheduler().runTask(this.getBSkyBlock(), () -> {
+            registeredWorlds = new HashSet<>();
             // Start warp signs
-            warpSignsManager = new WarpSignsManager(this, bSkyBlock);
+            warpSignsManager = new WarpSignsManager(this, plugin);
             warpPanelManager = new WarpPanelManager(this);
             // Load the listener
-            getServer().getPluginManager().registerEvents(warpSignsManager, bSkyBlock);
+            getServer().getPluginManager().registerEvents(new WarpSignsListener(this, plugin), plugin);
             // Register commands
-            CompositeCommand bsbIslandCmd = (CompositeCommand) BSkyBlock.getInstance().getCommandsManager().getCommand(Constants.ISLANDCOMMAND);
+            CompositeCommand bsbIslandCmd = (CompositeCommand) BSkyBlock.getInstance().getCommandsManager().getCommand("island");
             new WarpCommand(this, bsbIslandCmd);
             new WarpsCommand(this, bsbIslandCmd);
+            registeredWorlds.add(plugin.getIWM().getIslandWorld());
+            // AcidIsland hook in
+            getServer().getScheduler().runTask(getBSkyBlock(), () -> {
+                this.getBSkyBlock().getAddonsManager().getAddonByName("AcidIsland").ifPresent(acidIsland -> {
+                    CompositeCommand acidIslandCmd = getBSkyBlock().getCommandsManager().getCommand("ai");
+                    new WarpCommand(this, acidIslandCmd);
+                    new WarpsCommand(this, acidIslandCmd);
+                    registeredWorlds.add(((AcidIsland)acidIsland).getAiw().getOverWorld());
+                });
+            });
             
             // Get the level addon if it exists
             setLevelAddon(getBSkyBlock().getAddonsManager().getAddonByName(BSKYBLOCK_LEVEL));
@@ -87,4 +106,18 @@ public class Warp extends Addon {
         this.levelAddon = levelAddon;
     }
 
+    public String getPermPrefix(World world) {
+        this.getBSkyBlock().getIWM().getPermissionPrefix(world);
+        return null;
+    }
+
+    /**
+     * Check if an event is in a registered world
+     * @param world - world to check
+     * @return true if it is
+     */
+    public boolean inRegisteredWorld(World world) {
+        return registeredWorlds.contains(Util.getWorld(world));
+    }
+
 }

src/bskyblock/addon/warps/WarpPanelManager.java

@@ -8,6 +8,7 @@ import java.util.UUID;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
+import org.bukkit.World;
 import org.bukkit.inventory.ItemStack;
 
 import us.tastybento.bskyblock.api.panels.PanelItem;
@@ -20,22 +21,23 @@ public class WarpPanelManager {
     private static final boolean DEBUG = false;
     private static final int PANEL_MAX_SIZE = 52;
     private Warp addon;
-    // This is a cache of heads, so they don't need to be created everytime
+    // This is a cache of signs
-    private Map<UUID, List<String>> cachedHeads = new HashMap<>();
+    private Map<World, Map<UUID, List<String>>> cachedSigns = new HashMap<>();
 
 
     public WarpPanelManager(Warp addon) {
         this.addon = addon;
-        addon.getWarpSignsManager().getSortedWarps().forEach(this :: getSign);
+        //addon.getWarpSignsManager().getSortedWarps().forEach(this :: getSign);
     }
 
-    private PanelItem getPanelItem(UUID warpOwner) {
+    private PanelItem getPanelItem(World world, UUID warpOwner) {
+        cachedSigns.putIfAbsent(world, new HashMap<>());
         return new PanelItemBuilder()
                 .icon(Material.SIGN)
                 .name(addon.getBSkyBlock().getPlayers().getName(warpOwner))
-                .description(cachedHeads.getOrDefault(warpOwner, getSign(warpOwner)))
+                .description(cachedSigns.get(world).getOrDefault(warpOwner, getSign(world, warpOwner)))
                 .clickHandler((panel, clicker, click, slot) -> { {
-                    addon.getWarpSignsManager().warpPlayer(clicker, warpOwner);
+                    addon.getWarpSignsManager().warpPlayer(world, clicker, warpOwner);
                     return true;
                 }
                 }).build();
@@ -46,19 +48,21 @@ public class WarpPanelManager {
      * @param playerUUID
      * @return
      */
-    private List<String> getSign(UUID playerUUID) {
+    private List<String> getSign(World world, UUID playerUUID) {
-        List<String> result = addon.getWarpSignsManager().getSignText(playerUUID);
+        List<String> result = addon.getWarpSignsManager().getSignText(world, playerUUID);
-        cachedHeads.put(playerUUID, result);
+        cachedSigns.putIfAbsent(world, new HashMap<>());
+        cachedSigns.get(world).put(playerUUID, result);
         return result;
     }
 
     /**
      * Show the warp panel for the user
+     * @param world 
      * @param user
      * @param index
      */
-    public void showWarpPanel(User user, int index) { 
+    public void showWarpPanel(World world, User user, int index) { 
-        List<UUID> warps = new ArrayList<>(addon.getWarpSignsManager().getSortedWarps());
+        List<UUID> warps = new ArrayList<>(addon.getWarpSignsManager().getSortedWarps(world));
         if (DEBUG) {
             Bukkit.getLogger().info("DEBUG: showing warps. warps list is " + warps.size());
         }
@@ -73,7 +77,7 @@ public class WarpPanelManager {
 
         int i = index * PANEL_MAX_SIZE;
         for (; i < (index * PANEL_MAX_SIZE + PANEL_MAX_SIZE) && i < warps.size(); i++) {
-            panelBuilder.item(getPanelItem(warps.get(i))); 
+            panelBuilder.item(getPanelItem(world, warps.get(i))); 
         }
         final int panelNum = index;
         // Add signs
@@ -84,7 +88,7 @@ public class WarpPanelManager {
                     .icon(new ItemStack(Material.SIGN))
                     .clickHandler((panel, clicker, click, slot) -> {
                         user.closeInventory();
-                        showWarpPanel(user, panelNum+1);
+                        showWarpPanel(world, user, panelNum+1);
                         return true;
                     }).build());
         }
@@ -95,7 +99,7 @@ public class WarpPanelManager {
                     .icon(new ItemStack(Material.SIGN))
                     .clickHandler((panel, clicker, click, slot) -> {
                         user.closeInventory();
-                        showWarpPanel(user, panelNum-1);
+                        showWarpPanel(world, user, panelNum-1);
                         return true;
                     }).build());
         }
@@ -106,8 +110,9 @@ public class WarpPanelManager {
      * Removes sign text from the cache
      * @param key
      */
-    public void removeWarp(UUID key) {
+    public void removeWarp(World world, UUID key) {
-        cachedHeads.remove(key);
+        cachedSigns.putIfAbsent(world, new HashMap<>());
+        cachedSigns.get(world).remove(key);
     }
 
 }

src/bskyblock/addon/warps/WarpSignsListener.java

@@ -0,0 +1,176 @@
+package bskyblock.addon.warps;
+
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.block.Sign;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.event.block.SignChangeEvent;
+
+import bskyblock.addon.level.Level;
+import bskyblock.addon.warps.config.Settings;
+import bskyblock.addon.warps.event.WarpRemoveEvent;
+import us.tastybento.bskyblock.BSkyBlock;
+import us.tastybento.bskyblock.api.user.User;
+
+/**
+ * Handles warping. Players can add one sign
+ * 
+ * @author tastybento
+ * 
+ */
+public class WarpSignsListener implements Listener {
+    private BSkyBlock plugin;
+
+    private Warp addon;
+
+    /**
+     * @param addon - addon
+     * @param plugin - BSB plugin
+     */
+    public WarpSignsListener(Warp addon, BSkyBlock plugin) {
+        this.addon = addon;
+        this.plugin = plugin;
+    }
+
+    /**
+     * Checks to see if a sign has been broken
+     * @param e - event
+     */
+    @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = false)
+    public void onSignBreak(BlockBreakEvent e) {
+        Block b = e.getBlock();
+        // Signs only
+        if (!b.getType().equals(Material.SIGN_POST) && !b.getType().equals(Material.WALL_SIGN)) {
+            return;
+        }
+        if (!addon.inRegisteredWorld(b.getWorld())) {
+            return;
+        }
+        User user = User.getInstance(e.getPlayer());
+        Sign s = (Sign) b.getState();
+        if (s == null) {
+            return;
+        }
+        if (s.getLine(0).equalsIgnoreCase(ChatColor.GREEN + addon.getConfig().getString("welcomeLine"))) {
+            // Do a quick check to see if this sign location is in
+            // the list of warp signs
+            if (addon.getWarpSignsManager().getWarpList(b.getWorld()).containsValue(s.getLocation())) {
+                // Welcome sign detected - check to see if it is
+                // this player's sign
+                if ((addon.getWarpSignsManager().getWarpList(b.getWorld()).containsKey(user.getUniqueId()) && addon.getWarpSignsManager().getWarpList(b.getWorld()).get(user.getUniqueId()).equals(s.getLocation()))) {
+                    // Player removed sign
+                    addon.getWarpSignsManager().removeWarp(s.getLocation());
+                    Bukkit.getPluginManager().callEvent(new WarpRemoveEvent(addon, s.getLocation(), user.getUniqueId()));
+                } else if (user.isOp()  || user.hasPermission(addon.getPermPrefix(e.getBlock().getWorld()) + "mod.removesign")) {
+                    // Op or mod removed sign
+                    user.sendMessage("warps.removed");
+                    addon.getWarpSignsManager().removeWarp(s.getLocation());
+                    Bukkit.getPluginManager().callEvent(new WarpRemoveEvent(addon, s.getLocation(), user.getUniqueId()));
+                } else {
+                    // Someone else's sign - not allowed
+                    user.sendMessage("warps.error.no-remove");
+                    e.setCancelled(true);
+                }
+            }
+        }
+    }
+
+    /**
+     * Event handler for Sign Changes
+     * 
+     * @param e - event
+     */
+    @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = false)
+    public void onSignWarpCreate(SignChangeEvent e) {
+        Block b = e.getBlock();
+        // Signs only
+        if (!b.getType().equals(Material.SIGN_POST) && !b.getType().equals(Material.WALL_SIGN)) {
+            return;
+        }
+        if (!addon.inRegisteredWorld(b.getWorld())) {
+            return;
+        }
+        String title = e.getLine(0);
+        User user = User.getInstance(e.getPlayer());
+        // Check if someone is changing their own sign
+        if (title.equalsIgnoreCase(addon.getConfig().getString("welcomeLine"))) {
+            // Welcome sign detected - check permissions
+            if (!(user.hasPermission(addon.getPermPrefix(e.getBlock().getWorld()) + "island.addwarp"))) {
+                user.sendMessage("warps.error.no-permission");
+                return;
+            }
+            if (addon.getLevelAddon().isPresent()) {
+                Level lev = (Level) addon.getLevelAddon().get();
+                if (lev.getIslandLevel(e.getBlock().getWorld(), user.getUniqueId()) < Settings.warpLevelRestriction) {
+                    user.sendMessage("warps.error.not-enough-level");
+                    user.sendMessage("warps.error.your-level-is", 
+                            "[level]", String.valueOf(lev.getIslandLevel(e.getBlock().getWorld(), user.getUniqueId())),
+                            "[required]", String.valueOf(Settings.warpLevelRestriction));
+                    return;
+                }
+            }
+
+
+            // Check that the player is on their island
+            if (!(plugin.getIslands().userIsOnIsland(e.getBlock().getWorld(), user))) {
+                user.sendMessage("warps.error.not-on-island");
+                e.setLine(0, ChatColor.RED + addon.getConfig().getString("welcomeLine"));
+                return;
+            }
+            // Check if the player already has a sign
+            final Location oldSignLoc = addon.getWarpSignsManager().getWarp(e.getBlock().getWorld(), user.getUniqueId());
+            if (oldSignLoc == null) {
+                //plugin.getLogger().info("DEBUG: Player does not have a sign already");
+                // First time the sign has been placed or this is a new
+                // sign
+                if (addon.getWarpSignsManager().addWarp(user.getUniqueId(), e.getBlock().getLocation())) {
+                    user.sendMessage("warps.success");
+                    e.setLine(0, ChatColor.GREEN + addon.getConfig().getString("welcomeLine"));
+                    for (int i = 1; i<4; i++) {
+                        e.setLine(i, ChatColor.translateAlternateColorCodes('&', e.getLine(i)));
+                    }
+                } else {
+                    user.sendMessage("warps.error.duplicate");
+                    e.setLine(0, ChatColor.RED + addon.getConfig().getString("welcomeLine"));
+                    for (int i = 1; i<4; i++) {
+                        e.setLine(i, ChatColor.translateAlternateColorCodes('&', e.getLine(i)));
+                    }
+                }
+            } else {
+                // A sign already exists. Check if it still there and if
+                // so,
+                // deactivate it
+                Block oldSignBlock = oldSignLoc.getBlock();
+                if (oldSignBlock.getType().equals(Material.SIGN_POST) || oldSignBlock.getType().equals(Material.WALL_SIGN)) {
+                    // The block is still a sign
+                    Sign oldSign = (Sign) oldSignBlock.getState();
+                    if (oldSign != null) {
+                        if (oldSign.getLine(0).equalsIgnoreCase(ChatColor.GREEN + addon.getConfig().getString("welcomeLine"))) {
+                            oldSign.setLine(0, ChatColor.RED + addon.getConfig().getString("welcomeLine"));
+                            oldSign.update(true, false);
+                            user.sendMessage("warps.deactivate");
+                            addon.getWarpSignsManager().removeWarp(oldSignBlock.getWorld(), user.getUniqueId());
+                            Bukkit.getPluginManager().callEvent(new WarpRemoveEvent(addon, oldSign.getLocation(), user.getUniqueId()));
+                        }
+                    }
+                }
+                // Set up the warp
+                if (addon.getWarpSignsManager().addWarp(user.getUniqueId(), e.getBlock().getLocation())) {
+                    user.sendMessage("warps.error.success");
+                    e.setLine(0, ChatColor.GREEN + addon.getConfig().getString("welcomeLine"));
+                } else {
+                    user.sendMessage("warps.error.duplicate");
+                    e.setLine(0, ChatColor.RED + addon.getConfig().getString("welcomeLine"));
+                }
+            }
+        }
+
+    }
+
+}

src/bskyblock/addon/warps/WarpSignsManager.java

@@ -9,35 +9,30 @@ import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Objects;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.Sound;
+import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.block.Sign;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.block.BlockBreakEvent;
-import org.bukkit.event.block.SignChangeEvent;
 
-import bskyblock.addon.level.Level;
-import bskyblock.addon.warps.config.Settings;
 import bskyblock.addon.warps.database.object.WarpsData;
 import bskyblock.addon.warps.event.WarpInitiateEvent;
 import bskyblock.addon.warps.event.WarpListEvent;
-import bskyblock.addon.warps.event.WarpRemoveEvent;
 import us.tastybento.bskyblock.BSkyBlock;
-import us.tastybento.bskyblock.Constants;
 import us.tastybento.bskyblock.api.user.User;
 import us.tastybento.bskyblock.database.BSBDatabase;
 import us.tastybento.bskyblock.database.objects.Island;
+import us.tastybento.bskyblock.util.Util;
 
 /**
  * Handles warping. Players can add one sign
@@ -45,26 +40,29 @@ import us.tastybento.bskyblock.database.objects.Island;
  * @author tastybento
  * 
  */
-public class WarpSignsManager implements Listener {
+public class WarpSignsManager {
-    private static final boolean DEBUG = false;
     private static final boolean DEBUG2 = false;
     private static final int MAX_WARPS = 600;
-    private BSkyBlock bSkyBlock;
+    private BSkyBlock plugin;
     // Map of all warps stored as player, warp sign Location
-    private Map<UUID, Location> warpList;
+    private Map<World, Map<UUID, Location>> worldsWarpList;
     // Database handler for level data
     private BSBDatabase<WarpsData> handler;
 
     private Warp addon;
 
+    public Map<UUID, Location> getWarpList(World world) {
+        worldsWarpList.putIfAbsent(world, new HashMap<>());
+        return worldsWarpList.get(world);
+    }
 
     /**
      * @param addon - addon
-     * @param bSkyBlock - BSB plugin
+     * @param plugin - BSB plugin
      */
-    public WarpSignsManager(Warp addon, BSkyBlock bSkyBlock) {
+    public WarpSignsManager(Warp addon, BSkyBlock plugin) {
         this.addon = addon;
-        this.bSkyBlock = bSkyBlock;
+        this.plugin = plugin;
         // Set up the database handler to store and retrieve Island classes
         // Note that these are saved by the BSkyBlock database
         handler = new BSBDatabase<>(addon, WarpsData.class);
@@ -83,14 +81,14 @@ public class WarpSignsManager implements Listener {
             return false;
         }
         // Do not allow warps to be in the same location
-        if (warpList.containsValue(loc)) {
+        if (getWarpList(loc.getWorld()).containsValue(loc)) {
             return false;
         }
         // Remove the old warp if it existed
-        if (warpList.containsKey(playerUUID)) {
+        if (getWarpList(loc.getWorld()).containsKey(playerUUID)) {
-            warpList.remove(playerUUID);
+            getWarpList(loc.getWorld()).remove(playerUUID);
         }
-        warpList.put(playerUUID, loc);
+        getWarpList(loc.getWorld()).put(playerUUID, loc);
         saveWarpList();
         Bukkit.getPluginManager().callEvent(new WarpInitiateEvent(addon, loc, playerUUID));
         return true;
@@ -103,13 +101,13 @@ public class WarpSignsManager implements Listener {
      *            - the warp requested
      * @return Location of warp
      */
-    public Location getWarp(UUID playerUUID) {
+    public Location getWarp(World world, UUID playerUUID) {
-        if (playerUUID != null && warpList.containsKey(playerUUID)) {
+        if (playerUUID != null && getWarpList(world).containsKey(playerUUID)) {
-            if (warpList.get(playerUUID) == null) {
+            if (getWarpList(world).get(playerUUID) == null) {
-                warpList.remove(playerUUID);
+                getWarpList(world).remove(playerUUID);
                 return null;
             }
-            return warpList.get(playerUUID);
+            return getWarpList(world).get(playerUUID);
         } else {
             return null;
         }
@@ -120,9 +118,9 @@ public class WarpSignsManager implements Listener {
      * @return Name of warp owner
      */
     public String getWarpOwner(Location location) {
-        for (UUID playerUUID : warpList.keySet()) {
+        for (UUID playerUUID : getWarpList(location.getWorld()).keySet()) {
-            if (location.equals(warpList.get(playerUUID))) {
+            if (location.equals(getWarpList(location.getWorld()).get(playerUUID))) {
-                return bSkyBlock.getPlayers().getName(playerUUID);
+                return plugin.getPlayers().getName(playerUUID);
             }
         }
         return "";
@@ -130,12 +128,12 @@ public class WarpSignsManager implements Listener {
 
     /**
      * Get sorted list of warps with most recent players listed first
-     * @return UUID collenction
+     * @return UUID collection
      */
-    public List<UUID> getSortedWarps() {
+    public List<UUID> getSortedWarps(World world) {
         // Bigger value of time means a more recent login
         TreeMap<Long, UUID> map = new TreeMap<Long, UUID>();
-        Iterator<Entry<UUID, Location>> it = warpList.entrySet().iterator();
+        Iterator<Entry<UUID, Location>> it = getWarpList(world).entrySet().iterator();
         while (it.hasNext()) {
             Entry<UUID, Location> en = it.next();
             // Check if the location of the warp still exists, if not, delete it
@@ -167,20 +165,14 @@ public class WarpSignsManager implements Listener {
 
     /**
      * Lists all the known warps
+     * @param world 
      * 
      * @return UUID set of warps
      */
-    public Set<UUID> listWarps() {
+    public Set<UUID> listWarps(World world) {
-        // Check if any of the warp locations are null
+        // Remove any null locations
-        Iterator<Entry<UUID, Location>> it = warpList.entrySet().iterator();
+        getWarpList(world).values().removeIf(Objects::isNull);
-        while (it.hasNext()) {
+        return getWarpList(world).entrySet().stream().filter(e -> Util.sameWorld(world, e.getValue().getWorld())).map(Map.Entry::getKey).collect(Collectors.toSet());
-            Entry<UUID, Location> en = it.next();
-            // Check if the location of the warp still exists, if not, delete it
-            if (en.getValue() == null) {
-                it.remove();
-            }
-        }
-        return warpList.keySet();
     }
 
     /**
@@ -188,186 +180,16 @@ public class WarpSignsManager implements Listener {
      */
     public void loadWarpList() {
         addon.getLogger().info("Loading warps...");
-        warpList = new HashMap<>();
+        worldsWarpList = new HashMap<>();
         WarpsData warps = handler.loadObject("warps");
-        // If there's nothing there, start fresh
+        // Load into map
-        if (warps == null) {
+        if (warps != null) {
-            if (DEBUG) 
+            warps.getWarpSigns().forEach((k,v) -> {
-                Bukkit.getLogger().info("DEBUG: nothing in the database");              
+                if (k != null && (k.getBlock().getType().equals(Material.SIGN_POST) || k.getBlock().getType().equals(Material.WALL_SIGN))) {
-            warpList = new HashMap<>();
+                    // Add to map
-        } else {
+                    getWarpList(k.getWorld()).put(v, k);
-            if (DEBUG) 
-                Bukkit.getLogger().info("DEBUG: something in the database");
-            warpList = warps.getWarpSigns();
-            if (DEBUG) 
-                Bukkit.getLogger().info("DEBUG: warpList size = " + warpList.size());
-        }
-        Iterator<Entry<UUID, Location>> it = warpList.entrySet().iterator();
-        while (it.hasNext()) {
-            Entry<UUID, Location> en = it.next();
-            // Check the warp sign
-            Block b = en.getValue().getBlock();
-            // Check that a warp sign is still there
-            if (!b.getType().equals(Material.SIGN_POST) && !b.getType().equals(Material.WALL_SIGN)) {
-                addon.getLogger().warning("Warp at location " + en.getValue() + " has no sign - removing.");
-                it.remove();
-            }
-        }
-        /*
-        if (warpList.size() < 100) {
-            // TEST CODE
-            for (int i = 0; i < 300; i++) {
-                UUID rand = UUID.randomUUID();
-                int x = RandomUtils.nextInt(100000) - RandomUtils.nextInt(100000);
-                int z = RandomUtils.nextInt(100000) - RandomUtils.nextInt(100000);
-                Block b = IslandWorld.getIslandWorld().getBlockAt(x, 119, z);
-                b.setType(Material.STONE);
-                b.getRelative(BlockFace.UP).setType(Material.SIGN_POST);
-                Sign sign = (Sign)b.getRelative(BlockFace.UP).getState();
-                sign.setLine(0, ChatColor.GREEN + plugin.getConfig().getString("welcomeLine"));
-                sign.update();
-                warpList.put(rand, new Location(IslandWorld.getIslandWorld(), x, 120, z));
-            }
-        }*/
-    }
-
-    /**
-     * Checks to see if a sign has been broken
-     * @param e - event
-     */
-    @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = false)
-    public void onSignBreak(BlockBreakEvent e) {
-        Block b = e.getBlock();
-        User player = User.getInstance(e.getPlayer());
-        if (b.getWorld().equals(bSkyBlock.getIslandWorldManager().getIslandWorld()) || b.getWorld().equals(bSkyBlock.getIslandWorldManager().getNetherWorld())) {
-            if (b.getType().equals(Material.SIGN_POST) || b.getType().equals(Material.WALL_SIGN)) {
-                Sign s = (Sign) b.getState();
-                if (s != null) {
-                    //plugin.getLogger().info("DEBUG: sign found at location " + s.toString());
-                    if (s.getLine(0).equalsIgnoreCase(ChatColor.GREEN + addon.getConfig().getString("welcomeLine"))) {
-                        // Do a quick check to see if this sign location is in
-                        //plugin.getLogger().info("DEBUG: welcome sign");
-                        // the list of warp signs
-                        if (warpList.containsValue(s.getLocation())) {
-                            //plugin.getLogger().info("DEBUG: warp sign is in list");
-                            // Welcome sign detected - check to see if it is
-                            // this player's sign
-                            if ((warpList.containsKey(player.getUniqueId()) && warpList.get(player.getUniqueId()).equals(s.getLocation()))) {
-                                // Player removed sign
-                                removeWarp(s.getLocation());
-                                Bukkit.getPluginManager().callEvent(new WarpRemoveEvent(addon, s.getLocation(), player.getUniqueId()));
-                            } else if (player.isOp()  || player.hasPermission(Constants.PERMPREFIX + "mod.removesign")) {
-                                // Op or mod removed sign
-                                player.sendMessage("warps.removed");
-                                removeWarp(s.getLocation());
-                                Bukkit.getPluginManager().callEvent(new WarpRemoveEvent(addon, s.getLocation(), player.getUniqueId()));
-                            } else {
-                                // Someone else's sign - not allowed
-                                player.sendMessage("warps.error.no-remove");
-                                e.setCancelled(true);
-                            }
-                        }
-                    }
                 }
-            }
+            });
-        }
-    }
-
-    /**
-     * Event handler for Sign Changes
-     * 
-     * @param e - event
-     */
-    @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = false)
-    public void onSignWarpCreate(SignChangeEvent e) {
-        if (DEBUG)
-            addon.getLogger().info("DEBUG: SignChangeEvent called");
-        String title = e.getLine(0);
-        User player = User.getInstance(e.getPlayer());
-        if (player.getWorld().equals(bSkyBlock.getIslandWorldManager().getIslandWorld()) || player.getWorld().equals(bSkyBlock.getIslandWorldManager().getNetherWorld())) {
-            if (DEBUG)
-                addon.getLogger().info("DEBUG: Correct world");
-            if (e.getBlock().getType().equals(Material.SIGN_POST) || e.getBlock().getType().equals(Material.WALL_SIGN)) {
-                if (DEBUG)
-                    addon.getLogger().info("DEBUG: The first line of the sign says " + title);
-                // Check if someone is changing their own sign
-                // This should never happen !!
-                if (title.equalsIgnoreCase(addon.getConfig().getString("welcomeLine"))) {
-                    if (DEBUG)
-                        addon.getLogger().info("DEBUG: Welcome sign detected");
-                    // Welcome sign detected - check permissions
-                    if (!(player.hasPermission(Constants.PERMPREFIX + "island.addwarp"))) {
-                        player.sendMessage("warps.error.no-permission");
-                        return;
-                    }
-                    if (addon.getLevelAddon().isPresent()) {
-                        Level lev = (Level) addon.getLevelAddon().get();
-                        if (lev.getIslandLevel(player.getUniqueId()) < Settings.warpLevelRestriction) {
-                            player.sendMessage("warps.error.NotEnoughLevel");
-                            player.sendRawMessage("Your level is only " + lev.getIslandLevel(player.getUniqueId()));
-                            return;
-                        }
-                    }
-
-
-                    // Check that the player is on their island
-                    if (!(bSkyBlock.getIslands().userIsOnIsland(player))) {
-                        player.sendMessage("warps.error.not-on-island");
-                        e.setLine(0, ChatColor.RED + addon.getConfig().getString("welcomeLine"));
-                        return;
-                    }
-                    // Check if the player already has a sign
-                    final Location oldSignLoc = getWarp(player.getUniqueId());
-                    if (oldSignLoc == null) {
-                        //plugin.getLogger().info("DEBUG: Player does not have a sign already");
-                        // First time the sign has been placed or this is a new
-                        // sign
-                        if (addWarp(player.getUniqueId(), e.getBlock().getLocation())) {
-                            player.sendMessage("warps.success");
-                            e.setLine(0, ChatColor.GREEN + addon.getConfig().getString("welcomeLine"));
-                            for (int i = 1; i<4; i++) {
-                                e.setLine(i, ChatColor.translateAlternateColorCodes('&', e.getLine(i)));
-                            }
-                        } else {
-                            player.sendMessage("warps.error.duplicate");
-                            e.setLine(0, ChatColor.RED + addon.getConfig().getString("welcomeLine"));
-                            for (int i = 1; i<4; i++) {
-                                e.setLine(i, ChatColor.translateAlternateColorCodes('&', e.getLine(i)));
-                            }
-                        }
-                    } else {
-                        //plugin.getLogger().info("DEBUG: Player already has a Sign");
-                        // A sign already exists. Check if it still there and if
-                        // so,
-                        // deactivate it
-                        Block oldSignBlock = oldSignLoc.getBlock();
-                        if (oldSignBlock.getType().equals(Material.SIGN_POST) || oldSignBlock.getType().equals(Material.WALL_SIGN)) {
-                            // The block is still a sign
-                            //plugin.getLogger().info("DEBUG: The block is still a sign");
-                            Sign oldSign = (Sign) oldSignBlock.getState();
-                            if (oldSign != null) {
-                                //plugin.getLogger().info("DEBUG: Sign block is a sign");
-                                if (oldSign.getLine(0).equalsIgnoreCase(ChatColor.GREEN + addon.getConfig().getString("welcomeLine"))) {
-                                    //plugin.getLogger().info("DEBUG: Old sign had a green welcome");
-                                    oldSign.setLine(0, ChatColor.RED + addon.getConfig().getString("welcomeLine"));
-                                    oldSign.update(true, false);
-                                    player.sendMessage("warps.deactivate");
-                                    removeWarp(player.getUniqueId());
-                                    Bukkit.getPluginManager().callEvent(new WarpRemoveEvent(addon, oldSign.getLocation(), player.getUniqueId()));
-                                }
-                            }
-                        }
-                        // Set up the warp
-                        if (addWarp(player.getUniqueId(), e.getBlock().getLocation())) {
-                            player.sendMessage("warps.error.success");
-                            e.setLine(0, ChatColor.GREEN + addon.getConfig().getString("welcomeLine"));
-                        } else {
-                            player.sendMessage("warps.error.duplicate");
-                            e.setLine(0, ChatColor.RED + addon.getConfig().getString("welcomeLine"));
-                        }
-                    }
-                }
-            }
         }
     }
 
@@ -396,7 +218,7 @@ public class WarpSignsManager implements Listener {
     public void removeWarp(Location loc) {
         //plugin.getLogger().info("Asked to remove warp at " + loc);
         popSign(loc);
-        Iterator<Entry<UUID, Location>> it = warpList.entrySet().iterator();
+        Iterator<Entry<UUID, Location>> it = getWarpList(loc.getWorld()).entrySet().iterator();
         while (it.hasNext()) {
             Entry<UUID, Location> en = it.next();
             if (en.getValue().equals(loc)) {
@@ -407,7 +229,7 @@ public class WarpSignsManager implements Listener {
                     user.sendMessage("warps.sign-removed");
                 }
                 // Remove sign from warp panel cache
-                addon.getWarpPanelManager().removeWarp(en.getKey());
+                addon.getWarpPanelManager().removeWarp(loc.getWorld(), en.getKey());
                 it.remove();
             }
         }
@@ -419,12 +241,12 @@ public class WarpSignsManager implements Listener {
      * 
      * @param uuid
      */
-    public void removeWarp(UUID uuid) {
+    public void removeWarp(World world, UUID uuid) {
-        if (warpList.containsKey(uuid)) {
+        if (getWarpList(world).containsKey(uuid)) {
-            popSign(warpList.get(uuid));
+            popSign(getWarpList(world).get(uuid));
-            warpList.remove(uuid);
+            getWarpList(world).remove(uuid);
             // Remove sign from warp panel cache
-            addon.getWarpPanelManager().removeWarp(uuid);
+            addon.getWarpPanelManager().removeWarp(world, uuid);
         }
         saveWarpList();
     }
@@ -433,10 +255,7 @@ public class WarpSignsManager implements Listener {
      * Saves the warp lists to the database
      */
     public void saveWarpList() {
-        if (warpList == null) {
+        handler.saveObject(new WarpsData().save(worldsWarpList));
-            return;
-        }
-        handler.saveObject(new WarpsData().save(warpList));
     }
 
     /**
@@ -444,12 +263,12 @@ public class WarpSignsManager implements Listener {
      * @param uuid
      * @return List of lines
      */
-    public List<String> getSignText(UUID uuid) {
+    public List<String> getSignText(World world, UUID uuid) {
         List<String> result = new ArrayList<>();
         //get the sign info
-        Location signLocation = getWarp(uuid);
+        Location signLocation = getWarp(world, uuid);
         if (signLocation == null) {
-            addon.getWarpSignsManager().removeWarp(uuid);
+            addon.getWarpSignsManager().removeWarp(world, uuid);
         } else { 
             if (DEBUG2)
                 Bukkit.getLogger().info("DEBUG: getting sign text");
@@ -554,8 +373,8 @@ public class WarpSignsManager implements Listener {
      * @param user
      * @param owner
      */
-    public void warpPlayer(User user, UUID owner) {
+    public void warpPlayer(World world, User user, UUID owner) {
-        final Location warpSpot = addon.getWarpSignsManager().getWarp(owner);
+        final Location warpSpot = addon.getWarpSignsManager().getWarp(world, owner);
         // Check if the warp spot is safe
         if (warpSpot == null) {
             user.sendMessage("warps.error.NotReadyYet");
@@ -565,7 +384,7 @@ public class WarpSignsManager implements Listener {
         // Find out if island is locked
         // TODO: Fire event
 
-        Island island = addon.getBSkyBlock().getIslands().getIsland(owner);
+        Island island = addon.getBSkyBlock().getIslands().getIsland(world, owner);
         boolean pvp = false;
         if (island != null) {
             //if ((warpSpot.getWorld().equals(IslandWorld.getIslandWorld()) && island.getFlag(SettingsFlag.PVP_OVERWORLD)) 
@@ -581,10 +400,10 @@ public class WarpSignsManager implements Listener {
             BlockFace directionFacing = s.getFacing();
             Location inFront = b.getRelative(directionFacing).getLocation();
             Location oneDown = b.getRelative(directionFacing).getRelative(BlockFace.DOWN).getLocation();
-            if ((bSkyBlock.getIslands().isSafeLocation(inFront))) {
+            if ((plugin.getIslands().isSafeLocation(inFront))) {
                 addon.getWarpSignsManager().warpPlayer(user, inFront, owner, directionFacing, pvp);
                 return;
-            } else if (b.getType().equals(Material.WALL_SIGN) && bSkyBlock.getIslands().isSafeLocation(oneDown)) {
+            } else if (b.getType().equals(Material.WALL_SIGN) && plugin.getIslands().isSafeLocation(oneDown)) {
                 // Try one block down if this is a wall sign
                 addon.getWarpSignsManager().warpPlayer(user, oneDown, owner, directionFacing, pvp);
                 return;
@@ -595,7 +414,7 @@ public class WarpSignsManager implements Listener {
             addon.getWarpSignsManager().removeWarp(warpSpot);
             return;
         }
-        if (!(bSkyBlock.getIslands().isSafeLocation(warpSpot))) {
+        if (!(plugin.getIslands().isSafeLocation(warpSpot))) {
             user.sendMessage("warps.error.NotSafe");
             // WALL_SIGN's will always be unsafe if the place in front is obscured.
             if (b.getType().equals(Material.SIGN_POST)) {
@@ -623,8 +442,8 @@ public class WarpSignsManager implements Listener {
      * @param playerUUID - player's UUID
      * @return true if they have warp
      */
-    public boolean hasWarp(UUID playerUUID) {
+    public boolean hasWarp(World world, UUID playerUUID) {
-        return warpList.containsKey(playerUUID);
+        return getWarpList(world).containsKey(playerUUID);
     }
 
 }

src/bskyblock/addon/warps/commands/WarpCommand.java

@@ -7,14 +7,13 @@ import java.util.Set;
 import java.util.UUID;
 
 import bskyblock.addon.warps.Warp;
-import us.tastybento.bskyblock.Constants;
 import us.tastybento.bskyblock.api.commands.CompositeCommand;
 import us.tastybento.bskyblock.api.user.User;
 
 /**
  * The /is warp <name> command
  * 
- * @author ben
+ * @author tastybento
  *
  */
 public class WarpCommand extends CompositeCommand {
@@ -28,7 +27,7 @@ public class WarpCommand extends CompositeCommand {
 
     @Override
     public void setup() {
-        this.setPermission(Constants.PERMPREFIX + "island.warp");
+        this.setPermission(getPermissionPrefix() + "island.warp");
         this.setOnlyPlayer(true);
         this.setParameters("warp.help.parameters");
         this.setDescription("warp.help.description");
@@ -37,7 +36,7 @@ public class WarpCommand extends CompositeCommand {
     @Override
     public Optional<List<String>> tabComplete(User user, String alias, List<String> args) {
         List<String> options = new ArrayList<>();
-        final Set<UUID> warpList = plugin.getWarpSignsManager().listWarps();
+        final Set<UUID> warpList = plugin.getWarpSignsManager().listWarps(getWorld());
 
         for (UUID warp : warpList) {
             options.add(plugin.getBSkyBlock().getPlayers().getName(warp));
@@ -50,7 +49,7 @@ public class WarpCommand extends CompositeCommand {
     public boolean execute(User user, List<String> args) {
         if (args.size() == 1) {
             // Warp somewhere command
-            final Set<UUID> warpList = plugin.getWarpSignsManager().listWarps();
+            final Set<UUID> warpList = plugin.getWarpSignsManager().listWarps(getWorld());
             if (warpList.isEmpty()) {
                 user.sendMessage("warps.errorNoWarpsYet");
                 user.sendMessage("warps.warpTip");
@@ -73,7 +72,7 @@ public class WarpCommand extends CompositeCommand {
                     return true;
                 } else {
                     // Warp exists!
-                    plugin.getWarpSignsManager().warpPlayer(user, foundWarp);
+                    plugin.getWarpSignsManager().warpPlayer(getWorld(), user, foundWarp);
                 }
             }
         }

src/bskyblock/addon/warps/commands/WarpsCommand.java

@@ -6,7 +6,6 @@ package bskyblock.addon.warps.commands;
 import java.util.List;
 
 import bskyblock.addon.warps.Warp;
-import us.tastybento.bskyblock.Constants;
 import us.tastybento.bskyblock.api.commands.CompositeCommand;
 import us.tastybento.bskyblock.api.user.User;
 
@@ -28,7 +27,7 @@ public class WarpsCommand extends CompositeCommand {
      */
     @Override
     public void setup() {
-        this.setPermission(Constants.PERMPREFIX + "island.warp");
+        this.setPermission(getPermissionPrefix() + "island.warp");
         this.setOnlyPlayer(true);
         this.setDescription("warps.help.description");
     }
@@ -38,11 +37,11 @@ public class WarpsCommand extends CompositeCommand {
      */
     @Override
     public boolean execute(User user, List<String> args) {
-        if (plugin.getWarpSignsManager().listWarps().isEmpty()) {
+        if (plugin.getWarpSignsManager().listWarps(getWorld()).isEmpty()) {
             user.sendMessage("warps.error.no-warps-yet");
             user.sendMessage("warps.warpTip");                
         } else {
-            plugin.getWarpPanelManager().showWarpPanel(user,0);
+            plugin.getWarpPanelManager().showWarpPanel(getWorld(), user,0);
         }
         return true;
     }

src/bskyblock/addon/warps/database/object/WarpsData.java

@@ -5,6 +5,7 @@ import java.util.Map;
 import java.util.UUID;
 
 import org.bukkit.Location;
+import org.bukkit.World;
 
 import com.google.gson.annotations.Expose;
 
@@ -15,7 +16,7 @@ public class WarpsData implements DataObject {
     @Expose
     private String uniqueId = "warps";
     @Expose
-    private Map<UUID, Location> warpSigns = new HashMap<>(); 
+    private Map<Location, UUID> warpSigns = new HashMap<>(); 
 
     @Override
     public String getUniqueId() {
@@ -27,18 +28,23 @@ public class WarpsData implements DataObject {
         this.uniqueId = uniqueId;
     }
 
-    public Map<UUID, Location> getWarpSigns() {
+    public Map<Location,  UUID> getWarpSigns() {
     		if (warpSigns == null)
     			return new HashMap<>();
         return warpSigns;
     }
 
-    public void setWarpSigns(Map<UUID, Location> warpSigns) {
+    public void setWarpSigns(Map<Location, UUID> warpSigns) {
         this.warpSigns = warpSigns;
     }
 
-    public WarpsData save(Map<UUID, Location> warpList) {
+    /**
-        this.warpSigns = warpList;
+     * Puts all the data from the map into this object ready for saving
+     * @param worldsWarpList
+     * @return this class filled with data
+     */
+    public WarpsData save(Map<World, Map<UUID, Location>> worldsWarpList) {
+        worldsWarpList.values().forEach(world -> world.forEach((uuid,location) -> warpSigns.put(location, uuid)));
         return this;
     }