What james bond movie is this?

in this james bond movie, a villain trying to make profit off a village in drought forcing them to drink beer only dies to bond when bond puts him in a desert and gives him only one can of beer to live on. Also, what movie is this, I'm not sure if this is the same one but I think it takes place in cuba or some desert-type area, but anyways, bond and some women are in this desert area in which they had to fight in, it was closed off and i believe they were lured there, anyways, it was like a castle and they escaped by jumping off(or with) a horse and landing in water, but before that, they were battling middle-eastern men, who, shot at them while they were in the water.