PaperMC/Spigot-Server-Patches/0232-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch

37 lines
1.5 KiB
Diff
Raw Normal View History

From f515ce3d4d364afc397e823afbf29457bca7cf4a Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
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 0203e26ec..aa6e5681f 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 {
2019-04-30 03:20:24 +02:00
while (iterator.hasNext()) {
MinecraftKey minecraftkey = (MinecraftKey) iterator.next();
+ // Paper start - ignore missing recipes
2019-04-30 03:20:24 +02:00
+ final Optional<? extends IRecipe<?>> recipe = this.l.a(minecraftkey);
+ if (!recipe.isPresent()) continue;
+ // Paper end
2019-12-12 00:43:22 +01:00
nbttaglist.add(NBTTagString.a(minecraftkey.toString()));
2019-04-30 03:20:24 +02:00
}
@@ -89,6 +93,10 @@ public class RecipeBookServer extends RecipeBook {
2019-04-30 03:20:24 +02:00
while (iterator1.hasNext()) {
MinecraftKey minecraftkey1 = (MinecraftKey) iterator1.next();
+ // Paper start - ignore missing recipes
2019-04-30 03:20:24 +02:00
+ final Optional<? extends IRecipe<?>> recipe = this.l.a(minecraftkey1);
+ if (!recipe.isPresent()) continue;
+ // Paper end
2019-12-12 00:43:22 +01:00
nbttaglist1.add(NBTTagString.a(minecraftkey1.toString()));
2019-04-30 03:20:24 +02:00
}
--
2.25.0.windows.1