SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.10

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2016-06-09 11:43:49 +10:00
parent 604d9373c0
commit a39b7e5f3a
161 changed files with 1176 additions and 1147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
paper-server/nms-patches/RecipesFurnace.patch
View File

@@ -1,11 +1,12 @@
--- a/net/minecraft/server/RecipesFurnace.java
+++ b/net/minecraft/server/RecipesFurnace.java
@@ -10,7 +10,9 @@
@@ -9,8 +9,10 @@
public class RecipesFurnace {
private static final RecipesFurnace a = new RecipesFurnace();
public Map<ItemStack, ItemStack> recipes = Maps.newHashMap();
- private Map<ItemStack, Float> c = Maps.newHashMap();
+ private Map<ItemStack, Float> c = Maps.newHashMap(); // PAIL: rename
- public final Map<ItemStack, ItemStack> recipes = Maps.newHashMap();
+ public Map<ItemStack, ItemStack> recipes = Maps.newHashMap();
private final Map<ItemStack, Float> experience = Maps.newHashMap();
+ public Map<ItemStack,ItemStack> customRecipes = Maps.newHashMap(); // CraftBukkit - add field
+ public Map<ItemStack,Float> customExperience = Maps.newHashMap(); // CraftBukkit - add field
@@ -54,7 +55,7 @@
}
public float b(ItemStack itemstack) {
- Iterator iterator = this.c.entrySet().iterator();
- Iterator iterator = this.experience.entrySet().iterator();
+ // CraftBukkit start - initialize to customRecipes
+ boolean vanilla = false;
+ Iterator<Entry<ItemStack, Float>> iterator = this.customExperience.entrySet().iterator();
@@ -66,8 +67,8 @@
if (!iterator.hasNext()) {
- return 0.0F;
+ // CraftBukkit start - fall back to vanilla recipes
+ if (!vanilla && !this.c.isEmpty()) {
+ iterator = this.c.entrySet().iterator();
+ if (!vanilla && !this.experience.isEmpty()) {
+ iterator = this.experience.entrySet().iterator();
+ vanilla = true;
+ } else {
+ return 0.0F;