mirror of
https://github.com/PaperMC/Paper.git
synced 2024-10-31 07:49:57 +01:00
22 lines
1.1 KiB
Diff
22 lines
1.1 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
||
|
|
Date: Tue, 12 Oct 2021 13:32:52 -0700
|
||
|
|
Subject: [PATCH] Null check isApplicable for CraftBlockEntityState#update
|
||
|
|
|
||
|
|
If the update call removed the TE, then isApplicable would
|
||
|
|
have NPE'd.
|
||
|
|
|
||
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
|
||
|
|
index d2ff7e373476aaab0d4d08977c9d9f274fff67bf..a31162bbb37b79cb7f84956c91f2ef9efc4ededc 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
|
||
|
|
@@ -102,7 +102,7 @@ public abstract class CraftBlockEntityState<T extends BlockEntity> extends Craft
|
||
|
|
}
|
||
|
|
|
||
|
|
protected boolean isApplicable(BlockEntity tileEntity) {
|
||
|
|
- return this.tileEntity.getClass() == tileEntity.getClass();
|
||
|
|
+ return tileEntity != null && this.tileEntity.getClass() == tileEntity.getClass(); // Paper - fix NPE if the TE was removed
|
||
|
|
}
|
||
|
|
|
||
|
|
@Override
|