Expand autodrop fix to include dropping weapon.

Addresses #1633