|
|
@ -616,8 +616,10 @@ public abstract class EntityPlayer extends EntityLiving implements ICommandSende
|
|
|
|
|
|
|
|
|
|
|
|
public void moveEntity(double par1, double par3, double par5)
|
|
|
|
public void moveEntity(double par1, double par3, double par5)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
super.boundingBox.setBounds(this.boundingBox.minX.doubleValue(), super.boundingBox.minY, this.boundingBox.minZ.doubleValue(), this.boundingBox.maxX.doubleValue(), super.boundingBox.maxY, this.boundingBox.maxZ.doubleValue());
|
|
|
|
super.boundingBox.setBounds(this.boundingBox.minX.doubleValue(), this.boundingBox.minY, this.boundingBox.minZ.doubleValue(), this.boundingBox.maxX.doubleValue(), this.boundingBox.maxY, this.boundingBox.maxZ.doubleValue());
|
|
|
|
super.moveEntity(par1, par3, par5);
|
|
|
|
super.moveEntity(par1, par3, par5);
|
|
|
|
|
|
|
|
this.boundingBox.maxY = super.boundingBox.maxY;
|
|
|
|
|
|
|
|
this.boundingBox.minY = super.boundingBox.minY;
|
|
|
|
if (this.noClip)
|
|
|
|
if (this.noClip)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
this.boundingBox.offset(par1, par3, par5);
|
|
|
|
this.boundingBox.offset(par1, par3, par5);
|
|
|
@ -721,12 +723,13 @@ public abstract class EntityPlayer extends EntityLiving implements ICommandSende
|
|
|
|
List var30 = this.worldObj.getCollidingBoundingBoxes(this, super.boundingBox.addCoord(par1, par3, par5));
|
|
|
|
List var30 = this.worldObj.getCollidingBoundingBoxes(this, super.boundingBox.addCoord(par1, par3, par5));
|
|
|
|
AxisAlignedBB var21;
|
|
|
|
AxisAlignedBB var21;
|
|
|
|
|
|
|
|
|
|
|
|
for (Iterator var20 = var30.iterator(); var20.hasNext(); par3 = var21.calculateYOffset(super.boundingBox, par3))
|
|
|
|
// Do not pross Y asix movement
|
|
|
|
{
|
|
|
|
// for (Iterator var20 = var30.iterator(); var20.hasNext(); par3 = var21.calculateYOffset(super.boundingBox, par3))
|
|
|
|
var21 = (AxisAlignedBB)var20.next();
|
|
|
|
// {
|
|
|
|
}
|
|
|
|
// var21 = (AxisAlignedBB)var20.next();
|
|
|
|
|
|
|
|
// }
|
|
|
|
this.boundingBox.offset(0.0D, par3, 0.0D);
|
|
|
|
//
|
|
|
|
|
|
|
|
// this.boundingBox.offset(0.0D, par3, 0.0D);
|
|
|
|
|
|
|
|
|
|
|
|
if (!this.field_70135_K && var13 != par3)
|
|
|
|
if (!this.field_70135_K && var13 != par3)
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -862,7 +865,6 @@ public abstract class EntityPlayer extends EntityLiving implements ICommandSende
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.posXBig = (this.boundingBox.minX.add(this.boundingBox.maxX)).divide(BigDecimal.valueOf(2));
|
|
|
|
this.posXBig = (this.boundingBox.minX.add(this.boundingBox.maxX)).divide(BigDecimal.valueOf(2));
|
|
|
|
this.posZBig = (this.boundingBox.minZ.add(this.boundingBox.maxZ)).divide(BigDecimal.valueOf(2));
|
|
|
|
this.posZBig = (this.boundingBox.minZ.add(this.boundingBox.maxZ)).divide(BigDecimal.valueOf(2));
|
|
|
|
this.worldObj.theProfiler.endSection();
|
|
|
|
this.worldObj.theProfiler.endSection();
|
|
|
|