This commit is contained in:
Jesse Boyd 2017-06-20 18:26:01 +10:00
parent 33e162eafd
commit 283fd746d5
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F

View File

@ -177,7 +177,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 if (block.getId() == 217) continue; // 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) {
@ -215,9 +215,8 @@ 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 if (block.getId() == 217) continue; // 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()) {