Fix TileEntities and Blocks getting out of sync. Fixes BUKKIT-3501