diff --git a/About/About.xml b/About/About.xml index 33c40d68..e80f77a2 100644 --- a/About/About.xml +++ b/About/About.xml @@ -72,7 +72,7 @@ maarxx: Various fixes and improvements rimpy-custom: Fix for Russian translation <size=24>Version</size> -This is version 4.30.612, for RimWorld 1.1.2624. +This is version 4.30.615, for RimWorld 1.1.2624. diff --git a/Assemblies/Fluffy_ColonyManager.dll b/Assemblies/Fluffy_ColonyManager.dll index fede5de7..00c0f725 100644 Binary files a/Assemblies/Fluffy_ColonyManager.dll and b/Assemblies/Fluffy_ColonyManager.dll differ diff --git a/Readme.md b/Readme.md index f9375821..03513a3f 100644 --- a/Readme.md +++ b/Readme.md @@ -79,4 +79,4 @@ Show your appreciation by buying me a coffee (or contribute towards a nice singl [![I Have a Black Dog](https://i.ibb.co/ss59Rwy/New-Project-2.png)](https://www.youtube.com/watch?v=XiCrniLQGYc) # Version -This is version 4.30.612, for RimWorld 1.1.2624. \ No newline at end of file +This is version 4.30.615, for RimWorld 1.1.2624. \ No newline at end of file diff --git a/Source/Helpers/Livestock/Utilities_Livestock.cs b/Source/Helpers/Livestock/Utilities_Livestock.cs index 792fcad0..feef068e 100644 --- a/Source/Helpers/Livestock/Utilities_Livestock.cs +++ b/Source/Helpers/Livestock/Utilities_Livestock.cs @@ -88,9 +88,12 @@ public static IEnumerable GetAll( this PawnKindDef pawnKind, Map map ) // if not, set up a cache Func> getter = () => map.mapPawns.AllPawns - .Where( p => p.RaceProps.Animal // is animal - && !p.Dead // is alive - && p.kindDef == pawnKind ); // is our managed pawnkind + .Where( p => p.RaceProps.Animal // is animal + && !p.Dead // is alive + && p.kindDef == pawnKind // is our managed pawnkind + && !( p.Faction == Faction.OfPlayer && + p.HasExtraHomeFaction() + ) ); // was not borrowed to us AllCache.Add( key, getter ); return getter(); diff --git a/Source/Properties/AssemblyInfo.cs b/Source/Properties/AssemblyInfo.cs index 01516995..6ff80865 100644 --- a/Source/Properties/AssemblyInfo.cs +++ b/Source/Properties/AssemblyInfo.cs @@ -39,4 +39,4 @@ // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("4.0.0")] -[assembly: AssemblyFileVersion("4.30.612")] \ No newline at end of file +[assembly: AssemblyFileVersion("4.30.615")] \ No newline at end of file