Fix a few minor potion errors

Now *all* potions work instead of just *most* of them
Also EntityPotion works.
Merge pull request #696 from mcmonkey4eva/master

Pull request for fixing broken things Part 2