From 5e67496180189eb198ca1edb924a62679000c812 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 440e8f134..091c4abbd 100644 --- a/src/main/java/net/minecraft/server/RecipeBookServer.java +++ b/src/main/java/net/minecraft/server/RecipeBookServer.java @@ -78,6 +78,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(new NBTTagString(minecraftkey.toString())); } @@ -88,6 +92,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(new NBTTagString(minecraftkey1.toString())); } -- 2.21.0