From 2254efe08d48aaa38d04951a58506d25258777a3 Mon Sep 17 00:00:00 2001 From: graywolf336 Date: Wed, 11 Dec 2013 17:02:32 -0600 Subject: [PATCH] Only step if they have the wand in hand. --- .../jail/listeners/PlayerListener.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/graywolf336/jail/listeners/PlayerListener.java b/src/main/java/com/graywolf336/jail/listeners/PlayerListener.java index 16496ba..21da347 100644 --- a/src/main/java/com/graywolf336/jail/listeners/PlayerListener.java +++ b/src/main/java/com/graywolf336/jail/listeners/PlayerListener.java @@ -11,6 +11,7 @@ import org.bukkit.event.player.PlayerInteractEvent; import com.graywolf336.jail.JailMain; import com.graywolf336.jail.JailManager; +import com.graywolf336.jail.Util; public class PlayerListener implements Listener { private JailMain pl; @@ -26,14 +27,16 @@ public class PlayerListener implements Listener { Location loc = event.getClickedBlock() == null ? p.getLocation() : event.getClickedBlock().getLocation(); JailManager jm = pl.getJailManager(); - if(jm.isCreatingSomething(p.getName())) { - if(jm.isCreatingAJail(p.getName())) { - jm.getJailCreationSteps().step(jm, p, jm.getJailCreationPlayer(p.getName()), loc); - }else if(jm.isCreatingACell(p.getName())) { - jm.getCellCreationSteps().step(jm, p, jm.getCellCreationPlayer(p.getName()), loc); + if(p.getItemInHand().isSimilar(Util.getWand())) { + if(jm.isCreatingSomething(p.getName())) { + if(jm.isCreatingAJail(p.getName())) { + jm.getJailCreationSteps().step(jm, p, jm.getJailCreationPlayer(p.getName()), loc); + }else if(jm.isCreatingACell(p.getName())) { + jm.getCellCreationSteps().step(jm, p, jm.getCellCreationPlayer(p.getName()), loc); + } + + event.setCancelled(true); } - - event.setCancelled(true); } } }