Merge pull request #45 from emris/Water-bottle-exploit

Fixed water bottle drinking exploit