From fcc3ded5cb470ee561c478106080b88fb01ff431 Mon Sep 17 00:00:00 2001 From: David Gay Date: Fri, 28 May 2021 10:57:25 -0400 Subject: (Hopefully) fix bug caused by char becoming unable to fight but then getting an `activity_started_at` value set --- app/controllers/game_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app') 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 -- cgit v1.2.3