From f9c1420daf3eb90ecbc8792c3a6716dc2f397235 Mon Sep 17 00:00:00 2001
From: CraftBukkit/Spigot <noreply+git-craftbukkit@papermc.io>
Date: Fri, 15 Oct 2021 18:03:01 +1100
Subject: [PATCH] #940: Fixed a NPE during CraftBlockEntityState#update.

When the BlockState's block type was changed, #update may have removed
the TileEntity, causing #isApplicable to fail with a NPE.

By: blablubbabc <lukas@wirsindwir.de>
---
 .../org/bukkit/craftbukkit/block/CraftBlockEntityState.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
index 26409a4f5..1584bf8d9 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
@@ -82,7 +82,7 @@ public abstract class CraftBlockEntityState<T extends TileEntity> extends CraftB
     }
 
     protected boolean isApplicable(TileEntity tileEntity) {
-        return this.tileEntity.getClass() == tileEntity.getClass();
+        return tileEntity != null && this.tileEntity.getClass() == tileEntity.getClass();
     }
 
     @Override