Skip to content

Commit

Permalink
Make combat event use all trade groups
Browse files Browse the repository at this point in the history
  • Loading branch information
LukeFZ committed Jul 24, 2023
1 parent e526dd7 commit c4402ff
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions DragaliaAPI/Features/Event/CombatEventController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,9 @@ public async Task<DragaliaResult> GetEventData(CombatEventGetEventDataRequest re
resp.user_event_location_reward_list =
await eventService.GetEventRewardList<UserEventLocationRewardList>(request.event_id);

int tradeGroupId = MasterAsset.EventTradeGroup.Enumerable
.First(x => x.EventId == request.event_id)
.Id;
resp.event_trade_list = tradeService.GetEventTradeList(tradeGroupId);
resp.event_trade_list = MasterAsset.EventTradeGroup.Enumerable
.Where(x => x.EventId == request.event_id)
.SelectMany(x => tradeService.GetEventTradeList(x.Id));

return Ok(resp);
}
Expand Down

0 comments on commit c4402ff

Please sign in to comment.