diff options
author | Nate Mortensen <nate.richard.mortensen@gmail.com> | 2013-07-01 06:03:00 -0500 |
---|---|---|
committer | Wesley Wolfe <weswolf@aol.com> | 2013-07-01 12:10:06 -0500 |
commit | 6c09066e224ac85b8a6464eaf8f53edfeb4beda4 (patch) | |
tree | 573e05f4b148cb1891a1d3839175e501e6257442 /src/main/java/net/minecraft/server/DispenseBehaviorMinecart.java | |
parent | f887b76a259e12468b28d82d1eced93f0b73bd6d (diff) | |
download | craftbukkit-6c09066e224ac85b8a6464eaf8f53edfeb4beda4.tar craftbukkit-6c09066e224ac85b8a6464eaf8f53edfeb4beda4.tar.gz craftbukkit-6c09066e224ac85b8a6464eaf8f53edfeb4beda4.tar.lz craftbukkit-6c09066e224ac85b8a6464eaf8f53edfeb4beda4.tar.xz craftbukkit-6c09066e224ac85b8a6464eaf8f53edfeb4beda4.zip |
Update CraftBukkit to 1.6.1
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, 7 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/DispenseBehaviorMinecart.java b/src/main/java/net/minecraft/server/DispenseBehaviorMinecart.java index 2a7b4ad3..0682194b 100644 --- a/src/main/java/net/minecraft/server/DispenseBehaviorMinecart.java +++ b/src/main/java/net/minecraft/server/DispenseBehaviorMinecart.java @@ -12,7 +12,7 @@ final class DispenseBehaviorMinecart extends DispenseBehaviorItem { DispenseBehaviorMinecart() {} public ItemStack b(ISourceBlock isourceblock, ItemStack itemstack) { - EnumFacing enumfacing = BlockDispenser.j_(isourceblock.h()); + EnumFacing enumfacing = BlockDispenser.l_(isourceblock.h()); World world = isourceblock.k(); double d0 = isourceblock.getX() + (double) ((float) enumfacing.c() * 1.125F); double d1 = isourceblock.getY() + (double) ((float) enumfacing.d() * 1.125F); @@ -23,10 +23,10 @@ final class DispenseBehaviorMinecart extends DispenseBehaviorItem { int l = world.getTypeId(i, j, k); double d3; - if (BlockMinecartTrackAbstract.d_(l)) { + if (BlockMinecartTrackAbstract.e_(l)) { d3 = 0.0D; } else { - if (l != 0 || !BlockMinecartTrackAbstract.d_(world.getTypeId(i, j - 1, k))) { + if (l != 0 || !BlockMinecartTrackAbstract.e_(world.getTypeId(i, j - 1, k))) { return this.b.a(isourceblock, itemstack); } @@ -63,6 +63,10 @@ final class DispenseBehaviorMinecart extends DispenseBehaviorItem { EntityMinecartAbstract entityminecartabstract = EntityMinecartAbstract.a(world, event.getVelocity().getX(), event.getVelocity().getY(), event.getVelocity().getZ(), ((ItemMinecart) itemstack1.getItem()).a); // CraftBukkit end + if (itemstack.hasName()) { + entityminecartabstract.a(itemstack.getName()); + } + world.addEntity(entityminecartabstract); // itemstack.a(1); // CraftBukkit - handled during event processing return itemstack; |