From 9fee3b6963c30ba13580583834244aba92641374 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 16 Jun 2018 16:32:17 -0400 Subject: [PATCH] accidently set the wrong collection on last commit copy pasting... --- ...nore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Spigot-Server-Patches/0310-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch b/Spigot-Server-Patches/0310-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch index bb4c5bb09..ae55bc73b 100644 --- a/Spigot-Server-Patches/0310-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch +++ b/Spigot-Server-Patches/0310-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch @@ -1,4 +1,4 @@ -From 4d65cc39ce63e647fa1d79567a7b44c5666b8fca Mon Sep 17 00:00:00 2001 +From 4239f1b642632d1a77265622b23dc07b9dab6fae Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 16 Jun 2018 16:23:38 -0400 Subject: [PATCH] Ignore Missing Recipes in RecipeBook to avoid data errors @@ -6,7 +6,7 @@ Subject: [PATCH] Ignore Missing Recipes in RecipeBook to avoid data errors This code was causing NPE's in saving player data, potentially related to reloads. diff --git a/src/main/java/net/minecraft/server/RecipeBookServer.java b/src/main/java/net/minecraft/server/RecipeBookServer.java -index 7eecdc9da..c7b947d2f 100644 +index 7eecdc9da..f65e74ebd 100644 --- a/src/main/java/net/minecraft/server/RecipeBookServer.java +++ b/src/main/java/net/minecraft/server/RecipeBookServer.java @@ -63,7 +63,11 @@ public class RecipeBookServer extends RecipeBook { @@ -33,7 +33,7 @@ index 7eecdc9da..c7b947d2f 100644 - nbttaglist1.add(new NBTTagString(((MinecraftKey) CraftingManager.recipes.b(irecipe1)).toString())); + MinecraftKey key = CraftingManager.recipes.b(irecipe); + if (key == null) continue; -+ nbttaglist.add(new NBTTagString(key.toString())); ++ nbttaglist1.add(new NBTTagString(key.toString())); + // Paper end }