Updated for latest Bukkit.