geforkt von Mirrors/Paper
73983e4c16
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 3dc4cdcd Update to Minecraft 1.14.3-pre4 88b25a8c SPIGOT-5098: Add a method to allow colored sign changes 6d913552 Update to Minecraft 1.14.3-pre4 CraftBukkit Changes:f1f33559Update to Minecraft 1.14.38a3d3f49SPIGOT-5098: Add a method to allow colored sign changes533290e2SPIGOT-5100: Console warning from pig zombie targeting6dde4b9fSPIGOT-5094: Allow opening merchant for wandering traders and hide the xp bar for custom merchants9af90077SPIGOT-5097: Bukkit.clearRecipes() no longer working38fa220fFix setting game rules via the APIfe3930ceUpdate to Minecraft 1.14.3-pre4da071ec5Remove outdated build delay. Spigot Changes: 4d2f30f1 Update to Minecraft 1.14.3 f16400e3 Update to Minecraft 1.14.3-pre4
37 Zeilen
1.5 KiB
Diff
37 Zeilen
1.5 KiB
Diff
From e54cc15c485c0393d77dc5537e748586b42ddc8b 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 121e1fd538..0e66bdda8c 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<? extends IRecipe<?>> recipe = this.l.a(minecraftkey);
|
|
+ if (!recipe.isPresent()) continue;
|
|
+ // Paper end
|
|
|
|
nbttaglist.add(new NBTTagString(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<? extends IRecipe<?>> recipe = this.l.a(minecraftkey1);
|
|
+ if (!recipe.isPresent()) continue;
|
|
+ // Paper end
|
|
|
|
nbttaglist1.add(new NBTTagString(minecraftkey1.toString()));
|
|
}
|
|
--
|
|
2.22.0
|
|
|