Make all changes into one patch for CraftBukkit