Add back sentinel filtering removed in previous commit

2No2Name · 2No2Name · commit 29c1c12d6dec · 2026-02-27T20:40:53.000+01:00
diff --git a/common/src/main/java/net/caffeinemc/mods/lithium/mixin/ai/useless_behaviors/BrainMixin.java b/common/src/main/java/net/caffeinemc/mods/lithium/mixin/ai/useless_behaviors/BrainMixin.java
@@ -5,30 +5,36 @@
 import com.google.common.collect.UnmodifiableIterator;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import com.mojang.datafixers.util.Pair;
+import net.caffeinemc.mods.lithium.common.ai.useless_behaviors.LithiumEmptyBehavior;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.ai.Brain;
+import net.minecraft.world.entity.ai.behavior.BehaviorControl;
 import org.jspecify.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 
 import java.util.Iterator;
 
 @Mixin(Brain.class)
-public abstract class BrainMixin<E extends LivingEntity> {
+public abstract class BrainMixin<T extends LivingEntity> {
 
     /**
      * @author jcw780, 2No2Name
      * @reason Prevent EMPTY_BEHAVIOR_SENTINEL from being added - those are what useless behaviors are replaced with.
      */
     @WrapOperation(method = "addActivityAndRemoveMemoriesWhenStopped",
             at = @At(value = "INVOKE", target = "Lcom/google/common/collect/ImmutableList;iterator()Lcom/google/common/collect/UnmodifiableIterator;"))
-    private UnmodifiableIterator<E> filterSentinels(ImmutableList<E> instance, Operation<UnmodifiableIterator<E>> original) {
+    private <E extends Pair<Integer, ? extends BehaviorControl<? super T>>> UnmodifiableIterator<E> filterSentinels(ImmutableList<E> instance, Operation<UnmodifiableIterator<E>> original) {
         Iterator<E> wrapped = original.call(instance);
         return new AbstractIterator<>() {
             @Override
             protected @Nullable E computeNext() {
-                if (wrapped.hasNext()) {
-                    return wrapped.next();
+                while (wrapped.hasNext()) {
+                    E next = wrapped.next();
+                    if (next.getSecond() != LithiumEmptyBehavior.EMPTY_BEHAVIOR_SENTINEL) {
+                        return next;
+                    }
                 }
                 return this.endOfData();
             }
