Update Bukkit 5245 to latest Bukkit version

Use this commit to update your PR to the latest version of Bukkit and resolve merge conflicts.

ToDo:
1) Merge PR
2) Reset the index to the corresponding commit from CraftBukkit:master and commit the changes.
3) Force upload to overwrite your current branch.
This will automatically update your PR with the latest changes.