Yet more work on block damage and block entities