Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix errors caused by pocket maps with Multifaction/spectator faction #475

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix errors caused by pocket maps with Multifaction/spectator faction #475

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 14 additions & 0 deletions Source/Client/AsyncTime/StorytellerPatches.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,3 +139,17 @@ static IEnumerable<IncidentTargetTagDef> Postfix(IEnumerable<IncidentTargetTagDe
}
}
}

[HarmonyPatch(typeof(StorytellerUtility), nameof(StorytellerUtility.DefaultThreatPointsNow))]
static class FixMultifactionPocketMapDefaultThreatPointsNow
{
static bool Prefix(IIncidentTarget target)
{
// StorytellerUtility.DefaultThreatPointsNow uses Find.AnyPlayerHomeMap if
// the target map is a pocket map. In such a situation, we stop the method
// from executing if Find.AnyPlayerHomeMap would return null, as otherwise
// we'll end up with a very frequent error spam from spectator faction and
// any other factions without a map.
return Multiplayer.Client == null || target is not Map { IsPocketMap: true } || Find.AnyPlayerHomeMap != null;
}
}
Loading