diff --git a/.classpath b/.classpath index 3364bf6..43a0b04 100644 --- a/.classpath +++ b/.classpath @@ -1,49 +1,40 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/me/TheTealViper/enderbank/BankStorage.java b/src/me/TheTealViper/enderbank/BankStorage.java index 911631f..b1326af 100644 --- a/src/me/TheTealViper/enderbank/BankStorage.java +++ b/src/me/TheTealViper/enderbank/BankStorage.java @@ -336,11 +336,6 @@ public class BankStorage { public void openSearch(String search, Player opener) { //Load up inventory this.itemIdentifiers = new ArrayList(); - if (items == null) - { - items=BankStorage.getBank(opener.getUniqueId()).items; - - } for(int i = 0;i < items.size();i++) { ItemStack item = items.get(i); diff --git a/src/me/TheTealViper/enderbank/EnderBank.java b/src/me/TheTealViper/enderbank/EnderBank.java index 232c440..a766acd 100644 --- a/src/me/TheTealViper/enderbank/EnderBank.java +++ b/src/me/TheTealViper/enderbank/EnderBank.java @@ -416,15 +416,15 @@ public class EnderBank extends JavaPlugin implements Listener { if(handler.equals("banksearch")) { queue.remove(queue.size() - 1); e.setCancelled(true); -// Block b = p.getTargetBlock(null, 10); -// if(!pf.getBoolean("Must_Look_At_Chest_To_Search") || b.getType().equals(Material.ENDER_CHEST)) { - String search = e.getMessage(); - BankStorage bank = BankStorage.searchDatabase.get(p); - bank.openSearch(search, p); -// }else { -// p.sendMessage(ViperStringUtils.makeColors(formatString(messages.getString("Open_Inventory_Not_Looking_At_Ender"), p.getUniqueId()))); + Block b = p.getTargetBlock(null, 10); + if(!pf.getBoolean("Must_Look_At_Chest_To_Search") || b.getType().equals(Material.ENDER_CHEST)) { + String search = e.getMessage(); + BankStorage bank = BankStorage.searchDatabase.get(p); + bank.openSearch(search, p); + }else { + p.sendMessage(ViperStringUtils.makeColors(formatString(messages.getString("Open_Inventory_Not_Looking_At_Ender"), p.getUniqueId()))); // p.sendMessage(EnderBank.notificationString + " You must be looking at an ender chest!"); -// } + } BankStorage.searchDatabase.remove(p); } }