Brandon/FastAsyncWorldedit
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix clipboard paste error.

Browse Source
This commit is contained in:
Jesse Boyd 2016-10-21 00:54:02 +11:00
parent 8e91d8a6ad
commit 0054e432ae
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -335,7 +335,7 @@ public class ClipboardCommands {
Clipboard clipboard = holder.getClipboard(); Clipboard clipboard = holder.getClipboard();
Region region = clipboard.getRegion().clone(); Region region = clipboard.getRegion().clone();
final int maxY = editSession.getMaxY();
final Vector bot = clipboard.getMinimumPoint(); final Vector bot = clipboard.getMinimumPoint();
final Vector origin = clipboard.getOrigin(); final Vector origin = clipboard.getOrigin();
final Vector to = atOrigin ? origin : session.getPlacementPosition(player); final Vector to = atOrigin ? origin : session.getPlacementPosition(player);
@ -352,7 +352,9 @@ public class ClipboardCommands {
pos.x += relx; pos.x += relx;
pos.y += rely; pos.y += rely;
pos.z += relz; pos.z += relz;
editSession.setBlockFast(pos, block); if (pos.y >= 0 && pos.y <= maxY) {
editSession.setBlockFast(pos, block);
}
} }
}, !ignoreAirBlocks); }, !ignoreAirBlocks);
} else { } else {
@ -370,7 +372,9 @@ public class ClipboardCommands {
loc.x += relx; loc.x += relx;
loc.y += rely; loc.y += rely;
loc.z += relz; loc.z += relz;
editSession.setBlock(loc, block); if (loc.y >= 0 && loc.y <= maxY) {
editSession.setBlockFast(loc, block);
}
} }
} }
// Entity offset is the paste location subtract the clipboard origin (entity's location is already relative to the world origin) // Entity offset is the paste location subtract the clipboard origin (entity's location is already relative to the world origin)