Update for CraftBukkit 1.4.7 changes