Fixes #4600

Will fix #4600 and the problem with drinks not knowing when they are open/closed.
Hopefully I didn't miss a string of code again,I don't think so,though.
Merge pull request #4603 from Jarcolr/patch-1

Fixes #4600