Made handling of non-right angles in getDirection() return more relevant errors.

This commit is contained in:
sk89q 2011-01-09 11:22:42 -08:00
parent 010a1c84fd
commit 2f411fa838

View File

@ -1701,8 +1701,12 @@ public class WorldEditController {
LocalPlayer.DIRECTION dir = null; LocalPlayer.DIRECTION dir = null;
dirStr = dirStr.toLowerCase();
boolean wasDetected = false;
if (dirStr.equals("me")) { if (dirStr.equals("me")) {
dir = player.getCardinalDirection(); dir = player.getCardinalDirection();
wasDetected = true;
} }
if (dirStr.charAt(0) == 'w' || dir == LocalPlayer.DIRECTION.WEST) { if (dirStr.charAt(0) == 'w' || dir == LocalPlayer.DIRECTION.WEST) {
@ -1718,7 +1722,11 @@ public class WorldEditController {
} else if (dirStr.charAt(0) == 'd') { } else if (dirStr.charAt(0) == 'd') {
ym -= 1; ym -= 1;
} else { } else {
throw new UnknownDirectionException(dirStr); if (wasDetected) {
throw new UnknownDirectionException(dir.name());
} else {
throw new UnknownDirectionException(dirStr);
}
} }
return new Vector(xm, ym, zm); return new Vector(xm, ym, zm);