From 9c3fa9c3aba4969f6460a8b01322e5a0b6b41924 Mon Sep 17 00:00:00 2001 From: j502647092 Date: Wed, 29 Apr 2015 10:18:23 +0800 Subject: [PATCH] Remove UUID Bound... Signed-off-by: j502647092 --- .../me/tft_02/soulbound/listeners/PlayerListener.java | 1 - .../java/com/me/tft_02/soulbound/util/ItemUtils.java | 9 ++++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/me/tft_02/soulbound/listeners/PlayerListener.java b/src/main/java/com/me/tft_02/soulbound/listeners/PlayerListener.java index 9ab7b26..43495a0 100644 --- a/src/main/java/com/me/tft_02/soulbound/listeners/PlayerListener.java +++ b/src/main/java/com/me/tft_02/soulbound/listeners/PlayerListener.java @@ -58,7 +58,6 @@ public class PlayerListener implements Listener { if (Permissions.pickupBypass(player)) { return; } - event.setCancelled(true); return; } diff --git a/src/main/java/com/me/tft_02/soulbound/util/ItemUtils.java b/src/main/java/com/me/tft_02/soulbound/util/ItemUtils.java index cd5c11c..b5f1515 100644 --- a/src/main/java/com/me/tft_02/soulbound/util/ItemUtils.java +++ b/src/main/java/com/me/tft_02/soulbound/util/ItemUtils.java @@ -51,7 +51,7 @@ public class ItemUtils { itemLore.addAll(oldLore); } - itemLore.add(Misc.SOULBOUND_TAG + StringUtils.hideUUID(player.getUniqueId())); + itemLore.add(Misc.SOULBOUND_TAG); if (Config.getInstance().getShowNameInLore()) { itemLore.add(player.getName()); @@ -143,9 +143,11 @@ public class ItemUtils { List itemLore = new ArrayList(); itemLore.addAll(oldLore); int index = StringUtils.getIndexOfSoulbound(itemLore); + if (index == -1){ return null; } + itemLore.remove(index); if (index itemLore = itemStack.getItemMeta().getLore(); - Soulbound.p.debug("UUID MATCH? " + player.getUniqueId().equals(StringUtils.readUUIDFromLore(itemLore))); - Soulbound.p.debug("NAME MATCH? " + itemLore.contains(player.getName())); - - return player.getUniqueId().equals(StringUtils.readUUIDFromLore(itemLore)) || itemLore.contains(player.getName()); + return itemLore.contains(player.getName()); } private static ItemStack updateOldLore(Player player, ItemStack itemStack) {