Changed //cyl and //hcyl to use the same code.

This commit is contained in:
sk89q 2010-10-18 10:41:56 -07:00
parent 1b88e1592e
commit 33ff7fb34c

View File

@ -409,28 +409,21 @@ public class WorldEdit {
return true; return true;
// Draw a hollow cylinder // Draw a hollow cylinder
} else if (split[0].equalsIgnoreCase("//hcyl")) { } else if (split[0].equalsIgnoreCase("//hcyl")
|| split[0].equalsIgnoreCase("//cyl")) {
checkArgs(split, 2, 3, split[0]); checkArgs(split, 2, 3, split[0]);
BaseBlock block = getBlock(split[1]); BaseBlock block = getBlock(split[1]);
int radius = Math.max(1, Integer.parseInt(split[2])); int radius = Math.max(1, Integer.parseInt(split[2]));
int height = split.length > 3 ? Integer.parseInt(split[3]) : 1; int height = split.length > 3 ? Integer.parseInt(split[3]) : 1;
boolean filled = split[0].equalsIgnoreCase("//cyl");
Vector pos = session.getPlacementPosition(player); Vector pos = session.getPlacementPosition(player);
int affected = editSession.makeHollowCylinder(pos, block, radius, height); int affected;
player.print(affected + " block(s) have been created."); if (filled) {
affected = editSession.makeCylinder(pos, block, radius, height);
return true; } else {
affected = editSession.makeHollowCylinder(pos, block, radius, height);
// Draw a filled cylinder }
} else if (split[0].equalsIgnoreCase("//cyl")) {
checkArgs(split, 2, 3, split[0]);
BaseBlock block = getBlock(split[1]);
int radius = Math.max(1, Integer.parseInt(split[2]));
int height = split.length > 3 ? Integer.parseInt(split[3]) : 1;
Vector pos = session.getPlacementPosition(player);
int affected = editSession.makeCylinder(pos, block, radius, height);
player.findFreePosition();
player.print(affected + " block(s) have been created."); player.print(affected + " block(s) have been created.");
return true; return true;