From fc697a4f440829c6813b198b9e1e0a87789e042b Mon Sep 17 00:00:00 2001 From: EvilSeph Date: Fri, 16 Mar 2012 02:38:57 -0400 Subject: Fixed translation issue in EntityMinecart. Addresses BUKKIT-980 --- src/main/java/net/minecraft/server/EntityMinecart.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/main/java/net/minecraft/server/EntityMinecart.java b/src/main/java/net/minecraft/server/EntityMinecart.java index 7dfc5870..8e040351 100644 --- a/src/main/java/net/minecraft/server/EntityMinecart.java +++ b/src/main/java/net/minecraft/server/EntityMinecart.java @@ -753,11 +753,11 @@ public class EntityMinecart extends Entity implements IInventory { if (collisionEvent.isCancelled()) { return; } + // CraftBukkit end - if (entity instanceof EntityLiving && !(entity instanceof EntityHuman) && this.type == 0 && this.motX * this.motX + this.motZ * this.motZ > 0.01D && this.passenger == null && entity.vehicle == null) { + if (entity instanceof EntityLiving && !(entity instanceof EntityHuman) && !(entity instanceof EntityIronGolem) && this.type == 0 && this.motX * this.motX + this.motZ * this.motZ > 0.01D && this.passenger == null && entity.vehicle == null) { entity.mount(this); } - // CraftBukkit end double d0 = entity.locX - this.locX; double d1 = entity.locZ - this.locZ; -- cgit v1.2.3