From 7d6809dc2ab42ab8f4d0a1a38233d197cd8351db Mon Sep 17 00:00:00 2001
From: amevarashi <kp-karasu@yandex.ru>
Date: Tue, 9 Aug 2022 21:32:25 +0500
Subject: [PATCH] Check if doer exists in _Gendered precept comps

---
 .../Ideology/Precepts/Comp_KnowsMemoryThought_Gendered.cs    | 5 +++--
 .../Ideology/Precepts/Comp_SelfTookMemoryThought_Gendered.cs | 5 +++--
 Source/IdeologyAddon/IdeologyAddon.csproj                    | 1 +
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Source/IdeologyAddon/Ideology/Precepts/Comp_KnowsMemoryThought_Gendered.cs b/Source/IdeologyAddon/Ideology/Precepts/Comp_KnowsMemoryThought_Gendered.cs
index 648f196..d35013d 100644
--- a/Source/IdeologyAddon/Ideology/Precepts/Comp_KnowsMemoryThought_Gendered.cs
+++ b/Source/IdeologyAddon/Ideology/Precepts/Comp_KnowsMemoryThought_Gendered.cs
@@ -11,9 +11,10 @@ namespace RJWSexperience.Ideology.Precepts
 
 		public override void Notify_MemberWitnessedAction(HistoryEvent ev, Precept precept, Pawn member)
 		{
-			Pawn doer = ev.args.GetArg<Pawn>(HistoryEventArgsNames.Doer);
-			if (doer.gender == doersGender)
+			if (ev.args.TryGetArg(HistoryEventArgsNames.Doer, out Pawn doer) && doer.gender == doersGender)
+			{
 				base.Notify_MemberWitnessedAction(ev, precept, member);
+			}
 		}
 	}
 }
diff --git a/Source/IdeologyAddon/Ideology/Precepts/Comp_SelfTookMemoryThought_Gendered.cs b/Source/IdeologyAddon/Ideology/Precepts/Comp_SelfTookMemoryThought_Gendered.cs
index 66c651b..a950f6d 100644
--- a/Source/IdeologyAddon/Ideology/Precepts/Comp_SelfTookMemoryThought_Gendered.cs
+++ b/Source/IdeologyAddon/Ideology/Precepts/Comp_SelfTookMemoryThought_Gendered.cs
@@ -11,9 +11,10 @@ namespace RJWSexperience.Ideology.Precepts
 
 		public override void Notify_MemberTookAction(HistoryEvent ev, Precept precept, bool canApplySelfTookThoughts)
 		{
-			Pawn doer = ev.args.GetArg<Pawn>(HistoryEventArgsNames.Doer);
-			if (doer.gender == gender)
+			if (ev.args.TryGetArg(HistoryEventArgsNames.Doer, out Pawn doer) && doer.gender == gender)
+			{
 				TakeThought(ev, precept, canApplySelfTookThoughts, doer);
+			}
 		}
 
 		/// <summary>
diff --git a/Source/IdeologyAddon/IdeologyAddon.csproj b/Source/IdeologyAddon/IdeologyAddon.csproj
index bd28493..1ea925e 100644
--- a/Source/IdeologyAddon/IdeologyAddon.csproj
+++ b/Source/IdeologyAddon/IdeologyAddon.csproj
@@ -42,6 +42,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="DebugAction.cs" />
     <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="Ideology\HistoryEvents\DefExtension_SecondaryEvents.cs" />
     <Compile Include="Ideology\HistoryEvents\DefExtension_EventOverrides.cs" />