Paper/patches/server/0080-EntityPathfindEvent.patch

152 lines
7.8 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
2023-09-22 19:59:56 +02:00
index 3db41017c6690d4519564496edd8e7365b2f5a22..027eef4ace908147285c8d72b612d16e4f925672 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);
2021-11-04 01:54:11 +01:00
+ return this.createPath(entity.blockPosition(), entity, distance); // Paper - Forward target entity
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
index 12564909abff7da4e5a4bb3d004a7ede2ffda12d..ac996b066415e461af1fcb71b19807401179c7f8 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
2023-09-21 22:14:58 +02: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) {
+ public Path createPath(BlockPos target, @javax.annotation.Nullable Entity entity, int distance) { // Paper
2023-09-21 22:14:58 +02:00
LevelChunk levelChunk = this.level.getChunkSource().getChunkNow(SectionPos.blockToSectionCoord(target.getX()), SectionPos.blockToSectionCoord(target.getZ()));
if (levelChunk == null) {
return null;
@@ -52,7 +52,7 @@ public class GroundPathNavigation extends PathNavigation {
}
2022-09-20 23:06:11 +02:00
2023-09-21 22:14:58 +02:00
if (blockPos.getY() > this.level.getMinBuildHeight()) {
- return super.createPath(blockPos.above(), distance);
+ return super.createPath(blockPos.above(), entity, distance); // Paper
}
2022-09-20 23:06:11 +02:00
2023-09-21 22:14:58 +02:00
while(blockPos.getY() < this.level.getMaxBuildHeight() && levelChunk.getBlockState(blockPos).isAir()) {
@@ -63,20 +63,20 @@ public class GroundPathNavigation extends PathNavigation {
}
if (!levelChunk.getBlockState(target).isSolid()) {
- return super.createPath(target, distance);
+ return super.createPath(target, entity, distance); // Paper
} else {
BlockPos blockPos2;
2023-09-21 22:14:58 +02:00
for(blockPos2 = target.above(); blockPos2.getY() < this.level.getMaxBuildHeight() && levelChunk.getBlockState(blockPos2).isSolid(); blockPos2 = blockPos2.above()) {
}
2022-09-20 23:06:11 +02:00
2023-09-21 22:14:58 +02:00
- return super.createPath(blockPos2, distance);
+ return super.createPath(blockPos2, entity, distance); // Paper
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);
2021-11-04 01:54:11 +01:00
+ return this.createPath(entity.blockPosition(), entity, distance); // Paper - Forward target entity
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
2023-09-22 19:59:56 +02:00
index fa19df17967f57b5ac99b8eee9d38864c0b7a1bb..d14b329e5bccf13139c32f71da274082efc7199c 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
2023-03-14 19:36:39 +01:00
@@ -110,7 +110,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);
2021-11-04 01:54:11 +01:00
+ // Paper start - add target entity parameter
+ 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);
2021-06-11 14:02:28 +02:00
+ // Paper end
}
2021-06-12 04:24:43 +02:00
@Nullable
2023-03-14 19:36:39 +01:00
@@ -120,7 +126,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);
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
2023-03-14 19:36:39 +01:00
@@ -130,6 +136,16 @@ 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) {
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) {
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()) {
2023-03-14 19:36:39 +01:00
@@ -139,6 +155,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 - Pathfind event
+ 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
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);
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
2023-09-22 19:59:56 +02:00
index e9b49c72aa73dfcef6c136d9ed7bb5044fe8405d..2d1b2b84d7cf5bafe2cccfa0dec2bae805dbe7cf 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
this.pathToPosition = target;
- return super.createPath(target, distance);
+ return super.createPath(target, entity, distance); // Paper
}
@Override