Updated for Bukkit 1.8-R0.1