diff options
author | Wesley Wolfe <weswolf@aol.com> | 2012-12-17 01:31:41 -0600 |
---|---|---|
committer | Wesley Wolfe <weswolf@aol.com> | 2012-12-17 01:31:41 -0600 |
commit | 78f48258d8ab491065498492588acc5287a6fb6c (patch) | |
tree | 11027439669a05c335fc6cb07c12a82b9c551f31 /src/main/java/net/minecraft/server/DispenseBehaviorMinecart.java | |
parent | d20d4dc43aaa74fba457c44994cda8180523c9db (diff) | |
download | craftbukkit-78f48258d8ab491065498492588acc5287a6fb6c.tar craftbukkit-78f48258d8ab491065498492588acc5287a6fb6c.tar.gz craftbukkit-78f48258d8ab491065498492588acc5287a6fb6c.tar.lz craftbukkit-78f48258d8ab491065498492588acc5287a6fb6c.tar.xz craftbukkit-78f48258d8ab491065498492588acc5287a6fb6c.zip |
Implement ItemFactory and ItemMeta values. Adds BUKKIT-15
Diffstat (limited to 'src/main/java/net/minecraft/server/DispenseBehaviorMinecart.java')
-rw-r--r-- | src/main/java/net/minecraft/server/DispenseBehaviorMinecart.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/net/minecraft/server/DispenseBehaviorMinecart.java b/src/main/java/net/minecraft/server/DispenseBehaviorMinecart.java index cc92846e..1ec5310e 100644 --- a/src/main/java/net/minecraft/server/DispenseBehaviorMinecart.java +++ b/src/main/java/net/minecraft/server/DispenseBehaviorMinecart.java @@ -41,9 +41,9 @@ public class DispenseBehaviorMinecart 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(d0, d1 + d3, d2)); + BlockDispenseEvent event = new BlockDispenseEvent(block, craftItem.clone(), new org.bukkit.util.Vector(d0, d1 + d3, d2)); if (!BlockDispenser.eventFired) { world.getServer().getPluginManager().callEvent(event); } @@ -53,10 +53,10 @@ public class DispenseBehaviorMinecart 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); @@ -64,7 +64,7 @@ public class DispenseBehaviorMinecart extends DispenseBehaviorItem { } } - itemstack1 = CraftItemStack.createNMSItemStack(event.getItem()); + itemstack1 = CraftItemStack.asNMSCopy(event.getItem()); EntityMinecart entityminecart = new EntityMinecart(world, event.getVelocity().getX(), event.getVelocity().getY(), event.getVelocity().getZ(), ((ItemMinecart) itemstack1.getItem()).a); // CraftBukkit end |