Revert "Optimize Pathfinding"

This patch appears to be causing some issues with 1.14.3 entity AI
This commit is contained in:
Shane Freeder
2019-06-25 20:18:50 +01:00
parent 2fd8cba9f4
commit 9f6ea786bc
148 changed files with 190 additions and 239 deletions

View File

@@ -1,49 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 3 Mar 2016 02:02:07 -0600
Subject: [PATCH] Optimize Pathfinding
Prevents pathfinding from spamming failures for things such as
arrow attacks.
diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
index 49b27c4310..75e01c2420 100644
--- a/src/main/java/net/minecraft/server/NavigationAbstract.java
+++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
@@ -0,0 +0,0 @@ public abstract class NavigationAbstract {
}
public boolean a(Entity entity, double d0) {
+ // Paper start - Pathfinding optimizations
+ if (this.pathfindFailures > 10 && this.c == null && MinecraftServer.currentTick < this.lastFailure + 40) {
+ return false;
+ }
+
PathEntity pathentity = this.a(entity);
- return pathentity != null && this.a(pathentity, d0);
+ if (pathentity != null && this.a(pathentity, d0)) {
+ this.lastFailure = 0;
+ this.pathfindFailures = 0;
+ return true;
+ } else {
+ this.pathfindFailures++;
+ this.lastFailure = MinecraftServer.currentTick;
+ return false;
+ }
}
+ private int lastFailure = 0;
+ private int pathfindFailures = 0;
+ // Paper end
public boolean a(@Nullable PathEntity pathentity, double d0) {
if (pathentity == null) {
@@ -0,0 +0,0 @@ public abstract class NavigationAbstract {
}
public void o() {
+ this.pathfindFailures = 0; this.lastFailure = 0; // Paper - Pathfinding optimizations
this.c = null;
}
--