2020-05-06 17:48:49 +08:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2019-04-27 11:05:36 +08: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 09:39:06 +08:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/Navigation.java b/src/main/java/net/minecraft/server/Navigation.java
|
2020-05-06 17:48:49 +08:00
|
|
|
index 3fdeda0cea0b1df2d1f1051f5654e06bcbccd410..abf450917e605972d84cb603b966feb013ae0002 100644
|
2019-05-13 09:39:06 +08: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 12:01:24 +08:00
|
|
|
public PathEntity a(Entity entity, int i) {
|
|
|
|
- return this.a(new BlockPosition(entity), i);
|
|
|
|
+ return this.a(new BlockPosition(entity), entity, i); // Paper - Forward target entity
|
2019-05-13 09:39:06 +08:00
|
|
|
}
|
|
|
|
|
2019-06-25 09:47:58 +08:00
|
|
|
private int t() {
|
2019-04-27 11:05:36 +08:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
|
2020-05-06 17:48:49 +08:00
|
|
|
index a600ee7654aa0898c17c8a433580d92ce447320c..5e7158ba1053ae77fc5c5811d49214e877a5fe30 100644
|
2019-04-27 11:05:36 +08:00
|
|
|
--- a/src/main/java/net/minecraft/server/NavigationAbstract.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
|
2019-07-20 12:01:24 +08:00
|
|
|
@@ -8,7 +8,7 @@ import javax.annotation.Nullable;
|
2019-04-27 11:05:36 +08: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;
|
2019-12-11 10:43:21 +08:00
|
|
|
@@ -91,16 +91,26 @@ public abstract class NavigationAbstract {
|
2019-04-27 11:05:36 +08:00
|
|
|
|
2019-07-20 12:01:24 +08: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 11:05:36 +08:00
|
|
|
+ // Paper end
|
|
|
|
}
|
|
|
|
|
|
|
|
@Nullable
|
2019-07-20 12:01:24 +08:00
|
|
|
public PathEntity a(Entity entity, int i) {
|
|
|
|
- return this.a(ImmutableSet.of(new BlockPosition(entity)), 16, true, i);
|
|
|
|
+ return this.a(ImmutableSet.of(new BlockPosition(entity)), entity, 16, true, i); // Paper
|
2019-04-27 11:05:36 +08:00
|
|
|
}
|
|
|
|
|
2019-05-14 10:20:58 +08:00
|
|
|
@Nullable
|
2019-07-20 12:01:24 +08: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 11:05:36 +08:00
|
|
|
return null;
|
2019-12-11 10:43:21 +08:00
|
|
|
} else if (this.a.locY() < 0.0D) {
|
|
|
|
@@ -110,6 +120,23 @@ public abstract class NavigationAbstract {
|
2019-07-20 12:01:24 +08:00
|
|
|
} else if (this.c != null && !this.c.b() && set.contains(this.q)) {
|
2019-04-27 11:05:36 +08:00
|
|
|
return this.c;
|
|
|
|
} else {
|
|
|
|
+ // Paper start - Pathfind event
|
2019-07-20 12:01:24 +08: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 11:05:36 +08:00
|
|
|
+ }
|
|
|
|
+ // Paper end
|
2019-07-20 12:01:24 +08:00
|
|
|
this.b.getMethodProfiler().enter("pathfind");
|
2019-12-11 10:43:21 +08:00
|
|
|
float f = (float) this.p.getValue();
|
2019-07-20 12:01:24 +08:00
|
|
|
BlockPosition blockposition = flag ? (new BlockPosition(this.a)).up() : new BlockPosition(this.a);
|
2019-04-27 11:05:36 +08:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/NavigationFlying.java b/src/main/java/net/minecraft/server/NavigationFlying.java
|
2020-05-06 17:48:49 +08:00
|
|
|
index 5b057e96db5e12bace186f449ae5658b25123000..f16c6d1faac21478cc9b828c478f3f38a90615fc 100644
|
2019-04-27 11:05:36 +08: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 12:01:24 +08:00
|
|
|
public PathEntity a(Entity entity, int i) {
|
|
|
|
- return this.a(new BlockPosition(entity), i);
|
|
|
|
+ return this.a(new BlockPosition(entity), entity, i); // Paper - Forward target entity
|
2019-04-27 11:05:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
@Override
|