From 0af82fd31ff7d353d3367e1163e84f3ddd68ea9b Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Wed, 15 Feb 2017 14:26:40 +1100
Subject: [PATCH] Fixes #421

---
 build.gradle                                                 | 2 +-
 .../com/sk89q/worldedit/world/registry/BundledBlockData.java | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 31465a30..3c72a325 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 = -69;  // Offset to mach CI
+    index = -70;  // Offset to mach CI
     int major, minor, patch;
     major = minor = patch = 0;
     for (;parents != null && !parents.isEmpty();index++) {
diff --git a/core/src/main/java/com/sk89q/worldedit/world/registry/BundledBlockData.java b/core/src/main/java/com/sk89q/worldedit/world/registry/BundledBlockData.java
index 7f9a5423..170d6f82 100644
--- a/core/src/main/java/com/sk89q/worldedit/world/registry/BundledBlockData.java
+++ b/core/src/main/java/com/sk89q/worldedit/world/registry/BundledBlockData.java
@@ -216,7 +216,10 @@ public class BundledBlockData {
             int len = dir.values.size();
             int index = 0;
             for (Map.Entry<String, FaweStateValue> valuesEntry : dir.values.entrySet()) {
-                valuesEntry.getValue().setDirection(dirs[index]);
+                FaweStateValue state = valuesEntry.getValue();
+                if (state != null) {
+                    state.setDirection(dirs[index]);
+                }
                 index++;
             }
             return true;