mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-21 20:52:34 +00:00
Fix new brain hooks not persisting active activities.
This commit is contained in:
2 files changed
+13
-1
No files matched your search
@@ -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<U> {
|
||||
|
||||
@@ -48,6 +48,7 @@ public class BrainBuilder<E extends LivingEntity> {
|
||||
private final Map<Activity, Set<Pair<MemoryModuleType<?>, MemoryStatus>>> activityRequirements = Maps.newHashMap();
|
||||
private final Map<Activity, Set<MemoryModuleType<?>>> activityMemoriesToEraseWhenStopped = Maps.newHashMap();
|
||||
private final Set<Activity> coreActivities = Sets.newHashSet();
|
||||
private final Set<Activity> activeActivites = Sets.newHashSet();
|
||||
private Activity defaultActivity = Activity.IDLE;
|
||||
|
||||
public BrainBuilder(Brain<E> ignoredBrain) {}
|
||||
@@ -96,6 +97,15 @@ public class BrainBuilder<E extends LivingEntity> {
|
||||
this.defaultActivity = defaultActivity;
|
||||
}
|
||||
|
||||
public Set<Activity> getActiveActivites() {
|
||||
return this.activeActivites;
|
||||
}
|
||||
|
||||
public void setActiveActivites(Set<Activity> 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<? super E> behaviorControl) {
|
||||
this.availableBehaviorsByPriority.computeIfAbsent(priority, (i) -> Maps.newHashMap()).computeIfAbsent(activity, (a) -> Sets.newLinkedHashSet()).add(behaviorControl);
|
||||
|
||||
Reference in new issue
Block a user