Update EntityHook.java

Added xwaffle's fix
Fixed trainers
Merge branch 'master' of https://github.com/MrMasochism/Pixelmon
Merge remote-tracking branch 'origin/master'
Fixes to /pokebattle and /pokeheal
- Both commands now tab autocomplete for playernames
- /pokeheal now works without argument to heal user's team
Merge pull request #1114 from ghostwolf2398/master

Fixes to /pokebattle and /pokeheal
updated version number
Merge branch 'master' of https://github.com/MrMasochism/Pixelmon
Update to EntityHook.java, hoping it should be the last!
Removed Debug code
Merge pull request #1142 from Xwaffle1/master

Update to EntityHook.java, hoping it should be the last!
Merge remote-tracking branch 'origin/master'
Fixed an exp glitch
Merge branch 'master' of https://github.com/MrMasochism/Pixelmon
fixed pokecenter spawning on server
incorporated various fixed from ghostwolf
manually merged riding fix from ghostwolf
added damping for surfing
fixed camera crash in server battles
Merge remote-tracking branch 'origin/master'
undid change that broke some spawners etc