Disarming with whip now prints message, no longer disarm when no weapon is held