diff --git a/src/main/java/tsp/headdb/api/Head.java b/src/main/java/tsp/headdb/api/Head.java index 959df5b..c34eb48 100644 --- a/src/main/java/tsp/headdb/api/Head.java +++ b/src/main/java/tsp/headdb/api/Head.java @@ -26,7 +26,7 @@ public class Head { private int id; private List tags; private ItemStack menuItem; - private ItemStack itemStack; + //Unimplemented private ItemStack itemStack; public Head() {} @@ -70,6 +70,7 @@ public class Head { return menuItem; } + /* For some reason this causes issues with some heads in categories not having lore public ItemStack getItemStack() { if (itemStack == null) { itemStack = menuItem; @@ -85,6 +86,7 @@ public class Head { return itemStack; } + */ public String getName() { return name; diff --git a/src/main/java/tsp/headdb/command/CommandHeadDB.java b/src/main/java/tsp/headdb/command/CommandHeadDB.java index 69365f7..10d9c0a 100644 --- a/src/main/java/tsp/headdb/command/CommandHeadDB.java +++ b/src/main/java/tsp/headdb/command/CommandHeadDB.java @@ -122,7 +122,7 @@ public class CommandHeadDB implements CommandExecutor { Utils.sendMessage(sender, "&cCould not find head with id &e" + id); return true; } - ItemStack item = head.getItemStack(); + ItemStack item = head.getMenuItem(); item.setAmount(amount); target.getInventory().addItem(item); Utils.sendMessage(sender, "&7Gave &6" + target.getName() + " &ex" + amount + " " + head.getName()); diff --git a/src/main/java/tsp/headdb/inventory/InventoryUtils.java b/src/main/java/tsp/headdb/inventory/InventoryUtils.java index d688ed4..d9e7c3d 100644 --- a/src/main/java/tsp/headdb/inventory/InventoryUtils.java +++ b/src/main/java/tsp/headdb/inventory/InventoryUtils.java @@ -344,7 +344,7 @@ public class InventoryUtils { PlayerHeadPurchaseEvent event = new PlayerHeadPurchaseEvent(player, head, getCategoryCost(player, category)); Bukkit.getPluginManager().callEvent(event); if (!event.isCancelled()) { - ItemStack item = head.getItemStack(); + ItemStack item = head.getMenuItem(); item.setAmount(amount); player.getInventory().addItem(item); } diff --git a/src/main/resources/messages.yml b/src/main/resources/messages.yml index 8225fca..651efb6 100644 --- a/src/main/resources/messages.yml +++ b/src/main/resources/messages.yml @@ -10,10 +10,4 @@ menu: tagSearch: "&c&lHeadDB &8- &eTag Search: %search%" search: "&c&lHeadDB &8- &eSearch: %search%" favorites: "&c&lHeadDB &8- &eFavorites: %player%" - local: "&c&lHeadDB &8- &aLocal Heads &7(%size%)" - -# Head item given to players -head: - name: "%name%" - lore: - - '' \ No newline at end of file + local: "&c&lHeadDB &8- &aLocal Heads &7(%size%)" \ No newline at end of file