Skip to content
Open
Show file tree
Hide file tree
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
@@ -1,11 +1,10 @@
package org.bukkit.event.inventory;

import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.entity.Player;
import org.bukkit.event.block.BlockExpEvent;
import org.bukkit.material.MaterialData;
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;

Expand All @@ -17,17 +16,14 @@
public class FurnaceExtractEvent extends BlockExpEvent {

private final Player player;
private final Material itemType;
private final ItemStack itemStack;
private final int itemAmount;

@ApiStatus.Internal
public FurnaceExtractEvent(@NotNull Player player, @NotNull Block block, @NotNull Material itemType, int itemAmount, int exp) {
public FurnaceExtractEvent(@NotNull Player player, @NotNull Block block, @NotNull ItemStack itemStack, int itemAmount, int exp) {
super(block, exp);
this.player = player;
if (itemType != null && itemType.isLegacy()) {
itemType = Bukkit.getUnsafe().fromLegacy(new MaterialData(itemType), true);
}
this.itemType = itemType;
this.itemStack = itemStack;
this.itemAmount = itemAmount;
}

Expand All @@ -48,7 +44,17 @@ public Player getPlayer() {
*/
@NotNull
public Material getItemType() {
return this.itemType;
return this.itemStack.getType();
}

/**
* Get the ItemStack of the item triggering the event
*
* @return the item stack
*/
@NotNull
public ItemStack getItemStack(){
return this.itemStack;
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@
+ event = new org.bukkit.event.inventory.FurnaceExtractEvent(
+ serverPlayer.getBukkitEntity(),
+ org.bukkit.craftbukkit.block.CraftBlock.at(level, blockPos),
+ org.bukkit.craftbukkit.inventory.CraftItemType.minecraftToBukkit(itemStack.getItem()),
+ itemStack.asBukkitCopy(),
+ amount,
+ floor
+ );
Expand Down