OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-11 09:23:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

SPIGOT-4842: Dummy recipes should not give AIR as result type

Browse source
This commit is contained in:
md_5 2019-05-03 17:41:23 +10:00
parent 8ddb94da62
commit 84c2f4d1ab
10 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nms-patches/RecipeArmorDye.patch
View file

@ -10,7 +10,7 @@
+ // CraftBukkit start - Delegate to new parent class with bogus info + // CraftBukkit start - Delegate to new parent class with bogus info
public RecipeArmorDye(MinecraftKey minecraftkey) { public RecipeArmorDye(MinecraftKey minecraftkey) {
- super(minecraftkey); - super(minecraftkey);
+ super(minecraftkey, "", new ItemStack(Items.LEATHER_HELMET, 0), NonNullList.a(RecipeItemStack.a, RecipeItemStack.a(Items.BONE_MEAL))); + super(minecraftkey, "", new ItemStack(Items.LEATHER_HELMET), NonNullList.a(RecipeItemStack.a, RecipeItemStack.a(Items.BONE_MEAL)));
} }
+ // CraftBukkit end + // CraftBukkit end

2
nms-patches/RecipeBannerDuplicate.patch
View file

@ -9,7 +9,7 @@
+ // CraftBukkit start - Delegate to new parent class with bogus info + // CraftBukkit start - Delegate to new parent class with bogus info
public RecipeBannerDuplicate(MinecraftKey minecraftkey) { public RecipeBannerDuplicate(MinecraftKey minecraftkey) {
- super(minecraftkey); - super(minecraftkey);
+ super(minecraftkey, "", new ItemStack(Items.WHITE_BANNER, 0), NonNullList.a(RecipeItemStack.a, RecipeItemStack.a(Items.WHITE_BANNER))); + super(minecraftkey, "", new ItemStack(Items.WHITE_BANNER), NonNullList.a(RecipeItemStack.a, RecipeItemStack.a(Items.WHITE_BANNER)));
} }
+ // CraftBukkit end + // CraftBukkit end

2
nms-patches/RecipeBookClone.patch
View file

@ -9,7 +9,7 @@
+ // CraftBukkit start - Delegate to new parent class with bogus info + // CraftBukkit start - Delegate to new parent class with bogus info
public RecipeBookClone(MinecraftKey minecraftkey) { public RecipeBookClone(MinecraftKey minecraftkey) {
- super(minecraftkey); - super(minecraftkey);
+ super(minecraftkey, "", new ItemStack(Items.WRITTEN_BOOK, 0), NonNullList.a(RecipeItemStack.a, RecipeItemStack.a(Items.WRITABLE_BOOK))); + super(minecraftkey, "", new ItemStack(Items.WRITTEN_BOOK), NonNullList.a(RecipeItemStack.a, RecipeItemStack.a(Items.WRITABLE_BOOK)));
} }
+ // CraftBukkit end + // CraftBukkit end

2
nms-patches/RecipeFireworks.patch
View file

@ -13,7 +13,7 @@
+ // CraftBukkit start - Delegate to new parent class with bogus info + // CraftBukkit start - Delegate to new parent class with bogus info
public RecipeFireworks(MinecraftKey minecraftkey) { public RecipeFireworks(MinecraftKey minecraftkey) {
- super(minecraftkey); - super(minecraftkey);
+ super(minecraftkey, "", new ItemStack(Items.FIREWORK_ROCKET, 0), NonNullList.a(RecipeItemStack.a, RecipeItemStack.a(Items.GUNPOWDER))); + super(minecraftkey, "", new ItemStack(Items.FIREWORK_ROCKET, 3), NonNullList.a(RecipeItemStack.a, RecipeItemStack.a(Items.GUNPOWDER)));
} }
+ // CraftBukkit end + // CraftBukkit end

2
nms-patches/RecipeFireworksFade.patch
View file

@ -12,7 +12,7 @@
+ // CraftBukkit start - Delegate to new parent class with bogus info + // CraftBukkit start - Delegate to new parent class with bogus info
public RecipeFireworksFade(MinecraftKey minecraftkey) { public RecipeFireworksFade(MinecraftKey minecraftkey) {
- super(minecraftkey); - super(minecraftkey);
+ super(minecraftkey, "", new ItemStack(Items.FIREWORK_STAR, 0), NonNullList.a(RecipeItemStack.a, RecipeItemStack.a(Items.FIREWORK_STAR, Items.BONE_MEAL))); + super(minecraftkey, "", new ItemStack(Items.FIREWORK_STAR), NonNullList.a(RecipeItemStack.a, RecipeItemStack.a(Items.FIREWORK_STAR, Items.BONE_MEAL)));
} }
+ // CraftBukkit end + // CraftBukkit end

2
nms-patches/RecipeFireworksStar.patch
View file

@ -22,7 +22,7 @@
+ // CraftBukkit start - Delegate to new parent class with bogus info + // CraftBukkit start - Delegate to new parent class with bogus info
public RecipeFireworksStar(MinecraftKey minecraftkey) { public RecipeFireworksStar(MinecraftKey minecraftkey) {
- super(minecraftkey); - super(minecraftkey);
+ super(minecraftkey, "", new ItemStack(Items.FIREWORK_STAR, 0), NonNullList.a(RecipeItemStack.a, RecipeItemStack.a(Items.GUNPOWDER))); + super(minecraftkey, "", new ItemStack(Items.FIREWORK_STAR), NonNullList.a(RecipeItemStack.a, RecipeItemStack.a(Items.GUNPOWDER)));
} }
+ // CraftBukkit end + // CraftBukkit end

2
nms-patches/RecipeMapClone.patch
View file

@ -9,7 +9,7 @@
+ // CraftBukkit start - Delegate to new parent class + // CraftBukkit start - Delegate to new parent class
public RecipeMapClone(MinecraftKey minecraftkey) { public RecipeMapClone(MinecraftKey minecraftkey) {
- super(minecraftkey); - super(minecraftkey);
+ super(minecraftkey, "", new ItemStack(Items.MAP, 0), NonNullList.a(RecipeItemStack.a, RecipeItemStack.a(Items.MAP))); + super(minecraftkey, "", new ItemStack(Items.MAP), NonNullList.a(RecipeItemStack.a, RecipeItemStack.a(Items.MAP)));
} }
+ // CraftBukkit end + // CraftBukkit end

2
nms-patches/RecipeShulkerBox.patch
View file

@ -9,7 +9,7 @@
+ // CraftBukkit start - Delegate to new parent class with bogus info + // CraftBukkit start - Delegate to new parent class with bogus info
public RecipeShulkerBox(MinecraftKey minecraftkey) { public RecipeShulkerBox(MinecraftKey minecraftkey) {
- super(minecraftkey); - super(minecraftkey);
+ super(minecraftkey, "", new ItemStack(Blocks.WHITE_SHULKER_BOX, 0), NonNullList.a(RecipeItemStack.a, RecipeItemStack.a(Items.BONE_MEAL))); + super(minecraftkey, "", new ItemStack(Blocks.WHITE_SHULKER_BOX), NonNullList.a(RecipeItemStack.a, RecipeItemStack.a(Items.BONE_MEAL)));
} }
+ // CraftBukkit end + // CraftBukkit end

2
nms-patches/RecipeSuspiciousStew.patch
View file

@ -9,7 +9,7 @@
+ // CraftBukkit start - Delegate to new parent class with bogus info + // CraftBukkit start - Delegate to new parent class with bogus info
public RecipeSuspiciousStew(MinecraftKey minecraftkey) { public RecipeSuspiciousStew(MinecraftKey minecraftkey) {
- super(minecraftkey); - super(minecraftkey);
+ super(minecraftkey, "", new ItemStack(Items.SUSPICIOUS_STEW, 0), NonNullList.a(RecipeItemStack.a, RecipeItemStack.a(Items.BOWL))); + super(minecraftkey, "", new ItemStack(Items.SUSPICIOUS_STEW), NonNullList.a(RecipeItemStack.a, RecipeItemStack.a(Items.BOWL)));
} }
+ // CraftBukkit end + // CraftBukkit end

2
nms-patches/RecipiesShield.patch
View file

@ -9,7 +9,7 @@
+ // CraftBukkit start - Delegate to new parent class with bogus info + // CraftBukkit start - Delegate to new parent class with bogus info
public RecipiesShield(MinecraftKey minecraftkey) { public RecipiesShield(MinecraftKey minecraftkey) {
- super(minecraftkey); - super(minecraftkey);
+ super(minecraftkey, "", new ItemStack(Items.SHIELD, 0), NonNullList.a(RecipeItemStack.a, RecipeItemStack.a(Items.WHITE_BANNER))); + super(minecraftkey, "", new ItemStack(Items.SHIELD), NonNullList.a(RecipeItemStack.a, RecipeItemStack.a(Items.WHITE_BANNER)));
} }
+ // CraftBukkit end + // CraftBukkit end