Updating to work with latest Minecraft/Bukkit 1.5