diff --git a/patches/minecraft/net/minecraft/world/entity/ai/Brain.java.patch b/patches/minecraft/net/minecraft/world/entity/ai/Brain.java.patch index 66f2f7cbe2..68bb220fba 100644 --- a/patches/minecraft/net/minecraft/world/entity/ai/Brain.java.patch +++ b/patches/minecraft/net/minecraft/world/entity/ai/Brain.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/world/entity/ai/Brain.java +++ b/net/minecraft/world/entity/ai/Brain.java -@@ -478,6 +_,28 @@ +@@ -478,6 +_,30 @@ return builder.build(); } @@ -14,6 +14,7 @@ + builder.addActivityMemoriesToEraseWhenStoppedFrom(this.f_21848_); + builder.getCoreActivities().addAll(this.f_21849_); + builder.setDefaultActivity(this.f_21851_); ++ builder.setActiveActivites(this.f_21850_); + return builder; + } + @@ -24,6 +25,7 @@ + builder.addActivityMemoriesToEraseWhenStoppedTo(this.f_21848_); + this.m_21930_(builder.getCoreActivities()); + this.m_21944_(builder.getDefaultActivity()); ++ this.f_21850_.addAll(builder.getActiveActivites()); + } + static final class MemoryValue { diff --git a/src/main/java/net/minecraftforge/common/util/BrainBuilder.java b/src/main/java/net/minecraftforge/common/util/BrainBuilder.java index 7de0dcc33c..57ad7f56a6 100644 --- a/src/main/java/net/minecraftforge/common/util/BrainBuilder.java +++ b/src/main/java/net/minecraftforge/common/util/BrainBuilder.java @@ -48,6 +48,7 @@ public class BrainBuilder { private final Map, MemoryStatus>>> activityRequirements = Maps.newHashMap(); private final Map>> activityMemoriesToEraseWhenStopped = Maps.newHashMap(); private final Set coreActivities = Sets.newHashSet(); + private final Set activeActivites = Sets.newHashSet(); private Activity defaultActivity = Activity.IDLE; public BrainBuilder(Brain ignoredBrain) {} @@ -96,6 +97,15 @@ public class BrainBuilder { this.defaultActivity = defaultActivity; } + public Set getActiveActivites() { + return this.activeActivites; + } + + public void setActiveActivites(Set value) { + this.activeActivites.clear(); + this.activeActivites.addAll(value); + } + /** You may use this as a helper method for adding a behavior to an Activity by priority to an entity's brain. */ public void addBehaviorToActivityByPriority(Integer priority, Activity activity, BehaviorControl behaviorControl) { this.availableBehaviorsByPriority.computeIfAbsent(priority, (i) -> Maps.newHashMap()).computeIfAbsent(activity, (a) -> Sets.newLinkedHashSet()).add(behaviorControl);