From d84e5a09e200732327a2a3825ec22f61f79441b3 Mon Sep 17 00:00:00 2001 From: Redemption <25185835+Redemption198@users.noreply.github.com> Date: Tue, 21 Nov 2017 19:32:06 +0100 Subject: [PATCH] Pedestals now check for the block above --- .../Slimefun/listeners/AncientAltarListener.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/me/mrCookieSlime/Slimefun/listeners/AncientAltarListener.java b/src/me/mrCookieSlime/Slimefun/listeners/AncientAltarListener.java index 5b8c6df9b..dae701592 100644 --- a/src/me/mrCookieSlime/Slimefun/listeners/AncientAltarListener.java +++ b/src/me/mrCookieSlime/Slimefun/listeners/AncientAltarListener.java @@ -57,7 +57,12 @@ public class AncientAltarListener implements Listener { e.setCancelled(true); Item stack = findItem(b); if (stack == null) { - insertItem(e.getPlayer(), b); + if(e.getPlayer().getItemInHand().getType().equals(Material.AIR)) return; + if(b.getRelative(0, 1, 0).getType() != Material.AIR) { + Messages.local.sendTranslation(e.getPlayer(), "PEDESTAL.obstructed", true); + return; + } + else insertItem(e.getPlayer(), b); } else if (!removed_items.contains(stack.getUniqueId())) { final UUID uuid = stack.getUniqueId(); @@ -145,7 +150,7 @@ public class AncientAltarListener implements Listener { private void insertItem(Player p, Block b) { final ItemStack stack = p.getInventory().getItemInMainHand(); - if (stack != null && !stack.getType().equals(Material.AIR)) { + if (stack != null) { PlayerInventory.consumeItemInHand(p); String nametag = StringUtils.formatItemName(stack, false); Item entity = b.getWorld().dropItem(b.getLocation().add(0.5, 1.2, 0.5), new CustomItem(new CustomItem(stack, 1), "&5&dALTAR &3Probe - &e" + System.nanoTime()));