From 765575b43365907e949bec32f30da34e7bb931a9 Mon Sep 17 00:00:00 2001 From: sk89q Date: Mon, 18 Oct 2010 10:47:23 -0700 Subject: [PATCH] Added back in /worldedit for permissions purposes. --- src/SMWorldEditListener.java | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/SMWorldEditListener.java b/src/SMWorldEditListener.java index 866105a60..57ecf9b31 100644 --- a/src/SMWorldEditListener.java +++ b/src/SMWorldEditListener.java @@ -51,7 +51,7 @@ public class SMWorldEditListener extends PluginListener { WorldEditPlayer player = new SMWorldEditPlayer(modPlayer); if (itemInHand != 271) { return false; } - if (!modPlayer.canUseCommand("/editpos2")) { return false; } + if (!canUseCommand(modPlayer, "/editpos2")) { return false; } WorldEditSession session = worldEdit.getSession(player); @@ -79,8 +79,8 @@ public class SMWorldEditListener extends PluginListener { */ @Override public boolean onBlockDestroy(Player modPlayer, Block blockClicked) { - if (!modPlayer.canUseCommand("/editpos1") - && !modPlayer.canUseCommand("/.")) { return false; } + if (!canUseCommand(modPlayer, "/editpos1") + && !canUseCommand(modPlayer, "/.")) { return false; } WorldEdit worldEdit = WorldEdit.getInstance(); WorldEditPlayer player = new SMWorldEditPlayer(modPlayer); @@ -132,7 +132,7 @@ public class SMWorldEditListener extends PluginListener { try { if (worldEdit.getCommands().containsKey(split[0])) { - if (modPlayer.canUseCommand(split[0])) { + if (canUseCommand(modPlayer, split[0])) { WorldEditPlayer player = new SMWorldEditPlayer(modPlayer); WorldEditSession session = worldEdit.getSession(player); EditSession editSession = @@ -176,4 +176,16 @@ public class SMWorldEditListener extends PluginListener { return true; } + + /** + * Checks to see if the player can use a command or /worldedit. + * + * @param player + * @param command + * @return + */ + private boolean canUseCommand(Player player, String command) { + return player.canUseCommand(command) + || player.canUseCommand("/worldedit"); + } } \ No newline at end of file