twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-10 17:52:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update to Minecraft 1.13-pre7

Browse Source
This commit is contained in:
md_5
2018-07-15 10:00:00 +10:00
parent 57ab4cfc6f
commit 421c1728c8
608 changed files with 17788 additions and 9378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
nms-patches/RecipeFireworks.patch
View File

@@ -1,20 +1,21 @@
--- a/net/minecraft/server/RecipeFireworks.java
+++ b/net/minecraft/server/RecipeFireworks.java
@@ -3,13 +3,16 @@
import com.google.common.collect.Lists;
import java.util.ArrayList;
@@ -1,14 +1,16 @@
package net.minecraft.server;
-public class RecipeFireworks implements IRecipe {
-public class RecipeFireworks extends IRecipeComplex {
+public class RecipeFireworks extends ShapelessRecipes implements IRecipe { // CraftBukkit - added extends
private ItemStack a;
private static final RecipeItemStack a = RecipeItemStack.a(new IMaterial[] { Items.PAPER});
private static final RecipeItemStack b = RecipeItemStack.a(new IMaterial[] { Items.GUNPOWDER});
private static final RecipeItemStack c = RecipeItemStack.a(new IMaterial[] { Items.FIREWORK_STAR});
+ // CraftBukkit start - Delegate to new parent class with bogus info
public RecipeFireworks() {
+ super("", new ItemStack(Items.FIREWORKS, 0, 0), NonNullList.a(RecipeItemStack.a, RecipeItemStack.a(Items.GUNPOWDER)));
this.a = ItemStack.a;
public RecipeFireworks(MinecraftKey minecraftkey) {
- super(minecraftkey);
+ super(minecraftkey, "", new ItemStack(Items.FIREWORK_ROCKET, 0), NonNullList.a(RecipeItemStack.a, RecipeItemStack.a(Items.GUNPOWDER)));
}
+ // CraftBukkit end
public boolean a(InventoryCrafting inventorycrafting, World world) {
this.a = ItemStack.a;
public boolean a(IInventory iinventory, World world) {
if (!(iinventory instanceof InventoryCrafting)) {