2020-05-06 09:48:49 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2019-04-27 03:05:36 +00:00
|
|
|
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.
|
|
|
|
|
2019-05-13 01:39:06 +00:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/Navigation.java b/src/main/java/net/minecraft/server/Navigation.java
|
2020-08-25 02:22:08 +00:00
|
|
|
index 3bb8363d08a017623e55ed733b86d0899ef7391d..0ed01f40edfdbeeeea9db55fcba7501ee597c1fb 100644
|
2019-05-13 01:39:06 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/Navigation.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/Navigation.java
|
|
|
|
@@ -60,7 +60,7 @@ public class Navigation extends NavigationAbstract {
|
|
|
|
|
|
|
|
@Override
|
2019-07-20 04:01:24 +00:00
|
|
|
public PathEntity a(Entity entity, int i) {
|
2020-06-25 11:00:35 +00:00
|
|
|
- return this.a(entity.getChunkCoordinates(), i);
|
|
|
|
+ return this.a(entity.getChunkCoordinates(), entity, i); // Paper - Forward target entity
|
2019-05-13 01:39:06 +00:00
|
|
|
}
|
|
|
|
|
2019-06-25 01:47:58 +00:00
|
|
|
private int t() {
|
2019-04-27 03:05:36 +00:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
|
2020-08-25 02:22:08 +00:00
|
|
|
index 5003d16ab68e6b51bff07f66b10e93ce4a5cdb2d..8c51ab85ed4ef23f049fcbfac93e39ab739194cf 100644
|
2019-04-27 03:05:36 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/NavigationAbstract.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
|
2019-07-20 04:01:24 +00:00
|
|
|
@@ -8,7 +8,7 @@ import javax.annotation.Nullable;
|
2019-04-27 03:05:36 +00:00
|
|
|
|
|
|
|
public abstract class NavigationAbstract {
|
|
|
|
|
|
|
|
- protected final EntityInsentient a;
|
|
|
|
+ protected final EntityInsentient a; public Entity getEntity() { return a; } // Paper - OBFHELPER
|
|
|
|
protected final World b;
|
|
|
|
@Nullable
|
|
|
|
protected PathEntity c;
|
2020-06-25 11:00:35 +00:00
|
|
|
@@ -94,16 +94,26 @@ public abstract class NavigationAbstract {
|
2019-04-27 03:05:36 +00:00
|
|
|
|
2019-07-20 04:01:24 +00:00
|
|
|
@Nullable
|
|
|
|
public PathEntity a(BlockPosition blockposition, int i) {
|
|
|
|
- return this.a(ImmutableSet.of(blockposition), 8, false, i);
|
|
|
|
+ // Paper start - add target parameter
|
|
|
|
+ return this.a(blockposition, null, i);
|
|
|
|
+ }
|
|
|
|
+ @Nullable public PathEntity a(BlockPosition blockposition, Entity target, int i) {
|
|
|
|
+ return this.a(ImmutableSet.of(blockposition), target, 8, false, i);
|
2019-04-27 03:05:36 +00:00
|
|
|
+ // Paper end
|
|
|
|
}
|
|
|
|
|
|
|
|
@Nullable
|
2019-07-20 04:01:24 +00:00
|
|
|
public PathEntity a(Entity entity, int i) {
|
2020-06-25 11:00:35 +00:00
|
|
|
- return this.a(ImmutableSet.of(entity.getChunkCoordinates()), 16, true, i);
|
|
|
|
+ return this.a(ImmutableSet.of(entity.getChunkCoordinates()), entity, 16, true, i); // Paper
|
2019-04-27 03:05:36 +00:00
|
|
|
}
|
|
|
|
|
2019-05-14 02:20:58 +00:00
|
|
|
@Nullable
|
2019-07-20 04:01:24 +00:00
|
|
|
+ // Paper start - Add target
|
|
|
|
protected PathEntity a(Set<BlockPosition> set, int i, boolean flag, int j) {
|
|
|
|
+ return this.a(set, null, i, flag, j);
|
|
|
|
+ }
|
|
|
|
+ @Nullable protected PathEntity a(Set<BlockPosition> set, Entity target, int i, boolean flag, int j) {
|
|
|
|
+ // Paper end
|
|
|
|
if (set.isEmpty()) {
|
2019-04-27 03:05:36 +00:00
|
|
|
return null;
|
2019-12-11 02:43:21 +00:00
|
|
|
} else if (this.a.locY() < 0.0D) {
|
2020-06-25 11:00:35 +00:00
|
|
|
@@ -113,6 +123,23 @@ public abstract class NavigationAbstract {
|
2020-08-25 02:22:08 +00:00
|
|
|
} else if (this.c != null && !this.c.c() && set.contains(this.p)) {
|
2019-04-27 03:05:36 +00:00
|
|
|
return this.c;
|
|
|
|
} else {
|
|
|
|
+ // Paper start - Pathfind event
|
2019-07-20 04:01:24 +00:00
|
|
|
+ boolean copiedSet = false;
|
|
|
|
+ for (BlockPosition possibleTarget : set) {
|
|
|
|
+ if (!new com.destroystokyo.paper.event.entity.EntityPathfindEvent(getEntity().getBukkitEntity(),
|
|
|
|
+ MCUtil.toLocation(getEntity().world, possibleTarget), target == null ? null : target.getBukkitEntity()).callEvent()) {
|
|
|
|
+ if (!copiedSet) {
|
|
|
|
+ copiedSet = true;
|
|
|
|
+ set = new java.util.HashSet<>(set);
|
|
|
|
+ }
|
|
|
|
+ // note: since we copy the set this remove call is safe, since we're iterating over the old copy
|
|
|
|
+ set.remove(possibleTarget);
|
|
|
|
+ if (set.isEmpty()) {
|
|
|
|
+ return null;
|
|
|
|
+ }
|
|
|
|
+ }
|
2019-04-27 03:05:36 +00:00
|
|
|
+ }
|
|
|
|
+ // Paper end
|
2019-07-20 04:01:24 +00:00
|
|
|
this.b.getMethodProfiler().enter("pathfind");
|
2020-06-25 11:00:35 +00:00
|
|
|
float f = (float) this.a.b(GenericAttributes.FOLLOW_RANGE);
|
|
|
|
BlockPosition blockposition = flag ? this.a.getChunkCoordinates().up() : this.a.getChunkCoordinates();
|
2019-04-27 03:05:36 +00:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/NavigationFlying.java b/src/main/java/net/minecraft/server/NavigationFlying.java
|
2020-08-25 02:22:08 +00:00
|
|
|
index feed11b62a4df63c1782e7124a3f006d7a8019a3..013bdfe5540ae594a7f9cbe3ef8dc54dfb25afd4 100644
|
2019-04-27 03:05:36 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/NavigationFlying.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/NavigationFlying.java
|
|
|
|
@@ -25,7 +25,7 @@ public class NavigationFlying extends NavigationAbstract {
|
|
|
|
|
|
|
|
@Override
|
2019-07-20 04:01:24 +00:00
|
|
|
public PathEntity a(Entity entity, int i) {
|
2020-06-25 11:00:35 +00:00
|
|
|
- return this.a(entity.getChunkCoordinates(), i);
|
|
|
|
+ return this.a(entity.getChunkCoordinates(), entity, i); // Paper - Forward target entity
|
2019-04-27 03:05:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|