Upstream/FastAsyncWorldedit
1
0
Fork 0
mirror of https://github.com/boy0001/FastAsyncWorldedit.git synced 2024-11-28 21:56:33 +01:00
Code Issues Projects Releases Wiki Activity

CuboidClipboard rotation fix

Browse Source
This commit is contained in:
Jesse Boyd 2017-06-25 11:42:46 +10:00
parent 8603729390
commit ebdcf1afcd
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/main/java/com/sk89q/worldedit/CuboidClipboard.java
View File

@ -480,7 +480,7 @@ public class CuboidClipboard {
Math.abs(sizeRotated.getBlockY()), Math.abs(sizeRotated.getBlockY()),
Math.abs(sizeRotated.getBlockZ())); Math.abs(sizeRotated.getBlockZ()));
offset = offset.transform2D(angle, 0, 0, 0, 0) offset = offset.transform2D(angle, 0, 0, 0, 0)
.subtract(shiftX, 0, shiftZ); .subtract(shiftX, 0, shiftZ).round();
dx = cloned.dx; dx = cloned.dx;
dxz = cloned.dxz; dxz = cloned.dxz;
} }
@ -694,16 +694,12 @@ public class CuboidClipboard {
* @throws MaxChangedBlocksException thrown if too many blocks were changed * @throws MaxChangedBlocksException thrown if too many blocks were changed
*/ */
public void place(EditSession editSession, Vector newOrigin, boolean noAir) throws MaxChangedBlocksException { public void place(EditSession editSession, Vector newOrigin, boolean noAir) throws MaxChangedBlocksException {
Vector v = new Vector(0, 0, 0);
int ox = newOrigin.getBlockX(); int ox = newOrigin.getBlockX();
int oy = newOrigin.getBlockY(); int oy = newOrigin.getBlockY();
int oz = newOrigin.getBlockZ(); int oz = newOrigin.getBlockZ();
for (int x = 0; x < size.getBlockX(); ++x) {
v.mutX(x + ox);
for (int y = 0; y < size.getBlockY(); ++y) { for (int y = 0; y < size.getBlockY(); ++y) {
v.mutY(y + oy);
for (int z = 0; z < size.getBlockZ(); ++z) { for (int z = 0; z < size.getBlockZ(); ++z) {
v.mutZ(z + oz); for (int x = 0; x < size.getBlockX(); ++x) {
final BaseBlock block = getBlock(x, y, z); final BaseBlock block = getBlock(x, y, z);
if (block == null) { if (block == null) {
continue; continue;
@ -711,7 +707,7 @@ public class CuboidClipboard {
if (noAir && block.isAir()) { if (noAir && block.isAir()) {
continue; continue;
} }
editSession.setBlockFast(new Vector(x, y, z).add(newOrigin), block); editSession.setBlock(x + ox, y + oy, z + oz, block);
} }
} }
} }