Fixed the order of the tool checking code you can now use edit wand again.

This commit is contained in:
sk89q 2010-10-14 01:43:20 -07:00
parent 3bf7c08ad6
commit 98d1a0be05

View File

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