mirror/WorldEdit
2
0
Fork 0
mirror of https://github.com/EngineHub/WorldEdit.git synced 2024-12-15 04:41:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed /editstack(air), fixed getLength()/getHeight() of WorldEditSession.

Browse Source
This commit is contained in:
sk89q 2010-10-05 21:08:52 -07:00
parent 35f46473de
commit c59d77e138
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/WorldEdit.java
View File

@ -66,8 +66,8 @@ public WorldEdit() {
commands.put("/editcopy", "Copies the currently selected region");
commands.put("/editpaste", "Pastes the clipboard");
commands.put("/editpasteair", "Pastes the clipboard (with air)");
commands.put("/editstack [Dir] <Count>", "Stacks the clipboard");
commands.put("/editstackair [Dir] <Count>", "Stacks the clipboard (with air)");
commands.put("/editstack", "[Dir] <Count> - Stacks the clipboard");
commands.put("/editstackair", "[Dir] <Count> - Stacks the clipboard (with air)");
commands.put("/editload", "[Filename] - Load .schematic into clipboard");
commands.put("/editsave", "[Filename] - Save clipboard to .schematic");
commands.put("/editfill", "[ID] [Radius] <Depth> - Fill a hole");
@ -752,16 +752,21 @@ private boolean performCommand(Player player, WorldEditSession session,
// Stack
} else if (split[0].equalsIgnoreCase("/editstackair") ||
split[0].equalsIgnoreCase("/editstack")) {
checkArgs(split, 1, 2, split[0]);
String dir = split[1];
int count = Math.max(1, Integer.parseInt(split[2]));
checkArgs(split, 0, 2, split[0]);
String dir = split.length > 1 ? split[1] : "me";
int count = split.length > 2 ? Math.max(1, Integer.parseInt(split[2])) : 1;
int xm = 0;
int ym = 0;
int zm = 0;
boolean copyAir = split[0].equalsIgnoreCase("/editstackair");
if (dir.equalsIgnoreCase("me")) {
dir = etc.getCompassPointForDirection(player.getRotation());
// From hey0's code
double rot = (player.getRotation() - 90) % 360;
if (rot < 0) {
rot += 360.0;
}
dir = etc.getCompassPointForDirection(rot);
}
if (dir.equalsIgnoreCase("w")) {
@ -789,7 +794,7 @@ private boolean performCommand(Player player, WorldEditSession session,
for (int x = lowerX; x <= upperX; x++) {
for (int z = lowerZ; z <= upperZ; z++) {
for (int y = lowerY; y <= lowerY; y++) {
for (int y = lowerY; y <= upperY; y++) {
int blockType = editSession.getBlock(x, y, z);
if (blockType != 0 || copyAir) {
@ -803,14 +808,14 @@ private boolean performCommand(Player player, WorldEditSession session,
}
}
int shiftX = xs * xm * count;
/*int shiftX = xs * xm * count;
int shiftY = ys * ym * count;
int shiftZ = zs * zm * count;
int[] pos1 = session.getPos1();
int[] pos2 = session.getPos2();
session.setPos1(pos1[0] + shiftX, pos1[1] + shiftY, pos1[2] + shiftZ);
session.setPos2(pos2[0] + shiftX, pos2[1] + shiftY, pos2[2] + shiftZ);
session.setPos2(pos2[0] + shiftX, pos2[1] + shiftY, pos2[2] + shiftZ);*/
logger.log(Level.INFO, player.getName() + " used " + split[0]);
player.sendMessage(Colors.LightPurple + "Stacked. Undo with /editundo");

4
src/WorldEditSession.java
View File

@ -290,7 +290,7 @@ public int getWidth() throws IncompleteRegionException {
* @throws IncompleteRegionException
*/
public int getLength() throws IncompleteRegionException {
return getUpperY() - getLowerY() + 1;
return getUpperZ() - getLowerZ() + 1;
}
/**
@ -300,7 +300,7 @@ public int getLength() throws IncompleteRegionException {
* @throws IncompleteRegionException
*/
public int getHeight() throws IncompleteRegionException {
return getUpperZ() - getLowerZ() + 1;
return getUpperY() - getLowerY() + 1;
}
/**