Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-03-12 22:59:31 +01:00
Code Issues Projects Releases Wiki Activity

[1.15] Fix MobGoals#getAllGoals not actually returning all goals (#3671)

Browse Source
This commit is contained in:
MiniDigger | Martin 2020-06-28 21:56:59 +02:00
parent f884a07f57
commit 8cd2d012a3
2 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Spigot-API-Patches/Add-Mob-Goal-API.patch
View File

@ -162,7 +162,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ MOVE, + MOVE,
+ LOOK, + LOOK,
+ JUMP, + JUMP,
+ TARGET + TARGET,
+ /**
+ * Used to map vanilla goals, that are a behavior goal but don't have a type set...
+ */
+ UNKNOWN_BEHAVIOR,
+ +
+} +}
diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoals.java b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoals.java diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoals.java b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoals.java

34
Spigot-Server-Patches/Implement-Mob-Goal-API.patch
View File

@ -308,6 +308,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ return GoalType.LOOK; + return GoalType.LOOK;
+ case JUMP: + case JUMP:
+ return GoalType.JUMP; + return GoalType.JUMP;
+ case UNKNOWN_BEHAVIOR:
+ return GoalType.UNKNOWN_BEHAVIOR;
+ case TARGET: + case TARGET:
+ return GoalType.TARGET; + return GoalType.TARGET;
+ default: + default:
@ -331,6 +333,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ return PathfinderGoal.Type.LOOK; + return PathfinderGoal.Type.LOOK;
+ case JUMP: + case JUMP:
+ return PathfinderGoal.Type.JUMP; + return PathfinderGoal.Type.JUMP;
+ case UNKNOWN_BEHAVIOR:
+ return PathfinderGoal.Type.UNKNOWN_BEHAVIOR;
+ case TARGET: + case TARGET:
+ return PathfinderGoal.Type.TARGET; + return PathfinderGoal.Type.TARGET;
+ default: + default:
@ -396,6 +400,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ this.handle = handle; + this.handle = handle;
+ +
+ this.setTypes(MobGoalHelper.paperToVanilla(handle.getTypes())); + this.setTypes(MobGoalHelper.paperToVanilla(handle.getTypes()));
+ if (this.getGoalTypes().size() == 0) {
+ this.getGoalTypes().addUnchecked(Type.UNKNOWN_BEHAVIOR);
+ }
+ } + }
+ +
+ @Override + @Override
@ -748,8 +755,17 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
--- a/src/main/java/net/minecraft/server/PathfinderGoal.java --- a/src/main/java/net/minecraft/server/PathfinderGoal.java
+++ b/src/main/java/net/minecraft/server/PathfinderGoal.java +++ b/src/main/java/net/minecraft/server/PathfinderGoal.java
@@ -0,0 +0,0 @@ public abstract class PathfinderGoal { @@ -0,0 +0,0 @@ public abstract class PathfinderGoal {
private final EnumSet<PathfinderGoal.Type> a = EnumSet.noneOf(PathfinderGoal.Type.class); // Paper unused, but dummy to prevent plugins from crashing as hard. Theyll need to support paper in a special case if this is super important, but really doesn't seem like it would be.
private final OptimizedSmallEnumSet<Type> goalTypes = new OptimizedSmallEnumSet<>(PathfinderGoal.Type.class); // Paper - remove streams from pathfindergoalselector
public PathfinderGoal() {} - public PathfinderGoal() {}
+ // Paper start make sure goaltypes is never empty
+ public PathfinderGoal() {
+ if (this.goalTypes.size() == 0) {
+ this.goalTypes.addUnchecked(Type.UNKNOWN_BEHAVIOR);
+ }
+ }
+ // paper end
- public abstract boolean a(); - public abstract boolean a();
+ public boolean a() { return this.shouldActivate(); } public boolean shouldActivate() { return false;} public boolean shouldActivate2() { return a(); } // Paper - OBFHELPER, for both directions... + public boolean a() { return this.shouldActivate(); } public boolean shouldActivate() { return false;} public boolean shouldActivate2() { return a(); } // Paper - OBFHELPER, for both directions...
@ -779,6 +795,22 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
// Paper start - remove streams from pathfindergoalselector // Paper start - remove streams from pathfindergoalselector
this.goalTypes.clear(); this.goalTypes.clear();
this.goalTypes.addAllUnchecked(enumset); this.goalTypes.addAllUnchecked(enumset);
+ // make sure its never empty
+ if (this.goalTypes.size() == 0) {
+ this.goalTypes.addUnchecked(Type.UNKNOWN_BEHAVIOR);
+ }
// Paper end - remove streams from pathfindergoalselector
}
@@ -0,0 +0,0 @@ public abstract class PathfinderGoal {
public static enum Type {
- MOVE, LOOK, JUMP, TARGET;
+ MOVE, LOOK, JUMP, TARGET, UNKNOWN_BEHAVIOR; // Paper - add unknown
private Type() {}
}
diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java --- a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java