Merge pull request #1142 from Xwaffle1/master

Update to EntityHook.java, hoping it should be the last!
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