Properly handle main hand empty and off-hand with weapon in calc_bonuses() (1.3)

Properly handle main hand empty and off-hand with weapon in calc_bonuses() (1.3) #1071