Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -254,9 +254,13 @@ private void handleIngredientAdd(Furniture furniture, Player player, FurnitureIn

}

FoodItem ingredient = null;

if (MixingBowlSlots.FLOUR.equals(expectedSlot) || MixingBowlSlots.YEAST.equals(expectedSlot)) {

if (FoodItem.fromItem(hand) == null) {
ingredient = FoodItem.fromItem(hand);

if (ingredient == null) {

player.sendMessage("§cUse converted cooking ingredients.");

Expand Down Expand Up @@ -294,7 +298,7 @@ private void handleIngredientAdd(Furniture furniture, Player player, FurnitureIn



storeIngredientQuality(furniture, expectedSlot, hand);
storeIngredientQuality(furniture, expectedSlot, ingredient);

MixingBowlState.setStage(furniture, stage.advance());

Expand Down Expand Up @@ -407,9 +411,7 @@ private void handleMixinAdd(Furniture furniture, Player player, FurnitureInterac



private void storeIngredientQuality(Furniture furniture, String slotId, ItemStack hand) {

FoodItem foodItem = FoodItem.fromItem(hand);
private void storeIngredientQuality(Furniture furniture, String slotId, FoodItem foodItem) {

if (foodItem == null) {

Expand Down