summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/ItemMinecart.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/net/minecraft/server/ItemMinecart.java')
-rw-r--r--src/main/java/net/minecraft/server/ItemMinecart.java12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/ItemMinecart.java b/src/main/java/net/minecraft/server/ItemMinecart.java
index cd06b9b7..b4320456 100644
--- a/src/main/java/net/minecraft/server/ItemMinecart.java
+++ b/src/main/java/net/minecraft/server/ItemMinecart.java
@@ -2,6 +2,7 @@ package net.minecraft.server;
public class ItemMinecart extends Item {
+ private static final IDispenseBehavior b = new DispenseBehaviorMinecart();
public int a;
public ItemMinecart(int i, int j) {
@@ -9,12 +10,13 @@ public class ItemMinecart extends Item {
this.maxStackSize = 1;
this.a = j;
this.a(CreativeModeTab.e);
+ BlockDispenser.a.a(this, b);
}
public boolean interactWith(ItemStack itemstack, EntityHuman entityhuman, World world, int i, int j, int k, int l, float f, float f1, float f2) {
int i1 = world.getTypeId(i, j, k);
- if (BlockMinecartTrack.e(i1)) {
+ if (BlockMinecartTrack.d_(i1)) {
if (!world.isStatic) {
// CraftBukkit start - Minecarts
org.bukkit.event.player.PlayerInteractEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerInteractEvent(entityhuman, org.bukkit.event.block.Action.RIGHT_CLICK_BLOCK, i, j, k, l, itemstack);
@@ -24,7 +26,13 @@ public class ItemMinecart extends Item {
}
// CraftBukkit end
- world.addEntity(new EntityMinecart(world, (double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F), this.a));
+ EntityMinecartAbstract entityminecartabstract = EntityMinecartAbstract.a(world, (double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F), this.a);
+
+ if (itemstack.hasName()) {
+ entityminecartabstract.a(itemstack.getName());
+ }
+
+ world.addEntity(entityminecartabstract);
}
--itemstack.count;