papermc/patches/unapplied/server/0074-EntityPathfindEvent.patch

111 lines
5.7 KiB
Diff
Raw Normal View History

2021-06-11 12:02:28 +00:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 28 Mar 2016 21:22:26 -0400
Subject: [PATCH] EntityPathfindEvent
Fires when an Entity decides to start moving to a location.
diff --git a/src/main/java/net/minecraft/world/entity/ai/navigation/FlyingPathNavigation.java b/src/main/java/net/minecraft/world/entity/ai/navigation/FlyingPathNavigation.java
2021-11-04 00:54:11 +00:00
index 3afe97f4e330016164e741934c888f5b85824e67..6cdb0f0f881ea57c95821914262208c4b636587e 100644
2021-06-11 12:02:28 +00:00
--- a/src/main/java/net/minecraft/world/entity/ai/navigation/FlyingPathNavigation.java
+++ b/src/main/java/net/minecraft/world/entity/ai/navigation/FlyingPathNavigation.java
2021-06-12 02:24:43 +00:00
@@ -35,7 +35,7 @@ public class FlyingPathNavigation extends PathNavigation {
2021-06-11 12:02:28 +00:00
@Override
public Path createPath(Entity entity, int distance) {
- return this.createPath(entity.blockPosition(), distance);
2021-11-04 00:54:11 +00:00
+ return this.createPath(entity.blockPosition(), entity, distance); // Paper - Forward target entity
2021-06-11 12:02:28 +00:00
}
@Override
diff --git a/src/main/java/net/minecraft/world/entity/ai/navigation/GroundPathNavigation.java b/src/main/java/net/minecraft/world/entity/ai/navigation/GroundPathNavigation.java
2021-11-04 00:54:11 +00:00
index d2e71f1e70a8b3360110f7e5e6c5ec278218ae27..f351b1eb923cc72bc5bb7f891d27246af14f4e1d 100644
2021-06-11 12:02:28 +00:00
--- a/src/main/java/net/minecraft/world/entity/ai/navigation/GroundPathNavigation.java
+++ b/src/main/java/net/minecraft/world/entity/ai/navigation/GroundPathNavigation.java
2021-06-12 02:24:43 +00:00
@@ -70,7 +70,7 @@ public class GroundPathNavigation extends PathNavigation {
2021-06-11 12:02:28 +00:00
@Override
public Path createPath(Entity entity, int distance) {
- return this.createPath(entity.blockPosition(), distance);
2021-11-04 00:54:11 +00:00
+ return this.createPath(entity.blockPosition(), entity, distance); // Paper - Forward target entity
2021-06-11 12:02:28 +00:00
}
private int getSurfaceY() {
diff --git a/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java b/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java
2021-11-04 00:54:11 +00:00
index f4f2b7a1de7eb37c3d6331bd16f916cf4bbf1a03..5ddc033594c26a69f8c610cf1610a06a9be8dd4d 100644
2021-06-11 12:02:28 +00:00
--- a/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java
+++ b/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java
@@ -10,6 +10,7 @@ import net.minecraft.core.BlockPos;
import net.minecraft.core.Vec3i;
import net.minecraft.network.protocol.game.DebugPackets;
2021-06-12 02:24:43 +00:00
import net.minecraft.tags.BlockTags;
2021-06-11 12:02:28 +00:00
+import net.minecraft.server.MCUtil;
import net.minecraft.util.Mth;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.Mob;
2021-11-04 00:54:11 +00:00
@@ -108,7 +109,13 @@ public abstract class PathNavigation {
2021-06-11 12:02:28 +00:00
@Nullable
public Path createPath(BlockPos target, int distance) {
- return this.createPath(ImmutableSet.of(target), 8, false, distance);
2021-11-04 00:54:11 +00:00
+ // Paper start - add target entity parameter
+ return this.createPath(target, null, distance);
2021-06-11 12:02:28 +00:00
+ }
2021-11-04 00:54:11 +00:00
+ @Nullable
+ public Path createPath(BlockPos target, Entity entity, int distance) {
+ return this.createPath(ImmutableSet.of(target), entity, 8, false, distance);
2021-06-11 12:02:28 +00:00
+ // Paper end
}
2021-06-12 02:24:43 +00:00
@Nullable
2021-11-04 00:54:11 +00:00
@@ -118,7 +125,7 @@ public abstract class PathNavigation {
2021-06-12 02:24:43 +00:00
2021-06-11 12:02:28 +00:00
@Nullable
public Path createPath(Entity entity, int distance) {
- return this.createPath(ImmutableSet.of(entity.blockPosition()), 16, true, distance);
2021-06-12 02:24:43 +00:00
+ return this.createPath(ImmutableSet.of(entity.blockPosition()), entity, 16, true, distance); // Paper
2021-06-11 12:02:28 +00:00
}
@Nullable
2021-11-04 00:54:11 +00:00
@@ -128,6 +135,16 @@ public abstract class PathNavigation {
2021-06-12 02:24:43 +00:00
@Nullable
protected Path createPath(Set<BlockPos> positions, int range, boolean useHeadPos, int distance, float followRange) {
+ return this.createPath(positions, null, range, useHeadPos, distance, (float) this.mob.getAttributeValue(Attributes.FOLLOW_RANGE));
2021-06-11 12:02:28 +00:00
+ }
2021-06-12 02:24:43 +00:00
+
+ @Nullable
+ protected Path createPath(Set<BlockPos> positions, Entity target, int range, boolean useHeadPos, int distance) {
+ return this.createPath(positions, target, range, useHeadPos, distance, (float) this.mob.getAttributeValue(Attributes.FOLLOW_RANGE));
+ }
+
+ @Nullable protected Path createPath(Set<BlockPos> positions, Entity target, int range, boolean useHeadPos, int distance, float followRange) {
2021-06-11 12:02:28 +00:00
+ // Paper end
2021-06-12 02:24:43 +00:00
if (positions.isEmpty()) {
2021-06-11 12:02:28 +00:00
return null;
2021-06-12 02:24:43 +00:00
} else if (this.mob.getY() < (double)this.level.getMinBuildHeight()) {
2021-11-04 00:54:11 +00:00
@@ -137,6 +154,23 @@ public abstract class PathNavigation {
2021-06-12 02:24:43 +00:00
} else if (this.path != null && !this.path.isDone() && positions.contains(this.targetPos)) {
2021-06-11 12:02:28 +00:00
return this.path;
} else {
+ // Paper start - Pathfind event
+ boolean copiedSet = false;
2021-06-12 02:24:43 +00:00
+ for (BlockPos possibleTarget : positions) {
2021-06-17 21:39:36 +00:00
+ if (!new com.destroystokyo.paper.event.entity.EntityPathfindEvent(this.mob.getBukkitEntity(),
+ MCUtil.toLocation(this.mob.level, possibleTarget), target == null ? null : target.getBukkitEntity()).callEvent()) {
2021-06-11 12:02:28 +00:00
+ if (!copiedSet) {
+ copiedSet = true;
2021-06-12 02:24:43 +00:00
+ positions = new java.util.HashSet<>(positions);
2021-06-11 12:02:28 +00:00
+ }
+ // note: since we copy the set this remove call is safe, since we're iterating over the old copy
2021-06-12 02:24:43 +00:00
+ positions.remove(possibleTarget);
+ if (positions.isEmpty()) {
2021-06-11 12:02:28 +00:00
+ return null;
+ }
+ }
+ }
+ // Paper end
this.level.getProfiler().push("pathfind");
2021-06-12 02:24:43 +00:00
BlockPos blockPos = useHeadPos ? this.mob.blockPosition().above() : this.mob.blockPosition();
int i = (int)(followRange + (float)range);