diff options
| author | hibo98 <hibo98.niklas@gmail.com> | 2015-12-19 20:04:58 +0100 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2016-02-07 10:09:05 +1100 |
| commit | 3f3c65f471d01f4440f6bb32646fb8d48204783f (patch) | |
| tree | 9a4a204abc867dae26fbb0ba2adfcd41868e1fb4 /nms-patches/SlotFurnaceResult.patch | |
| parent | efe04b82b2dc2b1aedc55c10800d423bd8330ce1 (diff) | |
| download | craftbukkit-3f3c65f471d01f4440f6bb32646fb8d48204783f.tar craftbukkit-3f3c65f471d01f4440f6bb32646fb8d48204783f.tar.gz craftbukkit-3f3c65f471d01f4440f6bb32646fb8d48204783f.tar.lz craftbukkit-3f3c65f471d01f4440f6bb32646fb8d48204783f.tar.xz craftbukkit-3f3c65f471d01f4440f6bb32646fb8d48204783f.zip | |
[BUKKIT-3451] Use correct item amount for FurnaceExtractEvent.
Also don't call FurnaceExtractEvent when the item amount is 0.
Diffstat (limited to 'nms-patches/SlotFurnaceResult.patch')
| -rw-r--r-- | nms-patches/SlotFurnaceResult.patch | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/nms-patches/SlotFurnaceResult.patch b/nms-patches/SlotFurnaceResult.patch index a098a820..cb27c684 100644 --- a/nms-patches/SlotFurnaceResult.patch +++ b/nms-patches/SlotFurnaceResult.patch @@ -11,7 +11,7 @@ public class SlotFurnaceResult extends Slot { private EntityHuman a; -@@ -50,6 +55,17 @@ +@@ -50,6 +55,18 @@ i = j; } @@ -20,10 +20,11 @@ + TileEntityFurnace furnace = ((TileEntityFurnace) this.inventory); + 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); -+ a.world.getServer().getPluginManager().callEvent(event); -+ -+ i = event.getExpToDrop(); ++ if (b != 0) { ++ 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(); ++ } + // CraftBukkit end + while (i > 0) { |