From 86460d2bdc9ceab7be2bf015018c9804dc14efda Mon Sep 17 00:00:00 2001 From: Blackvein Date: Mon, 10 Mar 2014 13:26:06 -0700 Subject: [PATCH] Fixed item lore requirement bug --- .../java/me/blackvein/quests/GUIListener.java | 16 ++++++++++++++++ src/main/java/me/blackvein/quests/Quests.java | 1 - .../java/me/blackvein/quests/util/ItemUtil.java | 3 +-- 3 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 src/main/java/me/blackvein/quests/GUIListener.java diff --git a/src/main/java/me/blackvein/quests/GUIListener.java b/src/main/java/me/blackvein/quests/GUIListener.java new file mode 100644 index 000000000..04766392e --- /dev/null +++ b/src/main/java/me/blackvein/quests/GUIListener.java @@ -0,0 +1,16 @@ +package me.blackvein.quests; + +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.inventory.InventoryClickEvent; + +public class GUIListener implements Listener { + + @EventHandler + public void onInventoryClick(InventoryClickEvent evt) { + + + + } + +} diff --git a/src/main/java/me/blackvein/quests/Quests.java b/src/main/java/me/blackvein/quests/Quests.java index 7edba71c1..e26ea73d7 100644 --- a/src/main/java/me/blackvein/quests/Quests.java +++ b/src/main/java/me/blackvein/quests/Quests.java @@ -3,7 +3,6 @@ package me.blackvein.quests; import java.io.File; import java.io.IOException; import java.sql.Timestamp; -import java.util.Calendar; import java.util.Collections; import java.util.Comparator; import java.util.EnumMap; diff --git a/src/main/java/me/blackvein/quests/util/ItemUtil.java b/src/main/java/me/blackvein/quests/util/ItemUtil.java index 2e45ac4a4..2401afbe4 100644 --- a/src/main/java/me/blackvein/quests/util/ItemUtil.java +++ b/src/main/java/me/blackvein/quests/util/ItemUtil.java @@ -45,7 +45,6 @@ public class ItemUtil implements ColorUtil{ return -4; else if(one.hasItemMeta() == false && two.hasItemMeta()) return -4; - else if(one.getItemMeta().hasDisplayName() && two.getItemMeta().hasDisplayName() == false) return -4; else if(one.getItemMeta().hasDisplayName() == false && two.getItemMeta().hasDisplayName()) @@ -56,7 +55,7 @@ public class ItemUtil implements ColorUtil{ else if(one.getItemMeta().hasLore() == false && two.getItemMeta().hasLore()) return -4; - else if(ChatColor.stripColor(one.getItemMeta().getDisplayName()).equals(ChatColor.stripColor(two.getItemMeta().getDisplayName())) == false) + else if(one.getItemMeta().hasDisplayName() && two.getItemMeta().hasDisplayName() && ChatColor.stripColor(one.getItemMeta().getDisplayName()).equals(ChatColor.stripColor(two.getItemMeta().getDisplayName())) == false) return -4; else if(one.getItemMeta().hasLore() && two.getItemMeta().hasLore() && one.getItemMeta().getLore().equals(two.getItemMeta().getLore()) == false)