From 98d1a0be05416ad18d9e965ac452a5716a4b3807 Mon Sep 17 00:00:00 2001
From: sk89q <the.sk89q@gmail.com>
Date: Thu, 14 Oct 2010 01:43:20 -0700
Subject: [PATCH] Fixed the order of the tool checking code you can now use
 edit wand again.

---
 src/WorldEditSMListener.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/WorldEditSMListener.java b/src/WorldEditSMListener.java
index d88f96cbf..1e7958154 100644
--- a/src/WorldEditSMListener.java
+++ b/src/WorldEditSMListener.java
@@ -97,12 +97,7 @@ public class WorldEditSMListener extends PluginListener {
         WorldEditPlayer player = new SMWorldEditPlayer(modPlayer);
         WorldEditSession session = worldEdit.getSession(player);
 
-        if (player.isHoldingPickAxe()) {
-            if (session.hasSuperPickAxe()) {
-                return etc.getMCServer().e.d(blockClicked.getX(),
-                        blockClicked.getY(), blockClicked.getZ(), 0);
-            }
-        } else if (player.getItemInHand() == 271) {
+        if (player.getItemInHand() == 271) {
             if (session.isToolControlEnabled()) {
                 Vector cur = Vector.toBlockPoint(blockClicked.getX(),
                                                blockClicked.getY(),
@@ -120,6 +115,11 @@ public class WorldEditSMListener extends PluginListener {
 
                 return true;
             }
+        } else if (player.isHoldingPickAxe()) {
+            if (session.hasSuperPickAxe()) {
+                return etc.getMCServer().e.d(blockClicked.getX(),
+                        blockClicked.getY(), blockClicked.getZ(), 0);
+            }
         }
 
         return false;