Merge remote-tracking branch 'origin/master'

src/main/java/com/zandor300/ultimatekits/commands/KitCommand.java

 package com.zandor300.ultimatekits.commands;
 
+import com.zandor300.ultimatekits.UltimateKits;
 import com.zandor300.ultimatekits.inventories.KitMenu;
 import com.zandor300.zsutilities.commandsystem.Command;
 import org.bukkit.command.CommandSender;
@@ -16,8 +17,10 @@ public class KitCommand extends Command {
 
 	@Override
 	public void execute(CommandSender sender, String[] args) {
-		if(!(sender instanceof Player))
+		if(!(sender instanceof Player)) {
+			UltimateKits.getChat().sendConsoleMessage("You have to be a player.");
 			return;
+		}
 		KitMenu.open((Player) sender);
 	}
 }

src/main/java/com/zandor300/ultimatekits/enums/Kit.java

@@ -64,8 +64,10 @@ public class Kit {
 
 	public void giveKit(Player player) {
 		playerCooldown.put(player.getName(), cooldown);
-
 		PlayerInventory inventory = player.getInventory();
+
+		inventory.clear();
+
 		int i = 0;
 		for (Map.Entry<Material, Integer> entry : items.entrySet()) {
 			for (int a = 0; a < entry.getValue(); a++)

src/main/java/com/zandor300/ultimatekits/inventories/KitMenu.java

@@ -2,7 +2,6 @@ package com.zandor300.ultimatekits.inventories;
 
 import com.zandor300.ultimatekits.UltimateKits;
 import com.zandor300.ultimatekits.enums.Kit;
-import com.zandor300.zsutilities.inventorysystem.Inventory;
 import com.zandor300.zsutilities.inventorysystem.Item;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
@@ -13,8 +12,12 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.InventoryCloseEvent;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.scheduler.BukkitTask;
 
+import java.util.Arrays;
 import java.util.HashMap;
 
 /**
@@ -25,26 +28,32 @@ public class KitMenu implements Listener {
 	private static HashMap<String, BukkitTask> playerTask = new HashMap<String, BukkitTask>();
 
 	public static void open(final Player player) {
-		final Inventory inventory = new Inventory(ChatColor.DARK_PURPLE + "UltimateKits", 54);
+		final Inventory inventory = Bukkit.createInventory(null, 54, ChatColor.DARK_PURPLE + "UltimateKits");//new Inventory(ChatColor.DARK_PURPLE + "UltimateKits", 54);
 		playerTask.put(player.getName(), Bukkit.getScheduler().runTaskTimer(UltimateKits.getPlugin(), new Runnable() {
 			@Override
 			public void run() {
 				int i = 0;
 				for(Kit kit : Kit.getAllKits()) {
 					if(kit.getPlayerCooldown().containsKey(player.getName())) {
-						Item item = new Item(Material.STAINED_GLASS_PANE, 1, ChatColor.RED + kit.getName(), (byte) 14);
-						item.setLore("",
-								ChatColor.GREEN + "Cooldown will expire in " +
-										kit.getPlayerCooldown().get(player.getName()) + "seconds");
+						ItemStack item = new ItemStack(Material.STAINED_GLASS_PANE, 1, (byte) 14);
+						ItemMeta meta = item.getItemMeta();
+						meta.setDisplayName(ChatColor.RED + kit.getName());
+						meta.setLore(Arrays.asList("", ChatColor.GREEN + "Cooldown will expire in " +
+								kit.getPlayerCooldown().get(player.getName()) + " seconds"));
+						item.setItemMeta(meta);
 						inventory.setItem(i, item);
 					} else {
-						Item item = new Item(Material.STAINED_GLASS_PANE, 1, ChatColor.GREEN + kit.getName(), (byte) 13);
+						ItemStack item = new ItemStack(Material.STAINED_GLASS_PANE, 1, (byte) 13);
+						ItemMeta meta = item.getItemMeta();
+						meta.setDisplayName(ChatColor.GREEN + kit.getName());
+						item.setItemMeta(meta);
 						inventory.setItem(i, item);
 					}
 					i++;
 				}
 			}
 		}, 0l, 20l));
+		player.openInventory(inventory);
 	}
 
 	@EventHandler
@@ -65,6 +74,9 @@ public class KitMenu implements Listener {
 			return;
 		event.setCancelled(true);
 
+		if(event.getCurrentItem() == null || event.getCurrentItem().getType() == null || event.getCurrentItem().getType().equals(Material.AIR))
+			return;
+
 		Player player = (Player) event.getWhoClicked();
 		String name = event.getCurrentItem().getItemMeta().getDisplayName().replaceAll(ChatColor.RED + "", "")
 				.replaceAll(ChatColor.GREEN + "", "");
@@ -79,5 +91,6 @@ public class KitMenu implements Listener {
 
 		kit.giveKit(player);
 		player.playSound(player.getLocation(), Sound.ORB_PICKUP, 1, 1);
+		player.closeInventory();
 	}
 }