summaryrefslogtreecommitdiff
path: root/app/controllers/game_controller.rb
diff options
context:
space:
mode:
authorDavid Gay <david@davidgay.org>2021-05-28 10:57:25 -0400
committerDavid Gay <david@davidgay.org>2021-05-28 10:57:25 -0400
commitfcc3ded5cb470ee561c478106080b88fb01ff431 (patch)
tree65710e5685fd744ae062cccf0fe5684bdfc77cdb /app/controllers/game_controller.rb
parentb0a2bead2ae2f1dd09b96e0a0dea67ba6806af77 (diff)
(Hopefully) fix bug caused by char becoming unable to fight but then getting an `activity_started_at` value set
Diffstat (limited to 'app/controllers/game_controller.rb')
-rw-r--r--app/controllers/game_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/game_controller.rb b/app/controllers/game_controller.rb
index 588c502..8b92222 100644
--- a/app/controllers/game_controller.rb
+++ b/app/controllers/game_controller.rb
@@ -111,7 +111,7 @@ class GameController < ApplicationController
end
end
- if current_char.queued_actions
+ if current_char.activity && current_char.queued_actions
if current_char.queued_actions > 0
current_char.queued_actions -= 1
current_char.activity_started_at = Time.now