mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update ForgeFlower (#7857)

Browse source
This commit is contained in:
Jason 2022-05-29 12:54:25 -07:00 • committed by GitHub
parent 3f7fbe316d
commit af3b3778f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
38 changed files with 179 additions and 179 deletions
Download patch file Download diff file Expand all files Collapse all files

12
patches/server/0386-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
View file

@ -47,10 +47,10 @@ index 6667ecc4b7eded4e20a415cef1e1b1179e6710b8..4379b9948f1eecfe6fd7dea98e298ad5
protected int adjustedTickDelay(int ticks) {
diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java b/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
index ef8fe11bcda9fb8365d2c7efb2e088727dd849d9..c77fad612ba99663af2ec4418e3c2d68752dc2c8 100644
index 19ee04dd92b39a775260f832ca8880335d24988b..a910189177da0c1134c954b3d81b9e9bc4bc1420 100644
--- a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
+++ b/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
@@ -30,10 +30,12 @@ public class GoalSelector {
@@ -29,10 +29,12 @@ public class GoalSelector {
private final Map<Goal.Flag, WrappedGoal> lockedFlags = new EnumMap<>(Goal.Flag.class);
public final Set<WrappedGoal> availableGoals = Sets.newLinkedHashSet();
private final Supplier<ProfilerFiller> profiler;
@ -64,7 +64,7 @@ index ef8fe11bcda9fb8365d2c7efb2e088727dd849d9..c77fad612ba99663af2ec4418e3c2d68
public GoalSelector(Supplier<ProfilerFiller> profiler) {
this.profiler = profiler;
@@ -63,26 +65,32 @@ public class GoalSelector {
@@ -62,26 +64,32 @@ public class GoalSelector {
}
// Paper end
public void removeGoal(Goal goal) {
@ -111,7 +111,7 @@ index ef8fe11bcda9fb8365d2c7efb2e088727dd849d9..c77fad612ba99663af2ec4418e3c2d68
if (!goalsByControl.getOrDefault(flag, NO_GOAL).canBeReplacedBy(goal)) {
return false;
}
@@ -96,7 +104,7 @@ public class GoalSelector {
@@ -95,7 +103,7 @@ public class GoalSelector {
profilerFiller.push("goalCleanup");
for(WrappedGoal wrappedGoal : this.availableGoals) {
@ -120,7 +120,7 @@ index ef8fe11bcda9fb8365d2c7efb2e088727dd849d9..c77fad612ba99663af2ec4418e3c2d68
wrappedGoal.stop();
}
}
@@ -114,8 +122,14 @@ public class GoalSelector {
@@ -113,8 +121,14 @@ public class GoalSelector {
profilerFiller.push("goalUpdate");
for(WrappedGoal wrappedGoal2 : this.availableGoals) {
@ -137,7 +137,7 @@ index ef8fe11bcda9fb8365d2c7efb2e088727dd849d9..c77fad612ba99663af2ec4418e3c2d68
WrappedGoal wrappedGoal3 = this.lockedFlags.getOrDefault(flag, NO_GOAL);
wrappedGoal3.stop();
this.lockedFlags.put(flag, wrappedGoal2);
@@ -155,11 +169,11 @@ public class GoalSelector {
@@ -154,11 +168,11 @@ public class GoalSelector {
}
public void disableControlFlag(Goal.Flag control) {