Merge remote-tracking branch 'origin/master' into development

README.md

@@ -5,12 +5,13 @@ Forked from [FabledSkyBlock](https://gitlab.com/Songoda/fabledskyblock)
 This fork contains bug fixes, features and improvements:
 - Added option to check location security when using `/is visit`
 - Added option to remove water from Island Spawn
-- Added an option to toggle fall damage in certain conditions like when using `/is home`
+- Added option to have Members, Operators and Owners all responding to Members settings as a temporary fix to Operators and Owners settings not being editable via GUI
+- Added option to toggle fall damage in certain conditions like when using `/is home`
 - Added per-world generator (editable only from generators.yml, GUI not supported yet)
 - Added a "subtract" value to levels in order to have all the new islands to level 0
 - Added option to set default WorldBorder status
 - Added permissions for WorldBorder colors
-- Added permission to bypass `/is kick`
+- Added permissions to bypass kick and ban
 - Added water in Nether mechanics!
 - Added option to let slime splitting bypass limits.yml
 - Added option to define distance between islands
@@ -19,8 +20,17 @@ This fork contains bug fixes, features and improvements:
 - Fixed bugs in Challenges that didn't remove all the items
 - Fixed WorldBorder size not reflecting real island size
 - Fixed bugs in island settings that prevented the from loading correctly
+- Fixed mob grief setting
+- Fixed explosion setting
+- Fixed damage setting
+- Fixed use portal setting
+- Fixed bank that couldn't be opened from Members
+- Fixed message telling that island disappeared on login
+- Fixed GUI menus that had used the same page variable
+- Fixed stackable bypassing break setting
 - Now you can use `/is chat <message>` to send messages to island chat
 - Now Challenges can be per-island too
+- Now hunger setting works as intended
 - Hide options in control panel if missing the permission
 - Hide vanished players from visitors list
 - Hide bank from leaderboard if disabled

pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.songoda</groupId>
 	<artifactId>skyblock</artifactId>
-	<version>2.2.16-LaborPatch-0.0.3</version>
+	<version>2.2.16-LaborPatch-0.0.6</version>
 	<packaging>jar</packaging>
 	<build>
 		<defaultGoal>clean install</defaultGoal>

src/main/java/com/songoda/skyblock/SkyBlock.java

@@ -111,8 +111,8 @@ public class SkyBlock extends SongodaPlugin {
         // Load Holograms
         com.songoda.core.hooks.HologramManager.load(this);
 
-        permissionManager = new PermissionManager(this);
         fileManager = new FileManager(this);
+        permissionManager = new PermissionManager(this);
         localizationManager = new LocalizationManager();
         worldManager = new WorldManager(this);
         userCacheManager = new UserCacheManager(this);

src/main/java/com/songoda/skyblock/bank/BankManager.java

@@ -67,11 +67,11 @@ public class BankManager {
     public List<String> getBalanceLore(Player player) {
         List<String> result = new ArrayList<>();
         result.add("Some error occurred while loading your balance!");
-        Island island = SkyBlock.getInstance().getIslandManager().getIslandByPlayer(Bukkit.getOfflinePlayer(player.getUniqueId()));
+        Island island = SkyBlock.getInstance().getIslandManager().getIsland(player);
         result.add("If this is null then its a easy to fix bug: "+island.toString());
         if (island != null) {
             result.clear();
-            result.add(player.getDisplayName()+"'s balance is "+EconomyManager.formatEconomy(EconomyManager.getBalance(Bukkit.getOfflinePlayer(player.getUniqueId()))));
+            result.add(player.getDisplayName()+"'s balance is "+EconomyManager.formatEconomy(EconomyManager.getBalance(player)));
             result.add(player.getDisplayName()+"'s island has "+EconomyManager.formatEconomy(island.getBankBalance()));
         }
         return result;

src/main/java/com/songoda/skyblock/challenge/challenge/Challenge.java

@@ -160,7 +160,7 @@ public class Challenge {
 					ItemStack is = (ItemStack) obj;
 					//p.getInventory().removeItem(new ItemStack(is.getType(), is.getAmount()));
 					int toRemove = is.getAmount();
-					for(ItemStack jis : p.getInventory().getStorageContents()) {
+					for(ItemStack jis : p.getInventory().getContents()) {
 						if(jis != null && jis.isSimilar(is)) {
 							if(jis.getAmount() <= toRemove) {
 								toRemove -= jis.getAmount();

src/main/java/com/songoda/skyblock/challenge/challenge/ChallengeCategory.java

@@ -61,8 +61,8 @@ public class ChallengeCategory {
 				Challenge c = new Challenge(this, id, name, maxTimes, showInChat, require, reward, ic);
 				challenges.put(id, c);
 			} catch (IllegalArgumentException ex) {
-				throw new IllegalArgumentException("Exception at category " + this.name + "(" + this.id
+				throw new IllegalArgumentException("Exception at category " + this.name.replace("&", "") + "(" + this.id
-						+ ") at challenge " + name + "(" + id + "): " + ex.getMessage());
+						+ ") at challenge " + name.replace("&", "") + "(" + id + "): " + ex.getMessage());
 			}
 		}
 		Bukkit.getConsoleSender().sendMessage("[FabledSkyBlock] " + ChatColor.GREEN + "Category " + name + ChatColor.GREEN

src/main/java/com/songoda/skyblock/command/commands/island/AcceptCommand.java

@@ -170,7 +170,7 @@ public class AcceptCommand extends SubCommand {
                             if (scoreboardManager != null) {
                                 Scoreboard scoreboard = scoreboardManager.getScoreboard(player);
                                 scoreboard.setDisplayName(ChatColor.translateAlternateColorCodes('&',
-                                        configLoad.getString("Scoreboard.Island.Team.Displayname")));
+                                        configLoad.getString("Scoreboard.Island.Team.Displayname", "")));
 
                                 if (islandManager.getVisitorsAtIsland(island).size() == 0) {
                                     scoreboard.setDisplayList(

src/main/java/com/songoda/skyblock/command/commands/island/BanCommand.java

@@ -63,6 +63,9 @@ public class BanCommand extends SubCommand {
                         if (targetPlayerUUID == null) {
                             messageManager.sendMessage(player, configLoad.getString("Command.Island.Ban.Found.Message"));
                             soundManager.playSound(player, CompatibleSound.BLOCK_ANVIL_LAND.getSound(), 1.0F, 1.0F);
+                        } else if((targetPlayer.hasPermission("fabledskyblock.bypass.ban") || targetPlayer.isOp())){
+                            messageManager.sendMessage(player, configLoad.getString("Command.Island.Ban.Exempt"));
+                            soundManager.playSound(player, CompatibleSound.BLOCK_ANVIL_LAND.getSound(), 1.0F, 1.0F);
                         } else if (targetPlayerUUID.equals(player.getUniqueId())) {
                             messageManager.sendMessage(player, configLoad.getString("Command.Island.Ban.Yourself.Message"));
                             soundManager.playSound(player, CompatibleSound.BLOCK_ANVIL_LAND.getSound(), 1.0F, 1.0F);

src/main/java/com/songoda/skyblock/command/commands/island/KickCommand.java

@@ -73,9 +73,8 @@ public class KickCommand extends SubCommand {
                             }
 
                             assert targetPlayer != null;
-                            if(targetPlayer.hasPermission("fabledskyblock.bypass.kick") && islandVisitors.contains(targetPlayer.getUniqueId())){
+                            if((targetPlayer.hasPermission("fabledskyblock.bypass.kick") || targetPlayer.isOp()) && islandVisitors.contains(targetPlayer.getUniqueId())){
-                                // messageManager.sendMessage(player, languageConfig.getFileConfiguration().getString("Command.Island.Kick.Exempt")); // TODO
+                                messageManager.sendMessage(player, languageConfig.getFileConfiguration().getString("Command.Island.Kick.Exempt"));
-                                messageManager.sendMessage(player, "&cNon puoi cacciare questo utente!");
                                 soundManager.playSound(player, CompatibleSound.BLOCK_ANVIL_LAND.getSound(), 1.0F, 1.0F);
                             } else if (targetPlayerUUID.equals(player.getUniqueId())) {
                                 messageManager.sendMessage(player, languageConfig.getFileConfiguration().getString("Command.Island.Kick.Yourself.Message"));
@@ -143,7 +142,9 @@ public class KickCommand extends SubCommand {
                                                 languageConfig.getFileConfiguration().getString("Command.Island.Kick.Kicked.Target.Message").replace("%player", player.getName()));
                                         soundManager.playSound(targetPlayer, CompatibleSound.ENTITY_IRON_GOLEM_ATTACK.getSound(), 1.0F, 1.0F);
 
-                                        if (islandManager.isPlayerAtIsland(island, targetPlayer)) {
+                                        if (islandManager.isPlayerAtIsland(island, targetPlayer)
+                                                && !targetPlayer.hasPermission("fabledskyblock.bypass.kick")
+                                                && !targetPlayer.isOp()) {
                                             LocationUtil.teleportPlayerToSpawn(targetPlayer);
                                         }
 

src/main/java/com/songoda/skyblock/command/commands/island/TeleportCommand.java

@@ -40,7 +40,7 @@ public class TeleportCommand extends SubCommand {
 
         if (args.length == 1) {
             Player targetPlayer = Bukkit.getServer().getPlayer(args[0]);
-            UUID islandOwnerUUID = null;
+            UUID islandOwnerUUID;
             String targetPlayerName;
 
             if (targetPlayer == null) {

src/main/java/com/songoda/skyblock/island/IslandManager.java

@@ -47,7 +47,6 @@ import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
-import org.bukkit.plugin.IllegalPluginAccessException;
 
 import java.io.File;
 import java.io.IOException;
@@ -896,7 +895,9 @@ public class IslandManager {
 
         islandStorage.remove(island.getOwnerUUID());
 
+        Bukkit.getScheduler().runTask(skyblock, () -> {
            Bukkit.getServer().getPluginManager().callEvent(new IslandUnloadEvent(island.getAPIWrapper()));
+        });
     }
 
     public void prepareIsland(Island island, IslandWorld world) {
@@ -1084,8 +1085,8 @@ public class IslandManager {
                 }
             } else {
                 player.sendMessage(ChatColor.translateAlternateColorCodes('&',
-                        Objects.requireNonNull(skyblock.getFileManager().getConfig(new File(skyblock.getDataFolder(), "language.yml"))
+                        skyblock.getFileManager().getConfig(new File(skyblock.getDataFolder(), "language.yml"))
-                                .getFileConfiguration().getString("Island.Teleport.Unsafe.Message"))));
+                                .getFileConfiguration().getString("Island.Teleport.Unsafe.Message")));
             }
         } else {
             if (scoreboardManager != null) {

src/main/java/com/songoda/skyblock/listeners/Block.java

@@ -25,9 +25,8 @@ import org.bukkit.block.BlockFace;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.CreatureSpawner;
 import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.entity.ArmorStand;
+import org.bukkit.entity.*;
 import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -69,14 +68,14 @@ public class Block implements Listener {
         }
 
         // Check permissions.
-        if (!skyblock.getPermissionManager().processPermission(event, player, island)) {
+        if (!skyblock.getPermissionManager().processPermission(event, player, island) || event.isCancelled()) {
             return;
         }
 
         if (stackableManager != null && stackableManager.isStacked(blockLocation)) {
-            Stackable stackable = stackableManager.getStack(block.getLocation(), CompatibleMaterial.getBlockMaterial(block.getType()));
+            Stackable stackable = stackableManager.getStack(block.getLocation(), CompatibleMaterial.getMaterial(block));
             if (stackable != null) {
-                CompatibleMaterial material = CompatibleMaterial.getBlockMaterial(block.getType());
+                CompatibleMaterial material = CompatibleMaterial.getMaterial(block);
                 byte data = block.getData();
 
                 int droppedAmount = 0;
@@ -323,21 +322,24 @@ public class Block implements Listener {
         if(configLoad.getBoolean("Island.Nether.WaterDoNotFlowNearNetherMobs", false) && worldManager.getIslandWorld(block.getWorld()).equals(IslandWorld.Nether)){
             Collection<Entity> entities = block.getWorld().getNearbyEntities(block.getLocation(), 1d, 1d, 1d);
             if(entities.size() > 0){
-                EntityCycle: for(Entity ent : entities){
+                for(Entity ent : entities){
-                    switch(ent.getType()){
+                    boolean witherSkeleton;
-                        case PIG_ZOMBIE:
+                    if (NMSUtil.getVersionNumber() > 10) {
-                        case BLAZE:
+                        witherSkeleton = ent.getType().equals(EntityType.WITHER_SKELETON);
-                        case MAGMA_CUBE:
+                    } else {
-                        case WITHER_SKELETON:
+                        witherSkeleton = ent instanceof Skeleton && ((Skeleton) ent).getSkeletonType().equals(Skeleton.SkeletonType.WITHER);
-                        case WITHER:
+                    }
-                        case GHAST:
+                    if (ent.getType().equals(EntityType.PIG_ZOMBIE) ||
+                        ent.getType().equals(EntityType.BLAZE) ||
+                        ent.getType().equals(EntityType.MAGMA_CUBE) ||
+                        ent.getType().equals(EntityType.WITHER) ||
+                        ent.getType().equals(EntityType.GHAST) ||
+                        witherSkeleton) {
                         if(block.getRelative(event.getFace().getOppositeFace()).getType().equals(Material.WATER)){
                             event.setCancelled(true);
-                                event.getToBlock().getWorld().playSound(block.getLocation(), Sound.BLOCK_FIRE_EXTINGUISH, 1f, 1f);
+                            event.getToBlock().getWorld().playSound(block.getLocation(), CompatibleSound.BLOCK_FIRE_EXTINGUISH.getSound(), 1f, 1f);
                             event.getToBlock().getWorld().playEffect(block.getLocation(), Effect.SMOKE, 1);
                         }
-                            break EntityCycle; // TODO No spaghetti code
-                        default:
                         break;
                     }
                 }
@@ -638,7 +640,7 @@ public class Block implements Listener {
         // PortalCreateEvent.getBlocks() changed from ArrayList<Block> to
         // ArrayList<BlockState> in 1.14.1
         if (NMSUtil.getVersionNumber() > 13) {
-            List<BlockState> blocks = event.getBlocks();
+            List<BlockState> blocks = event.getBlocks(); // TODO 1.8
             if (event.getBlocks().isEmpty()) return;
 
             Island island = islandManager.getIslandAtLocation(event.getBlocks().get(0).getLocation());
@@ -722,6 +724,7 @@ public class Block implements Listener {
         // placed.
         // This shouldn't cause any issues besides the task number being increased
         // insanely fast.
+        // TODO Do this only in 1.8.8
         Bukkit.getScheduler().runTask(skyblock, () -> {
             org.bukkit.block.Block block = location.getBlock();
             CompatibleMaterial material = CompatibleMaterial.getMaterial(block);

src/main/java/com/songoda/skyblock/listeners/Entity.java

@@ -27,6 +27,8 @@ import org.bukkit.event.hanging.HangingBreakEvent;
 import org.bukkit.event.hanging.HangingPlaceEvent;
 import org.bukkit.event.player.PlayerArmorStandManipulateEvent;
 import org.bukkit.event.player.PlayerShearEntityEvent;
+import org.bukkit.event.vehicle.VehicleDamageEvent;
+import org.bukkit.event.vehicle.VehicleDestroyEvent;
 import org.bukkit.inventory.EntityEquipment;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.scheduler.BukkitRunnable;
@@ -107,9 +109,9 @@ public class Entity implements Listener {
 
             // Check permissions.
             skyblock.getPermissionManager()
-                    .processPermission(event, player, islandManager.getIslandAtLocation(player.getLocation()));
+                    .processPermission(event, player, islandManager.getIslandAtLocation(player.getLocation()), true);
 
-        } else if (event.getDamager() instanceof TNTPrimed) {
+        } else { // Make it work with all the entities, not just TNT
             org.bukkit.entity.Entity entity = event.getEntity();
 
             // Check permissions.
@@ -217,6 +219,7 @@ public class Entity implements Listener {
     @EventHandler
     public void onHangingBreak(HangingBreakEvent event) {
         Hanging hanging = event.getEntity();
+
         if (!skyblock.getWorldManager().isIslandWorld(hanging.getWorld())) return;
         IslandManager islandManager = skyblock.getIslandManager();
 
@@ -229,14 +232,15 @@ public class Entity implements Listener {
     public void onHangingBreak(HangingBreakByEntityEvent event) {
         Hanging hanging = event.getEntity();
 
-        if (!(event.getRemover() instanceof Player))
-            return;
-
         if (!skyblock.getWorldManager().isIslandWorld(hanging.getWorld())) return;
         IslandManager islandManager = skyblock.getIslandManager();
 
+        Player p = null;
+        if(event.getRemover() instanceof Player){
+            p = (Player) event.getRemover();
+        }
         // Check permissions.
-        skyblock.getPermissionManager().processPermission(event, (Player) event.getRemover(),
+        skyblock.getPermissionManager().processPermission(event, p,
                 islandManager.getIslandAtLocation(hanging.getLocation()));
     }
 
@@ -322,9 +326,11 @@ public class Entity implements Listener {
             event.setCancelled(true);
             return;
         }
+
         // Check permissions.
         skyblock.getPermissionManager().processPermission(event, null, island);
 
+
         if (!skyblock.getFileManager().getConfig(new File(skyblock.getDataFolder(), "config.yml")).getFileConfiguration()
                 .getBoolean("Island.Block.Level.Enable"))
             return;
@@ -373,10 +379,10 @@ public class Entity implements Listener {
         if (skyblock.getWorldManager().isIslandWorld(entity.getWorld())) {
             // Check permissions.
             Island island = islandManager.getIslandAtLocation(entity.getLocation());
+
             skyblock.getPermissionManager().processPermission(event, null, island);
 
             if (!event.isCancelled()) {
-
                 if (skyblock.getFileManager().getConfig(new File(skyblock.getDataFolder(), "config.yml")).getFileConfiguration()
                         .getBoolean("Island.Block.Level.Enable")) {
                     for (org.bukkit.block.Block blockList : event.blockList()) {
@@ -563,6 +569,22 @@ public class Entity implements Listener {
         event.setCancelled(true); // For other plugin API reasons.
     }
 
+    @EventHandler
+    public void onDamageVehicle(VehicleDamageEvent event) {
+        if (!(event.getAttacker() instanceof Player)) {
+            IslandManager islandManager = skyblock.getIslandManager();
+            skyblock.getPermissionManager().processPermission(event, null, islandManager.getIslandAtLocation(event.getVehicle().getLocation()));
+        }
+    }
+
+    @EventHandler
+    public void onDestroyVehicle(VehicleDestroyEvent event) {
+        if (!(event.getAttacker() instanceof Player)) {
+            IslandManager islandManager = skyblock.getIslandManager();
+            skyblock.getPermissionManager().processPermission(event, null, islandManager.getIslandAtLocation(event.getVehicle().getLocation()));
+        }
+    }
+
     private static SpawnReason getSpawnReason(String reason) {
         try {
             return SpawnReason.valueOf(reason);

src/main/java/com/songoda/skyblock/listeners/Interact.java

@@ -18,6 +18,7 @@ import com.songoda.skyblock.stackable.Stackable;
 import com.songoda.skyblock.stackable.StackableManager;
 import com.songoda.skyblock.utils.NumberUtil;
 import com.songoda.skyblock.utils.structure.StructureUtil;
+import com.songoda.skyblock.utils.version.NMSUtil;
 import com.songoda.skyblock.utils.world.LocationUtil;
 import com.songoda.skyblock.world.WorldManager;
 import org.apache.commons.lang.WordUtils;
@@ -121,7 +122,7 @@ public class Interact implements Listener {
             if(configLoad.getBoolean("Island.Nether.AllowNetherWater", false)){
                 event.setCancelled(true);
                 block.setType(Material.WATER, true);
-                block.getWorld().playSound(block.getLocation(), Sound.ITEM_BUCKET_EMPTY, 1f, 1f);
+                block.getWorld().playSound(block.getLocation(), CompatibleSound.ITEM_BUCKET_EMPTY.getSound(), 1f, 1f);
                 if(!event.getPlayer().getGameMode().equals(GameMode.CREATIVE)){
                     event.getItem().setType(Material.BUCKET);
                 }

src/main/java/com/songoda/skyblock/listeners/Move.java

@@ -169,12 +169,17 @@ public class Move implements Listener {
             }
 
             // Load the island they are now on if one exists
-            if (player.hasPermission("fabledskyblock.bypass")) {
             Island loadedIsland = islandManager.loadIslandAtLocation(player.getLocation());
             if (loadedIsland != null) {
+                if (player.hasPermission("fabledskyblock.bypass")) {
                     playerData.setIsland(loadedIsland.getOwnerUUID());
                     return;
                 }
+
+                if(loadedIsland.isOpen()){
+                    loadedIsland.getVisit().addVisitor(player.getUniqueId());
+                    return;
+                }
             }
 
             LocationUtil.teleportPlayerToSpawn(player);
@@ -230,21 +235,21 @@ public class Move implements Listener {
     }
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onTeleport(PlayerTeleportEvent e) {
+    public void onTeleport(PlayerTeleportEvent e) { // TODO We should wait for the player island to be loaded in 1.8.8 - Fabrimat
-
         final Player player = e.getPlayer();
         final WorldManager worldManager = skyblock.getWorldManager();
-
+        if(e.getTo() != null && e.getTo().getWorld() != null){
-        if (e.getTo() == null ||
+            e.getTo().getWorld().loadChunk(e.getTo().getChunk());
-                !worldManager.isIslandWorld(e.getTo().getWorld()) ||
+            if(worldManager.isIslandWorld(e.getTo().getWorld())
-                skyblock.getIslandManager().getIslandAtLocation(e.getTo()) != null)
+                    && (!e.getTo().getWorld().equals(e.getFrom().getWorld()) || e.getTo().distance(e.getFrom()) > 1.0d)){ // We should not care of self block tp
-            return;
+                if(skyblock.getIslandManager().getIslandAtLocation(e.getTo()) == null){
-
                     e.setCancelled(true);
-
                     skyblock.getMessageManager().sendMessage(player,
-                skyblock.getFileManager().getConfig(new File(skyblock.getDataFolder(), "language.yml")).getFileConfiguration().getString("Island.WorldBorder.Disappeared.Message"));
+                            skyblock.getFileManager().getConfig(new File(skyblock.getDataFolder(), "language.yml"))
+                                    .getFileConfiguration().getString("Island.WorldBorder.Disappeared.Message"));
                     skyblock.getSoundManager().playSound(player, CompatibleSound.ENTITY_ENDERMAN_TELEPORT.getSound(), 1.0F, 1.0F);
-
+                }
+            }
+        }
     }
 }

src/main/java/com/songoda/skyblock/listeners/Portal.java

@@ -81,9 +81,10 @@ public class Portal implements Listener {
         Config config = fileManager.getConfig(new File(skyblock.getDataFolder(), "config.yml"));
         FileConfiguration configLoad = config.getFileConfiguration();
 
+        PlayerEnterPortalEvent playerEnterPortalEvent = new PlayerEnterPortalEvent(player, player.getLocation()); // TODO Why?? - Fabrimat
         // Check permissions.
-        if (!skyblock.getPermissionManager().processPermission(new PlayerEnterPortalEvent(player, player.getLocation()),
+        if (!skyblock.getPermissionManager().processPermission(playerEnterPortalEvent,
-                player, island))
+                player, island) || playerEnterPortalEvent.isCancelled())
             return;
 
         IslandEnvironment spawnEnvironment;

src/main/java/com/songoda/skyblock/menus/Bank.java

@@ -141,7 +141,7 @@ public class Bank {
 
     public void open(Player player) {
         Island island;
-        island = islandManager.getIslandByPlayer(Bukkit.getOfflinePlayer(player.getUniqueId()));
+        island = islandManager.getIsland(player);
 
 
         SkyBlock skyblock = SkyBlock.getInstance();

src/main/java/com/songoda/skyblock/menus/Bans.java

@@ -128,13 +128,13 @@ public class Bans {
                     } else if ((is.getType() == SkullUtil.createItemStack().getType()) && (is.hasItemMeta())) {
                         if (is.getItemMeta().getDisplayName().equals(ChatColor.translateAlternateColorCodes('&',
                                 configLoad.getString("Menu.Bans.Item.Previous.Displayname")))) {
-                            playerData1.setPage(playerData1.getPage() - 1);
+                            playerData1.setPage(MenuType.BANS, playerData1.getPage(MenuType.BANS) - 1);
                             soundManager.playSound(player, CompatibleSound.ENTITY_ARROW_HIT.getSound(), 1.0F, 1.0F);
 
                             Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
                         } else if (is.getItemMeta().getDisplayName().equals(ChatColor.translateAlternateColorCodes(
                                 '&', configLoad.getString("Menu.Bans.Item.Next.Displayname")))) {
-                            playerData1.setPage(playerData1.getPage() + 1);
+                            playerData1.setPage(MenuType.BANS, playerData1.getPage(MenuType.BANS) + 1);
                             soundManager.playSound(player, CompatibleSound.ENTITY_ARROW_HIT.getSound(), 1.0F, 1.0F);
 
                             Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
@@ -173,7 +173,7 @@ public class Bans {
                             configLoad.getString("Menu.Bans.Item.Barrier.Displayname"), null, null, null, null),
                     9, 10, 11, 12, 13, 14, 15, 16, 17);
 
-            int playerMenuPage = playerData.getPage(), nextEndIndex = islandBans.size() - playerMenuPage * 36;
+            int playerMenuPage = playerData.getPage(MenuType.BANS), nextEndIndex = islandBans.size() - playerMenuPage * 36;
 
             if (playerMenuPage != 1) {
                 nInv.addItem(nInv.createItem(SkullUtil.create(

src/main/java/com/songoda/skyblock/menus/Coop.java

@@ -151,13 +151,13 @@ public class Coop {
                     } else if ((is.getType() == SkullUtil.createItemStack().getType()) && (is.hasItemMeta())) {
                         if (is.getItemMeta().getDisplayName().equals(ChatColor.translateAlternateColorCodes('&',
                                 configLoad.getString("Menu.Coop.Item.Previous.Displayname")))) {
-                            playerData.setPage(playerData.getPage() - 1);
+                            playerData.setPage(MenuType.COOP, playerData.getPage(MenuType.COOP) - 1);
                             soundManager.playSound(player, CompatibleSound.ENTITY_ARROW_HIT.getSound(), 1.0F, 1.0F);
 
                             Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
                         } else if (is.getItemMeta().getDisplayName().equals(ChatColor.translateAlternateColorCodes(
                                 '&', configLoad.getString("Menu.Coop.Item.Next.Displayname")))) {
-                            playerData.setPage(playerData.getPage() + 1);
+                            playerData.setPage(MenuType.COOP, playerData.getPage(MenuType.COOP) + 1);
                             soundManager.playSound(player, CompatibleSound.ENTITY_ARROW_HIT.getSound(), 1.0F, 1.0F);
 
                             Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
@@ -194,7 +194,7 @@ public class Coop {
 
             Map<UUID, IslandCoop> coopPlayers = island.getCoopPlayers();
             
-            int playerMenuPage = playerData.getPage(), nextEndIndex = coopPlayers.size() - playerMenuPage * 36;
+            int playerMenuPage = playerData.getPage(MenuType.COOP), nextEndIndex = coopPlayers.size() - playerMenuPage * 36;
 
             nInv.addItem(nInv.createItem(CompatibleMaterial.OAK_FENCE_GATE.getItem(),
                     configLoad.getString("Menu.Coop.Item.Exit.Displayname"), null, null, null, null), 0, 8);

src/main/java/com/songoda/skyblock/menus/Information.java

@@ -303,7 +303,7 @@ public class Information {
                                 if (is.getItemMeta().getDisplayName()
                                         .equals(ChatColor.translateAlternateColorCodes('&', configLoad.getString(
                                                 "Menu.Information.Members.Item.Previous.Displayname")))) {
-                                    playerData1.setPage(playerData1.getPage() - 1);
+                                    playerData1.setPage(MenuType.INFORMATION, playerData1.getPage(MenuType.INFORMATION) - 1);
                                     soundManager.playSound(player, CompatibleSound.ENTITY_ARROW_HIT.getSound(), 1.0F, 1.0F);
 
                                     Bukkit.getServer().getScheduler().runTaskLater(skyblock,
@@ -311,7 +311,7 @@ public class Information {
                                 } else if (is.getItemMeta().getDisplayName()
                                         .equals(ChatColor.translateAlternateColorCodes('&', configLoad
                                                 .getString("Menu.Information.Members.Item.Next.Displayname")))) {
-                                    playerData1.setPage(playerData1.getPage() + 1);
+                                    playerData1.setPage(MenuType.INFORMATION, playerData1.getPage(MenuType.INFORMATION) + 1);
                                     soundManager.playSound(player, CompatibleSound.ENTITY_ARROW_HIT.getSound(), 1.0F, 1.0F);
 
                                     Bukkit.getServer().getScheduler().runTaskLater(skyblock,
@@ -358,7 +358,7 @@ public class Information {
                             configLoad.getString("Menu.Information.Members.Item.Barrier.Displayname"), null, null, null,
                             null), 9, 10, 11, 12, 13, 14, 15, 16, 17);
 
-                    int playerMenuPage = playerData.getPage(),
+                    int playerMenuPage = playerData.getPage(MenuType.INFORMATION),
                             nextEndIndex = displayedMembers.size() - playerMenuPage * 36;
 
                     if (playerMenuPage != 1) {
@@ -464,7 +464,7 @@ public class Information {
                                 if (is.getItemMeta().getDisplayName()
                                         .equals(ChatColor.translateAlternateColorCodes('&', configLoad.getString(
                                                 "Menu.Information.Visitors.Item.Previous.Displayname")))) {
-                                    playerData12.setPage(playerData12.getPage() - 1);
+                                    playerData12.setPage(MenuType.INFORMATION, playerData12.getPage(MenuType.INFORMATION) - 1);
                                     soundManager.playSound(player, CompatibleSound.ENTITY_ARROW_HIT.getSound(), 1.0F, 1.0F);
 
                                     Bukkit.getServer().getScheduler().runTaskLater(skyblock,
@@ -472,7 +472,7 @@ public class Information {
                                 } else if (is.getItemMeta().getDisplayName()
                                         .equals(ChatColor.translateAlternateColorCodes('&', configLoad
                                                 .getString("Menu.Information.Visitors.Item.Next.Displayname")))) {
-                                    playerData12.setPage(playerData12.getPage() + 1);
+                                    playerData12.setPage(MenuType.INFORMATION, playerData12.getPage(MenuType.INFORMATION) + 1);
                                     soundManager.playSound(player, CompatibleSound.ENTITY_ARROW_HIT.getSound(), 1.0F, 1.0F);
 
                                     Bukkit.getServer().getScheduler().runTaskLater(skyblock,
@@ -503,7 +503,7 @@ public class Information {
                             configLoad.getString("Menu.Information.Visitors.Item.Barrier.Displayname"), null, null,
                             null, null), 9, 10, 11, 12, 13, 14, 15, 16, 17);
 
-                    int playerMenuPage = playerData.getPage(),
+                    int playerMenuPage = playerData.getPage(MenuType.INFORMATION),
                             nextEndIndex = displayedVisitors.size() - playerMenuPage * 36;
 
                     if (playerMenuPage != 1) {

src/main/java/com/songoda/skyblock/menus/Leaderboard.java

@@ -123,7 +123,7 @@ public class Leaderboard {
                             2);
                 } else {
                     nInv.addItem(
-                            nInv.createItem(new ItemStack(Material.GRAY_STAINED_GLASS_PANE), "", null, null, null, null), 2);
+                            nInv.createItem(CompatibleMaterial.BLACK_STAINED_GLASS_PANE.getItem(), "", null, null, null, null), 2);
                 }
                 nInv.addItem(
                         nInv.createItem(new ItemStack(Material.EMERALD), configLoad

src/main/java/com/songoda/skyblock/menus/Levelling.java

@@ -146,12 +146,12 @@ public class Levelling {
                 PlayerData playerData1 = skyblock.getPlayerDataManager().getPlayerData(player);
 
                 if (is.getItemMeta().getDisplayName().equals(ChatColor.translateAlternateColorCodes('&', configLoad.getString("Menu.Levelling.Item.Previous.Displayname")))) {
-                    playerData1.setPage(playerData1.getPage() - 1);
+                    playerData1.setPage(MenuType.LEVELLING, playerData1.getPage(MenuType.LEVELLING) - 1);
                     soundManager.playSound(player, CompatibleSound.ENTITY_ARROW_HIT.getSound(), 1.0F, 1.0F);
 
                     Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
                 } else if (is.getItemMeta().getDisplayName().equals(ChatColor.translateAlternateColorCodes('&', configLoad.getString("Menu.Levelling.Item.Next.Displayname")))) {
-                    playerData1.setPage(playerData1.getPage() + 1);
+                    playerData1.setPage(MenuType.LEVELLING, playerData1.getPage(MenuType.LEVELLING) + 1);
                     soundManager.playSound(player, CompatibleSound.ENTITY_ARROW_HIT.getSound(), 1.0F, 1.0F);
 
                     Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
@@ -208,7 +208,7 @@ public class Levelling {
             }
         }
 
-        int playerMenuPage = playerData.getPage(), nextEndIndex = islandMaterials.size() - playerMenuPage * 36;
+        int playerMenuPage = playerData.getPage(MenuType.LEVELLING), nextEndIndex = islandMaterials.size() - playerMenuPage * 36;
 
         nInv.addItem(nInv.createItem(CompatibleMaterial.OAK_FENCE_GATE.getItem(), configLoad.getString("Menu.Levelling.Item.Exit.Displayname"), null, null, null, null), 0, 8);
         nInv.addItem(nInv.createItem(CompatibleMaterial.FIREWORK_STAR.getItem(), configLoad.getString("Menu.Levelling.Item.Rescan.Displayname"), configLoad.getStringList("Menu.Levelling.Item.Rescan.Lore"), null, null,

src/main/java/com/songoda/skyblock/menus/Members.java

@@ -130,14 +130,14 @@ public class Members {
                     } else if ((is.getType() == SkullUtil.createItemStack().getType()) && (is.hasItemMeta())) {
                         if (is.getItemMeta().getDisplayName().equals(ChatColor.translateAlternateColorCodes('&',
                                 configLoad.getString("Menu.Members.Item.Previous.Displayname")))) {
-                            playerData.setPage(playerData.getPage() - 1);
+                            playerData.setPage(MenuType.MEMBERS, playerData.getPage(MenuType.MEMBERS) - 1);
                             soundManager.playSound(player, CompatibleSound.ENTITY_ARROW_HIT.getSound(), 1.0F, 1.0F);
 
                             Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player, (Type) playerData.getType(),
                                     (Sort) playerData.getSort()), 1L);
                         } else if (is.getItemMeta().getDisplayName().equals(ChatColor.translateAlternateColorCodes(
                                 '&', configLoad.getString("Menu.Members.Item.Next.Displayname")))) {
-                            playerData.setPage(playerData.getPage() + 1);
+                            playerData.setPage(MenuType.MEMBERS, playerData.getPage(MenuType.MEMBERS) + 1);
                             soundManager.playSound(player, CompatibleSound.ENTITY_ARROW_HIT.getSound(), 1.0F, 1.0F);
 
                             Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player, (Type) playerData.getType(),
@@ -319,7 +319,7 @@ public class Members {
                 }
             }
 
-            int playerMenuPage = playerData.getPage(), nextEndIndex = displayedMembers.size() - playerMenuPage * 36;
+            int playerMenuPage = playerData.getPage(MenuType.MEMBERS), nextEndIndex = displayedMembers.size() - playerMenuPage * 36;
 
             nInv.addItem(nInv.createItem(CompatibleMaterial.OAK_FENCE_GATE.getItem(),
                     configLoad.getString("Menu.Members.Item.Exit.Displayname"), null, null, null, null), 0, 8);

src/main/java/com/songoda/skyblock/menus/MenuType.java

@@ -0,0 +1,14 @@
+package com.songoda.skyblock.menus;
+
+public enum MenuType {
+    ADMIN_LEVELLING,
+    ADMIN_CREATOR,
+    ADMIN_GENERATOR,
+    INFORMATION,
+    COOP,
+    LEVELLING,
+    MEMBERS,
+    BANS,
+    VISIT,
+    VISITORS
+}

src/main/java/com/songoda/skyblock/menus/Visit.java

@@ -120,13 +120,13 @@ public class Visit {
                 } else if ((is.getType() == SkullUtil.createItemStack().getType()) && (is.hasItemMeta())) {
                     if (is.getItemMeta().getDisplayName().equals(ChatColor.translateAlternateColorCodes('&',
                             configLoad.getString("Menu.Visit.Item.Previous.Displayname")))) {
-                        playerData.setPage(playerData.getPage() - 1);
+                        playerData.setPage(MenuType.VISIT, playerData.getPage(MenuType.VISIT) - 1);
                         soundManager.playSound(player, CompatibleSound.ENTITY_ARROW_HIT.getSound(), 1.0F, 1.0F);
 
                         Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player, (Type) playerData.getType(), (Sort) playerData.getSort()), 1L);
                     } else if (is.getItemMeta().getDisplayName().equals(ChatColor.translateAlternateColorCodes('&',
                             configLoad.getString("Menu.Visit.Item.Next.Displayname")))) {
-                        playerData.setPage(playerData.getPage() + 1);
+                        playerData.setPage(MenuType.VISIT, playerData.getPage(MenuType.VISIT) + 1);
                         soundManager.playSound(player, CompatibleSound.ENTITY_ARROW_HIT.getSound(), 1.0F, 1.0F);
 
                         Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player, (Type) playerData.getType(), (Sort) playerData.getSort()), 1L);
@@ -330,7 +330,7 @@ public class Visit {
             });
         }
 
-        int playerMenuPage = playerDataManager.getPlayerData(player).getPage(),
+        int playerMenuPage = playerDataManager.getPlayerData(player).getPage(MenuType.VISIT),
                 nextEndIndex = visitIslands.size() - playerMenuPage * 36,
                 totalIslands = visitManager.getIslands().size();
 

src/main/java/com/songoda/skyblock/menus/Visitors.java

@@ -95,13 +95,13 @@ public class Visitors {
                     } else if ((is.getType() == SkullUtil.createItemStack().getType()) && (is.hasItemMeta())) {
                         if (is.getItemMeta().getDisplayName().equals(ChatColor.translateAlternateColorCodes('&',
                                 configLoad.getString("Menu.Visitors.Item.Previous.Displayname")))) {
-                            playerData.setPage(playerData.getPage() - 1);
+                            playerData.setPage(MenuType.VISITORS, playerData.getPage(MenuType.VISITORS) - 1);
                             soundManager.playSound(player, CompatibleSound.ENTITY_ARROW_HIT.getSound(), 1.0F, 1.0F);
 
                             Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
                         } else if (is.getItemMeta().getDisplayName().equals(ChatColor.translateAlternateColorCodes(
                                 '&', configLoad.getString("Menu.Visitors.Item.Next.Displayname")))) {
-                            playerData.setPage(playerData.getPage() + 1);
+                            playerData.setPage(MenuType.VISITORS, playerData.getPage(MenuType.VISITORS) + 1);
                             soundManager.playSound(player, CompatibleSound.ENTITY_ARROW_HIT.getSound(), 1.0F, 1.0F);
 
                             Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
@@ -188,7 +188,7 @@ public class Visitors {
                 islandVisitors.add(sortedIslandVisitors.get(sortedIslandVisitorList));
             }
 
-            int playerMenuPage = playerData.getPage(), nextEndIndex = sortedIslandVisitors.size() - playerMenuPage * 36;
+            int playerMenuPage = playerData.getPage(MenuType.VISITORS), nextEndIndex = sortedIslandVisitors.size() - playerMenuPage * 36;
 
             if (playerMenuPage != 1) {
                 nInv.addItem(nInv.createItem(SkullUtil.create(

src/main/java/com/songoda/skyblock/menus/admin/Creator.java

@@ -5,6 +5,7 @@ import com.songoda.core.compatibility.CompatibleSound;
 import com.songoda.skyblock.SkyBlock;
 import com.songoda.skyblock.config.FileManager;
 import com.songoda.skyblock.config.FileManager.Config;
+import com.songoda.skyblock.menus.MenuType;
 import com.songoda.skyblock.message.MessageManager;
 import com.songoda.skyblock.placeholder.Placeholder;
 import com.songoda.skyblock.playerdata.PlayerData;
@@ -75,7 +76,7 @@ public class Creator implements Listener {
                     configLoad.getString("Menu.Admin.Creator.Browse.Item.Barrier.Displayname"), null, null, null, null),
                     9, 10, 11, 12, 13, 14, 15, 16, 17);
 
-            int playerMenuPage = playerData.getPage(), nextEndIndex = structures.size() - playerMenuPage * 36;
+            int playerMenuPage = playerData.getPage(MenuType.ADMIN_CREATOR), nextEndIndex = structures.size() - playerMenuPage * 36;
 
             if (playerMenuPage != 1) {
                 nInv.addItem(nInv.createItem(SkullUtil.create(

src/main/java/com/songoda/skyblock/menus/admin/Generator.java

@@ -8,6 +8,7 @@ import com.songoda.skyblock.config.FileManager.Config;
 import com.songoda.skyblock.generator.GeneratorManager;
 import com.songoda.skyblock.generator.GeneratorMaterial;
 import com.songoda.skyblock.island.IslandWorld;
+import com.songoda.skyblock.menus.MenuType;
 import com.songoda.skyblock.message.MessageManager;
 import com.songoda.skyblock.placeholder.Placeholder;
 import com.songoda.skyblock.playerdata.PlayerData;
@@ -75,7 +76,7 @@ public class Generator implements Listener {
                     configLoad.getString("Menu.Admin.Generator.Browse.Item.Barrier.Displayname"), null, null, null,
                     null), 9, 10, 11, 12, 13, 14, 15, 16, 17);
 
-            int playerMenuPage = playerData.getPage(), nextEndIndex = generators.size() - playerMenuPage * 36;
+            int playerMenuPage = playerData.getPage(MenuType.ADMIN_GENERATOR), nextEndIndex = generators.size() - playerMenuPage * 36;
 
             if (playerMenuPage != 1) {
                 nInv.addItem(nInv.createItem(SkullUtil.create(
@@ -394,7 +395,7 @@ public class Generator implements Listener {
                 && (is.hasItemMeta())) {
             if (is.getItemMeta().getDisplayName().equals(ChatColor.translateAlternateColorCodes('&',
                     configLoad.getString("Menu.Admin.Generator.Browse.Item.Previous.Displayname")))) {
-                playerData.setPage(playerData.getPage() - 1);
+                playerData.setPage(MenuType.ADMIN_GENERATOR, playerData.getPage(MenuType.ADMIN_GENERATOR) - 1);
                 soundManager.playSound(player, CompatibleSound.ENTITY_ARROW_HIT.getSound(), 1.0F, 1.0F);
 
                 player.closeInventory();
@@ -404,7 +405,7 @@ public class Generator implements Listener {
                 return;
             } else if (is.getItemMeta().getDisplayName().equals(ChatColor.translateAlternateColorCodes('&',
                     configLoad.getString("Menu.Admin.Generator.Browse.Item.Next.Displayname")))) {
-                playerData.setPage(playerData.getPage() + 1);
+                playerData.setPage(MenuType.ADMIN_GENERATOR, playerData.getPage(MenuType.ADMIN_GENERATOR) + 1);
                 soundManager.playSound(player, CompatibleSound.ENTITY_ARROW_HIT.getSound(), 1.0F, 1.0F);
 
                 player.closeInventory();

src/main/java/com/songoda/skyblock/menus/admin/Levelling.java

@@ -7,6 +7,7 @@ import com.songoda.skyblock.config.FileManager;
 import com.songoda.skyblock.config.FileManager.Config;
 import com.songoda.skyblock.levelling.rework.IslandLevelManager;
 import com.songoda.skyblock.levelling.rework.LevellingMaterial;
+import com.songoda.skyblock.menus.MenuType;
 import com.songoda.skyblock.message.MessageManager;
 import com.songoda.skyblock.placeholder.Placeholder;
 import com.songoda.skyblock.playerdata.PlayerData;
@@ -96,7 +97,7 @@ public class Levelling implements Listener {
                         configLoad.getString("Menu.Admin.Levelling.Item.Barrier.Displayname"), null, null, null, null),
                 9, 10, 11, 12, 13, 14, 15, 16, 17);
 
-        int playerMenuPage = playerData.getPage(), nextEndIndex = levellingMaterials.size() - playerMenuPage * 36;
+        int playerMenuPage = playerData.getPage(MenuType.ADMIN_LEVELLING), nextEndIndex = levellingMaterials.size() - playerMenuPage * 36;
 
         if (playerMenuPage != 1) {
             nInv.addItem(nInv.createItem(SkullUtil.create(
@@ -178,6 +179,7 @@ public class Levelling implements Listener {
             }
 
             if (inventoryName.equals(ChatColor.translateAlternateColorCodes('&', configLoad.getString("Menu.Admin.Levelling.Title")))) {
+                event.setCancelled(true);
                 PlayerData playerData = skyblock.getPlayerDataManager().getPlayerData(player);
 
                 if (!(player.hasPermission("fabledskyblock.admin.level") || player.hasPermission("fabledskyblock.admin.*")
@@ -185,7 +187,6 @@ public class Levelling implements Listener {
                     messageManager.sendMessage(player,
                             configLoad.getString("Island.Admin.Levelling.Permission.Message"));
                     soundManager.playSound(player, CompatibleSound.BLOCK_ANVIL_LAND.getSound(), 1.0F, 1.0F);
-                    event.setCancelled(true);
                     return;
                 }
 
@@ -193,7 +194,6 @@ public class Levelling implements Listener {
                         && (is.hasItemMeta())
                         && (is.getItemMeta().getDisplayName().equals(ChatColor.translateAlternateColorCodes('&',
                         configLoad.getString("Menu.Admin.Levelling.Item.Barrier.Displayname"))))) {
-                    event.setCancelled(true);
                     soundManager.playSound(player, CompatibleSound.BLOCK_GLASS_BREAK.getSound(), 1.0F, 1.0F);
 
                     return;
@@ -201,7 +201,6 @@ public class Levelling implements Listener {
                         && (is.hasItemMeta())
                         && (is.getItemMeta().getDisplayName().equals(ChatColor.translateAlternateColorCodes('&',
                         configLoad.getString("Menu.Admin.Levelling.Item.Exit.Displayname"))))) {
-                    event.setCancelled(true);
                     soundManager.playSound(player, CompatibleSound.BLOCK_CHEST_CLOSE.getSound(), 1.0F, 1.0F);
                     player.closeInventory();
 
@@ -209,7 +208,6 @@ public class Levelling implements Listener {
                 } else if ((event.getCurrentItem().getType() == CompatibleMaterial.OAK_SIGN.getMaterial()) && (is.hasItemMeta())
                         && (is.getItemMeta().getDisplayName().equals(ChatColor.translateAlternateColorCodes('&',
                         configLoad.getString("Menu.Admin.Levelling.Item.Information.Displayname"))))) {
-                    event.setCancelled(true);
                     soundManager.playSound(player, CompatibleSound.BLOCK_WOODEN_BUTTON_CLICK_ON.getSound(), 1.0F, 1.0F);
 
                     AbstractAnvilGUI gui = new AbstractAnvilGUI(player, event1 -> {
@@ -271,7 +269,6 @@ public class Levelling implements Listener {
                 } else if ((event.getCurrentItem().getType() == Material.BARRIER) && (is.hasItemMeta())
                         && (is.getItemMeta().getDisplayName().equals(ChatColor.translateAlternateColorCodes('&',
                         configLoad.getString("Menu.Admin.Levelling.Item.Nothing.Displayname"))))) {
-                    event.setCancelled(true);
                     soundManager.playSound(player, CompatibleSound.BLOCK_ANVIL_LAND.getSound(), 1.0F, 1.0F);
 
                     return;
@@ -279,10 +276,9 @@ public class Levelling implements Listener {
                         && (is.hasItemMeta())) {
                     if (is.getItemMeta().getDisplayName().equals(ChatColor.translateAlternateColorCodes('&',
                             configLoad.getString("Menu.Admin.Levelling.Item.Previous.Displayname")))) {
-                        event.setCancelled(true);
                         player.closeInventory();
 
-                        playerData.setPage(playerData.getPage() - 1);
+                        playerData.setPage(MenuType.ADMIN_LEVELLING, playerData.getPage(MenuType.ADMIN_LEVELLING) - 1);
                         soundManager.playSound(player, CompatibleSound.ENTITY_ARROW_HIT.getSound(), 1.0F, 1.0F);
 
                         Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
@@ -290,10 +286,9 @@ public class Levelling implements Listener {
                         return;
                     } else if (is.getItemMeta().getDisplayName().equals(ChatColor.translateAlternateColorCodes('&',
                             configLoad.getString("Menu.Admin.Levelling.Item.Next.Displayname")))) {
-                        event.setCancelled(true);
                         player.closeInventory();
 
-                        playerData.setPage(playerData.getPage() + 1);
+                        playerData.setPage(MenuType.ADMIN_LEVELLING, playerData.getPage(MenuType.ADMIN_LEVELLING) + 1);
                         soundManager.playSound(player, CompatibleSound.ENTITY_ARROW_HIT.getSound(), 1.0F, 1.0F);
 
                         Bukkit.getServer().getScheduler().runTaskLater(skyblock, () -> open(player), 1L);
@@ -306,9 +301,9 @@ public class Levelling implements Listener {
                     for (LevellingMaterial materialList : levellingManager.getWorthsAsLevelingMaterials()) {
                         CompatibleMaterial materials = materialList.getMaterials();
 
-                        if (event.getCurrentItem().getType() == CompatibleMaterial.getMaterial(materials.getMaterial()).getMaterial()
+                        if (CompatibleMaterial.getMaterial(materials.getMaterial()) != null
+                                &&  event.getCurrentItem().getType().equals(CompatibleMaterial.getMaterial(materials.getMaterial()).getMaterial())
                                 && ChatColor.stripColor(is.getItemMeta().getDisplayName()).equals(materials.name())) {
-                            event.setCancelled(true);
 
                             if (event.getClick() == ClickType.LEFT) {
                                 soundManager.playSound(player, CompatibleSound.BLOCK_WOODEN_BUTTON_CLICK_ON.getSound(), 1.0F, 1.0F);
@@ -411,8 +406,6 @@ public class Levelling implements Listener {
                     }
                 }
 
-                event.setCancelled(true);
-
                 CompatibleMaterial materials = CompatibleMaterial.getMaterial(event.getCurrentItem().getType());
 
                 if (NMSUtil.getVersionNumber() < 13) {

src/main/java/com/songoda/skyblock/permission/BasicPermission.java

@@ -60,15 +60,6 @@ public abstract class BasicPermission {
         return is;
     }
 
-    /**
-     * Use this to check additional perms.
-     *
-     * @return
-     */
-    public boolean overridingCheck() {
-        return true;
-    }
-
     public String getName() {
         return name;
     }

src/main/java/com/songoda/skyblock/permission/ListeningPermission.java

@@ -81,6 +81,10 @@ public abstract class ListeningPermission extends BasicPermission {
     public void onBlockIgnite(BlockIgniteEvent event) {}
 
     protected void noPermsMessage(Player player, SkyBlock plugin, MessageManager messageManager) {
+        if(messageManager == null){ // TODO Check why this is null - Fabrimat
+            messageManager = SkyBlock.getInstance().getMessageManager();
+        }
+
         messageManager.sendMessage(player,
                 plugin.getFileManager().getConfig(new File(plugin.getDataFolder(), "language.yml"))
                         .getFileConfiguration().getString("Island.Settings.Permission.Message"));

src/main/java/com/songoda/skyblock/permission/PermissionManager.java

@@ -1,6 +1,7 @@
 package com.songoda.skyblock.permission;
 
 import com.songoda.skyblock.SkyBlock;
+import com.songoda.skyblock.config.FileManager;
 import com.songoda.skyblock.island.Island;
 import com.songoda.skyblock.island.IslandRole;
 import com.songoda.skyblock.permission.event.Stoppable;
@@ -8,9 +9,11 @@ import com.songoda.skyblock.permission.permissions.basic.*;
 import com.songoda.skyblock.permission.permissions.listening.*;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
+import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
 
+import java.io.File;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.*;
@@ -27,7 +30,7 @@ public class PermissionManager {
         this.plugin = plugin;
 
         // Load default permissions.
-        registerPermissions(
+        registerPermissions( // TODO Reload them with /is admin reload - Fabrimat
                 //Listening
                 new StoragePermission(plugin),
                 new DragonEggUsePermission(plugin),
@@ -77,7 +80,6 @@ public class PermissionManager {
                 new MobGriefingPermission(plugin),
                 new ExperienceOrbPickupPermission(plugin),
                 new NaturalMobSpawningPermission(),
-                new HungerPermission(plugin),
                 new PortalPermission(plugin),
                 new ItemPickupPermission(),
                 new ItemDropPermission(),
@@ -100,6 +102,11 @@ public class PermissionManager {
                 new MainSpawnPermission(),
                 new VisitorSpawnPermission());
 
+        if(plugin.getFileManager().getConfig(new File(plugin.getDataFolder(), "config.yml"))
+                .getFileConfiguration().getBoolean("Island.Settings.Hunger.Enable")){
+            registerPermission(new HungerPermission(plugin));
+        }
+
         registeredHandlers = registeredHandlers.stream().sorted(Comparator.comparingInt(h -> {
             final PermissionHandler permissionHandler = h.getHandler().getAnnotation(PermissionHandler.class);
             return permissionHandler.priority().ordinal();
@@ -141,6 +148,10 @@ public class PermissionManager {
     }
 
     public boolean processPermission(Cancellable cancellable, Player player, Island island) {
+        return processPermission(cancellable, player, island, false);
+    }
+
+    public boolean processPermission(Cancellable cancellable, Player player, Island island, boolean reversePermission) {
         if (island == null) return true;
 
         for (HandlerWrapper wrapper : registeredHandlers) {
@@ -152,7 +163,7 @@ public class PermissionManager {
 
             BasicPermission permission = wrapper.getPermission();
 
-            if (permission.overridingCheck() || hasPermission(player, island, permission))
+            if (hasPermission(player, island, permission, reversePermission))
                 continue;
 
             try {
@@ -164,21 +175,38 @@ public class PermissionManager {
         return true;
     }
 
-    public boolean hasPermission(Player player, Island island, BasicPermission permission) {
+    public boolean hasPermission(Player player, Island island, BasicPermission permission, boolean reversePermission){
         if (player == null)
             return island.hasPermission(IslandRole.Owner, permission);
 
         if (player.hasPermission("fabledskyblock.bypass." + permission.getName().toLowerCase()))
-            return true;
+            return !reversePermission;
 
-        if (island.hasPermission(island.getRole(player), permission))
+        FileManager.Config config = SkyBlock.getInstance().getFileManager().getConfig(new File(plugin.getDataFolder(), "config.yml"));
-            return true;
+        FileConfiguration configLoad = config.getFileConfiguration();
-
-        if (island.isCoopPlayer(player.getUniqueId()) && island.hasPermission(IslandRole.Coop, permission))
-            return true;
 
+        switch(island.getRole(player)){
+            case Owner:
+                if(!configLoad.getBoolean("Island.Settings.OwnersAndOperatorsAsMembers", false)){
+                    return island.hasPermission(IslandRole.Owner, permission);
+                }
+            case Operator:
+                if(!configLoad.getBoolean("Island.Settings.OwnersAndOperatorsAsMembers", false)){
+                    return island.hasPermission(IslandRole.Operator, permission);
+                }
+            case Member:
+                return island.hasPermission(IslandRole.Member, permission);
+            case Coop:
+                return island.hasPermission(IslandRole.Coop, permission);
+            case Visitor:
                 return island.hasPermission(IslandRole.Visitor, permission);
         }
+        return false;
+    }
+
+    public boolean hasPermission(Player player, Island island, BasicPermission permission) {
+        return this.hasPermission(player, island, permission, false);
+    }
 
     public boolean hasPermission(Location location, String permission, IslandRole islandRole) {
         if (location == null)

src/main/java/com/songoda/skyblock/permission/permissions/listening/DamagePermission.java

@@ -7,6 +7,7 @@ import com.songoda.skyblock.permission.ListeningPermission;
 import com.songoda.skyblock.permission.PermissionHandler;
 import com.songoda.skyblock.permission.PermissionType;
 import com.songoda.skyblock.utils.version.NMSUtil;
+import org.bukkit.Bukkit;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
@@ -52,11 +53,11 @@ public class DamagePermission extends ListeningPermission {
         FileManager.Config config = fileManager.getConfig(new File(plugin.getDataFolder(), "config.yml"));
         FileConfiguration configLoad = config.getFileConfiguration();
 
-        if (configLoad.getBoolean("Island.Settings.Damage.Enable"))
+        if (configLoad.getBoolean("Island.Settings.Damage.Enable", false)
-            event.setCancelled(true);
+                || !configLoad.getBoolean("Island.Damage.Enable", false)) {
-        else if (!configLoad.getBoolean("Island.Damage.Enable"))
             event.setCancelled(true);
         }
+    }
 
     @PermissionHandler
     public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
@@ -67,9 +68,8 @@ public class DamagePermission extends ListeningPermission {
         FileManager.Config config = fileManager.getConfig(new File(plugin.getDataFolder(), "config.yml"));
         FileConfiguration configLoad = config.getFileConfiguration();
 
-        if (configLoad.getBoolean("Island.Settings.Damage.Enable")) {
+        if (configLoad.getBoolean("Island.Settings.Damage.Enable", false)
-            event.setCancelled(true);
+                || !configLoad.getBoolean("Island.Damage.Enable", false)) {
-        } else if (!configLoad.getBoolean("Island.Damage.Enable")) {
             event.setCancelled(true);
         }
     }

src/main/java/com/songoda/skyblock/permission/permissions/listening/ExplosionsPermission.java

@@ -1,53 +1,89 @@
 package com.songoda.skyblock.permission.permissions.listening;
 
 import com.songoda.core.compatibility.CompatibleMaterial;
+import com.songoda.core.compatibility.CompatibleSound;
 import com.songoda.skyblock.SkyBlock;
 import com.songoda.skyblock.permission.ListeningPermission;
 import com.songoda.skyblock.permission.PermissionHandler;
 import com.songoda.skyblock.permission.PermissionType;
-import org.bukkit.entity.Entity;
+import org.bukkit.Bukkit;
-import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Creeper;
 import org.bukkit.entity.TNTPrimed;
-import org.bukkit.event.block.BlockIgniteEvent;
+import org.bukkit.entity.minecart.ExplosiveMinecart;
+import org.bukkit.event.block.BlockExplodeEvent;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.entity.EntityDamageEvent;
+import org.bukkit.event.entity.EntityExplodeEvent;
+import org.bukkit.event.hanging.HangingBreakByEntityEvent;
 import org.bukkit.event.hanging.HangingBreakEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.event.vehicle.VehicleDamageEvent;
+import org.bukkit.event.vehicle.VehicleDestroyEvent;
 
 public class ExplosionsPermission extends ListeningPermission {
 
     private SkyBlock plugin;
 
     public ExplosionsPermission(SkyBlock plugin) {
-        super("Explosions", CompatibleMaterial.GUNPOWDER, PermissionType.GENERIC);
+        super("Explosions", CompatibleMaterial.GUNPOWDER, PermissionType.ISLAND);
         this.plugin = plugin;
     }
 
     @PermissionHandler
-    public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
+    public void onBlockExplode(BlockExplodeEvent event) {
-        Entity entity = event.getEntity();
-
-        if (event.getDamager() instanceof TNTPrimed)
         event.setCancelled(true);
-        if (entity.getType() == EntityType.PLAYER
+    }
-                && event.getDamager() instanceof TNTPrimed)
+
+    @PermissionHandler
+    public void onEntityExplode(EntityExplodeEvent event) {
+        event.setCancelled(true);
+    }
+
+    @PermissionHandler
+    public void onVehicleDamage(VehicleDamageEvent event) {
+        if (event.getAttacker() instanceof TNTPrimed
+                || event.getAttacker() instanceof ExplosiveMinecart
+                || event.getAttacker() instanceof Creeper)
+            event.setCancelled(true);
+    }
+
+    @PermissionHandler
+    public void onVehicleDestroy(VehicleDestroyEvent event) {
+        if (event.getAttacker() instanceof TNTPrimed
+                || event.getAttacker() instanceof ExplosiveMinecart
+                || event.getAttacker() instanceof Creeper)
+            event.setCancelled(true);
+    }
+
+    @PermissionHandler
+    public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
+        if (event.getCause().equals(EntityDamageEvent.DamageCause.ENTITY_EXPLOSION)
+                || event.getCause().equals(EntityDamageEvent.DamageCause.BLOCK_EXPLOSION)
+                || event.getDamager() instanceof TNTPrimed
+                || event.getDamager() instanceof ExplosiveMinecart
+                || event.getDamager() instanceof Creeper)
             event.setCancelled(true);
     }
 
     @PermissionHandler
     public void onHangingBreak(HangingBreakEvent event) {
-        if (event.getCause() != HangingBreakEvent.RemoveCause.EXPLOSION)
+        if (event.getCause().equals(HangingBreakEvent.RemoveCause.EXPLOSION)) {
-            return;
-
             event.setCancelled(true);
         }
+    }
 
     @PermissionHandler
-    public void onBlockInteract(PlayerInteractEvent event) {
+    public void onHangingBreak(HangingBreakByEntityEvent event) {
-        if (CompatibleMaterial.getMaterial(event.getPlayer().getItemInHand()) != CompatibleMaterial.FLINT_AND_STEEL)
+        if(event.getCause().equals(HangingBreakEvent.RemoveCause.EXPLOSION)){
-            return;
+            event.setCancelled(true);
+        }
+    }
 
-        CompatibleMaterial material = CompatibleMaterial.getMaterial(event.getClickedBlock());
+    @PermissionHandler
-        if (material == CompatibleMaterial.TNT)
+    public void onTNTInteract(PlayerInteractEvent event) {
+        if(event.getItem().getType().equals(CompatibleMaterial.FLINT_AND_STEEL.getMaterial())
+                && event.getClickedBlock().getType().equals(CompatibleMaterial.TNT.getBlockMaterial())){
             cancelAndMessage(event, event.getPlayer(), plugin, plugin.getMessageManager());
         }
     }
+}

src/main/java/com/songoda/skyblock/permission/permissions/listening/HungerPermission.java

@@ -21,12 +21,6 @@ public class HungerPermission extends ListeningPermission {
         this.messageManager = plugin.getMessageManager();
     }
 
-    @Override
-    public boolean overridingCheck() {
-        return plugin.getFileManager().getConfig(new File(plugin.getDataFolder(), "config.yml"))
-                .getFileConfiguration().getBoolean("Island.Settings.Hunger.Enable");
-    }
-
     @PermissionHandler
     public void onFoodLevelChange(FoodLevelChangeEvent event) {
         event.setCancelled(true);

src/main/java/com/songoda/skyblock/permission/permissions/listening/MobGriefingPermission.java

@@ -2,43 +2,79 @@ package com.songoda.skyblock.permission.permissions.listening;
 
 import com.songoda.core.compatibility.CompatibleMaterial;
 import com.songoda.skyblock.SkyBlock;
-import com.songoda.skyblock.message.MessageManager;
 import com.songoda.skyblock.permission.ListeningPermission;
 import com.songoda.skyblock.permission.PermissionHandler;
 import com.songoda.skyblock.permission.PermissionType;
-import org.bukkit.entity.*;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.TNTPrimed;
+import org.bukkit.entity.minecart.ExplosiveMinecart;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.entity.EntityExplodeEvent;
+import org.bukkit.event.hanging.HangingBreakByEntityEvent;
 import org.bukkit.event.vehicle.VehicleDamageEvent;
 import org.bukkit.event.vehicle.VehicleDestroyEvent;
 
 public class MobGriefingPermission extends ListeningPermission {
 
     private final SkyBlock plugin;
-    private final MessageManager messageManager;
 
     public MobGriefingPermission(SkyBlock plugin) {
         super("MobGriefing", CompatibleMaterial.IRON_SHOVEL, PermissionType.ISLAND);
         this.plugin = plugin;
-        this.messageManager = plugin.getMessageManager();
+    }
+
+    @PermissionHandler
+    public void onEntityExplode(EntityExplodeEvent event) {
+        if (!(event.getEntity() instanceof Player)
+                && (!(event.getEntity() instanceof org.bukkit.entity.Projectile)
+                || !(((org.bukkit.entity.Projectile) event.getEntity()).getShooter() instanceof Player))
+                && !(event.getEntity() instanceof TNTPrimed)
+                && !(event.getEntity() instanceof ExplosiveMinecart)) {
+            event.setCancelled(true);
+        }
     }
 
     @PermissionHandler
     public void onVehicleDamage(VehicleDamageEvent event) {
-
+        if (!(event.getAttacker() instanceof Player)
-
+                && (!(event.getAttacker() instanceof org.bukkit.entity.Projectile)
-        Player player = (Player) event.getAttacker();
+                || !(((org.bukkit.entity.Projectile) event.getAttacker()).getShooter() instanceof Player))
-        cancelAndMessage(event, player, plugin, messageManager);
+                && !(event.getAttacker() instanceof TNTPrimed)
+                && !(event.getAttacker() instanceof ExplosiveMinecart)) {
+            event.setCancelled(true);
+        }
     }
 
     @PermissionHandler
     public void onVehicleDestroy(VehicleDestroyEvent event) {
-
+        if (!(event.getAttacker() instanceof Player)
-
+                && (!(event.getAttacker() instanceof org.bukkit.entity.Projectile)
-        Player player = (Player) event.getAttacker();
+                || !(((org.bukkit.entity.Projectile) event.getAttacker()).getShooter() instanceof Player))
-        cancelAndMessage(event, player, plugin, messageManager);
+                && !(event.getAttacker() instanceof TNTPrimed)
+                && !(event.getAttacker() instanceof ExplosiveMinecart)) {
+            event.setCancelled(true);
+        }
     }
 
     @PermissionHandler
+    public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
+        if (!(event.getDamager() instanceof Player)
+                && (!(event.getDamager() instanceof org.bukkit.entity.Projectile)
+                || !(((org.bukkit.entity.Projectile) event.getDamager()).getShooter() instanceof Player))
+                && !(event.getDamager() instanceof TNTPrimed)
+                && !(event.getDamager() instanceof ExplosiveMinecart)) {
+            event.setCancelled(true);
+        }
+    }
+
+    @PermissionHandler
+    public void onHangingBreak(HangingBreakByEntityEvent event) {
+        if(!(event.getRemover() instanceof Player)){
+            event.setCancelled(true);
+        }
+    }
+
+    /*@PermissionHandler // TODO ? - Fabrimat
     public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
         Entity entity = event.getEntity();
         EntityType type = event.getEntityType();
@@ -53,6 +89,6 @@ public class MobGriefingPermission extends ListeningPermission {
         else return;
 
         cancelAndMessage(event, player, plugin, messageManager);
-    }
+    }*/
 }
 

src/main/java/com/songoda/skyblock/permission/permissions/listening/PortalPermission.java

@@ -3,12 +3,16 @@ package com.songoda.skyblock.permission.permissions.listening;
 import com.songoda.core.compatibility.CompatibleMaterial;
 import com.songoda.core.compatibility.ServerVersion;
 import com.songoda.skyblock.SkyBlock;
+import com.songoda.skyblock.island.*;
 import com.songoda.skyblock.message.MessageManager;
 import com.songoda.skyblock.permission.ListeningPermission;
 import com.songoda.skyblock.permission.PermissionHandler;
 import com.songoda.skyblock.permission.PermissionType;
 import com.songoda.skyblock.permission.event.events.PlayerEnterPortalEvent;
 import com.songoda.skyblock.utils.world.LocationUtil;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.block.BlockFace;
 import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerTeleportEvent;
@@ -26,29 +30,45 @@ public class PortalPermission extends ListeningPermission {
 
     @PermissionHandler
     public void onPortalEnter(PlayerEnterPortalEvent event) {
+        if(event.getEntity() instanceof Player){
             Player player = (Player) event.getEntity();
 
             cancelAndMessage(event, player, plugin, messageManager);
-    }
+            Bukkit.getScheduler().runTask(plugin, () -> {
-
+                player.teleport(getToLocation(event.getLocation(), player));
-    @PermissionHandler
+            });
-    public void onMove(PlayerMoveEvent event) {
-        CompatibleMaterial toMaterial = CompatibleMaterial.getMaterial(event.getTo().getBlock().getType());
-
-        if (toMaterial == CompatibleMaterial.NETHER_BRICK || toMaterial == CompatibleMaterial.END_PORTAL) {
-            event.setTo(LocationUtil.getRandomLocation(event.getFrom().getWorld(), 5000, 5000, true, true));
-            cancelAndMessage(event, event.getPlayer(), plugin, messageManager);
         }
     }
 
     @PermissionHandler
     public void onTeleport(PlayerTeleportEvent event) {
-        if (event.getCause() == PlayerTeleportEvent.TeleportCause.ENDER_PEARL
+        if (event.getCause().equals(PlayerTeleportEvent.TeleportCause.ENDER_PEARL)
-                || event.getCause() == PlayerTeleportEvent.TeleportCause.NETHER_PORTAL
+                || event.getCause().equals(PlayerTeleportEvent.TeleportCause.NETHER_PORTAL)
-                || event.getCause() == PlayerTeleportEvent.TeleportCause.END_PORTAL
+                || event.getCause().equals(PlayerTeleportEvent.TeleportCause.END_PORTAL)
-                || ServerVersion.isServerVersionAtLeast(ServerVersion.V1_9) &&
+                || (ServerVersion.isServerVersionAtLeast(ServerVersion.V1_9)
-                event.getCause() == PlayerTeleportEvent.TeleportCause.END_GATEWAY)
+                    && event.getCause().equals(PlayerTeleportEvent.TeleportCause.END_GATEWAY))){
+            event.getPlayer().teleport(getToLocation(event.getFrom(), event.getPlayer()));
+            Location to = getToLocation(event.getFrom(), event.getPlayer());
+            Bukkit.getScheduler().runTask(plugin, () -> {
+                event.getPlayer().teleport(to);
+            });
+            event.setTo(to);
+
             cancelAndMessage(event, event.getPlayer(), plugin, messageManager);
         }
     }
 
+    private Location getToLocation(Location from, Player player) {
+        IslandManager islandManager = plugin.getIslandManager();
+        Island island = islandManager.getIslandAtLocation(from);
+        Location to = island.getLocation(IslandWorld.Normal, IslandEnvironment.Main);
+        if(island.hasRole(IslandRole.Visitor, player.getUniqueId())){
+            to = LocationUtil.getSafeLocation(island.getLocation(IslandWorld.Normal, IslandEnvironment.Visitor));
+            if(to == null){
+                to = LocationUtil.getSpawnLocation();
+            }
+        }
+        return to;
+    }
+}
+

src/main/java/com/songoda/skyblock/playerdata/MenuPage.java

@@ -0,0 +1,25 @@
+package com.songoda.skyblock.playerdata;
+
+import com.songoda.skyblock.menus.MenuType;
+
+public class MenuPage {
+    MenuType type;
+    int page;
+
+    public MenuPage(MenuType type, int page){
+        this.type = type;
+        this.page = page;
+    }
+
+    public void setPage(int page){
+        this.page = page;
+    }
+
+    public MenuType getType(){
+        return type;
+    }
+
+    public int getPage(){
+        return page;
+    }
+}

src/main/java/com/songoda/skyblock/playerdata/PlayerData.java

@@ -6,6 +6,7 @@ import com.songoda.skyblock.bank.Transaction;
 import com.songoda.skyblock.bank.Type;
 import com.songoda.skyblock.config.FileManager.Config;
 import com.songoda.skyblock.confirmation.Confirmation;
+import com.songoda.skyblock.menus.MenuType;
 import com.songoda.skyblock.utils.structure.Area;
 
 import org.bukkit.Bukkit;
@@ -22,7 +23,7 @@ public class PlayerData {
     private UUID islandOwnerUUID;
     private UUID ownershipUUID;
 
-    private int page;
+    private List<MenuPage> pages;
     private int playTime;
     private int visitTime;
     private int confirmationTime;
@@ -45,7 +46,8 @@ public class PlayerData {
         uuid = player.getUniqueId();
         islandOwnerUUID = null;
 
-        page = 1;
+        pages = new ArrayList<>();
+
         confirmationTime = 0;
         playTime = getConfig().getFileConfiguration().getInt("Statistics.Island.Playtime");
 
@@ -67,12 +69,23 @@ public class PlayerData {
         }
     }
 
-    public int getPage() {
+    public int getPage(MenuType type) {
-        return page;
+        for(MenuPage menu : pages){
+            if(menu.getType().equals(type)){
+                return menu.getPage();
+            }
+        }
+        return 1;
     }
 
-    public void setPage(int page) {
+    public void setPage(MenuType type, int page) {
-        this.page = page;
+        for(MenuPage menu : pages){
+            if(menu.getType().equals(type)){
+               menu.setPage(page);
+               return;
+            }
+        }
+        pages.add(new MenuPage(type, page));
     }
 
     public Object getType() {

src/main/java/com/songoda/skyblock/tasks/MobNetherWaterTask.java

@@ -1,5 +1,6 @@
 package com.songoda.skyblock.tasks;
 
+import com.songoda.core.compatibility.CompatibleSound;
 import com.songoda.core.utils.TextUtils;
 import com.songoda.skyblock.SkyBlock;
 import com.songoda.skyblock.config.FileManager;
@@ -11,6 +12,7 @@ import com.songoda.skyblock.leaderboard.Leaderboard;
 import com.songoda.skyblock.leaderboard.LeaderboardManager;
 import com.songoda.skyblock.utils.NumberUtil;
 import com.songoda.skyblock.utils.player.OfflinePlayer;
+import com.songoda.skyblock.utils.version.NMSUtil;
 import com.songoda.skyblock.utils.world.LocationUtil;
 import com.songoda.skyblock.visit.Visit;
 import org.bukkit.*;
@@ -18,7 +20,9 @@ import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
+import org.bukkit.entity.Skeleton;
 import org.bukkit.scheduler.BukkitRunnable;
 
 import java.io.File;
@@ -52,32 +56,34 @@ public class MobNetherWaterTask  extends BukkitRunnable {
             for(World world : Bukkit.getServer().getWorlds()){
                 if(plugin.getWorldManager().isIslandWorld(world) && plugin.getWorldManager().getIslandWorld(world).equals(IslandWorld.Nether)){
                     for(Entity ent : world.getEntities()) {
-                        switch(ent.getType()){
+                        boolean witherSkeleton;
-                            case PIG_ZOMBIE:
+                        if (NMSUtil.getVersionNumber() > 10) {
-                            case BLAZE:
+                            witherSkeleton = ent.getType().equals(EntityType.WITHER_SKELETON);
-                            case MAGMA_CUBE:
+                        } else {
-                            case WITHER_SKELETON:
+                            witherSkeleton = ent instanceof Skeleton && ((Skeleton) ent).getSkeletonType().equals(Skeleton.SkeletonType.WITHER);
-                            case WITHER:
+                        }
-                            case GHAST:
+                        if (ent.getType().equals(EntityType.PIG_ZOMBIE) ||
+                                ent.getType().equals(EntityType.BLAZE) ||
+                                ent.getType().equals(EntityType.MAGMA_CUBE) ||
+                                ent.getType().equals(EntityType.WITHER) ||
+                                ent.getType().equals(EntityType.GHAST) ||
+                                witherSkeleton) {
                             Block block = ent.getLocation().getBlock();
+                            removeWater(world, block);
+                            removeWater(world, block.getRelative(BlockFace.UP));
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private void removeWater(World world, Block block) {
         if (block.getType().equals(Material.WATER)) {
             block.setType(Material.AIR, true);
-                                    world.playSound(block.getLocation(), Sound.BLOCK_FIRE_EXTINGUISH, 1f, 1f);
+            block.getWorld().playSound(block.getLocation(), CompatibleSound.BLOCK_FIRE_EXTINGUISH.getSound(), 1f, 1f);
             world.playEffect(block.getLocation(), Effect.SMOKE, 1);
         }
-                                block = block.getRelative(BlockFace.UP);
-                                if(block.getType().equals(Material.WATER)){
-                                    block.setType(Material.AIR, true);
-                                    world.playSound(block.getLocation(), Sound.BLOCK_FIRE_EXTINGUISH, 1f, 1f);
-                                    world.playEffect(block.getLocation(), Effect.SMOKE, 1);
-                                }
-                            default:
-                                break;
-                        }
-                    }
-                }
-            }
-        }
     }
 
     public void onDisable() {

src/main/java/com/songoda/skyblock/utils/world/LocationUtil.java

@@ -9,13 +9,13 @@ import com.songoda.skyblock.island.IslandEnvironment;
 import com.songoda.skyblock.island.IslandManager;
 import com.songoda.skyblock.island.IslandWorld;
 import com.songoda.skyblock.utils.math.VectorUtil;
+import com.songoda.skyblock.utils.version.NMSUtil;
 import com.songoda.skyblock.utils.world.block.BlockDegreesType;
 import com.songoda.skyblock.world.WorldManager;
 import org.bukkit.*;
 import org.bukkit.World.Environment;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
-import org.bukkit.block.data.Waterlogged;
 import org.bukkit.entity.Player;
 
 import java.io.File;
@@ -32,10 +32,8 @@ public final class LocationUtil {
             Location tempLoc = LocationUtil.getDefinitiveLocation(loc);
             if(tempLoc.getBlock().getType().equals(Material.WATER)){
                 tempLoc.getBlock().setType(Material.AIR);
-            } else if(tempLoc.getBlock().getBlockData() instanceof Waterlogged){
+            } else if(NMSUtil.getVersionNumber() > 13){
-                Waterlogged blockData = (Waterlogged) tempLoc.getBlock().getBlockData();
+                LocationUtil113.removeWaterLoggedFromLocation(tempLoc);
-                blockData.setWaterlogged(false);
-                tempLoc.getBlock().setBlockData(blockData);
             }
         }
     }
@@ -66,7 +64,8 @@ public final class LocationUtil {
         Location locWorking = loc.clone();
         for(int i=locWorking.getBlockY(); i>=0; i--){
             if(!locWorking.getBlock().isEmpty()){
-                if(locWorking.getBlock().getType().equals(Material.WATER) || locWorking.getBlock().getBlockData() instanceof Waterlogged){
+                if(locWorking.getBlock().getType().equals(CompatibleMaterial.WATER.getMaterial()) ||
+                        (NMSUtil.getVersionNumber() > 13 && locWorking.getBlock().getBlockData() instanceof org.bukkit.block.data.Waterlogged)){
                     loc = locWorking;
                 }
                 break;
@@ -79,39 +78,38 @@ public final class LocationUtil {
         boolean safe = false;
         if(!locChecked.getBlock().isEmpty() &&
                 !locChecked.getBlock().isLiquid() &&
-                !locChecked.getBlock().isPassable() &&
                 locChecked.getBlock().getType().isSolid() &&
                 locChecked.getBlock().getType().isBlock() &&
-                locChecked.add(0d,1d,0d).getBlock().getType().isAir() &&
+                locChecked.add(0d,1d,0d).getBlock().getType().equals(CompatibleMaterial.AIR.getMaterial()) &&
-                locChecked.add(0d,2d,0d).getBlock().getType().isAir() &&
+                locChecked.add(0d,2d,0d).getBlock().getType().equals(CompatibleMaterial.AIR.getMaterial()) &&
-                !(locChecked.getBlock().getBlockData() instanceof Waterlogged)){
+                !(NMSUtil.getVersionNumber() >= 13 && locChecked.getBlock().getBlockData() instanceof org.bukkit.block.data.Waterlogged)){
             safe = true;
-            switch(locChecked.getBlock().getType()){
+            switch(CompatibleMaterial.getMaterial(locChecked.getBlock())){
-                case ACACIA_BUTTON:
+                case ACACIA_DOOR: // <= 1.8.8
-                case ACACIA_DOOR:
                 case ACACIA_FENCE_GATE:
-                case ACACIA_TRAPDOOR:
                 case BIRCH_DOOR:
                 case BIRCH_FENCE_GATE:
-                case BIRCH_TRAPDOOR:
                 case CACTUS:
                 case CAKE:
-                case CAMPFIRE:
-                case COBWEB:
                 case DARK_OAK_DOOR:
                 case DARK_OAK_FENCE_GATE:
-                case DARK_OAK_TRAPDOOR:
                 case IRON_TRAPDOOR:
                 case JUNGLE_DOOR:
                 case JUNGLE_FENCE_GATE:
-                case JUNGLE_TRAPDOOR:
                 case LADDER:
+                case SPRUCE_DOOR:
+                case SPRUCE_FENCE_GATE:
+                case ACACIA_BUTTON:
+                case ACACIA_TRAPDOOR:
+                case BIRCH_TRAPDOOR:
+                case CAMPFIRE:
+                case COBWEB:
+                case DARK_OAK_TRAPDOOR:
+                case JUNGLE_TRAPDOOR:
                 case MAGMA_BLOCK:
                 case NETHER_PORTAL:
                 case OAK_DOOR:
                 case OAK_FENCE_GATE:
-                case SPRUCE_DOOR:
-                case SPRUCE_FENCE_GATE:
                     safe = false;
                     break;
             }

src/main/java/com/songoda/skyblock/utils/world/LocationUtil113.java

@@ -0,0 +1,13 @@
+package com.songoda.skyblock.utils.world;
+
+import org.bukkit.Location;
+
+public class LocationUtil113 {
+    public static void removeWaterLoggedFromLocation(Location loc){
+        if(loc.getBlock().getBlockData() instanceof org.bukkit.block.data.Waterlogged){
+            org.bukkit.block.data.Waterlogged blockData = (org.bukkit.block.data.Waterlogged) loc.getBlock().getBlockData();
+            blockData.setWaterlogged(false);
+            loc.getBlock().setBlockData(blockData);
+        }
+    }
+}

src/main/java/com/songoda/skyblock/utils/world/entity/EntityUtil.java

@@ -498,7 +498,10 @@ public final class EntityUtil {
     }
 
 	public static boolean isMonster(EntityType type) {
-		switch (type) {
+        if (NMSUtil.getVersionNumber() > 10) {
+            if(type.equals(EntityType.WITHER_SKELETON)) return true; // TODO In < 11 we have SkeletonType.Wither
+        }
+		switch (type) { // TODO Check server versions
 		case BAT:
 		case BLAZE:
 		case CAVE_SPIDER:
@@ -525,7 +528,6 @@ public final class EntityUtil {
 		case VINDICATOR:
 		case WITCH:
 		case WITHER:
-		case WITHER_SKELETON:
 		case ZOMBIE:
 		case ZOMBIE_VILLAGER:
 			return true;

src/main/resources/config.yml

@@ -36,7 +36,7 @@ Island:
             Time: 60
         # [!] How many seconds to wait before teleporting to a newly created island
         TeleportTimeout: 1
-        # The distance between the islands
+        # The distance between the islands EXPERIMENTAL!
         Distance: 1200
     Deletion:
         # [!] You are adviced to keep these options both enabled to prevent any issues.
@@ -299,6 +299,9 @@ Island:
             Enable: true
         Hunger:
             Enable: false
+        # If owners and operators should have same permission of members
+        # It should be left to false as it could be changed soon
+        OwnersAndOperatorsAsMembers: false
     Portal:
         # When disabled, when a player enters a portal, they will teleport to the nether or
         # end world rather than the island world.
@@ -337,11 +340,16 @@ Island:
         # Should slime split bypass limits.yml
         AllowSlimeSplit: true
     Nether:
+        # Allow placing water in the Nether
         AllowNetherWater: false
+        # Water disappear when a nether mob walks into it
         WaterDisappearWithNetherMobs: false
+        # Block water from flowing near nether mobs EXPERIMENTAL!
         WaterDoNotFlowNearNetherMobs: false
+        # Make blaze immune from water in the Nether
         BlazeImmuneToWaterInNether: false
     Restrict:
+        # Blocks that can be placed only if the island has nether unlocked
         NetherBlocks:
             NETHERRACK: true
             SOUL_SAND: true
@@ -364,6 +372,7 @@ Island:
             NETHER_WART_BLOCK: true
             WITHER_SKELETON_SKULL: true
             WITHER_ROSE: true
+        # Blocks that can be placed only if the island has The End unlocked
         EndBlocks:
             END_STONE: true
             END_STONE_BRICKS: true

src/main/resources/language.yml

@@ -433,6 +433,8 @@ Command:
       Permission:
         Message: '&bSkyBlock &8| &cError&8: &eYou do not have the right to delete your Island.'
     Kick:
+      Bypass:
+        Message: '&bSkyBlock &8| &cError&8: &cYou can''t kick this user!'
       Invalid:
         Message: '&bSkyBlock &8| &cError&8: &eInvalid: /island kick <player>'
       Role:
@@ -766,6 +768,8 @@ Command:
           Message: '&bSkyBlock &8| &aInfo&8: &eYou have banned the player &c%player &efrom the Island.'
         Target:
           Message: '&bSkyBlock &8| &aInfo&8: &eYou have been banned from the Island.'
+      Bypass:
+        Message: '&bSkyBlock &8| &cError&8: &cYou can''t ban this user!'
       Already:
         Message: '&bSkyBlock &8| &cError&8: &eThat player is already banned from the Island.'
       Owner: