From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Taiyou06 Date: Tue, 9 Nov 2077 00:00:00 +0800 Subject: [PATCH] Collect then startEachNonRunningBehavior in Brain diff --git a/src/main/java/net/minecraft/world/entity/ai/Brain.java b/src/main/java/net/minecraft/world/entity/ai/Brain.java index 65bd8c2cccd0a4a68984ea8ff4cd3cf365330630..aeb74b96704e0f187178e2ae106e0a3f6d95717c 100644 --- a/src/main/java/net/minecraft/world/entity/ai/Brain.java +++ b/src/main/java/net/minecraft/world/entity/ai/Brain.java @@ -466,20 +466,30 @@ public class Brain { } private void startEachNonRunningBehavior(ServerLevel world, E entity) { - long l = world.getGameTime(); + // Leaf start - Collect first then start + final long gameTime = world.getGameTime(); - for (Map>> map : this.availableBehaviorsByPriority.values()) { - for (Entry>> entry : map.entrySet()) { - Activity activity = entry.getKey(); - if (this.activeActivities.contains(activity)) { - for (BehaviorControl behaviorControl : entry.getValue()) { - if (behaviorControl.getStatus() == Behavior.Status.STOPPED) { - behaviorControl.tryStart(world, entity, l); + List> behaviorsToStart = new ObjectArrayList<>(); + + for (Activity activeActivity : this.activeActivities) { + for (Map>> priorityMap : this.availableBehaviorsByPriority.values()) { + Set> behaviors = priorityMap.get(activeActivity); + + if (behaviors != null && !behaviors.isEmpty()) { + for (BehaviorControl behavior : behaviors) { + if (behavior.getStatus() == Behavior.Status.STOPPED) { + behaviorsToStart.add(behavior); } } } } } + if (!behaviorsToStart.isEmpty()) { + for (BehaviorControl behavior : behaviorsToStart) { + behavior.tryStart(world, entity, gameTime); + } + } + // Leaf end - Collect first then start } private void tickEachRunningBehavior(ServerLevel world, E entity) {