Resynchronized with BukkitDev