diff options
author | Travis Watkins <amaranth@ubuntu.com> | 2013-03-13 17:33:27 -0500 |
---|---|---|
committer | Travis Watkins <amaranth@ubuntu.com> | 2013-03-15 13:28:59 -0500 |
commit | 83d29e461c85733f0113b6eb19db6e3b42da2949 (patch) | |
tree | b3063a1c28f478ab368d5ba3413a842def68c28f /src/main/java/net/minecraft/server/EntityProjectile.java | |
parent | ba6e4c38cfa98ad291974195cc46d70a4f138ac1 (diff) | |
download | craftbukkit-83d29e461c85733f0113b6eb19db6e3b42da2949.tar craftbukkit-83d29e461c85733f0113b6eb19db6e3b42da2949.tar.gz craftbukkit-83d29e461c85733f0113b6eb19db6e3b42da2949.tar.lz craftbukkit-83d29e461c85733f0113b6eb19db6e3b42da2949.tar.xz craftbukkit-83d29e461c85733f0113b6eb19db6e3b42da2949.zip |
Update CraftBukkit to Minecraft 1.5
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityProjectile.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntityProjectile.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java index 7e8122dd..85ca93d3 100644 --- a/src/main/java/net/minecraft/server/EntityProjectile.java +++ b/src/main/java/net/minecraft/server/EntityProjectile.java @@ -80,11 +80,11 @@ public abstract class EntityProjectile extends Entity implements IProjectile { this.i = 0; } - public void j_() { - this.T = this.locX; - this.U = this.locY; - this.V = this.locZ; - super.j_(); + public void l_() { + this.U = this.locX; + this.V = this.locY; + this.W = this.locZ; + super.l_(); if (this.shake > 0) { --this.shake; } @@ -130,7 +130,7 @@ public abstract class EntityProjectile extends Entity implements IProjectile { for (int j = 0; j < list.size(); ++j) { Entity entity1 = (Entity) list.get(j); - if (entity1.L() && (entity1 != entityliving || this.j >= 5)) { + if (entity1.K() && (entity1 != entityliving || this.j >= 5)) { float f = 0.3F; AxisAlignedBB axisalignedbb = entity1.boundingBox.grow((double) f, (double) f, (double) f); MovingObjectPosition movingobjectposition1 = axisalignedbb.a(vec3d, vec3d1); @@ -153,7 +153,7 @@ public abstract class EntityProjectile extends Entity implements IProjectile { if (movingobjectposition != null) { if (movingobjectposition.type == EnumMovingObjectType.TILE && this.world.getTypeId(movingobjectposition.b, movingobjectposition.c, movingobjectposition.d) == Block.PORTAL.id) { - this.aa(); + this.Z(); } else { this.a(movingobjectposition); // CraftBukkit start @@ -193,7 +193,7 @@ public abstract class EntityProjectile extends Entity implements IProjectile { float f2 = 0.99F; float f3 = this.g(); - if (this.H()) { + if (this.G()) { for (int k = 0; k < 4; ++k) { float f4 = 0.25F; |