From 88da6c05339b507afbc7e2f4be35d4b73d7ba61e Mon Sep 17 00:00:00 2001 From: "Jesse C. Fisher" Date: Sat, 26 Oct 2019 02:18:39 -0700 Subject: [PATCH] Fix logic for next players turn --- app/models/game.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/game.rb b/app/models/game.rb index 0e0613e4..81bcf46f 100644 --- a/app/models/game.rb +++ b/app/models/game.rb @@ -131,12 +131,12 @@ class Game < ActiveRecord::Base end def player_ids_by_seat_order - player_ids = self.seats.order(:position).select {|s| s.player_id}.map {|s| s.player_id} + player_ids = self.seats.order(:position).select {|s| ( s.player.inventory.count > 0) ? s.player_id : nil}.compact.map {|s| s.player_id} end def next_player_id @controlling_player_index = self.player_ids_by_seat_order.index(controlling_player_id) - player_ids_by_seat_order[(@controlling_player_index + 1) % self.player_ids.length] + player_ids_by_seat_order[(@controlling_player_index + 1) % self.player_ids_by_seat_order.length] end # The player whose turn it is