From 2f411fa838b61f6ed7da1eb6a99ef24bd3b5f2b8 Mon Sep 17 00:00:00 2001 From: sk89q Date: Sun, 9 Jan 2011 11:22:42 -0800 Subject: [PATCH] Made handling of non-right angles in getDirection() return more relevant errors. --- src/com/sk89q/worldedit/WorldEditController.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/com/sk89q/worldedit/WorldEditController.java b/src/com/sk89q/worldedit/WorldEditController.java index 98efeeb80..1b01e3007 100644 --- a/src/com/sk89q/worldedit/WorldEditController.java +++ b/src/com/sk89q/worldedit/WorldEditController.java @@ -1700,9 +1700,13 @@ public class WorldEditController { int zm = 0; LocalPlayer.DIRECTION dir = null; + + dirStr = dirStr.toLowerCase(); + boolean wasDetected = false; if (dirStr.equals("me")) { dir = player.getCardinalDirection(); + wasDetected = true; } if (dirStr.charAt(0) == 'w' || dir == LocalPlayer.DIRECTION.WEST) { @@ -1718,7 +1722,11 @@ public class WorldEditController { } else if (dirStr.charAt(0) == 'd') { ym -= 1; } else { - throw new UnknownDirectionException(dirStr); + if (wasDetected) { + throw new UnknownDirectionException(dir.name()); + } else { + throw new UnknownDirectionException(dirStr); + } } return new Vector(xm, ym, zm);