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

Fixes #593

Browse Source
This commit is contained in:
Jesse Boyd 2017-06-19 14:15:09 +10:00
parent b2261bb9e2
commit 693963a0f3
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -28,7 +28,7 @@ ext {
date = git.head().date.format("yy.MM.dd") date = git.head().date.format("yy.MM.dd")
revision = "-${git.head().abbreviatedId}" revision = "-${git.head().abbreviatedId}"
parents = git.head().parentIds; parents = git.head().parentIds;
index = -92; // Offset to match CI index = -93; // Offset to match CI
int major, minor, patch; int major, minor, patch;
major = minor = patch = 0; major = minor = patch = 0;
for (;parents != null && !parents.isEmpty();index++) { for (;parents != null && !parents.isEmpty();index++) {

3
core/src/main/java/com/boydti/fawe/object/schematic/StructureFormat.java
View File

@ -184,6 +184,7 @@ public class StructureFormat implements ClipboardReader, ClipboardWriter {
ArrayList<HashMap<String, Object>> palette = new ArrayList<>(); ArrayList<HashMap<String, Object>> palette = new ArrayList<>();
for (Vector point : region) { for (Vector point : region) {
BaseBlock block = clipboard.getBlock(point); BaseBlock block = clipboard.getBlock(point);
if (block.getId() == 217) block = FaweCache.getBlock(0, 0); // Void
int combined = FaweCache.getCombined(block); int combined = FaweCache.getCombined(block);
int index = indexes[combined]; int index = indexes[combined];
if (index != -1) { if (index != -1) {
@ -221,7 +222,9 @@ public class StructureFormat implements ClipboardReader, ClipboardWriter {
Vector min = region.getMinimumPoint(); Vector min = region.getMinimumPoint();
for (Vector point : region) { for (Vector point : region) {
BaseBlock block = clipboard.getBlock(point); BaseBlock block = clipboard.getBlock(point);
if (block.getId() == 217) block = FaweCache.getBlock(0, 0); // Void
int combined = FaweCache.getCombined(block); int combined = FaweCache.getCombined(block);
if (combined >> 4 == 217) combined = 0; // Structure void
int index = indexes[combined]; int index = indexes[combined];
List<Integer> pos = Arrays.asList((int) (point.getX() - min.getX()), (int) (point.getY() - min.getY()), (int) (point.getZ() - min.getZ())); List<Integer> pos = Arrays.asList((int) (point.getX() - min.getX()), (int) (point.getY() - min.getY()), (int) (point.getZ() - min.getZ()));
if (!block.hasNbtData()) { if (!block.hasNbtData()) {