2019-04-22 23:36:14 +02:00
|
|
|
From cc6a121371a695b0890a0a4a88221769e8f08e43 Mon Sep 17 00:00:00 2001
|
2018-07-19 01:16:19 +02:00
|
|
|
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
|
2019-04-22 23:36:14 +02:00
|
|
|
index 5a21aed438..4d9f3d3695 100644
|
2018-07-19 01:16:19 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/RecipeBookServer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/RecipeBookServer.java
|
2019-01-01 04:15:55 +01:00
|
|
|
@@ -78,6 +78,10 @@ public class RecipeBookServer extends RecipeBook {
|
2018-10-02 12:01:56 +02:00
|
|
|
while (iterator.hasNext()) {
|
|
|
|
MinecraftKey minecraftkey = (MinecraftKey) iterator.next();
|
2018-07-19 01:16:19 +02:00
|
|
|
|
|
|
|
+ // Paper start - ignore missing recipes
|
|
|
|
+ IRecipe recipe = this.h.a(minecraftkey);
|
|
|
|
+ if (recipe == null) continue;
|
|
|
|
+ // Paper end
|
2018-10-02 12:01:56 +02:00
|
|
|
nbttaglist.add((NBTBase) (new NBTTagString(minecraftkey.toString())));
|
2018-07-19 01:16:19 +02:00
|
|
|
}
|
|
|
|
|
2019-01-01 04:15:55 +01:00
|
|
|
@@ -88,6 +92,10 @@ public class RecipeBookServer extends RecipeBook {
|
2018-10-02 12:01:56 +02:00
|
|
|
while (iterator1.hasNext()) {
|
|
|
|
MinecraftKey minecraftkey1 = (MinecraftKey) iterator1.next();
|
2018-07-19 01:16:19 +02:00
|
|
|
|
|
|
|
+ // Paper start - ignore missing recipes
|
|
|
|
+ IRecipe recipe = this.h.a(minecraftkey1);
|
|
|
|
+ if (recipe == null) continue;
|
|
|
|
+ // Paper end
|
2018-10-02 12:01:56 +02:00
|
|
|
nbttaglist1.add((NBTBase) (new NBTTagString(minecraftkey1.toString())));
|
2018-07-19 01:16:19 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
--
|
2019-03-20 02:46:00 +01:00
|
|
|
2.21.0
|
2018-07-19 01:16:19 +02:00
|
|
|
|