Updated for new Bukkit build