Update for CraftBukkit 1.8