Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-16 03:20:07 +01:00
835bc39b03
Updated Upstream (Bukkit/CraftBukkit/Spigot) Bukkit Changes: 2dcc44dc SPIGOT-4307: Fix hacky API for banners on shields e0fc6572 SPIGOT-4309: Add "forced" display of particles efeeab2f Add index to README.md for easier navigation f502bc6f Update to Minecraft 1.13.1 CraftBukkit Changes:d0bb0a1dFix some tests randomly failing997d378dFix client stall in specific teleportation scenariosb3dc2366SPIGOT-4307: Fix hacky API for banners on shields2a271162SPIGOT-4301: Fix more invalid enchants5d0d83bbSPIGOT-4309: Add "forced" display of particlesa6772578Add additional tests for CraftBlockDatace1af0c3Update to Minecraft 1.13.1 Spigot Changes: 2440e189 Rebuild patches 4ecffced Update to Minecraft 1.13.1
40 Zeilen
1.6 KiB
Diff
40 Zeilen
1.6 KiB
Diff
From 3eabe2d2409ef3d178aa5ff6c4768e05552d2844 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
|
|
|