summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
Diffstat (limited to 'app/models')
-rw-r--r--app/models/character.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/character.rb b/app/models/character.rb
index ce2b0db..d386002 100644
--- a/app/models/character.rb
+++ b/app/models/character.rb
@@ -197,6 +197,7 @@ class Character < ApplicationRecord
end
def activity_time_remaining
+ return nil unless self.activity
time = activity_duration - (Time.now - self.activity_started_at)
time -= rested_duration_to_spend_on_activity if self.rested_duration > 0
time