diff options
author | KHobbits <rob@khobbits.co.uk> | 2013-04-13 23:50:17 +0100 |
---|---|---|
committer | KHobbits <rob@khobbits.co.uk> | 2013-04-13 23:50:17 +0100 |
commit | 843a0297a19be478a39fe10dd5caf6c47c5b2f22 (patch) | |
tree | ebd973f7f109f2c08b609a2a031c33e1fe941021 | |
parent | 79cbcd6b00c4d9ecdca24e1231a7836a9f45e2fd (diff) | |
download | Essentials-843a0297a19be478a39fe10dd5caf6c47c5b2f22.tar Essentials-843a0297a19be478a39fe10dd5caf6c47c5b2f22.tar.gz Essentials-843a0297a19be478a39fe10dd5caf6c47c5b2f22.tar.lz Essentials-843a0297a19be478a39fe10dd5caf6c47c5b2f22.tar.xz Essentials-843a0297a19be478a39fe10dd5caf6c47c5b2f22.zip |
Remove duplicate perm.
-rw-r--r-- | Essentials/src/com/earth2me/essentials/Essentials.java | 4 | ||||
-rw-r--r-- | Essentials/src/com/earth2me/essentials/MetaItemStack.java | 17 |
2 files changed, 7 insertions, 14 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java index 07ca89c53..b4f226a8a 100644 --- a/Essentials/src/com/earth2me/essentials/Essentials.java +++ b/Essentials/src/com/earth2me/essentials/Essentials.java @@ -459,14 +459,14 @@ public class Essentials extends JavaPlugin implements IEssentials return true; } } - + public void cleanupOpenInventories() { for (Player player : getServer().getOnlinePlayers()) { User user = getUser(player); if (user.isRecipeSee()) - { + { user.getPlayer().getOpenInventory().getTopInventory().clear(); user.getPlayer().getOpenInventory().close(); user.setRecipeSee(false); diff --git a/Essentials/src/com/earth2me/essentials/MetaItemStack.java b/Essentials/src/com/earth2me/essentials/MetaItemStack.java index 5958839b5..665302dfb 100644 --- a/Essentials/src/com/earth2me/essentials/MetaItemStack.java +++ b/Essentials/src/com/earth2me/essentials/MetaItemStack.java @@ -156,23 +156,16 @@ public class MetaItemStack throw new Exception(_("onlyPlayerSkulls")); } } - else if (split.length > 1 && split[0].equalsIgnoreCase("book") && stack.getType() == Material.WRITTEN_BOOK && hasMetaPermission(sender, "book", false, true, ess)) + else if (split.length > 1 && split[0].equalsIgnoreCase("book") && stack.getType() == Material.WRITTEN_BOOK + && (hasMetaPermission(sender, "book", true, true, ess) || hasMetaPermission(sender, "chapter-" + split[1].toLowerCase(Locale.ENGLISH), true, true, ess))) { final BookMeta meta = (BookMeta)stack.getItemMeta(); final IText input = new BookInput("book", true, ess); final BookPager pager = new BookPager(input); - if (hasMetaPermission(sender, "chapter", true, true, ess) || hasMetaPermission(sender, "chapter-" + split[1].toLowerCase(Locale.ENGLISH), true, true, ess)) - { - List<String> pages = pager.getPages(split[1]); - meta.setPages(pages); - stack.setItemMeta(meta); - } - else - { - throw new Exception(_("noChapterMeta")); - } - + List<String> pages = pager.getPages(split[1]); + meta.setPages(pages); + stack.setItemMeta(meta); } else if (split.length > 1 && split[0].equalsIgnoreCase("author") && stack.getType() == Material.WRITTEN_BOOK && hasMetaPermission(sender, "author", false, true, ess)) { |