After a lot of faffing the tribunal pub drinks should now work as intended. When used they should return to the person who took them from their place. When the max uses have been used up they should reset and return to the group collection area.