Alternate fix to bdb58b4 (Also protects G_LogWeaponPickup too)