From 77172236865ae124ae245a26dc02b01c281df4e0 Mon Sep 17 00:00:00 2001
From: Jeremy Koletar <jjkoletar@gmail.com>
Date: Thu, 7 Jul 2011 14:05:03 -0500
Subject: [PATCH] Some code tidying.

---
 .../commands/NavigationCommands.java          | 47 +++++++++----------
 1 file changed, 21 insertions(+), 26 deletions(-)

diff --git a/src/main/java/com/sk89q/worldedit/commands/NavigationCommands.java b/src/main/java/com/sk89q/worldedit/commands/NavigationCommands.java
index 525e2b9c9..0cef16aa3 100644
--- a/src/main/java/com/sk89q/worldedit/commands/NavigationCommands.java
+++ b/src/main/java/com/sk89q/worldedit/commands/NavigationCommands.java
@@ -57,26 +57,23 @@ public class NavigationCommands {
     public static void ascend(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
-        if (args.argsLength() == 0) { 
-            if (player.ascendLevel()) {
-                player.print("Ascended a level.");
+            int levelsToAscend = 0;
+            if (args.argsLength() == 0) {
+                levelsToAscend = 1;
             } else {
-                player.printError("No free spot above you found.");
+                levelsToAscend = args.getInteger(0);
             }
-        } else {
-            Boolean ascentDone = false;
             int ascentLevels = 1;
-            int levelsToAscend = args.getInteger(0);
             while (player.ascendLevel() && levelsToAscend != ascentLevels) {
                 ascentLevels++;
             }
             if (ascentLevels == 0) {
             player.printError("No free spot above you found.");
             } else {
-            player.print("Ascended " + Integer.toString(ascentLevels) + " levels.");
+            player.print((ascentLevels != 1) ? "Ascended " + Integer.toString(ascentLevels) + " levels." : "Ascended a level.");
             }
+        
         }
-    }
 
     @Command(
         aliases = {"descend"},
@@ -89,25 +86,23 @@ public class NavigationCommands {
     public static void descend(CommandContext args, WorldEdit we,
             LocalSession session, LocalPlayer player, EditSession editSession)
             throws WorldEditException {
-        
-        if (args.argsLength() == 0) { 
-            if (player.descendLevel()) {
-                player.print("Descended a level.");
-            } else {
-                player.printError("No free spot above you found.");
-            }
+        int levelsToDescend = 0;
+        if (args.argsLength() == 0) {
+            levelsToDescend = 1;
         } else {
-            int descentLevels = 1;
-            int levelsToDescend = args.getInteger(0);
-            while (player.descendLevel() && levelsToDescend != descentLevels) {
-                descentLevels++;
-            }
-            if (descentLevels == 0) {
-            player.printError("No free spot above you found.");
-            } else {
-            player.print("Descended " + Integer.toString(descentLevels) + " levels.");
-            }
+            levelsToDescend = args.getInteger(0);
         }
+        
+        int descentLevels = 1;
+        while (player.descendLevel() && levelsToDescend != descentLevels) {
+            descentLevels++;
+        }
+        if (descentLevels == 0) {
+        player.printError("No free spot above you found.");
+        } else {
+        player.print((descentLevels != 1) ? "Descended " + Integer.toString(descentLevels) + " levels." : "Descended a level.");
+        }
+        
     }
 
     @Command(