summaryrefslogtreecommitdiffstats
path: root/nms-patches/RecipeFireworks.patch
diff options
context:
space:
mode:
authorThinkofdeath <thinkofdeath@spigotmc.org>2015-02-26 22:41:06 +0000
committerThinkofdeath <thinkofdeath@spigotmc.org>2015-03-04 09:48:58 +0000
commitd8a9c7be4227b2243968b63ab7cc7a00098c93ad (patch)
tree554a08a5f23ffa5dd66a28247d6358515b1ffb7a /nms-patches/RecipeFireworks.patch
parent33d5de312e9fcc8aec3fc53136658cb6920562aa (diff)
downloadcraftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.tar
craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.tar.gz
craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.tar.lz
craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.tar.xz
craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.zip
Update to Minecraft 1.8.3
Diffstat (limited to 'nms-patches/RecipeFireworks.patch')
-rw-r--r--nms-patches/RecipeFireworks.patch7
1 files changed, 3 insertions, 4 deletions
diff --git a/nms-patches/RecipeFireworks.patch b/nms-patches/RecipeFireworks.patch
index fd54312c..39d46e8c 100644
--- a/nms-patches/RecipeFireworks.patch
+++ b/nms-patches/RecipeFireworks.patch
@@ -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)));