mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

accidently set the wrong collection on last commit

Browse source 
copy pasting...
This commit is contained in:
Aikar 2018-06-16 16:32:17 -04:00
parent 708d52ca03
commit 9fee3b6963
No known key found for this signature in database
GPG key ID: 401ADFC9891FAAFE
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Spigot-Server-Patches/0310-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch
View file

@ -1,4 +1,4 @@
From 4d65cc39ce63e647fa1d79567a7b44c5666b8fca Mon Sep 17 00:00:00 2001 From 4239f1b642632d1a77265622b23dc07b9dab6fae Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sat, 16 Jun 2018 16:23:38 -0400 Date: Sat, 16 Jun 2018 16:23:38 -0400
Subject: [PATCH] Ignore Missing Recipes in RecipeBook to avoid data errors Subject: [PATCH] Ignore Missing Recipes in RecipeBook to avoid data errors
@ -6,7 +6,7 @@ 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. 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 diff --git a/src/main/java/net/minecraft/server/RecipeBookServer.java b/src/main/java/net/minecraft/server/RecipeBookServer.java
index 7eecdc9da..c7b947d2f 100644 index 7eecdc9da..f65e74ebd 100644
--- a/src/main/java/net/minecraft/server/RecipeBookServer.java --- a/src/main/java/net/minecraft/server/RecipeBookServer.java
+++ b/src/main/java/net/minecraft/server/RecipeBookServer.java +++ b/src/main/java/net/minecraft/server/RecipeBookServer.java
@@ -63,7 +63,11 @@ public class RecipeBookServer extends RecipeBook { @@ -63,7 +63,11 @@ public class RecipeBookServer extends RecipeBook {
@ -33,7 +33,7 @@ index 7eecdc9da..c7b947d2f 100644
- nbttaglist1.add(new NBTTagString(((MinecraftKey) CraftingManager.recipes.b(irecipe1)).toString())); - nbttaglist1.add(new NBTTagString(((MinecraftKey) CraftingManager.recipes.b(irecipe1)).toString()));
+ MinecraftKey key = CraftingManager.recipes.b(irecipe); + MinecraftKey key = CraftingManager.recipes.b(irecipe);
+ if (key == null) continue; + if (key == null) continue;
+ nbttaglist.add(new NBTTagString(key.toString())); + nbttaglist1.add(new NBTTagString(key.toString()));
+ // Paper end + // Paper end
} }