Merge branch 'master' of https://github.com/Rim-Of-Madness-Team/Rim-o…

…f-Madness---Vampires
Rim-Of-Madness-Team · Jun 24, 2022 · d6cd845 · d6cd845
2 parents fc2ed0b + d09b02a
commit d6cd845
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Source/Vampires/HarmonyPatches/HarmonyPatches_Pathing.cs b/Source/Vampires/HarmonyPatches/HarmonyPatches_Pathing.cs
@@ -55,14 +55,14 @@ public static void HarmonyPatches_Pathing(Harmony harmony)
         // Verse.ReachabilityUtility
         public static void CanReach_Vampire(ref bool __result, Pawn pawn, LocalTargetInfo dest, PathEndMode peMode, Danger maxDanger, bool canBashDoors = false, bool canBashFences = false, TraverseMode mode = TraverseMode.ByPawn)
         {
+            if !(__result && pawn.IsVampire()) return;
             var inBeastMentalState = pawn?.MentalStateDef == DefDatabase<MentalStateDef>.GetNamed("ROMV_VampireBeast");
             var inRestrictedSunlightAIMode = pawn?.VampComp()?.CurrentSunlightPolicy == SunlightPolicy.Restricted;
             var isDaylight = VampireUtility.IsDaylight(pawn);
             var isPlayerCharacter = pawn?.Faction == Faction.OfPlayerSilentFail;
             var isNotDrafted = !pawn?.Drafted ?? false;
             var destIsNotRoofed = !dest.Cell.Roofed(pawn?.MapHeld ?? Find.CurrentMap);
-            if (__result && pawn.IsVampire() &&
-                (inRestrictedSunlightAIMode || inBeastMentalState) &&
+            if ((inRestrictedSunlightAIMode || inBeastMentalState) &&
                 isDaylight && isPlayerCharacter && isNotDrafted && destIsNotRoofed) __result = false;
         }