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

@@ -1,5 +1,5 @@
--- ../work/decompile-8eb82bde//net/minecraft/server/RecipeFireworks.java 2014-11-28 17:43:43.349707429 +0000
+++ src/main/java/net/minecraft/server/RecipeFireworks.java 2014-11-28 17:38:17.000000000 +0000
--- /home/matt/mc-dev-private//net/minecraft/server/RecipeFireworks.java 2015-02-26 22:40:23.047608134 +0000
+++ src/main/java/net/minecraft/server/RecipeFireworks.java 2015-02-26 22:40:23.047608134 +0000
@@ -3,11 +3,15 @@
import com.google.common.collect.Lists;
import java.util.ArrayList;
@@ -8,9 +8,8 @@
+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() {
+ super(new ItemStack(Items.FIREWORKS, 0, 0), java.util.Arrays.asList(new ItemStack(Items.GUNPOWDER, 0, 5)));