From 18531addad6c8a349bf076cd842cc1aa4a8add8a Mon Sep 17 00:00:00 2001 From: Brianna O'Keefe Date: Thu, 14 Feb 2019 09:33:07 -0500 Subject: [PATCH] Fixed chances for commands and money. --- .../java/com/songoda/ultimatekits/kit/Kit.java | 4 ++-- .../com/songoda/ultimatekits/kit/KitItem.java | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/songoda/ultimatekits/kit/Kit.java b/src/main/java/com/songoda/ultimatekits/kit/Kit.java index e0f7149..c9f1f79 100644 --- a/src/main/java/com/songoda/ultimatekits/kit/Kit.java +++ b/src/main/java/com/songoda/ultimatekits/kit/Kit.java @@ -219,10 +219,10 @@ public class Kit { for (String line : is.getItemMeta().getLore()) { command.append(line); } - list.add(new KitItem(ChatColor.stripColor(command.toString()))); + list.add(new KitItem(is, ChatColor.stripColor(command.toString()))); } else if (is.getType() == Material.PAPER && ChatColor.stripColor(is.getItemMeta().getDisplayName()).endsWith("Money")) { String money = is.getItemMeta().getLore().get(0); - list.add(new KitItem(ChatColor.stripColor(money))); + list.add(new KitItem(is, ChatColor.stripColor(money))); } else { list.add(new KitItem(is)); } diff --git a/src/main/java/com/songoda/ultimatekits/kit/KitItem.java b/src/main/java/com/songoda/ultimatekits/kit/KitItem.java index 2b2190d..edfa97e 100644 --- a/src/main/java/com/songoda/ultimatekits/kit/KitItem.java +++ b/src/main/java/com/songoda/ultimatekits/kit/KitItem.java @@ -36,6 +36,21 @@ public class KitItem { } } + public KitItem(ItemStack item, String line) { + ItemStack itemStack = item.clone(); + ItemMeta meta = itemStack.getItemMeta(); + if (itemStack.hasItemMeta() && meta.hasDisplayName() && meta.getDisplayName().contains(";")) { + translateLine(meta.getDisplayName()); + } + if (line.startsWith(UltimateKits.getInstance().getConfig().getString("Main.Currency Symbol"))) { + this.content = new KitContentEconomy(Double.parseDouble(line.substring(1).trim())); + } else if (line.startsWith("/")) { + this.content = new KitContentCommand(line.substring(1)); + } else { + this.content = new KitContentItem(UltimateKits.getInstance().getItemSerializer().deserializeLegacyItemStack(line)); + } + } + public KitItem(ItemStack item) { ItemStack itemStack = item.clone(); ItemMeta meta = itemStack.getItemMeta();