[BLEEDING/INSTABLE] Roughly adjust to 1.6.1 Bukkit API changes.