Fix merge conflicts

This commit is contained in:
mDiyo committed 2014-06-30 09:22:30 -08:00
commit 145f7b9724
37 files changed
+3017 -776

No files matched your search

@@ -316,7 +316,7 @@ public class SearedBlock extends InventoryBlock
int meta = world.getBlockMetadata(x, y, z);
if (meta != 1)
{
return AxisAlignedBB.getAABBPool().getAABB(x, y, z, x + 1, y + 1, z + 1);
return AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1);
}
else
{
@@ -348,7 +348,7 @@ public class SearedBlock extends InventoryBlock
break;
}
return AxisAlignedBB.getAABBPool().getAABB((double) ((float) x + xMin), (double) y + 0.25, (double) ((float) z + zMin), (double) ((float) x + xMax), (double) y + 0.625,
return AxisAlignedBB.getBoundingBox((double) ((float) x + xMin), (double) y + 0.25, (double) ((float) z + zMin), (double) ((float) x + xMax), (double) y + 0.625,
(double) ((float) z + zMax));
}
}