diff options
| author | Nassim Jahnke <[email protected]> | 2024-12-18 12:36:30 +0100 |
|---|---|---|
| committer | Nassim Jahnke <[email protected]> | 2024-12-18 12:36:30 +0100 |
| commit | a5e786a5783f113ca2c54b34cda72ba35e1426b5 (patch) | |
| tree | 1265125ad6f7d74bbb0c2aebb28b3d6cda71e27f | |
| parent | c4fd69c80717bf34d4568df8bb4575ef38e555f9 (diff) | |
| download | Paper-a5e786a5783f113ca2c54b34cda72ba35e1426b5.tar.gz Paper-a5e786a5783f113ca2c54b34cda72ba35e1426b5.zip | |
Add back missing hunk in AbstractFurnaceBlockEntity
2 files changed, 10 insertions, 3 deletions
diff --git a/paper-server/patches/sources/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java.patch b/paper-server/patches/sources/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java.patch index 092b7d392d..f57bc6379f 100644 --- a/paper-server/patches/sources/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java.patch +++ b/paper-server/patches/sources/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java.patch @@ -229,7 +229,7 @@ player.awardRecipes(recipesToAwardAndPopExperience); for (RecipeHolder<?> recipeHolder : recipesToAwardAndPopExperience) { -@@ -356,26 +_,52 @@ +@@ -356,30 +_,60 @@ } public List<RecipeHolder<?>> getRecipesToAwardAndPopExperience(ServerLevel level, Vec3 popVec) { @@ -285,3 +285,11 @@ } @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); + } diff --git a/paper-server/patches/sources/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java.patch b/paper-server/patches/sources/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java.patch index 93f629fdbf..15e9dfa1d3 100644 --- a/paper-server/patches/sources/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java.patch +++ b/paper-server/patches/sources/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java.patch @@ -166,9 +166,8 @@ return potionBrewing.isIngredient(stack); } else { 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(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 && this.getItem(index).isEmpty(); } |