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
|
2024-12-03 18:27:11 +01:00
|
|
|
index b81a5149720daf23d3d33f0aaae51216121ea2e2..2bd66da93227d4e4fc2ec4df47ae94b17f4d39d3 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
|
2024-12-03 18:27:11 +01:00
|
|
|
@@ -39,7 +39,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);
|
2024-01-23 14:34:17 +01:00
|
|
|
+ return this.createPath(entity.blockPosition(), entity, distance); // Paper - EntityPathfindEvent
|
2021-06-11 14:02:28 +02: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
|
2024-12-03 18:27:11 +01:00
|
|
|
index 90a7940bf8b32cb245e9253d957cb437fa600857..2796df7af365c452b28373adfd7daf1d6730bac5 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
|
2024-12-03 18:27:11 +01:00
|
|
|
@@ -41,7 +41,7 @@ public class GroundPathNavigation extends PathNavigation {
|
2022-09-20 23:06:11 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
|
|
- public Path createPath(BlockPos target, int distance) {
|
2024-01-23 14:34:17 +01:00
|
|
|
+ public Path createPath(BlockPos target, @javax.annotation.Nullable Entity entity, int distance) { // Paper - EntityPathfindEvent
|
2024-04-12 21:14:06 +02:00
|
|
|
LevelChunk levelChunk = this.level
|
|
|
|
.getChunkSource()
|
|
|
|
.getChunkNow(SectionPos.blockToSectionCoord(target.getX()), SectionPos.blockToSectionCoord(target.getZ()));
|
2024-12-03 18:27:11 +01:00
|
|
|
@@ -56,7 +56,7 @@ public class GroundPathNavigation extends PathNavigation {
|
2023-09-21 22:14:58 +02:00
|
|
|
}
|
2022-09-20 23:06:11 +02:00
|
|
|
|
2024-10-22 20:04:31 +02:00
|
|
|
if (mutableBlockPos.getY() > this.level.getMinY()) {
|
|
|
|
- return super.createPath(mutableBlockPos.above(), distance);
|
|
|
|
+ return super.createPath(mutableBlockPos.above(), entity, distance); // Paper - EntityPathfindEvent
|
2023-09-21 22:14:58 +02:00
|
|
|
}
|
2022-09-20 23:06:11 +02:00
|
|
|
|
2024-10-22 20:04:31 +02:00
|
|
|
mutableBlockPos.setY(target.getY() + 1);
|
2024-12-03 18:27:11 +01:00
|
|
|
@@ -69,7 +69,7 @@ public class GroundPathNavigation extends PathNavigation {
|
2023-09-23 00:38:31 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!levelChunk.getBlockState(target).isSolid()) {
|
|
|
|
- return super.createPath(target, distance);
|
2024-01-23 14:34:17 +01:00
|
|
|
+ return super.createPath(target, entity, distance); // Paper - EntityPathfindEvent
|
2023-09-23 00:38:31 +02:00
|
|
|
} else {
|
2024-10-22 20:04:31 +02:00
|
|
|
BlockPos.MutableBlockPos mutableBlockPos2 = target.mutable().move(Direction.UP);
|
2024-04-12 21:14:06 +02:00
|
|
|
|
2024-12-03 18:27:11 +01:00
|
|
|
@@ -77,14 +77,14 @@ public class GroundPathNavigation extends PathNavigation {
|
2024-10-22 20:04:31 +02:00
|
|
|
mutableBlockPos2.move(Direction.UP);
|
2023-09-21 22:14:58 +02:00
|
|
|
}
|
2022-09-20 23:06:11 +02:00
|
|
|
|
2024-10-22 20:04:31 +02:00
|
|
|
- return super.createPath(mutableBlockPos2.immutable(), distance);
|
|
|
|
+ return super.createPath(mutableBlockPos2.immutable(), entity, distance); // Paper - EntityPathfindEvent
|
2022-09-20 23:06:11 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
@Override
|
|
|
|
public Path createPath(Entity entity, int distance) {
|
|
|
|
- return this.createPath(entity.blockPosition(), distance);
|
2024-01-23 14:34:17 +01:00
|
|
|
+ return this.createPath(entity.blockPosition(), entity, distance); // Paper - EntityPathfindEvent
|
2021-06-11 14:02:28 +02: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
|
2024-10-22 20:04:31 +02:00
|
|
|
index 7d3cb358fe543253e988531df3434ae1274814d3..1d5ce4caf99a3fb376b350968a6bd1ac8471ffec 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
|
2024-10-22 20:04:31 +02:00
|
|
|
@@ -125,7 +125,13 @@ 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);
|
2024-01-23 14:34:17 +01:00
|
|
|
+ // Paper start - EntityPathfindEvent
|
2021-11-04 01:54:11 +01:00
|
|
|
+ return this.createPath(target, null, distance);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
2021-11-04 01:54:11 +01:00
|
|
|
+ @Nullable
|
2022-09-20 23:06:11 +02:00
|
|
|
+ public Path createPath(BlockPos target, @Nullable Entity entity, int distance) {
|
2021-11-04 01:54:11 +01:00
|
|
|
+ return this.createPath(ImmutableSet.of(target), entity, 8, false, distance);
|
2024-01-23 14:34:17 +01:00
|
|
|
+ // Paper end - EntityPathfindEvent
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
2021-06-12 04:24:43 +02:00
|
|
|
@Nullable
|
2024-10-22 20:04:31 +02:00
|
|
|
@@ -135,7 +141,7 @@ public abstract class PathNavigation {
|
2021-06-12 04:24:43 +02:00
|
|
|
|
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);
|
2024-01-23 14:34:17 +01:00
|
|
|
+ return this.createPath(ImmutableSet.of(entity.blockPosition()), entity, 16, true, distance); // Paper - EntityPathfindEvent
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
@Nullable
|
2024-10-22 20:04:31 +02:00
|
|
|
@@ -145,6 +151,17 @@ public abstract class PathNavigation {
|
2021-06-12 04:24:43 +02:00
|
|
|
|
|
|
|
@Nullable
|
|
|
|
protected Path createPath(Set<BlockPos> positions, int range, boolean useHeadPos, int distance, float followRange) {
|
2024-01-23 14:34:17 +01:00
|
|
|
+ // Paper start - EntityPathfindEvent
|
2022-09-20 23:06:11 +02:00
|
|
|
+ return this.createPath(positions, null, range, useHeadPos, distance, followRange);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
2021-06-12 04:24:43 +02:00
|
|
|
+
|
|
|
|
+ @Nullable
|
2022-09-20 23:06:11 +02:00
|
|
|
+ protected Path createPath(Set<BlockPos> positions, @Nullable Entity target, int range, boolean useHeadPos, int distance) {
|
2021-06-12 04:24:43 +02:00
|
|
|
+ return this.createPath(positions, target, range, useHeadPos, distance, (float) this.mob.getAttributeValue(Attributes.FOLLOW_RANGE));
|
|
|
|
+ }
|
|
|
|
+
|
2022-09-20 23:06:11 +02:00
|
|
|
+ @Nullable protected Path createPath(Set<BlockPos> positions, @Nullable Entity target, int range, boolean useHeadPos, int distance, float followRange) {
|
2024-01-23 14:34:17 +01:00
|
|
|
+ // Paper end - EntityPathfindEvent
|
2021-06-12 04:24:43 +02:00
|
|
|
if (positions.isEmpty()) {
|
2021-06-11 14:02:28 +02:00
|
|
|
return null;
|
2024-10-22 20:04:31 +02:00
|
|
|
} else if (this.mob.getY() < (double)this.level.getMinY()) {
|
|
|
|
@@ -154,6 +171,23 @@ public abstract class PathNavigation {
|
2021-06-12 04:24:43 +02:00
|
|
|
} else if (this.path != null && !this.path.isDone() && positions.contains(this.targetPos)) {
|
2021-06-11 14:02:28 +02:00
|
|
|
return this.path;
|
|
|
|
} else {
|
2024-01-23 14:34:17 +01:00
|
|
|
+ // Paper start - EntityPathfindEvent
|
2021-06-11 14:02:28 +02:00
|
|
|
+ boolean copiedSet = false;
|
2021-06-12 04:24:43 +02:00
|
|
|
+ for (BlockPos possibleTarget : positions) {
|
2021-06-17 23:39:36 +02:00
|
|
|
+ if (!new com.destroystokyo.paper.event.entity.EntityPathfindEvent(this.mob.getBukkitEntity(),
|
2023-06-08 00:28:06 +02:00
|
|
|
+ io.papermc.paper.util.MCUtil.toLocation(this.mob.level(), possibleTarget), target == null ? null : target.getBukkitEntity()).callEvent()) {
|
2021-06-11 14:02:28 +02:00
|
|
|
+ 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;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
2024-01-23 14:34:17 +01:00
|
|
|
+ // Paper end - EntityPathfindEvent
|
2024-10-22 20:04:31 +02:00
|
|
|
ProfilerFiller profilerFiller = Profiler.get();
|
|
|
|
profilerFiller.push("pathfind");
|
2021-06-12 04:24:43 +02:00
|
|
|
BlockPos blockPos = useHeadPos ? this.mob.blockPosition().above() : this.mob.blockPosition();
|
2022-09-20 23:06:11 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/ai/navigation/WallClimberNavigation.java b/src/main/java/net/minecraft/world/entity/ai/navigation/WallClimberNavigation.java
|
2024-04-16 21:44:59 +02:00
|
|
|
index 1a1bc30b425858d82dbfb84b4a94d7793cab7125..5bbfa43d1e97970f035fcb101c3252c01ffead0d 100644
|
2022-09-20 23:06:11 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/ai/navigation/WallClimberNavigation.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/ai/navigation/WallClimberNavigation.java
|
|
|
|
@@ -16,9 +16,9 @@ public class WallClimberNavigation extends GroundPathNavigation {
|
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
|
|
- public Path createPath(BlockPos target, int distance) {
|
2024-01-23 14:34:17 +01:00
|
|
|
+ public Path createPath(BlockPos target, @Nullable Entity entity, int distance) { // Paper - EntityPathfindEvent
|
2022-09-20 23:06:11 +02:00
|
|
|
this.pathToPosition = target;
|
|
|
|
- return super.createPath(target, distance);
|
2024-01-23 14:34:17 +01:00
|
|
|
+ return super.createPath(target, entity, distance); // Paper - EntityPathfindEvent
|
2022-09-20 23:06:11 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|