[BUKKIT-3451] Use correct item amount for FurnaceExtractEvent.

Also don't call FurnaceExtractEvent when the item amount is 0.

By: hibo98 <hibo98.niklas@gmail.com>
This commit is contained in:
CraftBukkit/Spigot
2015-12-19 20:04:58 +01:00
parent 7588b12e6c
commit eb6f00d0c9

View File

@@ -11,7 +11,7 @@
public class SlotFurnaceResult extends Slot { public class SlotFurnaceResult extends Slot {
private EntityHuman a; private EntityHuman a;
@@ -50,6 +55,17 @@ @@ -50,6 +55,18 @@
i = j; i = j;
} }
@@ -20,10 +20,11 @@
+ TileEntityFurnace furnace = ((TileEntityFurnace) this.inventory); + TileEntityFurnace furnace = ((TileEntityFurnace) this.inventory);
+ org.bukkit.block.Block block = a.world.getWorld().getBlockAt(furnace.position.getX(), furnace.position.getY(), furnace.position.getZ()); + org.bukkit.block.Block block = a.world.getWorld().getBlockAt(furnace.position.getX(), furnace.position.getY(), furnace.position.getZ());
+ +
+ FurnaceExtractEvent event = new FurnaceExtractEvent(player, block, org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(itemstack.getItem()), itemstack.count, i); + if (b != 0) {
+ a.world.getServer().getPluginManager().callEvent(event); + FurnaceExtractEvent event = new FurnaceExtractEvent(player, block, org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(itemstack.getItem()), b, i);
+ + a.world.getServer().getPluginManager().callEvent(event);
+ i = event.getExpToDrop(); + i = event.getExpToDrop();
+ }
+ // CraftBukkit end + // CraftBukkit end
+ +
while (i > 0) { while (i > 0) {