Update EntityHook.java

Added xwaffle's fix
Fixed trainers
Merge branch 'master' of https://github.com/MrMasochism/Pixelmon
Merge branch 'master' of https://github.com/MrMasochism/Pixelmon

Conflicts:
	minecraft/pixelmon/entities/projectiles/EntityHook.java