From 789abaada9c104102d70dccd768fafd7f0e69990 Mon Sep 17 00:00:00 2001
From: Valentin Stahlmann <2kaz4u@gmail.com>
Date: Mon, 21 Mar 2011 22:01:15 +0800
Subject: [PATCH] Added diagonal stacking

---
 src/com/sk89q/worldedit/WorldEdit.java        | 60 +++++++++++++++++++
 .../worldedit/commands/RegionCommands.java    |  2 +-
 2 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/src/com/sk89q/worldedit/WorldEdit.java b/src/com/sk89q/worldedit/WorldEdit.java
index f57d859c5..01972c776 100644
--- a/src/com/sk89q/worldedit/WorldEdit.java
+++ b/src/com/sk89q/worldedit/WorldEdit.java
@@ -624,6 +624,66 @@ public class WorldEdit {
 
         return new Vector(xm, ym, zm);
     }
+    
+    /**
+     * Get diagonal direction vector for a player's direction. May return
+     * null if a direction could not be found.
+     * 
+     * @param player
+     * @param dirStr 
+     * @return
+     * @throws UnknownDirectionException 
+     */
+    public Vector getDiagonalDirection( LocalPlayer player, String dirStr )
+        throws UnknownDirectionException {
+        int xm = 0;
+        int ym = 0;
+        int zm = 0;
+
+        PlayerDirection dir = null;
+
+        dirStr = dirStr.toLowerCase();
+        boolean wasDetected = false;
+
+        if ( dirStr.equals( "me" ) ) {
+            dir = player.getCardinalDirection();
+            wasDetected = true;
+        }
+
+        if ((dirStr.charAt(0) == 's' && dirStr.indexOf( 'w' ) > 0) || dir == PlayerDirection.SOUTH_WEST) {
+            zm += 1;
+            xm += 1;
+        } else if ((dirStr.charAt(0) == 'n' && dirStr.indexOf( 'w' ) > 0) || dir == PlayerDirection.NORTH_WEST) {
+            zm += 1;
+            xm -= 1;
+        } else if ((dirStr.charAt(0) == 's' && dirStr.indexOf( 'e' ) > 0) || dir == PlayerDirection.SOUTH_EAST) {
+            zm -= 1;
+            xm += 1;
+        } else if ((dirStr.charAt(0) == 'n' && dirStr.indexOf( 'e' ) > 0) || dir == PlayerDirection.NORTH_EAST) {
+            zm -= 1;
+            xm -= 1;
+        } else if (dirStr.charAt(0) == 'w' || dir == PlayerDirection.WEST) {
+            zm += 1;
+        } else if (dirStr.charAt(0) == 'e' || dir == PlayerDirection.EAST) {
+            zm -= 1;
+        } else if (dirStr.charAt(0) == 's' || dir == PlayerDirection.SOUTH) {
+            xm += 1;
+        } else if (dirStr.charAt(0) == 'n' || dir == PlayerDirection.NORTH) {
+            xm -= 1;
+        } else if (dirStr.charAt(0) == 'u') {
+            ym += 1;
+        } else if (dirStr.charAt(0) == 'd') {
+            ym -= 1;
+        } else {
+            if (wasDetected) {
+                throw new UnknownDirectionException(dir.name());
+            } else {
+                throw new UnknownDirectionException(dirStr);
+            }
+        }
+
+        return new Vector( xm, ym, zm );
+    }
 
     /**
      * Get the flip direction for a player's direction. May return
diff --git a/src/com/sk89q/worldedit/commands/RegionCommands.java b/src/com/sk89q/worldedit/commands/RegionCommands.java
index bab30907c..e97fbb058 100644
--- a/src/com/sk89q/worldedit/commands/RegionCommands.java
+++ b/src/com/sk89q/worldedit/commands/RegionCommands.java
@@ -223,7 +223,7 @@ public class RegionCommands {
             throws WorldEditException {
 
         int count = args.argsLength() > 0 ? Math.max(1, args.getInteger(0)) : 1;
-        Vector dir = we.getDirection(player,
+        Vector dir = we.getDiagonalDirection(player,
                 args.argsLength() > 1 ? args.getString(1).toLowerCase() : "me");
 
         int affected = editSession.stackCuboidRegion(session.getSelection(player.getWorld()),