Updated to be compatible with the 1.8 snapshot of CraftBukkit/Spigot.