Updated for CraftBukkit @ 1.6.4