Skip to content

Commit 0445a0b

Browse files
committed
Update activity system to use new team pick time
1 parent 0f02a93 commit 0445a0b

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

ProjectLighthouse.Tests.GameApiTests/Unit/Activity/ActivityEventHandlerTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,7 @@ public async Task Slot_WithTeamPickChange_ShouldCreateLevelActivity()
673673
{
674674
SlotId = 1,
675675
CreatorId = 1,
676-
TeamPick = true,
676+
TeamPickTime = 1,
677677
};
678678

679679
eventHandler.OnEntityChanged(database, oldSlot, newSlot);

ProjectLighthouse/Types/Activity/ActivityEntityEventHandler.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -245,10 +245,13 @@ public void OnEntityChanged<T>(DatabaseContext database, T origEntity, T current
245245
{
246246
if (origEntity is not SlotEntity oldSlotEntity) break;
247247

248-
switch (oldSlotEntity.TeamPick)
248+
bool oldIsTeamPick = oldSlotEntity.TeamPickTime != 0;
249+
bool newIsTeamPick = slotEntity.TeamPickTime != 0;
250+
251+
switch (oldIsTeamPick)
249252
{
250253
// When a level is team picked
251-
case false when slotEntity.TeamPick:
254+
case false when newIsTeamPick:
252255
activity = new LevelActivityEntity
253256
{
254257
Type = EventType.MMPickLevel,
@@ -257,7 +260,7 @@ public void OnEntityChanged<T>(DatabaseContext database, T origEntity, T current
257260
};
258261
break;
259262
// When a level has its team pick removed then remove the corresponding activity
260-
case true when !slotEntity.TeamPick:
263+
case true when !newIsTeamPick:
261264
database.Activities.OfType<LevelActivityEntity>()
262265
.Where(a => a.Type == EventType.MMPickLevel)
263266
.Where(a => a.SlotId == slotEntity.SlotId)

0 commit comments

Comments
 (0)