Fixed some merge conflicts, server test not currently functional due to changes.

Note: Original block gives errors when attempting to place a block adjacent or attempting to delete it. Placement will work, deleting it will not.