From dfe2b00874e5f77ffce0819e994a01ba424100c7 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 --- ...-NPE-during-CraftBlockEntityState-load.patch | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/Spigot-Server-Patches/0236-Avoid-NPE-during-CraftBlockEntityState-load.patch b/Spigot-Server-Patches/0236-Avoid-NPE-during-CraftBlockEntityState-load.patch index 96965ee2d..843cea6bd 100644 --- a/Spigot-Server-Patches/0236-Avoid-NPE-during-CraftBlockEntityState-load.patch +++ b/Spigot-Server-Patches/0236-Avoid-NPE-during-CraftBlockEntityState-load.patch @@ -1,11 +1,24 @@ -From 1c427c765b20086e3ee11f87d4e5ffb653067c43 Mon Sep 17 00:00:00 2001 +From 220e3ea760acbe9b80893c45b55012089f55cc60 Mon Sep 17 00:00:00 2001 From: kashike 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 +@@ -60,7 +60,7 @@ 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 @@ -24,6 +24,7 @@ public class CraftBlockEntityState extends CraftBlockState