3d321e7 Check NBT data too

~vpzom pushed to ~vpzom/retail git

c1b8ca9 Check NBT data too

~vpzom pushed to ~vpzom/retail git