Fix issue on Duplicate/Permute about worksettings not initialized

Atla55 · Jul 31, 2021 · b9a28ff · b9a28ff
1 parent 23c28c3
commit b9a28ff
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/1.3/Assemblies/AndroidTiers.dll b/1.3/Assemblies/AndroidTiers.dll
diff --git a/Source/Androids For RW1.3/.vs/Androids/v15/.suo b/Source/Androids For RW1.3/.vs/Androids/v15/.suo
diff --git a/Source/Androids For RW1.3/Utils/Utils.cs b/Source/Androids For RW1.3/Utils/Utils.cs
@@ -1600,13 +1600,14 @@ public static void Duplicate(Pawn source, Pawn dest, bool overwriteAsDeath=true)
                     if (source.workSettings == null)
                     {
                         source.workSettings = new Pawn_WorkSettings(source);
-                        source.workSettings.EnableAndInitializeIfNotAlreadyInitialized();
                     }
+                    source.workSettings.EnableAndInitializeIfNotAlreadyInitialized();
+
                     if (dest.workSettings == null)
                     {
                         dest.workSettings = new Pawn_WorkSettings(dest);
-                        dest.workSettings.EnableAndInitializeIfNotAlreadyInitialized();
                     }
+                    dest.workSettings.EnableAndInitializeIfNotAlreadyInitialized();
 
                     if (source.workSettings != null && source.workSettings.EverWork)
                     {
@@ -1997,13 +1998,14 @@ public static void PermutePawn(Pawn p1, Pawn p2, bool allowSettingsPermutation=t
                 if (p1.workSettings == null)
                 {
                     p1.workSettings = new Pawn_WorkSettings(p1);
-                    p1.workSettings.EnableAndInitializeIfNotAlreadyInitialized();
                 }
+                p1.workSettings.EnableAndInitializeIfNotAlreadyInitialized();
 
-                if (p2.workSettings == null) {
+                if (p2.workSettings == null)
+                {
                     p2.workSettings = new Pawn_WorkSettings(p2);
-                    p2.workSettings.EnableAndInitializeIfNotAlreadyInitialized();
                 }
+                p2.workSettings.EnableAndInitializeIfNotAlreadyInitialized();
 
                 /*************************************** PERMUTATION of Settings,restrictions********************************/
                 if (allowSettingsPermutation && p1.Faction == Faction.OfPlayer && p2.Faction == Faction.OfPlayer)

diff --git a/Source/Androids For RW1.3/obj/Debug/AndroidTiers.dll b/Source/Androids For RW1.3/obj/Debug/AndroidTiers.dll