diff options
| author | David Gay <david@davidgay.org> | 2021-06-14 10:22:57 -0400 |
|---|---|---|
| committer | David Gay <david@davidgay.org> | 2021-06-14 10:22:57 -0400 |
| commit | 362fcb62af0949b4c7ac1dfa052fa10b39d70b43 (patch) | |
| tree | 7ba4d1b41413800c7e2d4626dbd02c08a983286c | |
| parent | d349eaa9ce4700f5c71f7266dbbaaceade9dd7c1 (diff) | |
| parent | 007896b0057b8aecbf74dddd269b57efe3f6e0e6 (diff) | |
Merge branch 'develop' into 0.1.11
# Conflicts:
# CHANGELOG.md
| -rw-r--r-- | CHANGELOG.md | 5 | ||||
| -rw-r--r-- | app/lib/activity_processor.rb | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e8872f..86a9fc9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,11 @@ All notable changes to this project will be documented in this file. ### UI - Character skills were moved to their own view, which features a new interface with XP bars. +## [0.1.10.3] - 2021-06-14 + +### Fixed +- Bug in title award code. + ## [0.1.10.2] - 2021-06-10 ### Activities diff --git a/app/lib/activity_processor.rb b/app/lib/activity_processor.rb index b5dd11c..4a06a98 100644 --- a/app/lib/activity_processor.rb +++ b/app/lib/activity_processor.rb @@ -166,7 +166,8 @@ class ActivityProcessor end def handle_title_result(data) - if @character.award_title(data[:gid]) + title = Title.find_by_gid(data[:gid]) + if @character.award_title(title) @results.push({ type: "title", title: title }) end end |