From 76e3f5b3c8f08048bfb80d9d056f334dd9315fca Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Sat, 27 Mar 2021 18:44:04 +0100 Subject: [PATCH] Add check if item has meta as that could've returned null (Fixes #427) --- .../ChestShop/Listeners/ItemInfoListener.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/Acrobot/ChestShop/Listeners/ItemInfoListener.java b/src/main/java/com/Acrobot/ChestShop/Listeners/ItemInfoListener.java index 6d07eca..aef257c 100644 --- a/src/main/java/com/Acrobot/ChestShop/Listeners/ItemInfoListener.java +++ b/src/main/java/com/Acrobot/ChestShop/Listeners/ItemInfoListener.java @@ -1,9 +1,7 @@ package com.Acrobot.ChestShop.Listeners; import com.Acrobot.Breeze.Utils.StringUtil; -import com.Acrobot.ChestShop.ChestShop; import com.Acrobot.ChestShop.Events.ItemInfoEvent; -import com.Acrobot.ChestShop.Utils.ItemUtil; import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.command.CommandSender; @@ -19,18 +17,14 @@ import org.bukkit.potion.Potion; import org.bukkit.potion.PotionEffect; import java.util.Map; -import java.util.logging.Level; import static com.Acrobot.Breeze.Utils.NumberUtil.toRoman; import static com.Acrobot.Breeze.Utils.NumberUtil.toTime; import static com.Acrobot.Breeze.Utils.StringUtil.capitalizeFirstLetter; -import static com.Acrobot.ChestShop.Configuration.Messages.iteminfo; import static com.Acrobot.ChestShop.Configuration.Messages.iteminfo_book; import static com.Acrobot.ChestShop.Configuration.Messages.iteminfo_book_generation; -import static com.Acrobot.ChestShop.Configuration.Messages.iteminfo_fullname; import static com.Acrobot.ChestShop.Configuration.Messages.iteminfo_lore; import static com.Acrobot.ChestShop.Configuration.Messages.iteminfo_repaircost; -import static com.Acrobot.ChestShop.Configuration.Messages.iteminfo_shopname; /** * @author Acrobot @@ -123,9 +117,11 @@ public class ItemInfoListener implements Listener { @EventHandler public static void addLoreInfo(ItemInfoEvent event) { - ItemMeta meta = event.getItem().getItemMeta(); - if (meta.hasLore()) { - iteminfo_lore.send(event.getSender(), "lore", String.join("\n", meta.getLore())); + if (event.getItem().hasItemMeta()) { + ItemMeta meta = event.getItem().getItemMeta(); + if (meta.hasLore()) { + iteminfo_lore.send(event.getSender(), "lore", String.join("\n", meta.getLore())); + } } } }