Attempt to fix knockback and swimming.
Fixed warnings
Changed /** to /*
Merge branch 'master' into Monster
Merge pull request #1284 from Howaner/Monster

Attempt to fix knockback and swimming.