Bukkit 2220

Addresses [BUKKIT-2220](https://bukkit.atlassian.net/browse/BUKKIT-2220) as I need it for a project.

Bukkit PR and a proper description: https://github.com/Bukkit/Bukkit/pull/683