From 3ce80033e5e6ecf68e705e7cc7b95c69e0fa928e Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Sun, 19 Feb 2017 14:49:19 +1100
Subject: [PATCH] Fixes #431

---
 build.gradle                                                    | 2 +-
 .../main/java/com/boydti/fawe/forge/v1710/ForgeQueue_All.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4085ad48..de28215b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,7 +28,7 @@ ext {
     date = git.head().date.format("yy.MM.dd")
     revision = "-${git.head().abbreviatedId}"
     parents = git.head().parentIds;
-    index = -73;  // Offset to mach CI
+    index = -71;  // Offset to mach CI
     int major, minor, patch;
     major = minor = patch = 0;
     for (;parents != null && !parents.isEmpty();index++) {
diff --git a/forge1710/src/main/java/com/boydti/fawe/forge/v1710/ForgeQueue_All.java b/forge1710/src/main/java/com/boydti/fawe/forge/v1710/ForgeQueue_All.java
index 25a544bf..75f8b306 100644
--- a/forge1710/src/main/java/com/boydti/fawe/forge/v1710/ForgeQueue_All.java
+++ b/forge1710/src/main/java/com/boydti/fawe/forge/v1710/ForgeQueue_All.java
@@ -376,7 +376,7 @@ public class ForgeQueue_All extends NMSMappedFaweQueue<World, Chunk, ExtendedBlo
                         int y = FaweCache.CACHE_Y[layer][j];
                         int z = FaweCache.CACHE_Z[layer][j];
                         int id = currentIdArray[j] & 0xFF;
-                        byte data = (byte) currentDataArray.get(x, y & 15, z);
+                        byte data = (byte) (currentDataArray != null ? currentDataArray.get(x, y & 15, z) : 0);
                         previous.setBlock(x, y, z, id, data);
                     }
                 }