Ensure golem adheres to the village faction (even after chunk load)

TeamLapen · Oct 15, 2023 · 60bcd8a · 60bcd8a
1 parent 8f46f13
commit 60bcd8a
Showing 1 changed file with 28 additions and 2 deletions.
diff --git a/src/main/java/de/teamlapen/vampirism/entity/ai/goals/GolemTargetNonVillageFactionGoal.java b/src/main/java/de/teamlapen/vampirism/entity/ai/goals/GolemTargetNonVillageFactionGoal.java
@@ -30,9 +30,35 @@ public GolemTargetNonVillageFactionGoal(@NotNull IronGolem creature) {
         this.golem = creature;
     }
 
+    @Override
+    public boolean canContinueToUse() {
+        if (golem.tickCount % 16 == 0) {
+            if (determineGolemFaction()) {
+                return false;
+            }
+        }
+        return super.canContinueToUse();
+    }
+
     @SuppressWarnings({"unchecked", "rawtypes"})
     @Override
     public boolean canUse() {
+        if (golem.tickCount < 20) return false; // Some delay to allow nearby totems to load
+        return super.canUse();
+    }
+
+    @Override
+    protected void findTarget() {
+        determineGolemFaction();
+        super.findTarget();
+    }
+
+    /**
+     * Determine the faction of the golem by checking for nearby totems. Update the targetConditions accordingly
+     *
+     * @return Whether the faction has changed
+     */
+    private boolean determineGolemFaction() {
         IFaction<?> faction = VReference.HUNTER_FACTION;
         if (VampirismConfig.BALANCE.golemAttackNonVillageFaction.get()) {
             Optional<TotemBlockEntity> tile = TotemHelper.getTotemNearPos(((ServerLevel) this.golem.level()), this.golem.blockPosition(), true);
@@ -41,8 +67,8 @@ public boolean canUse() {
 
         if (faction != this.faction) {
             this.targetConditions.selector(predicates.computeIfAbsent(this.faction = faction, faction1 -> VampirismAPI.factionRegistry().getPredicate(faction1, true, true, false, false, null)));
+            return true;
         }
-
-        return super.canUse();
+        return false;
     }
 }