Skip to content

Commit

Permalink
Merge pull request #1070 from Mygod/station-available
Browse files Browse the repository at this point in the history
fix: available max pokemon battles
  • Loading branch information
TurtIeSocks authored Nov 13, 2024
2 parents 67a2f21 + f1a296c commit fb7af9f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion server/src/models/Station.js
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ class Station extends Model {
const results = await this.query()
.distinct(['battle_pokemon_id', 'battle_pokemon_form', 'battle_level'])
.where('is_inactive', false)
.andWhere('end_time', '>', ts)
.andWhere('battle_end', '>', ts)
.groupBy(['battle_pokemon_id', 'battle_pokemon_form', 'battle_level'])
.orderBy('battle_pokemon_id', 'asc')
return {
Expand Down

0 comments on commit fb7af9f

Please sign in to comment.