Update for net.minecraft.server.v1_4_R1.
Will merge in main branch changes over the next few days to official.