PaperMC/Spigot-Server-Patches/0046-Optimize-Pathfinding.patch
Aikar b62dfa0bf9
Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
39ce5d3a SPIGOT-4399: ItemMeta.equals broken with AttributeModifiers

CraftBukkit Changes:
1cf8b5dc SPIGOT-4400: Populators running on existing chunks
116cb9a1 SPIGOT-4399: Add attribute modifier equality test
5ee1c18a SPIGOT-4398: Set ASM7_EXPERIMENTAL flag
2018-09-28 19:31:59 -04:00

51 lines
1.7 KiB
Diff

From 4eb56052b0b279c261b87dc066fc9840888f694c 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 d1d16b25d0..5d6f726d05 100644
--- a/src/main/java/net/minecraft/server/NavigationAbstract.java
+++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
@@ -113,9 +113,26 @@ 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) {
@@ -241,6 +258,7 @@ public abstract class NavigationAbstract {
}
public void q() {
+ this.pathfindFailures = 0; this.lastFailure = 0; // Paper - Pathfinding optimizations
this.c = null;
}
--
2.19.0