From b7487e99019c8d024bfd7d3ba7f1e20d9fe86833 Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Wed, 13 Sep 2023 13:55:06 +0100
Subject: [PATCH] Prevent registering custom AI to our own entities. Closes
 #185

---
 .../unicopia/entity/Creature.java             | 27 +++++++++----------
 .../unicopia/entity/Living.java               |  3 +--
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/minelittlepony/unicopia/entity/Creature.java b/src/main/java/com/minelittlepony/unicopia/entity/Creature.java
index 5252add0..733d8cec 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/Creature.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/Creature.java
@@ -17,7 +17,6 @@ import com.minelittlepony.unicopia.entity.ai.BreakHeartGoal;
 import com.minelittlepony.unicopia.entity.ai.DynamicTargetGoal;
 import com.minelittlepony.unicopia.entity.ai.EatMuffinGoal;
 import com.minelittlepony.unicopia.entity.ai.WantItTakeItGoal;
-import com.minelittlepony.unicopia.entity.mob.SombraEntity;
 import com.minelittlepony.unicopia.entity.mob.UEntityAttributes;
 
 import net.minecraft.entity.EntityType;
@@ -122,14 +121,13 @@ public class Creature extends Living<LivingEntity> implements WeaklyOwned.Mutabl
     }
 
     public void initAi(GoalSelector goals, GoalSelector targets) {
-
-        if (entity instanceof SombraEntity) {
-            return;
-        }
-
         this.goals = Optional.of(goals);
         this.targets = Optional.of(targets);
 
+        if (entity instanceof MagicImmune) {
+            return;
+        }
+
         DynamicTargetGoal targetter = new DynamicTargetGoal((MobEntity)entity);
         targets.add(1, targetter);
         if (!Unicopia.getConfig().wantItNeedItEntityExcludelist.get().contains(EntityType.getId(entity.getType()).toString())) {
@@ -143,13 +141,8 @@ public class Creature extends Living<LivingEntity> implements WeaklyOwned.Mutabl
             goals.add(3, eatMuffinGoal);
         }
 
-        if (getMasterReference().isSet()) {
-            initMinionAi(targets);
-        }
-
-        if (isDiscorded()) {
-            initDiscordedAi();
-        }
+        initMinionAi(targets);
+        initDiscordedAi();
 
         if (entity instanceof CreeperEntity mob) {
             goals.add(1, new FleeEntityGoal<>(mob, LivingEntity.class, 10, 1.5, 1.9, AmuletSelectors.ALICORN_AMULET));
@@ -160,6 +153,10 @@ public class Creature extends Living<LivingEntity> implements WeaklyOwned.Mutabl
     }
 
     private void initMinionAi(GoalSelector targets) {
+        if (entity instanceof MagicImmune || !getMasterReference().isSet()) {
+            return;
+        }
+
         clearGoals(targets);
         targets.add(2, new ActiveEnemyGoal<>(PlayerEntity.class));
         targets.add(2, new ActiveEnemyGoal<>(HostileEntity.class));
@@ -167,7 +164,7 @@ public class Creature extends Living<LivingEntity> implements WeaklyOwned.Mutabl
     }
 
     private void initDiscordedAi() {
-        if (getMasterReference().isSet()) {
+        if (entity instanceof MagicImmune || getMasterReference().isSet() || !isDiscorded()) {
             return;
         }
         targets.ifPresent(this::clearGoals);
@@ -197,7 +194,7 @@ public class Creature extends Living<LivingEntity> implements WeaklyOwned.Mutabl
 
     @Override
     public boolean beforeUpdate() {
-        if (isDiscorded() && discordedChanged) {
+        if (discordedChanged) {
             discordedChanged = false;
             initDiscordedAi();
         }
diff --git a/src/main/java/com/minelittlepony/unicopia/entity/Living.java b/src/main/java/com/minelittlepony/unicopia/entity/Living.java
index 3b06206c..72bb95a7 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/Living.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/Living.java
@@ -6,7 +6,6 @@ import java.util.stream.StreamSupport;
 
 import org.jetbrains.annotations.Nullable;
 
-import com.google.common.base.Preconditions;
 import com.minelittlepony.unicopia.USounds;
 import com.minelittlepony.unicopia.UTags;
 import com.minelittlepony.unicopia.Unicopia;
@@ -113,7 +112,7 @@ public abstract class Living<T extends LivingEntity> implements Equine<T>, Caste
     }
 
     public <Q extends Tickable> Q addTicker(Q tickable) {
-        tickers.add(Preconditions.checkNotNull(tickable, "tickable"));
+        tickers.add(Objects.requireNonNull(tickable, "tickable cannot be null"));
         return tickable;
     }