good-humoured

adj.

Sharpened by drink into an amiability so pointed that every kindness resembles a mild rebuke.

Source: Wiktionary