summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2018-11-10 20:30:58 +1100
committermd_5 <git@md-5.net>2018-11-10 20:30:58 +1100
commit1663a63de2df7ca41e645b7faf02df5961319667 (patch)
treebaacbe0fe9f8a9143a2992770deb38aa7b3ee8db
parent3697ec7a60f718cfc05064af169a29c8594073d9 (diff)
downloadcraftbukkit-1663a63de2df7ca41e645b7faf02df5961319667.tar
craftbukkit-1663a63de2df7ca41e645b7faf02df5961319667.tar.gz
craftbukkit-1663a63de2df7ca41e645b7faf02df5961319667.tar.lz
craftbukkit-1663a63de2df7ca41e645b7faf02df5961319667.tar.xz
craftbukkit-1663a63de2df7ca41e645b7faf02df5961319667.zip
SPIGOT-4478: NPE during PlayerLoginEvent recipe manipulation
-rw-r--r--nms-patches/RecipeBookServer.patch8
1 files changed, 8 insertions, 0 deletions
diff --git a/nms-patches/RecipeBookServer.patch b/nms-patches/RecipeBookServer.patch
index 3d60bc79..82133174 100644
--- a/nms-patches/RecipeBookServer.patch
+++ b/nms-patches/RecipeBookServer.patch
@@ -17,3 +17,11 @@
this.a(minecraftkey);
this.c(minecraftkey);
arraylist.add(minecraftkey);
+@@ -61,6 +62,7 @@
+ }
+
+ private void a(PacketPlayOutRecipes.Action packetplayoutrecipes_action, EntityPlayer entityplayer, List<MinecraftKey> list) {
++ if (entityplayer.playerConnection == null) return; // SPIGOT-4478 during PlayerLoginEvent
+ entityplayer.playerConnection.sendPacket(new PacketPlayOutRecipes(packetplayoutrecipes_action, list, Collections.emptyList(), this.c, this.d, this.e, this.f));
+ }
+