Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 04:20:04 +01:00
45 Zeilen
3.5 KiB
Diff
45 Zeilen
3.5 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Thonk <30448663+ExcessiveAmountsOfZombies@users.noreply.github.com>
|
||
|
|
Date: Wed, 6 Jan 2021 12:04:03 -0800
|
||
|
|
Subject: [PATCH] Add recipe to cook events
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/TileEntityCampfire.java b/src/main/java/net/minecraft/server/TileEntityCampfire.java
|
||
|
|
index c56c588f508b51677c599412215f043aa0a35f98..3239d8dd120fda2faa6b770603c5f613c13f7c43 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/TileEntityCampfire.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/TileEntityCampfire.java
|
||
|
|
@@ -56,7 +56,10 @@ public class TileEntityCampfire extends TileEntity implements Clearable, ITickab
|
||
|
|
|
||
|
|
if (this.cookingTimes[i] >= this.cookingTotalTimes[i]) {
|
||
|
|
InventorySubcontainer inventorysubcontainer = new InventorySubcontainer(new ItemStack[]{itemstack});
|
||
|
|
- ItemStack itemstack1 = (ItemStack) this.world.getCraftingManager().craft(Recipes.CAMPFIRE_COOKING, inventorysubcontainer, this.world).map((recipecampfire) -> {
|
||
|
|
+ // Paper start
|
||
|
|
+ Optional<RecipeCampfire> recipe = this.world.getCraftingManager().craft(Recipes.CAMPFIRE_COOKING, inventorysubcontainer, this.world);
|
||
|
|
+ ItemStack itemstack1 = (ItemStack) recipe.map((recipecampfire) -> {
|
||
|
|
+ // Paper end
|
||
|
|
return recipecampfire.a(inventorysubcontainer);
|
||
|
|
}).orElse(itemstack);
|
||
|
|
BlockPosition blockposition = this.getPosition();
|
||
|
|
@@ -65,7 +68,7 @@ public class TileEntityCampfire extends TileEntity implements Clearable, ITickab
|
||
|
|
CraftItemStack source = CraftItemStack.asCraftMirror(itemstack);
|
||
|
|
org.bukkit.inventory.ItemStack result = CraftItemStack.asBukkitCopy(itemstack1);
|
||
|
|
|
||
|
|
- BlockCookEvent blockCookEvent = new BlockCookEvent(CraftBlock.at(this.world, this.position), source, result);
|
||
|
|
+ BlockCookEvent blockCookEvent = new BlockCookEvent(CraftBlock.at(this.world, this.position), source, result, (org.bukkit.inventory.CookingRecipe<?>) recipe.map(RecipeCampfire::toBukkitRecipe).orElse(null)); // Paper
|
||
|
|
this.world.getServer().getPluginManager().callEvent(blockCookEvent);
|
||
|
|
|
||
|
|
if (blockCookEvent.isCancelled()) {
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java
|
||
|
|
index eb6aa82c3c25928070475815288ec215938322c7..935c7f111a7d7b9cc7c8e384d43e7ab6092cfc5f 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
|
||
|
|
@@ -366,7 +366,7 @@ public abstract class TileEntityFurnace extends TileEntityContainer implements I
|
||
|
|
CraftItemStack source = CraftItemStack.asCraftMirror(itemstack);
|
||
|
|
org.bukkit.inventory.ItemStack result = CraftItemStack.asBukkitCopy(itemstack1);
|
||
|
|
|
||
|
|
- FurnaceSmeltEvent furnaceSmeltEvent = new FurnaceSmeltEvent(this.world.getWorld().getBlockAt(position.getX(), position.getY(), position.getZ()), source, result);
|
||
|
|
+ FurnaceSmeltEvent furnaceSmeltEvent = new FurnaceSmeltEvent(this.world.getWorld().getBlockAt(position.getX(), position.getY(), position.getZ()), source, result, (org.bukkit.inventory.CookingRecipe<?>) irecipe.toBukkitRecipe()); // Paper
|
||
|
|
this.world.getServer().getPluginManager().callEvent(furnaceSmeltEvent);
|
||
|
|
|
||
|
|
if (furnaceSmeltEvent.isCancelled()) {
|