diff --git a/server/services/database/resolvers/gameEvent.go b/server/services/database/resolvers/gameEvent.go index 033051a..f655d98 100644 --- a/server/services/database/resolvers/gameEvent.go +++ b/server/services/database/resolvers/gameEvent.go @@ -86,7 +86,9 @@ func IsGameRunning(outsideTX *gorm.DB) bool { if len(events) == 0 { return true } - result = result.Where("time <= ?", currentTime).Order("time desc").First(¤tEvent) + result = outsideTX.Where( + outsideTX.Where(map[string]interface{}{"action": entity.PauseEvent}).Or(map[string]interface{}{"action": entity.ResumeEvent}), + ).Where("time <= ?", currentTime).Order("time desc").First(¤tEvent) if errors.Is(result.Error, gorm.ErrRecordNotFound) { return false } else if result.Error != nil {