Bugfix for 1.3 version [Recipe_ModifyMechanoid_WorkModule.PostSuccessfulApply NULLReferecnceException!]

1.3/Source/WhatTheHack/Jobs/Depricated/JobDriver_Ability.cs

@@ -27,7 +27,7 @@ private Pawn TargetPawn
             }
         }
 
-        public override IEnumerable<Toil> MakeNewToils()
+        protected override IEnumerable<Toil> MakeNewToils()
         {
             if(TargetA != null)
             {

1.3/Source/WhatTheHack/Jobs/JobDriver_CarryToHackingTable.cs

@@ -31,7 +31,7 @@ public override bool TryMakePreToilReservations(bool errorOnFailed)
             return this.pawn.Reserve(this.Takee, this.job, 1, -1, null) && this.pawn.Reserve(this.HackingTable, this.job, 1, -1, null);
         }
 
-        public override IEnumerable<Toil> MakeNewToils()
+        protected override IEnumerable<Toil> MakeNewToils()
         {
             this.FailOnDestroyedOrNull(TargetIndex.A);
             this.FailOnDestroyedOrNull(TargetIndex.B);

1.3/Source/WhatTheHack/Jobs/JobDriver_ClearHackingTable.cs

@@ -31,15 +31,16 @@ public override bool TryMakePreToilReservations(bool errorOnFailed)
             return this.pawn.Reserve(this.Takee, this.job, 1, -1, null) && this.pawn.Reserve(this.HackingTable, this.job, 1, -1, null);
         }
 
-        public override IEnumerable<Toil> MakeNewToils()
+        protected override IEnumerable<Toil> MakeNewToils()
         {
             this.FailOnDestroyedOrNull(TargetIndex.A);
             this.FailOnDestroyedOrNull(TargetIndex.B);
             this.FailOnAggroMentalState(TargetIndex.A);
             yield return Toils_Goto.GotoThing(TargetIndex.A, PathEndMode.OnCell).FailOnDestroyedNullOrForbidden(TargetIndex.A).FailOnDespawnedNullOrForbidden(TargetIndex.B).FailOn(() => !this.pawn.CanReach(this.Takee, PathEndMode.OnCell, Danger.Deadly, false, false, TraverseMode.ByPawn)).FailOnSomeonePhysicallyInteracting(TargetIndex.A);
             Toil toil = new Toil();
             toil.defaultCompleteMode = ToilCompleteMode.Instant;
-            toil.initAction = new Action(delegate {
+            toil.initAction = new Action(delegate
+            {
                 Takee.jobs.EndCurrentJob(JobCondition.InterruptForced);
                 Takee.health.surgeryBills.Clear();
             });
@@ -53,7 +54,7 @@ public override IEnumerable<Toil> MakeNewToils()
             {
                 initAction = delegate
                 {
-                     this.pawn.carryTracker.TryDropCarriedThing(pawn.Position, ThingPlaceMode.Direct, out Thing thing, null);
+                    this.pawn.carryTracker.TryDropCarriedThing(pawn.Position, ThingPlaceMode.Direct, out Thing thing, null);
                 },
                 defaultCompleteMode = ToilCompleteMode.Instant
             };

1.3/Source/WhatTheHack/Jobs/JobDriver_ControlMechanoid.cs

@@ -20,7 +20,7 @@ private Pawn Mech
                 return pawn.RemoteControlLink();
             }
         }
-        public override IEnumerable<Toil> MakeNewToils()
+        protected override IEnumerable<Toil> MakeNewToils()
         {
             Toil toil = new Toil();
             toil.defaultCompleteMode = ToilCompleteMode.Never;

1.3/Source/WhatTheHack/Jobs/JobDriver_ControlMechanoid_GoTo.cs

@@ -20,7 +20,7 @@ private Pawn Mech
                 return pawn.RemoteControlLink();
             }
         }
-        public override IEnumerable<Toil> MakeNewToils()
+        protected override IEnumerable<Toil> MakeNewToils()
         {
             Toil gotoCell = Toils_Goto.GotoCell(TargetIndex.A, PathEndMode.OnCell);
             gotoCell.FailOn(() => pawn.UnableToControl() || this.Mech.DestroyedOrNull() || this.Mech.Downed);

1.3/Source/WhatTheHack/Jobs/JobDriver_HackRogueAI.cs

@@ -27,7 +27,7 @@ public override bool TryMakePreToilReservations(bool errorOnFailed)
             return true;
         }
 
-        public override IEnumerable<Toil> MakeNewToils()
+        protected override IEnumerable<Toil> MakeNewToils()
         {
             this.FailOnDespawnedNullOrForbidden(TargetIndex.A);
             this.FailOn(() => RogueAI.goingRogue == false);

1.3/Source/WhatTheHack/Jobs/JobDriver_MechanoidAbility.cs

@@ -25,7 +25,7 @@ private Pawn TargetPawn
             }
         }
 
-        public override IEnumerable<Toil> MakeNewToils()
+        protected override IEnumerable<Toil> MakeNewToils()
         {
             if(TargetA != null && job.def.GetModExtension<DefModExtension_Ability>() is DefModExtension_Ability modExt)
             {

1.3/Source/WhatTheHack/Jobs/JobDriver_Mechanoid_Rest.cs

@@ -30,7 +30,7 @@ public override bool TryMakePreToilReservations(bool errorOnFailed)
             return result;
         }
 
-        public override IEnumerable<Toil> MakeNewToils()
+        protected override IEnumerable<Toil> MakeNewToils()
         {
             //this.AddFinishAction(new Action(delegate { Log.Message("finish action called for job!");  }));
             this.FailOnDespawnedOrNull(TargetIndex.A);

1.3/Source/WhatTheHack/Jobs/JobDriver_PerformMaintenance.cs

@@ -54,7 +54,7 @@ public override bool TryMakePreToilReservations(bool errorOnFailed)
             }
             return false;
         }
-        public override IEnumerable<Toil> MakeNewToils()
+        protected override IEnumerable<Toil> MakeNewToils()
         {
             this.FailOnAggroMentalState(TargetIndex.A);
             this.FailOnDespawnedNullOrForbidden(TargetIndex.A);

1.3/Source/WhatTheHack/Jobs/JobGiver_ControlMechanoid.cs

@@ -9,7 +9,7 @@ namespace WhatTheHack.Jobs
 {
     class JobGiver_ControlMechanoid : ThinkNode_JobGiver
     {
-        public override Job TryGiveJob(Pawn pawn)
+        protected override Job TryGiveJob(Pawn pawn)
         {
             if(pawn.RemoteControlLink() != null && Utilities.QuickDistance(pawn.Position, pawn.RemoteControlLink().Position) <= Utilities.GetRemoteControlRadius(pawn) - 5f)
             {

1.3/Source/WhatTheHack/Jobs/JobGiver_ControlMechanoid_Follow.cs

@@ -21,7 +21,7 @@ private int FollowJobExpireInterval
             }
         }
 
-        public override Job TryGiveJob(Pawn pawn)
+        protected override Job TryGiveJob(Pawn pawn)
         {
             Pawn followee = pawn.RemoteControlLink();
             if (followee == null)

1.3/Source/WhatTheHack/Jobs/JobGiver_Mechanoid_Ability.cs

@@ -13,7 +13,7 @@ class JobGiver_Mechanoid_Ability : ThinkNode_JobGiver
     {
         float powerDrain = 40f; //Should store this globally. 
         float fuelConsumption = 5f; //Should store this globally. 
-        public override Job TryGiveJob(Pawn pawn)
+        protected override Job TryGiveJob(Pawn pawn)
         {
             if(pawn.health.hediffSet.HasHediff(WTH_DefOf.WTH_SelfDestruct) && pawn.health.summaryHealth.SummaryHealthPercent < 0.5f)
             {

1.3/Source/WhatTheHack/Jobs/JobGiver_Mechanoid_Rest.cs

@@ -12,7 +12,7 @@ namespace WhatTheHack.Jobs
 {
     class JobGiver_Mechanoid_Rest : ThinkNode_JobGiver
     {
-        public override Job TryGiveJob(Pawn pawn)
+        protected override Job TryGiveJob(Pawn pawn)
         {
             Job job = null;
             if (pawn.IsActivated() && (pawn.ShouldRecharge() || pawn.ShouldBeMaintained()))

1.3/Source/WhatTheHack/Recipes/Recipe_ModifyMechanoid_UninstallModule.cs

@@ -42,12 +42,14 @@ private static void Cleanup(Pawn pawn, HediffDef removedHediff)
             {
                 pawnData.workTypes.RemoveAll((WorkTypeDef def) => ext.workTypes.Contains(def));
             }
+            /* Disableled because after this part of code runs -> mechanoid will never do hunting (actualy this part breaks a lot of things)
             if (!pawn.health.hediffSet.hediffs.Exists((Hediff h) => h.def.HasModExtension<DefModExtension_Hediff_WorkModule>()))
             {
                 pawnData.workTypes = null;
                 pawn.skills = null;
                 pawn.workSettings = null;
             }
+            */
             if(removedHediff == WTH_DefOf.WTH_RepairModule)
             {
                 Base.RemoveComps(pawn);

1.3/Source/WhatTheHack/Recipes/Recipe_ModifyMechanoid_WorkModule.cs

@@ -13,10 +13,14 @@ class Recipe_ModifyMechanoid_WorkModule : Recipe_ModifyMechanoid
         protected override void PostSuccessfulApply(Pawn pawn, BodyPartRecord part, Pawn billDoer, List<Thing> ingredients, Bill bill)
         {
             base.PostSuccessfulApply(pawn, part, billDoer, ingredients, bill);
-            ExtendedPawnData pawnData = Base.Instance.GetExtendedDataStorage().GetExtendedDataFor(pawn);
+            if (pawn.skills == null || pawn.workSettings == null || Base.Instance.GetExtendedDataStorage().GetExtendedDataFor(pawn).workTypes == null)
+            {
+                //for people who became victums of NullReferenceException bug (reinitialize ALL mechanoid skills and worktypes)
+                Utilities.InitWorkTypesAndSkills(pawn, Base.Instance.GetExtendedDataStorage().GetExtendedDataFor(pawn));
+            }
             if (bill.recipe.addsHediff.GetModExtension<DefModExtension_Hediff_WorkModule>() is DefModExtension_Hediff_WorkModule modExt)
             {
-
+                ExtendedPawnData pawnData = Base.Instance.GetExtendedDataStorage().GetExtendedDataFor(pawn);
                 foreach (WorkTypeDef workType in modExt.workTypes)
                 {
                     pawnData.workTypes.Add(workType);