Merge pull request #936 from LightAdept/master

Fixes
added player to eventFired
Merge branch 'master' of https://github.com/MrMasochism/Pixelmon
Merge remote-tracking branch 'origin/master'