52 lines
2.8 KiB
Diff
52 lines
2.8 KiB
Diff
--- a/net/minecraft/world/level/block/entity/TileEntityCampfire.java
|
|
+++ b/net/minecraft/world/level/block/entity/TileEntityCampfire.java
|
|
@@ -30,6 +30,14 @@
|
|
import net.minecraft.world.level.block.state.IBlockData;
|
|
import net.minecraft.world.level.gameevent.GameEvent;
|
|
|
|
+// CraftBukkit start
|
|
+import org.bukkit.craftbukkit.block.CraftBlock;
|
|
+import org.bukkit.craftbukkit.inventory.CraftItemStack;
|
|
+import org.bukkit.event.block.BlockCookEvent;
|
|
+import org.bukkit.event.block.CampfireStartEvent;
|
|
+import org.bukkit.inventory.CampfireRecipe;
|
|
+// CraftBukkit end
|
|
+
|
|
public class TileEntityCampfire extends TileEntity implements Clearable {
|
|
|
|
private static final int BURN_COOL_SPEED = 2;
|
|
@@ -64,6 +72,20 @@
|
|
}).orElse(itemstack);
|
|
|
|
if (itemstack1.isItemEnabled(world.enabledFeatures())) {
|
|
+ // CraftBukkit start - fire BlockCookEvent
|
|
+ CraftItemStack source = CraftItemStack.asCraftMirror(itemstack);
|
|
+ org.bukkit.inventory.ItemStack result = CraftItemStack.asBukkitCopy(itemstack1);
|
|
+
|
|
+ BlockCookEvent blockCookEvent = new BlockCookEvent(CraftBlock.at(world, blockposition), source, result);
|
|
+ world.getCraftServer().getPluginManager().callEvent(blockCookEvent);
|
|
+
|
|
+ if (blockCookEvent.isCancelled()) {
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ result = blockCookEvent.getResult();
|
|
+ itemstack1 = CraftItemStack.asNMSCopy(result);
|
|
+ // CraftBukkit end
|
|
InventoryUtils.dropItemStack(world, (double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ(), itemstack1);
|
|
tileentitycampfire.items.set(i, ItemStack.EMPTY);
|
|
world.sendBlockUpdated(blockposition, iblockdata, iblockdata, 3);
|
|
@@ -176,7 +198,11 @@
|
|
ItemStack itemstack1 = (ItemStack) this.items.get(j);
|
|
|
|
if (itemstack1.isEmpty()) {
|
|
- this.cookingTime[j] = i;
|
|
+ // CraftBukkit start
|
|
+ CampfireStartEvent event = new CampfireStartEvent(CraftBlock.at(this.level,this.worldPosition), CraftItemStack.asCraftMirror(itemstack), (CampfireRecipe) getCookableRecipe(itemstack).get().toBukkitRecipe());
|
|
+ this.level.getCraftServer().getPluginManager().callEvent(event);
|
|
+ this.cookingTime[j] = event.getTotalCookTime(); // i -> event.getTotalCookTime()
|
|
+ // CraftBukkit end
|
|
this.cookingProgress[j] = 0;
|
|
this.items.set(j, itemstack.consumeAndReturn(1, entityliving));
|
|
this.level.gameEvent((Holder) GameEvent.BLOCK_CHANGE, this.getBlockPos(), GameEvent.a.of(entityliving, this.getBlockState()));
|