added check for boss on boss drops
forced player pokemon to be non-boss
Merge branch 'master' of https://github.com/MrMasochism/Pixelmon