Is there a reason you don't get mad? Are you trying to avoid escalation? The only person who can really say whether or not it's a problem for you is, well, you.
As for the drinking friend, or drinkers in general, all you can really do is put up firm boundaries. And stick to them. No matter what kind of mood they are in. For example (and this is just an example - take what you like and leave the rest) you might suggest that the two of you hang out without the drinking. See what he says. You may want to consider not drinking with him (as you did when you brought the water that time) given that he has such a problem with it. And I am a recovered alcoholic - so I know what it's like to be on the chaos-causing side of it. You are entitled to stick up for yourself.