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

Update CraftBukkit to 1.6.4

Browse Source
This commit is contained in:
feildmaster
2013-09-19 13:25:08 -05:00
parent e20ef1f606
commit dcb9d6a5ef
92 changed files with 730 additions and 694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -128,7 +128,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.K() && (entity1 != entityliving || this.j >= 5)) {
if (entity1.L() && (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);
@@ -151,7 +151,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.ab();
} else {
this.a(movingobjectposition);
// CraftBukkit start
@@ -190,7 +190,7 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
float f2 = 0.99F;
float f3 = this.e();
if (this.G()) {
if (this.H()) {
for (int k = 0; k < 4; ++k) {
float f4 = 0.25F;