Updated for latest bukkit version