Bring into line with master commit 2a9d682.

This fixes a bug where dropping a full bottle could get your `holding`
count out of sync and thus screw up your passage to and from the
plover room.

Author: Quuxplusone