- raise PlayError('nothing to consume')
- if self.thing.carrying.type_ != 'Consumable':
- raise PlayError('cannot consume non-consumable')
+ raise PlayError('carrying nothing to drink from')
+ if self.thing.carrying.type_ != 'Bottle':
+ raise PlayError('cannot drink from non-bottle')
+ if not self.thing.carrying.full:
+ raise PlayError('bottle is empty')