Updated to work with CraftBukkit 1.7.2