2021-06-11 14:02:28 +02: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-06-12 04:24:43 +02:00
|
|
|
index 3afe97f4e330016164e741934c888f5b85824e67..48a42a8374641f4737d5eb6a460bf80a12c2cae5 100644
|
2021-06-11 14:02:28 +02: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 04:24:43 +02:00
|
|
|
@@ -35,7 +35,7 @@ public class FlyingPathNavigation extends PathNavigation {
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
@Override
|
|
|
|
public Path createPath(Entity entity, int distance) {
|
|
|
|
- return this.createPath(entity.blockPosition(), distance);
|
|
|
|
+ return this.a(entity.blockPosition(), entity, distance); // Paper - Forward target entity
|
|
|
|
}
|
|
|
|
|
|
|
|
@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-06-12 04:24:43 +02:00
|
|
|
index d2e71f1e70a8b3360110f7e5e6c5ec278218ae27..0ac90b5fefa9720a9d0130f5438e5ef55fccf29a 100644
|
2021-06-11 14:02:28 +02: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 04:24:43 +02:00
|
|
|
@@ -70,7 +70,7 @@ public class GroundPathNavigation extends PathNavigation {
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
@Override
|
|
|
|
public Path createPath(Entity entity, int distance) {
|
|
|
|
- return this.createPath(entity.blockPosition(), distance);
|
|
|
|
+ return this.a(entity.blockPosition(), entity, distance); // Paper - Forward target entity
|
|
|
|
}
|
|
|
|
|
|
|
|
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-06-17 21:52:26 +02:00
|
|
|
index 92e1c43b0b7d901636b7fee7136e573f440e0179..34ce42afc6e822d209d2facc130b32e76836f40a 100644
|
2021-06-11 14:02:28 +02: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 04:24:43 +02:00
|
|
|
import net.minecraft.tags.BlockTags;
|
2021-06-11 14:02:28 +02:00
|
|
|
+import net.minecraft.server.MCUtil;
|
|
|
|
import net.minecraft.util.Mth;
|
|
|
|
import net.minecraft.world.entity.Entity;
|
|
|
|
import net.minecraft.world.entity.Mob;
|
2021-06-12 04:24:43 +02:00
|
|
|
@@ -26,7 +27,7 @@ import net.minecraft.world.phys.Vec3;
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
public abstract class PathNavigation {
|
2021-06-12 04:24:43 +02:00
|
|
|
private static final int MAX_TIME_RECOMPUTE = 20;
|
2021-06-11 14:02:28 +02:00
|
|
|
- protected final Mob mob;
|
2021-06-17 21:52:26 +02:00
|
|
|
+ protected final Mob mob; @Deprecated public Entity getEntity() { return mob; } // Paper - OBFHELPER
|
2021-06-11 14:02:28 +02:00
|
|
|
protected final Level level;
|
|
|
|
@Nullable
|
|
|
|
protected Path path;
|
2021-06-12 04:24:43 +02:00
|
|
|
@@ -108,7 +109,12 @@ public abstract class PathNavigation {
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
@Nullable
|
|
|
|
public Path createPath(BlockPos target, int distance) {
|
|
|
|
- return this.createPath(ImmutableSet.of(target), 8, false, distance);
|
|
|
|
+ // Paper start - add target parameter
|
|
|
|
+ return this.a(target, null, distance);
|
|
|
|
+ }
|
2021-06-12 04:24:43 +02:00
|
|
|
+ @Nullable public Path a(BlockPos blockposition, Entity target, int distance) {
|
|
|
|
+ return this.createPath(ImmutableSet.of(blockposition), target, 8, false, distance);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ // Paper end
|
|
|
|
}
|
|
|
|
|
2021-06-12 04:24:43 +02:00
|
|
|
@Nullable
|
|
|
|
@@ -118,7 +124,7 @@ public abstract class PathNavigation {
|
|
|
|
|
2021-06-11 14:02:28 +02:00
|
|
|
@Nullable
|
|
|
|
public Path createPath(Entity entity, int distance) {
|
|
|
|
- return this.createPath(ImmutableSet.of(entity.blockPosition()), 16, true, distance);
|
2021-06-12 04:24:43 +02:00
|
|
|
+ return this.createPath(ImmutableSet.of(entity.blockPosition()), entity, 16, true, distance); // Paper
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
@Nullable
|
2021-06-12 04:24:43 +02:00
|
|
|
@@ -128,6 +134,16 @@ public abstract class PathNavigation {
|
|
|
|
|
|
|
|
@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 14:02:28 +02:00
|
|
|
+ }
|
2021-06-12 04:24:43 +02: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 14:02:28 +02:00
|
|
|
+ // Paper end
|
2021-06-12 04:24:43 +02:00
|
|
|
if (positions.isEmpty()) {
|
2021-06-11 14:02:28 +02:00
|
|
|
return null;
|
2021-06-12 04:24:43 +02:00
|
|
|
} else if (this.mob.getY() < (double)this.level.getMinBuildHeight()) {
|
|
|
|
@@ -137,6 +153,23 @@ public abstract class PathNavigation {
|
|
|
|
} else if (this.path != null && !this.path.isDone() && positions.contains(this.targetPos)) {
|
2021-06-11 14:02:28 +02:00
|
|
|
return this.path;
|
|
|
|
} else {
|
|
|
|
+ // Paper start - Pathfind event
|
|
|
|
+ boolean copiedSet = false;
|
2021-06-12 04:24:43 +02:00
|
|
|
+ for (BlockPos possibleTarget : positions) {
|
2021-06-11 14:02:28 +02:00
|
|
|
+ if (!new com.destroystokyo.paper.event.entity.EntityPathfindEvent(getEntity().getBukkitEntity(),
|
|
|
|
+ MCUtil.toLocation(getEntity().level, possibleTarget), target == null ? null : target.getBukkitEntity()).callEvent()) {
|
|
|
|
+ if (!copiedSet) {
|
|
|
|
+ copiedSet = true;
|
2021-06-12 04:24:43 +02:00
|
|
|
+ positions = new java.util.HashSet<>(positions);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+ // note: since we copy the set this remove call is safe, since we're iterating over the old copy
|
2021-06-12 04:24:43 +02:00
|
|
|
+ positions.remove(possibleTarget);
|
|
|
|
+ if (positions.isEmpty()) {
|
2021-06-11 14:02:28 +02:00
|
|
|
+ return null;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
this.level.getProfiler().push("pathfind");
|
2021-06-12 04:24:43 +02:00
|
|
|
BlockPos blockPos = useHeadPos ? this.mob.blockPosition().above() : this.mob.blockPosition();
|
|
|
|
int i = (int)(followRange + (float)range);
|