Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update CraftBukkit to Minecraft 1.5

Browse Source
This commit is contained in:
Travis Watkins
2013-03-13 17:33:27 -05:00
parent ba6e4c38cf
commit 83d29e461c
246 changed files with 8499 additions and 6759 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/net/minecraft/server/EntityProjectile.java
View File

@@ -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;