diff --git a/src/main/java/hu/jgj52/wolfFFA/Commands/EditKitCommand.java b/src/main/java/hu/jgj52/wolfFFA/Commands/EditKitCommand.java index 034741c..84e41d4 100644 --- a/src/main/java/hu/jgj52/wolfFFA/Commands/EditKitCommand.java +++ b/src/main/java/hu/jgj52/wolfFFA/Commands/EditKitCommand.java @@ -146,19 +146,19 @@ public class EditKitCommand implements CommandExecutor, TabCompleter { ItemMeta uhcmetawater4 = uhcwater4.getItemMeta(); ItemMeta uhcmetashield2 = uhcshield2.getItemMeta(); - uhcmetalava2.getPersistentDataContainer().set(new NamespacedKey(String.valueOf(this), "lavab"), PersistentDataType.STRING, "lava2uuid"); + uhcmetalava2.getPersistentDataContainer().set(new NamespacedKey("wolfffa", "lavab"), PersistentDataType.STRING, "lava2uuid"); uhclava2.setItemMeta(uhcmetalava2); - uhcmetawater2.getPersistentDataContainer().set(new NamespacedKey(String.valueOf(this), "waterb"), PersistentDataType.STRING, "water2uuid"); + uhcmetawater2.getPersistentDataContainer().set(new NamespacedKey("wolfffa", "waterb"), PersistentDataType.STRING, "water2uuid"); uhcwater2.setItemMeta(uhcmetawater2); - uhcmetawater3.getPersistentDataContainer().set(new NamespacedKey(String.valueOf(this), "waterc"), PersistentDataType.STRING, "water3uuid"); + uhcmetawater3.getPersistentDataContainer().set(new NamespacedKey("wolfffa", "waterc"), PersistentDataType.STRING, "water3uuid"); uhcwater3.setItemMeta(uhcmetawater3); - uhcmetawater4.getPersistentDataContainer().set(new NamespacedKey(String.valueOf(this), "waterd"), PersistentDataType.STRING, "water4uuid"); + uhcmetawater4.getPersistentDataContainer().set(new NamespacedKey("wolfffa", "waterd"), PersistentDataType.STRING, "water4uuid"); uhcwater4.setItemMeta(uhcmetawater4); - uhcmetashield2.getPersistentDataContainer().set(new NamespacedKey(String.valueOf(this), "shieldb"), PersistentDataType.STRING, "shield2uuid"); + uhcmetashield2.getPersistentDataContainer().set(new NamespacedKey("wolfffa", "shieldb"), PersistentDataType.STRING, "shield2uuid"); uhcshield2.setItemMeta(uhcmetashield2); inv.setItem(getItemSlot("axe", "uhc", player), uhcaxe); diff --git a/src/main/java/hu/jgj52/wolfFFA/Listeners/KitListener.java b/src/main/java/hu/jgj52/wolfFFA/Listeners/KitListener.java index 8eace5c..2a44061 100644 --- a/src/main/java/hu/jgj52/wolfFFA/Listeners/KitListener.java +++ b/src/main/java/hu/jgj52/wolfFFA/Listeners/KitListener.java @@ -67,66 +67,84 @@ public class KitListener implements Listener { if (event.getClickedInventory() == event.getView().getTopInventory() && event.getView().title().equals(Component.text("Kit Editor"))) { event.setCancelled(true); if ((0 <= event.getSlot() && event.getSlot() <= 2) || (9 <= event.getSlot() && event.getSlot() <= 11) || (18 <= event.getSlot() && event.getSlot() <= 20)) { - if (gui.getItem(13).getItemMeta().getDisplayName() == "§fSword Kit") { + if (gui.getItem(13).getItemMeta().getDisplayName().equals("§fSword Kit")) { for (int i = 0; i < inv.length; i++) { ItemStack item = inv[i]; - if (item.getType() == Material.DIAMOND_SWORD) { - plugin.getConfig().set("kits.sword." + player.getUniqueId() + ".sword", i); + if (item != null) { + if (item.getType() == Material.DIAMOND_SWORD) { + plugin.getConfig().set("kits.sword." + player.getUniqueId() + ".sword", i); + } } } - } else if (gui.getItem(13).getItemMeta().getDisplayName() == "§fUHC Kit") { + } else if (gui.getItem(13).getItemMeta().getDisplayName().equals("§fUHC Kit")) { for (int i = 0; i < inv.length; i++) { ItemStack item = inv[i]; - if (item.getType() == Material.DIAMOND_AXE) { - plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".axe", i); - } else if (item.getType() == Material.DIAMOND_SWORD) { - plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".sword", i); - } else if (item.getType() == Material.LAVA_BUCKET) { - if (item.getItemMeta().getPersistentDataContainer().has(new NamespacedKey(String.valueOf(this), "lavab"), PersistentDataType.STRING)) { - plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".lava2", i); - } else { - plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".lava", i); - } - } else if (item.getType() == Material.COBWEB) { - plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".cobweb", i); - } else if (item.getType() == Material.COBBLESTONE) { - plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".cobblestone", i); - } else if (item.getType() == Material.GOLDEN_APPLE) { - plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".goldenapple", i); - } else if (item.getType() == Material.WATER_BUCKET) { - if (item.getItemMeta().getPersistentDataContainer().has(new NamespacedKey(String.valueOf(this), "waterb"), PersistentDataType.STRING)) { - plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".water2", i); - } else if (item.getItemMeta().getPersistentDataContainer().has(new NamespacedKey(String.valueOf(this), "waterc"), PersistentDataType.STRING)) { - plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".water3", i); - } else if (item.getItemMeta().getPersistentDataContainer().has(new NamespacedKey(String.valueOf(this), "waterd"), PersistentDataType.STRING)) { - plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".water4", i); - } else { - plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".water", i); - } - } else if (item.getType() == Material.CROSSBOW) { - plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".crossbow", i); - } else if (item.getType() == Material.BOW) { - plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".bow", i); - } else if (item.getType() == Material.ARROW) { - plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".arrow", i); - } else if (item.getType() == Material.OAK_PLANKS) { - plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".planks", i); - } else if (item.getType() == Material.DIAMOND_PICKAXE) { - plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".pickaxe", i); - } else if (item.getType() == Material.SHIELD) { - if (item.getItemMeta().getPersistentDataContainer().has(new NamespacedKey(String.valueOf(this), "shieldb"), PersistentDataType.STRING)) { - plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".shield2", i); - } else { - plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".shield", i); + if (item != null) { + if (item.getType() == Material.DIAMOND_AXE) { + plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".axe", i); + } else if (item.getType() == Material.DIAMOND_SWORD) { + plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".sword", i); + } else if (item.getType() == Material.LAVA_BUCKET) { + if (item.getItemMeta().getPersistentDataContainer().has(new NamespacedKey("wolfffa", "lavab"), PersistentDataType.STRING)) { + plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".lava2", i); + } else { + plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".lava", i); + } + } else if (item.getType() == Material.COBWEB) { + plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".cobweb", i); + } else if (item.getType() == Material.COBBLESTONE) { + plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".cobblestone", i); + } else if (item.getType() == Material.GOLDEN_APPLE) { + plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".goldenapple", i); + } else if (item.getType() == Material.WATER_BUCKET) { + if (item.getItemMeta().getPersistentDataContainer().has(new NamespacedKey("wolfffa", "waterb"), PersistentDataType.STRING)) { + plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".water2", i); + } else if (item.getItemMeta().getPersistentDataContainer().has(new NamespacedKey("wolfffa", "waterc"), PersistentDataType.STRING)) { + plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".water3", i); + } else if (item.getItemMeta().getPersistentDataContainer().has(new NamespacedKey("wolfffa", "waterd"), PersistentDataType.STRING)) { + plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".water4", i); + } else { + plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".water", i); + } + } else if (item.getType() == Material.CROSSBOW) { + plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".crossbow", i); + } else if (item.getType() == Material.BOW) { + plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".bow", i); + } else if (item.getType() == Material.ARROW) { + plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".arrow", i); + } else if (item.getType() == Material.OAK_PLANKS) { + plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".planks", i); + } else if (item.getType() == Material.DIAMOND_PICKAXE) { + plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".pickaxe", i); + } else if (item.getType() == Material.SHIELD) { + if (item.getItemMeta().getPersistentDataContainer().has(new NamespacedKey("wolfffa", "shieldb"), PersistentDataType.STRING)) { + plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".shield2", i); + } else { + plugin.getConfig().set("kits.uhc." + player.getUniqueId() + ".shield", i); + } } } } } + plugin.saveConfig(); + plugin.reloadConfig(); + player.sendMessage("§aSikeresen elmentetted a kitedet!"); } else if ((6 <= event.getSlot() && event.getSlot() <= 8) || (15 <= event.getSlot() && event.getSlot() <= 17) || (24 <= event.getSlot() && event.getSlot() <= 26)) { - + player.getInventory().clear(); + player.closeInventory(); + player.sendMessage("§cA kited nem került mentésre."); } } } + + @EventHandler + public void onInventoryClose(InventoryClickEvent event) { + if (!(event.getWhoClicked() instanceof Player player)) return; + if (event.getClickedInventory() == event.getView().getTopInventory() && event.getView().title().equals(Component.text("Kit Editor"))) { + player.getInventory().clear(); + player.sendMessage("§cA kited nem került mentésre."); + } + } } diff --git a/target/WolfFFA-1.0.jar b/target/WolfFFA-1.0.jar index a9e7f15..2d1f081 100644 Binary files a/target/WolfFFA-1.0.jar and b/target/WolfFFA-1.0.jar differ diff --git a/target/classes/hu/jgj52/wolfFFA/Commands/EditKitCommand.class b/target/classes/hu/jgj52/wolfFFA/Commands/EditKitCommand.class index de25c3f..b10b9e0 100644 Binary files a/target/classes/hu/jgj52/wolfFFA/Commands/EditKitCommand.class and b/target/classes/hu/jgj52/wolfFFA/Commands/EditKitCommand.class differ diff --git a/target/classes/hu/jgj52/wolfFFA/Listeners/KitListener.class b/target/classes/hu/jgj52/wolfFFA/Listeners/KitListener.class index a2589a2..12bffec 100644 Binary files a/target/classes/hu/jgj52/wolfFFA/Listeners/KitListener.class and b/target/classes/hu/jgj52/wolfFFA/Listeners/KitListener.class differ diff --git a/target/original-WolfFFA-1.0.jar b/target/original-WolfFFA-1.0.jar index 40048ae..a530efb 100644 Binary files a/target/original-WolfFFA-1.0.jar and b/target/original-WolfFFA-1.0.jar differ