From 3cc400a6aecde5e0318d7871df9e8d66ef35e01c Mon Sep 17 00:00:00 2001 From: alydev Date: Thu, 29 Oct 2026 00:59:38 +1000 Subject: [PATCH 1/2] fix halloween --- CHANGELOG.md | 3 ++- Directory.Build.targets | 2 +- Questionable/Windows/QuestComponents/EventInfoComponent.cs | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a3487b9d..f33267e19 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,2 +1,3 @@ - Feature: keybound event -alydev -- Bug fix: figured out why cbt's auto event quest thing wasn't working, hopefully -alydev \ No newline at end of file +- 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 \ No newline at end of file diff --git a/Directory.Build.targets b/Directory.Build.targets index 217ecf528..cca0e1187 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,6 +1,6 @@ - 15.756.3.57 + 15.756.3.58 diff --git a/Questionable/Windows/QuestComponents/EventInfoComponent.cs b/Questionable/Windows/QuestComponents/EventInfoComponent.cs index 66a832949..12b63d56b 100644 --- a/Questionable/Windows/QuestComponents/EventInfoComponent.cs +++ b/Questionable/Windows/QuestComponents/EventInfoComponent.cs @@ -4,6 +4,7 @@ using Humanizer; using Humanizer.Localisation; using Questionable.Model.Questing; +using static Questionable.Windows.QuestComponents.EventInfoComponent; namespace Questionable.Windows.QuestComponents; [RegisterSingleton] @@ -142,7 +143,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; @@ -154,7 +155,7 @@ public IEnumerable 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); From 1c2c38956a6f257a205107a578f9e4db0f228eb3 Mon Sep 17 00:00:00 2001 From: alydev Date: Thu, 29 Oct 2026 01:00:18 +1000 Subject: [PATCH 2/2] wat --- Questionable/Windows/QuestComponents/EventInfoComponent.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/Questionable/Windows/QuestComponents/EventInfoComponent.cs b/Questionable/Windows/QuestComponents/EventInfoComponent.cs index 12b63d56b..39d9e97d6 100644 --- a/Questionable/Windows/QuestComponents/EventInfoComponent.cs +++ b/Questionable/Windows/QuestComponents/EventInfoComponent.cs @@ -4,7 +4,6 @@ using Humanizer; using Humanizer.Localisation; using Questionable.Model.Questing; -using static Questionable.Windows.QuestComponents.EventInfoComponent; namespace Questionable.Windows.QuestComponents; [RegisterSingleton]