Ensure that the wand can be used before giving it

EngineHub · Oct 18, 2020 · d33b7a8 · d33b7a8
1 parent 5876f18
commit d33b7a8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/SelectionCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/SelectionCommands.java
@@ -28,6 +28,7 @@
 import com.sk89q.worldedit.command.argument.SelectorChoice;
 import com.sk89q.worldedit.command.tool.NavigationWand;
 import com.sk89q.worldedit.command.tool.SelectionWand;
+import com.sk89q.worldedit.command.tool.Tool;
 import com.sk89q.worldedit.command.util.CommandPermissions;
 import com.sk89q.worldedit.command.util.CommandPermissionsConditionGenerator;
 import com.sk89q.worldedit.command.util.Logging;
@@ -289,7 +290,13 @@ public void chunk(Actor actor, World world, LocalSession session,
     )
     @CommandPermissions("worldedit.wand")
     public void wand(Player player, LocalSession session,
-                        @Switch(name = 'n', desc = "Get a navigation wand") boolean navWand) throws WorldEditException {
+                     @Switch(name = 'n', desc = "Get a navigation wand")
+                         boolean navWand) throws WorldEditException {
+        Tool tool = navWand ? new NavigationWand() : new SelectionWand();
+        if (!tool.canUse(player)) {
+            player.printError(TranslatableComponent.of("worldedit.command.permissions"));
+            return;
+        }
         String wandId = navWand ? session.getNavWandItem() : session.getWandItem();
         if (wandId == null) {
             wandId = navWand ? we.getConfiguration().navigationWand : we.getConfiguration().wandItem;
@@ -300,13 +307,8 @@ public void wand(Player player, LocalSession session,
             return;
         }
         player.giveItem(new BaseItemStack(itemType, 1));
-        if (navWand) {
-            session.setTool(itemType, new NavigationWand());
-            player.printInfo(TranslatableComponent.of("worldedit.wand.navwand.info"));
-        } else {
-            session.setTool(itemType, new SelectionWand());
-            player.printInfo(TranslatableComponent.of("worldedit.wand.selwand.info"));
-        }
+        session.setTool(itemType, tool);
+        player.printInfo(TranslatableComponent.of("worldedit.wand." + (navWand ? "nav" : "sel" ) + "wand.info"));
     }
 
     @Command(

diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/NavigationWand.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/NavigationWand.java
@@ -28,9 +28,13 @@
 import com.sk89q.worldedit.util.formatting.text.TranslatableComponent;
 
 public class NavigationWand implements DoubleActionTraceTool {
+
+    private static final String PRIMARY_PERMISSION = "worldedit.navigation.thru.tool";
+    private static final String SECONDARY_PERMISSION = "worldedit.navigation.jumpto.tool";
+
     @Override
     public boolean actSecondary(Platform server, LocalConfiguration config, Player player, LocalSession session) {
-        if (!player.hasPermission("worldedit.navigation.jumpto.tool")) {
+        if (!player.hasPermission(SECONDARY_PERMISSION)) {
             return false;
         }
         final int maxDist = config.navigationWandMaxDistance;
@@ -48,7 +52,7 @@ public boolean actSecondary(Platform server, LocalConfiguration config, Player p
 
     @Override
     public boolean actPrimary(Platform server, LocalConfiguration config, Player player, LocalSession session) {
-        if (!player.hasPermission("worldedit.navigation.thru.tool")) {
+        if (!player.hasPermission(PRIMARY_PERMISSION)) {
             return false;
         }
         final int maxDist = config.navigationWandMaxDistance;
@@ -64,6 +68,6 @@ public boolean actPrimary(Platform server, LocalConfiguration config, Player pla
 
     @Override
     public boolean canUse(Actor actor) {
-        return true; // skip check here - checked separately for primary/secondary
+        return actor.hasPermission(PRIMARY_PERMISSION) || actor.hasPermission(SECONDARY_PERMISSION);
     }
 }