From 18c03d87ac38c6bc32d633d4fd54c6a69c3bbdfa Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Mon, 2 Feb 2015 20:27:12 +0000 Subject: [PATCH] Fix a null pointer in ShapeDetectorBlock By: Thinkofdeath --- paper-server/nms-patches/ShapeDetectorBlock.patch | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 paper-server/nms-patches/ShapeDetectorBlock.patch diff --git a/paper-server/nms-patches/ShapeDetectorBlock.patch b/paper-server/nms-patches/ShapeDetectorBlock.patch new file mode 100644 index 0000000000..9a28dffc11 --- /dev/null +++ b/paper-server/nms-patches/ShapeDetectorBlock.patch @@ -0,0 +1,15 @@ +--- ../work/decompile-8eb82bde//net/minecraft/server/ShapeDetectorBlock.java 2015-02-02 20:26:40.044135504 +0000 ++++ src/main/java/net/minecraft/server/ShapeDetectorBlock.java 2015-02-02 20:26:40.056135504 +0000 +@@ -16,8 +16,10 @@ + } + + public IBlockData a() { +- if (this.c == null && this.a.isLoaded(this.b)) { +- this.c = this.a.getType(this.b); ++ // CraftBukkit start - fix null pointer ++ if (this.c == null) { ++ this.c = this.a.isLoaded(this.b) ? this.a.getType(this.b) : Blocks.AIR.getBlockData(); ++ // CraftBukkit end + } + + return this.c;