Fix CraftBukkit/Forge block placement merge. Closes #286, #274.