Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
- Feature: keybound event -alydev
- Bug fix: figured out why cbt's auto event quest thing wasn't working, hopefully -alydev
- Bug fix: figured out why cbt's auto event quest thing wasn't working, hopefully -alydev
- Bug fix: it wasn't showing event quests that didn't have a specified start date, because they had already started when i added it -alydev
2 changes: 1 addition & 1 deletion Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup Condition="$(MSBuildProjectName) != 'GatheringPathRenderer'">
<Version>15.756.3.57</Version>
<Version>15.756.3.58</Version>
</PropertyGroup>

<PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions Questionable/Windows/QuestComponents/EventInfoComponent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ private bool IsIncomplete(EventQuest eventQuest)
if (eventQuest.EndsAtUtc <= DateTime.UtcNow)
return false;
// if event start time is in the future, event is complete
if (eventQuest.StartsAtUtc > DateTime.UtcNow)
if (eventQuest.StartsAtUtc != null && eventQuest.StartsAtUtc > DateTime.UtcNow)
return false;
if (eventQuest.staysActive)
return true;
Expand All @@ -154,7 +154,7 @@ public IEnumerable<ElementId> GetCurrentlyActiveEventQuests()
{
return EventQuests
.Where(x =>
x.StartsAtUtc < DateTime.UtcNow &&
(x.StartsAtUtc == null || x.StartsAtUtc < DateTime.UtcNow) &&
x.EndsAtUtc >= DateTime.UtcNow &&
x.QuestIds.Any(ShouldShowQuest))
.SelectMany(x => x.QuestIds);
Expand Down
Loading