Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-27 11:27:35 +01:00
Code Issues Projects Releases Wiki Activity

Add back missing hunk in AbstractFurnaceBlockEntity

Browse Source
This commit is contained in:
Nassim Jahnke 2024-12-18 12:36:30 +01:00
parent c4fd69c807
commit a5e786a578
No known key found for this signature in database
GPG Key ID: EF6771C01F6EF02F
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
paper-server/patches/sources/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java.patch
View File

@ -229,7 +229,7 @@
player.awardRecipes(recipesToAwardAndPopExperience); player.awardRecipes(recipesToAwardAndPopExperience);
for (RecipeHolder<?> recipeHolder : recipesToAwardAndPopExperience) { for (RecipeHolder<?> recipeHolder : recipesToAwardAndPopExperience) {
@@ -356,26 +_,52 @@ @@ -356,30 +_,60 @@
} }
public List<RecipeHolder<?>> getRecipesToAwardAndPopExperience(ServerLevel level, Vec3 popVec) { public List<RecipeHolder<?>> getRecipesToAwardAndPopExperience(ServerLevel level, Vec3 popVec) {
@ -285,3 +285,11 @@
} }
@Override @Override
public void fillStackedContents(StackedItemContents stackedContents) {
+ // Paper start - don't account fuel stack (fixes MC-243057)
+ stackedContents.accountStack(this.items.get(SLOT_INPUT));
+ stackedContents.accountStack(this.items.get(SLOT_RESULT));
+ // Paper end - don't account fuel stack (fixes MC-243057)
for (ItemStack itemStack : this.items) {
stackedContents.accountStack(itemStack);
}

3
paper-server/patches/sources/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java.patch
View File

@ -166,9 +166,8 @@
return potionBrewing.isIngredient(stack); return potionBrewing.isIngredient(stack);
} else { } else {
return index == 4 return index == 4
- ? stack.is(ItemTags.BREWING_FUEL) ? stack.is(ItemTags.BREWING_FUEL)
- : (stack.is(Items.POTION) || stack.is(Items.SPLASH_POTION) || stack.is(Items.LINGERING_POTION) || stack.is(Items.GLASS_BOTTLE)) - : (stack.is(Items.POTION) || stack.is(Items.SPLASH_POTION) || stack.is(Items.LINGERING_POTION) || stack.is(Items.GLASS_BOTTLE))
+ ? stack.is(net.minecraft.tags.ItemTags.BREWING_FUEL)
+ : (stack.is(Items.POTION) || stack.is(Items.SPLASH_POTION) || stack.is(Items.LINGERING_POTION) || stack.is(Items.GLASS_BOTTLE) || potionBrewing.isCustomInput(stack)) // Paper - Custom Potion Mixes + : (stack.is(Items.POTION) || stack.is(Items.SPLASH_POTION) || stack.is(Items.LINGERING_POTION) || stack.is(Items.GLASS_BOTTLE) || potionBrewing.isCustomInput(stack)) // Paper - Custom Potion Mixes
&& this.getItem(index).isEmpty(); && this.getItem(index).isEmpty();
} }