From bd24b362196cf6f9c17d8e3438a479615614d3e1 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 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 0203e26ec9..aa6e5681f6 100644 --- a/src/main/java/net/minecraft/server/RecipeBookServer.java +++ b/src/main/java/net/minecraft/server/RecipeBookServer.java @@ -79,6 +79,10 @@ public class RecipeBookServer extends RecipeBook { while (iterator.hasNext()) { MinecraftKey minecraftkey = (MinecraftKey) iterator.next(); + // Paper start - ignore missing recipes + final Optional> recipe = this.l.a(minecraftkey); + if (!recipe.isPresent()) continue; + // Paper end nbttaglist.add(NBTTagString.a(minecraftkey.toString())); } @@ -89,6 +93,10 @@ public class RecipeBookServer extends RecipeBook { while (iterator1.hasNext()) { MinecraftKey minecraftkey1 = (MinecraftKey) iterator1.next(); + // Paper start - ignore missing recipes + final Optional> recipe = this.l.a(minecraftkey1); + if (!recipe.isPresent()) continue; + // Paper end nbttaglist1.add(NBTTagString.a(minecraftkey1.toString())); } -- 2.24.1