Paper/patches/server/0080-EntityPathfindEvent.patch

155 lines
8.0 KiB
Diff
Raw Normal View History

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
index d3a279a1a14f99aee8dd516552e5c60de92b4969..a3e0c5af4cc9323c02e88e768cbda9e46854aea1 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
2022-12-07 19:52:24 +01:00
@@ -40,7 +40,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.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-10-22 20:04:31 +02:00
index d41ff85a96df07e4d6d9844289379bd3f0c38dc4..f73b559b8e60859020f762dab88b67b8c912bf8f 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-10-22 20:04:31 +02:00
@@ -42,7 +42,7 @@ public class GroundPathNavigation extends PathNavigation {
2022-09-20 23:06:11 +02:00
}
@Override
- public Path createPath(BlockPos target, int distance) {
+ public Path createPath(BlockPos target, @javax.annotation.Nullable Entity entity, int distance) { // Paper - EntityPathfindEvent
LevelChunk levelChunk = this.level
.getChunkSource()
.getChunkNow(SectionPos.blockToSectionCoord(target.getX()), SectionPos.blockToSectionCoord(target.getZ()));
2024-10-22 20:04:31 +02:00
@@ -57,7 +57,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);
@@ -70,7 +70,7 @@ public class GroundPathNavigation extends PathNavigation {
}
if (!levelChunk.getBlockState(target).isSolid()) {
- return super.createPath(target, distance);
+ return super.createPath(target, entity, distance); // Paper - EntityPathfindEvent
} else {
2024-10-22 20:04:31 +02:00
BlockPos.MutableBlockPos mutableBlockPos2 = target.mutable().move(Direction.UP);
2024-10-22 20:04:31 +02:00
@@ -78,14 +78,14 @@ public class GroundPathNavigation extends PathNavigation {
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);
+ 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);
+ // 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);
+ // 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);
+ 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) {
+ // 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) {
+ // 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 {
+ // 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;
+ }
+ }
+ }
+ // 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
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) {
+ 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);
+ return super.createPath(target, entity, distance); // Paper - EntityPathfindEvent
2022-09-20 23:06:11 +02:00
}
@Override