- check for aggroconsumer on familiars before trying to modify it

mfoltz · Dec 5, 2024 · a68963a · a68963a
1 parent 00af06b
commit a68963a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Core.cs b/Core.cs
@@ -14,6 +14,7 @@
 using ProjectM.Physics;
 using ProjectM.Scripting;
 using ProjectM.Shared;
+using ProjectM.Terrain;
 using Stunlock.Core;
 using System.Collections;
 using Unity.Collections;
@@ -84,9 +85,8 @@ public static void Initialize()
             //DeathEventListenerSystemPatch.OnDeathEvent += FamiliarLevelingSystem.OnUpdate;
             DeathEventListenerSystemPatch.OnDeathEvent += FamiliarUnlockSystem.OnUpdate;
         }
-        AffectPrisonerWithToxic
+
         //JobsUtility.JobScheduleParameters
-        //PrefabLookupUtility.TryGetConvertedAssetDataForPrefab     
 
         /*
         foreach (var kvp in Server.m_SystemLookup)

diff --git a/Utilities/FamiliarUtilities.cs b/Utilities/FamiliarUtilities.cs
@@ -339,6 +339,8 @@ public static void ResetAggro(Entity familiar)
         if (ServerGameManager.TryGetBuffer<AggroBuffer>(familiar, out var aggroBuffer)) aggroBuffer.Clear();
         */
 
+        if (!familiar.Has<AggroConsumer>()) return;
+
         familiar.With((ref AggroConsumer aggroConsumer) =>
         {
             aggroConsumer.AggroTarget = NetworkedEntity.Empty;
@@ -362,6 +364,8 @@ public static void ResetAndDisableAggro(Entity familiar)
         if (ServerGameManager.TryGetBuffer<AggroBuffer>(familiar, out var aggroBuffer)) aggroBuffer.Clear();
         */
 
+        if (!familiar.Has<AggroConsumer>()) return;
+
         familiar.With((ref AggroConsumer aggroConsumer) =>
         {
             aggroConsumer.Active._Value = false;