geforkt von Mirrors/Paper
05466e3b47
Upstream has released updates that appear to apply compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing. Bukkit Changes: d2834556 SPIGOT-4219: Event for PigZombies angering. CraftBukkit Changes:a9c796f1SPIGOT-4184: Fix furnaces not matching Vanilla smelt or animations195f071eSPIGOT-4219: Event for PigZombies angering.5e3082c7SPIGOT-4230: Improve legacy block types
40 Zeilen
1.6 KiB
Diff
40 Zeilen
1.6 KiB
Diff
From b38aa03f85f1c5e8c3f47b269fd8b7d59c71c6c0 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 71d6c45529..799f2be707 100644
|
|
--- a/src/main/java/net/minecraft/server/RecipeBookServer.java
|
|
+++ b/src/main/java/net/minecraft/server/RecipeBookServer.java
|
|
@@ -77,7 +77,11 @@ public class RecipeBookServer extends RecipeBook {
|
|
while (iterator.hasNext()) {
|
|
MinecraftKey minecraftkey = (MinecraftKey) iterator.next();
|
|
|
|
- nbttaglist.add((NBTBase) (new NBTTagString(minecraftkey.toString())));
|
|
+ // Paper start - ignore missing recipes
|
|
+ IRecipe recipe = this.h.a(minecraftkey);
|
|
+ if (recipe == null) continue;
|
|
+ nbttaglist.add(new NBTTagString(minecraftkey.toString()));
|
|
+ // Paper end
|
|
}
|
|
|
|
nbttagcompound.set("recipes", nbttaglist);
|
|
@@ -87,6 +91,11 @@ public class RecipeBookServer extends RecipeBook {
|
|
while (iterator1.hasNext()) {
|
|
MinecraftKey minecraftkey1 = (MinecraftKey) iterator1.next();
|
|
|
|
+ // Paper start - ignore missing recipes
|
|
+ IRecipe recipe = this.h.a(minecraftkey1);
|
|
+ if (recipe == null) continue;
|
|
+ // Paper end
|
|
+
|
|
nbttaglist1.add((NBTBase) (new NBTTagString(minecraftkey1.toString())));
|
|
}
|
|
|
|
--
|
|
2.18.0
|
|
|