Fixed entities being placed outside of the border

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

@@ -5,6 +5,7 @@ import com.songoda.skyblock.config.FileManager;
 import com.songoda.skyblock.island.Island;
 import com.songoda.skyblock.island.IslandLevel;
 import com.songoda.skyblock.island.IslandManager;
+import com.songoda.skyblock.island.IslandWorld;
 import com.songoda.skyblock.levelling.LevellingManager;
 import com.songoda.skyblock.limit.LimitManager;
 import com.songoda.skyblock.message.MessageManager;
@@ -17,6 +18,8 @@ import com.songoda.skyblock.utils.structure.StructureUtil;
 import com.songoda.skyblock.utils.version.Materials;
 import com.songoda.skyblock.utils.version.NMSUtil;
 import com.songoda.skyblock.utils.version.Sounds;
+import com.songoda.skyblock.world.WorldManager;
+
 import org.apache.commons.lang3.text.WordUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
@@ -198,6 +201,15 @@ public class Interact implements Listener {
                 return;
             }
             
+            // Check if the clicked block is outside of the border.
+            WorldManager worldManager = skyblock.getWorldManager();
+            org.bukkit.block.Block clickedBlock = event.getClickedBlock();
+            IslandWorld world = worldManager.getIslandWorld(clickedBlock.getWorld());
+            if (!islandManager.isLocationAtIsland(island, clickedBlock.getLocation(), world)) {
+            	event.setCancelled(true);
+            	return;
+            }
+
             if (event.getItem() != null && event.getItem().getType() == Materials.BONE_MEAL.parseMaterial() && !islandManager.hasPermission(player, block.getLocation(), "Place")) {
                 soundManager.playSound(player, Sounds.VILLAGER_NO.bukkitSound(), 1.0F, 1.0F);
                 event.setCancelled(true);
@@ -597,7 +609,8 @@ public class Interact implements Listener {
 
                         player.updateInventory();
                     }
-                } else if (event.getItem().getType() == Material.ARMOR_STAND) {
+                } else if (event.getItem().getType() == Material.ARMOR_STAND || event.getItem().getType().name().contains("BOAT")
+                		|| event.getItem().getType().name().contains("MINECART")) {
                     if (!islandManager.hasPermission(player, block.getLocation(), "EntityPlacement")) {
                         event.setCancelled(true);
 

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

@@ -9,6 +9,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.entity.ProjectileLaunchEvent;
+import org.bukkit.projectiles.ProjectileSource;
 
 import java.io.File;
 
@@ -22,37 +23,36 @@ public class Projectile implements Listener {
 
 	@EventHandler
 	public void onProjectileLaunch(ProjectileLaunchEvent event) {
-        if (!(event.getEntity().getShooter() instanceof Player)) {
+		org.bukkit.entity.Projectile projectile = event.getEntity();
+		ProjectileSource shooter = projectile.getShooter();
+		if (!(shooter instanceof Player))
 			return;
-        }
-
-        Player player = (Player) event.getEntity().getShooter();
 
 		MessageManager messageManager = skyblock.getMessageManager();
 		SoundManager soundManager = skyblock.getSoundManager();
+		Player player = (Player) shooter;
 
-        if (skyblock.getWorldManager().isIslandWorld(player.getWorld())) {
+		if (!skyblock.getWorldManager().isIslandWorld(player.getWorld()))
-            if (event.getEntity() instanceof FishHook) {
+			return;
+
+		if (projectile instanceof FishHook) {
 			if (!skyblock.getIslandManager().hasPermission(player, "Fishing")) {
 				event.setCancelled(true);
-
 				messageManager.sendMessage(player,
 						skyblock.getFileManager().getConfig(new File(skyblock.getDataFolder(), "language.yml"))
 								.getFileConfiguration().getString("Island.Settings.Permission.Message"));
 				soundManager.playSound(player, Sounds.VILLAGER_NO.bukkitSound(), 1.0F, 1.0F);
 			}
-
 			return;
 		}
 
 		if (!skyblock.getIslandManager().hasPermission(player, "Projectile")) {
 			event.setCancelled(true);
-
 			messageManager.sendMessage(player,
 					skyblock.getFileManager().getConfig(new File(skyblock.getDataFolder(), "language.yml"))
 							.getFileConfiguration().getString("Island.Settings.Permission.Message"));
 			soundManager.playSound(player, Sounds.VILLAGER_NO.bukkitSound(), 1.0F, 1.0F);
 		}
 	}
-    }
+
 }