Some code tidying.

Dieser Commit ist enthalten in:
Jeremy Koletar 2011-07-07 14:05:03 -05:00
Ursprung 6b9dbe349a
Commit 7717223686

Datei anzeigen

@ -57,25 +57,22 @@ public class NavigationCommands {
public static void ascend(CommandContext args, WorldEdit we, public static void ascend(CommandContext args, WorldEdit we,
LocalSession session, LocalPlayer player, EditSession editSession) LocalSession session, LocalPlayer player, EditSession editSession)
throws WorldEditException { throws WorldEditException {
int levelsToAscend = 0;
if (args.argsLength() == 0) { if (args.argsLength() == 0) {
if (player.ascendLevel()) { levelsToAscend = 1;
player.print("Ascended a level.");
} else { } else {
player.printError("No free spot above you found."); levelsToAscend = args.getInteger(0);
} }
} else {
Boolean ascentDone = false;
int ascentLevels = 1; int ascentLevels = 1;
int levelsToAscend = args.getInteger(0);
while (player.ascendLevel() && levelsToAscend != ascentLevels) { while (player.ascendLevel() && levelsToAscend != ascentLevels) {
ascentLevels++; ascentLevels++;
} }
if (ascentLevels == 0) { if (ascentLevels == 0) {
player.printError("No free spot above you found."); player.printError("No free spot above you found.");
} else { } else {
player.print("Ascended " + Integer.toString(ascentLevels) + " levels."); player.print((ascentLevels != 1) ? "Ascended " + Integer.toString(ascentLevels) + " levels." : "Ascended a level.");
}
} }
} }
@Command( @Command(
@ -89,25 +86,23 @@ public class NavigationCommands {
public static void descend(CommandContext args, WorldEdit we, public static void descend(CommandContext args, WorldEdit we,
LocalSession session, LocalPlayer player, EditSession editSession) LocalSession session, LocalPlayer player, EditSession editSession)
throws WorldEditException { throws WorldEditException {
int levelsToDescend = 0;
if (args.argsLength() == 0) { if (args.argsLength() == 0) {
if (player.descendLevel()) { levelsToDescend = 1;
player.print("Descended a level.");
} else { } else {
player.printError("No free spot above you found."); levelsToDescend = args.getInteger(0);
} }
} else {
int descentLevels = 1; int descentLevels = 1;
int levelsToDescend = args.getInteger(0);
while (player.descendLevel() && levelsToDescend != descentLevels) { while (player.descendLevel() && levelsToDescend != descentLevels) {
descentLevels++; descentLevels++;
} }
if (descentLevels == 0) { if (descentLevels == 0) {
player.printError("No free spot above you found."); player.printError("No free spot above you found.");
} else { } else {
player.print("Descended " + Integer.toString(descentLevels) + " levels."); player.print((descentLevels != 1) ? "Descended " + Integer.toString(descentLevels) + " levels." : "Descended a level.");
}
} }
} }
@Command( @Command(