AblativeAbsolute/rimworld-animations
1
0
Fork 0
mirror of https://gitgud.io/c0ffeeeeeeee/rimworld-animations.git synced 2024-08-15 00:43:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

null ref checks

Browse source
This commit is contained in:
Platinum 2020-04-22 17:52:59 -07:00
parent 6a1786b03f
commit ca53926996
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
1.1/Assemblies/Rimworld-Animations.dll
View file

Binary file not shown.

9
Defs/AnimationDefs/Animations_vanilla.xml
View file

@ -1968,24 +1968,27 @@
<li>Anal</li> <li>Anal</li>
<li>Vaginal</li> <li>Vaginal</li>
</sexTypes> </sexTypes>
<actors> <actors>
<li> <li>
<!--each type cooresponds to an animation clip in each animationStage--> <!--each type cooresponds to an animation clip in each animationStage-->
<defNames> <defNames>
<li>Human</li> <li>Human</li>
</defNames> </defNames>
<blacklistedRaces>
<li>Human</li>
</blacklistedRaces>
<isFucked>true</isFucked> <isFucked>true</isFucked>
<initiator>true</initiator> <initiator>true</initiator>
</li> </li>
<li> <li>
<defNames> <defNames>
<li>Human</li> <li>Human</li>
</defNames> </defNames>
<isFucking>true</isFucking> <isFucking>true</isFucking>
</li> </li>
</actors> </actors>
<animationStages> <animationStages>

4
Source/Patches/HarmonyPatch_FacialAnimation.cs
View file

@ -69,7 +69,7 @@ namespace Rimworld_Animations {
public static bool Prefix_IsSameA(JobDef job, string ___jobDef, ref bool __result) { public static bool Prefix_IsSameA(JobDef job, string ___jobDef, ref bool __result) {
if(___jobDef == "Lovin" && rjwLovinDefNames.Contains(job.ToString())) { if(___jobDef != null && ___jobDef == "Lovin" && job?.defName != null && rjwLovinDefNames.Contains(job?.defName)) {
__result = true; __result = true;
return false; return false;
} }
@ -79,7 +79,7 @@ namespace Rimworld_Animations {
public static bool Prefix_IsSameB(string jobName, string ___jobDef, ref bool __result) { public static bool Prefix_IsSameB(string jobName, string ___jobDef, ref bool __result) {
if (___jobDef == "Lovin" && rjwLovinDefNames.Contains(jobName)) { if (___jobDef != null && ___jobDef == "Lovin" && jobName != null && rjwLovinDefNames.Contains(jobName)) {
__result = true; __result = true;
return false; return false;
} }