SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix usage of vanilla goals

Browse Source
This commit is contained in:
MiniDigger | Martin
2020-05-16 15:25:40 +02:00
parent 77323d14ca
commit 8743a66ca2
1 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -446,14 +446,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ @Override + @Override
+ public <T extends Mob> void addGoal(T mob, int priority, Goal<T> goal) { + public <T extends Mob> void addGoal(T mob, int priority, Goal<T> goal) {
+ CraftMob craftMob = (CraftMob) mob; + CraftMob craftMob = (CraftMob) mob;
+ checkType(craftMob, goal.getTypes());
+ getHandle(craftMob, goal.getTypes()).addGoal(priority, new PaperCustomGoal<>(goal)); + getHandle(craftMob, goal.getTypes()).addGoal(priority, new PaperCustomGoal<>(goal));
+ } + }
+ +
+ @Override + @Override
+ public <T extends Mob> void removeGoal(T mob, Goal<T> goal) { + public <T extends Mob> void removeGoal(T mob, Goal<T> goal) {
+ CraftMob craftMob = (CraftMob) mob; + CraftMob craftMob = (CraftMob) mob;
+ checkType(craftMob, goal.getTypes());
+ if (goal instanceof PaperCustomGoal) { + if (goal instanceof PaperCustomGoal) {
+ getHandle(craftMob, goal.getTypes()).removeGoal((PathfinderGoal) goal); + getHandle(craftMob, goal.getTypes()).removeGoal((PathfinderGoal) goal);
+ } else if (goal instanceof PaperVanillaGoal) { + } else if (goal instanceof PaperVanillaGoal) {
@@ -631,16 +629,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ return goals; + return goals;
+ } + }
+ +
+ private void checkType(CraftMob mob, EnumSet<GoalType> types) {
+ if (!hasHandle(types)) {
+ throw new IllegalArgumentException(mob + " has no goal selector for types " + types);
+ }
+ }
+
+ private boolean hasHandle(EnumSet<GoalType> type) {
+ return !type.isEmpty();
+ }
+
+ private PathfinderGoalSelector getHandle(CraftMob mob, EnumSet<GoalType> types) { + private PathfinderGoalSelector getHandle(CraftMob mob, EnumSet<GoalType> types) {
+ if (types.contains(GoalType.TARGET)) { + if (types.contains(GoalType.TARGET)) {
+ return mob.getHandle().targetSelector; + return mob.getHandle().targetSelector;
@@ -693,12 +681,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ +
+ @Override + @Override
+ public boolean shouldActivate() { + public boolean shouldActivate() {
+ return handle.shouldActivate(); + return handle.shouldActivate2();
+ } + }
+ +
+ @Override + @Override
+ public boolean shouldStayActive() { + public boolean shouldStayActive() {
+ return handle.shouldStayActive(); + return handle.shouldStayActive2();
+ } + }
+ +
+ @Override + @Override
@@ -748,10 +736,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
public PathfinderGoal() {} public PathfinderGoal() {}
- public abstract boolean a(); - public abstract boolean a();
+ public boolean a() { return this.shouldActivate(); } public boolean shouldActivate() { return false;} // Paper - OBFHELPER + public boolean a() { return this.shouldActivate(); } public boolean shouldActivate() { return false;} public boolean shouldActivate2() { return a(); } // Paper - OBFHELPER, for both directions...
- public boolean b() { - public boolean b() {
+ public boolean b() { return this.shouldStayActive(); } public boolean shouldStayActive() { // Paper - OBFHELPER + public boolean b() { return this.shouldStayActive(); } public boolean shouldStayActive2() { return b(); } public boolean shouldStayActive() { // Paper - OBFHELPER, for both directions...
return this.a(); return this.a();
} }