No longer attacks the shopkeeper by default when holding a weapon.