Skip to content

Added null checks for everything in Harmony patch on no Royanty ending #96

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

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

Added null checks for everything in Harmony patch on no Royanty ending #96

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
9 changes: 7 additions & 2 deletions Source/1.5/HarmonyPatches.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4006,11 +4006,16 @@ public static class NoRoyaltyEndingForSpaceMap
{
public static bool Prefix(IncidentWorker_GiveQuest __instance, IncidentParms parms, ref bool __result)
{
QuestScriptDef quest = __instance.def.questScriptDef ?? parms.questScriptDef;
// Just nulletproof null checks, in case in modded situation things are set up strangely at this point
QuestScriptDef quest = __instance?.def?.questScriptDef ?? parms?.questScriptDef;
if (quest == null)
{
return true;
}
Map spaceHome = ShipInteriorMod2.FindPlayerShipMap();
if (quest.defName == "EndGame_RoyalAscent")
{
IEnumerable<Map> surfacePlayerMaps = Find.Maps.Where((Map x) => (x.IsPlayerHome && x != spaceHome));
IEnumerable<Map> surfacePlayerMaps = Find.Maps.Where((Map x) => (x != null && x.IsPlayerHome && x != spaceHome));
if (!surfacePlayerMaps.Any())
{
__result = false;
Expand Down