From da006a7e7b9808291a8d597fb60f2156936d4481 Mon Sep 17 00:00:00 2001 From: RandomPanda30 Date: Sun, 6 Oct 2013 16:39:50 +0100 Subject: [PATCH] + Added ability to hide as a Flower Pot. #18. --- .../BlockHunt/Listeners/OnInventoryClickEvent.java | 9 ++++++--- .../BlockHunt/Listeners/OnInventoryCloseEvent.java | 6 +++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/nl/Steffion/BlockHunt/Listeners/OnInventoryClickEvent.java b/src/nl/Steffion/BlockHunt/Listeners/OnInventoryClickEvent.java index 258c349..a0c534b 100644 --- a/src/nl/Steffion/BlockHunt/Listeners/OnInventoryClickEvent.java +++ b/src/nl/Steffion/BlockHunt/Listeners/OnInventoryClickEvent.java @@ -38,9 +38,12 @@ public class OnInventoryClickEvent implements Listener { if (inv.getName().contains("DisguiseBlocks")) { if (event.getCurrentItem() != null) { if (!event.getCurrentItem().getType().isBlock()) { - event.setCancelled(true); - MessageM.sendFMessage(player, - ConfigC.error_setNotABlock); + if (!event.getCurrentItem().getType() + .equals(Material.FLOWER_POT_ITEM)) { + event.setCancelled(true); + MessageM.sendFMessage(player, + ConfigC.error_setNotABlock); + } } } diff --git a/src/nl/Steffion/BlockHunt/Listeners/OnInventoryCloseEvent.java b/src/nl/Steffion/BlockHunt/Listeners/OnInventoryCloseEvent.java index cb85854..89c9722 100644 --- a/src/nl/Steffion/BlockHunt/Listeners/OnInventoryCloseEvent.java +++ b/src/nl/Steffion/BlockHunt/Listeners/OnInventoryCloseEvent.java @@ -42,7 +42,11 @@ public class OnInventoryCloseEvent implements Listener { for (ItemStack item : inv.getContents()) { if (item != null) { if (!item.getType().equals(Material.PAPER)) { - blocks.add(item); + if (item.getType().equals(Material.FLOWER_POT_ITEM)) { + blocks.add(new ItemStack(Material.FLOWER_POT)); + } else { + blocks.add(item); + } } } }