Updated to work with Bukkit 1.6.1