Update to Minecraft 1.11

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2016-11-17 12:41:03 +11:00
parent 49bc1c57f9
commit 4e412ab4e3
279 changed files with 3722 additions and 2992 deletions

View File

@@ -1,20 +1,20 @@
--- a/net/minecraft/server/RecipeFireworks.java
+++ b/net/minecraft/server/RecipeFireworks.java
@@ -4,11 +4,15 @@
@@ -3,13 +3,16 @@
import com.google.common.collect.Lists;
import java.util.ArrayList;
import javax.annotation.Nullable;
-public class RecipeFireworks implements IRecipe {
+public class RecipeFireworks extends ShapelessRecipes implements IRecipe { // CraftBukkit - added extends
private ItemStack a;
- public RecipeFireworks() {}
+ // CraftBukkit start - Delegate to new parent class with bogus info
+ public RecipeFireworks() {
public RecipeFireworks() {
+ super(new ItemStack(Items.FIREWORKS, 0, 0), java.util.Arrays.asList(new ItemStack(Items.GUNPOWDER, 0, 5)));
+ }
this.a = ItemStack.a;
}
+ // CraftBukkit end
public boolean a(InventoryCrafting inventorycrafting, World world) {
this.a = null;
this.a = ItemStack.a;