From 78f48258d8ab491065498492588acc5287a6fb6c Mon Sep 17 00:00:00 2001 From: Wesley Wolfe Date: Mon, 17 Dec 2012 01:31:41 -0600 Subject: Implement ItemFactory and ItemMeta values. Adds BUKKIT-15 --- src/main/java/net/minecraft/server/DispenseBehaviorFireball.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/main/java/net/minecraft/server/DispenseBehaviorFireball.java') diff --git a/src/main/java/net/minecraft/server/DispenseBehaviorFireball.java b/src/main/java/net/minecraft/server/DispenseBehaviorFireball.java index cc0bf8bb..9eb4ca2b 100644 --- a/src/main/java/net/minecraft/server/DispenseBehaviorFireball.java +++ b/src/main/java/net/minecraft/server/DispenseBehaviorFireball.java @@ -30,9 +30,9 @@ public class DispenseBehaviorFireball extends DispenseBehaviorItem { // CraftBukkit start ItemStack itemstack1 = itemstack.a(1); org.bukkit.block.Block block = world.getWorld().getBlockAt(isourceblock.getBlockX(), isourceblock.getBlockY(), isourceblock.getBlockZ()); - org.bukkit.inventory.ItemStack bukkitItem = new CraftItemStack(itemstack1).clone(); + CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack1); - BlockDispenseEvent event = new BlockDispenseEvent(block, bukkitItem, new org.bukkit.util.Vector(d3, d4, d5)); + BlockDispenseEvent event = new BlockDispenseEvent(block, craftItem.clone(), new org.bukkit.util.Vector(d3, d4, d5)); if (!BlockDispenser.eventFired) { world.getServer().getPluginManager().callEvent(event); } @@ -42,10 +42,10 @@ public class DispenseBehaviorFireball extends DispenseBehaviorItem { return itemstack; } - if (!event.getItem().equals(bukkitItem)) { + if (!event.getItem().equals(craftItem)) { itemstack.count++; // Chain to handler for new item - ItemStack eventStack = CraftItemStack.createNMSItemStack(event.getItem()); + ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem()); IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.a.a(eventStack.getItem()); if (idispensebehavior != IDispenseBehavior.a && idispensebehavior != this) { idispensebehavior.a(isourceblock, eventStack); -- cgit v1.2.3