From 68b6b0708640a60acd25c71c6ce367bfa00fdf73 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 18 Sep 2017 21:03:45 -0400 Subject: [PATCH] World can be null for sign conversion, fixes #886 --- ...id-NPE-during-CraftBlockEntityState-load.patch | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/Spigot-Server-Patches/Avoid-NPE-during-CraftBlockEntityState-load.patch b/Spigot-Server-Patches/Avoid-NPE-during-CraftBlockEntityState-load.patch index 6276928330..edad60d059 100644 --- a/Spigot-Server-Patches/Avoid-NPE-during-CraftBlockEntityState-load.patch +++ b/Spigot-Server-Patches/Avoid-NPE-during-CraftBlockEntityState-load.patch @@ -4,8 +4,21 @@ Date: Mon, 18 Sep 2017 13:38:40 -0700 Subject: [PATCH] Avoid NPE during CraftBlockEntityState load +diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java +index 54b719d91..3f2c5b2d5 100644 +--- a/src/main/java/net/minecraft/server/TileEntitySign.java ++++ b/src/main/java/net/minecraft/server/TileEntitySign.java +@@ -0,0 +0,0 @@ public class TileEntitySign extends TileEntity { + } + + public MinecraftServer C_() { +- return TileEntitySign.this.world.getMinecraftServer(); ++ return MinecraftServer.getServer(); // Paper - world may be null + } + }; + diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java -index 266f87d7..22dcaea7 100644 +index 266f87d7f..22dcaea72 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java @@ -0,0 +0,0 @@ public class CraftBlockEntityState extends CraftBlockState