diff options
| author | EvilSeph <evilseph@gmail.com> | 2012-03-16 02:38:57 -0400 |
|---|---|---|
| committer | EvilSeph <evilseph@gmail.com> | 2012-03-16 02:38:57 -0400 |
| commit | fc697a4f440829c6813b198b9e1e0a87789e042b (patch) | |
| tree | 4204cd140fcc62b335ca355277d1d2b48e0e072c /src | |
| parent | 241cf1c66484a59306b5731495d30bf7b8027496 (diff) | |
| download | craftbukkit-fc697a4f440829c6813b198b9e1e0a87789e042b.tar craftbukkit-fc697a4f440829c6813b198b9e1e0a87789e042b.tar.gz craftbukkit-fc697a4f440829c6813b198b9e1e0a87789e042b.tar.lz craftbukkit-fc697a4f440829c6813b198b9e1e0a87789e042b.tar.xz craftbukkit-fc697a4f440829c6813b198b9e1e0a87789e042b.zip | |
Fixed translation issue in EntityMinecart. Addresses BUKKIT-980
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityMinecart.java | 4 |
1 files changed, 2 insertions, 2 deletions
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; |