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 --- .../java/net/minecraft/server/DispenseBehaviorMonsterEgg.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/main/java/net/minecraft/server/DispenseBehaviorMonsterEgg.java') diff --git a/src/main/java/net/minecraft/server/DispenseBehaviorMonsterEgg.java b/src/main/java/net/minecraft/server/DispenseBehaviorMonsterEgg.java index 25e21d25..66ad86ec 100644 --- a/src/main/java/net/minecraft/server/DispenseBehaviorMonsterEgg.java +++ b/src/main/java/net/minecraft/server/DispenseBehaviorMonsterEgg.java @@ -23,9 +23,9 @@ public class DispenseBehaviorMonsterEgg extends DispenseBehaviorItem { World world = isourceblock.k(); 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(d0, d1, d2)); + BlockDispenseEvent event = new BlockDispenseEvent(block, craftItem.clone(), new org.bukkit.util.Vector(d0, d1, d2)); if (!BlockDispenser.eventFired) { world.getServer().getPluginManager().callEvent(event); } @@ -35,10 +35,10 @@ public class DispenseBehaviorMonsterEgg 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); @@ -46,7 +46,7 @@ public class DispenseBehaviorMonsterEgg extends DispenseBehaviorItem { } } - itemstack1 = CraftItemStack.createNMSItemStack(event.getItem()); + itemstack1 = CraftItemStack.asNMSCopy(event.getItem()); ItemMonsterEgg.a(isourceblock.k(), itemstack1.getData(), event.getVelocity().getX(), event.getVelocity().getY(), event.getVelocity().getZ()); // itemstack.a(1); // Handled during event processing // CraftBukkit end -- cgit v1.2.3