summaryrefslogtreecommitdiffstats
path: root/nms-patches/ShapeDetectorBlock.patch
blob: 9a28dffc11538b3f3fc0c28a4a5746fa90e04fdc (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
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;