2016-09-11 04:42:47 +02:00
|
|
|
From 9d545994314c0b641e4f24f76479e3c4135b52ad Mon Sep 17 00:00:00 2001
|
2016-03-01 00:09:49 +01:00
|
|
|
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
|
2016-06-09 05:57:14 +02:00
|
|
|
index c9cfe3f..b1a90c1 100644
|
2016-03-01 00:09:49 +01:00
|
|
|
--- a/src/main/java/net/minecraft/server/NavigationAbstract.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
|
2016-06-09 05:57:14 +02:00
|
|
|
@@ -118,10 +118,26 @@ public abstract class NavigationAbstract {
|
2016-03-01 00:09:49 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
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);
|
|
|
|
|
2016-06-09 05:57:14 +02:00
|
|
|
- return pathentity != null && this.a(pathentity, d0);
|
2016-03-01 00:09:49 +01:00
|
|
|
+ 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
|
|
|
|
|
2016-05-12 04:07:46 +02:00
|
|
|
public boolean a(@Nullable PathEntity pathentity, double d0) {
|
2016-03-01 00:09:49 +01:00
|
|
|
if (pathentity == null) {
|
2016-06-09 05:57:14 +02:00
|
|
|
@@ -255,6 +271,7 @@ public abstract class NavigationAbstract {
|
2016-03-01 00:09:49 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
public void o() {
|
|
|
|
+ this.pathfindFailures = 0; this.lastFailure = 0; // Paper - Pathfinding optimizations
|
|
|
|
this.c = null;
|
|
|
|
}
|
|
|
|
|
|
|
|
--
|
2016-09-11 04:42:47 +02:00
|
|
|
2.10.0.windows.1
|
2016-03-01 00:09:49 +01:00
|
|
|
|