Update to Minecraft 1.8.3

By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
CraftBukkit/Spigot
2015-02-26 22:41:06 +00:00
parent d789ce91d4
commit 85be409b13
347 changed files with 5027 additions and 5465 deletions

View File

@@ -0,0 +1,34 @@
--- /home/matt/mc-dev-private//net/minecraft/server/RecipesBanner.java 2015-02-26 22:40:23.055608134 +0000
+++ src/main/java/net/minecraft/server/RecipesBanner.java 2015-02-26 22:40:23.055608134 +0000
@@ -20,9 +20,13 @@
static class SyntheticClass_1 { }
- static class AddRecipe implements IRecipe {
+ static class AddRecipe extends ShapelessRecipes implements IRecipe { // CraftBukkit - added extends
- private AddRecipe() {}
+ // CraftBukkit start - Delegate to new parent class with bogus info
+ private AddRecipe() {
+ super(new ItemStack(Items.BANNER, 0, 0), java.util.Arrays.asList(new ItemStack(Items.BANNER)));
+ }
+ // CraftBukkit end
public boolean a(InventoryCrafting inventorycrafting, World world) {
boolean flag = false;
@@ -210,9 +214,13 @@
}
}
- static class DuplicateRecipe implements IRecipe {
+ static class DuplicateRecipe extends ShapelessRecipes implements IRecipe { // CraftBukkit - added extends
- private DuplicateRecipe() {}
+ // CraftBukkit start - Delegate to new parent class with bogus info
+ private DuplicateRecipe() {
+ super(new ItemStack(Items.BANNER, 0, 0), java.util.Arrays.asList(new ItemStack(Items.DYE, 0, 5)));
+ }
+ // CraftBukkit end
public boolean a(InventoryCrafting inventorycrafting, World world) {
ItemStack itemstack = null;