From a1834256428aa75de70a1831649fc2a377b14d85 Mon Sep 17 00:00:00 2001
From: NotMyFault <mc.cache@web.de>
Date: Tue, 6 Jul 2021 13:13:54 +0200
Subject: [PATCH] Update Upstream

40ded93 Fix loading legacy invalid blocks
---
 .../worldedit/extent/clipboard/io/MCEditSchematicReader.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/MCEditSchematicReader.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/MCEditSchematicReader.java
index bb4947994..b52e483ce 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/MCEditSchematicReader.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/MCEditSchematicReader.java
@@ -249,7 +249,10 @@ public class MCEditSchematicReader extends NBTSchematicReader {
                     int index = y * width * length + z * width + x;
                     BlockVector3 pt = BlockVector3.at(x, y, z);
                     BaseBlock state = Optional.ofNullable(tileEntityBlocks.get(pt))
-                            .orElseGet(() -> getBlockState(blocks[index], blockData[index]).toBaseBlock());
+                            .orElseGet(() -> {
+                                BlockState blockState = getBlockState(blocks[index], blockData[index]);
+                                return blockState == null ? null : blockState.toBaseBlock();
+                            });
 
                     try {
                         if (state != null) {