mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-06 02:42:14 +01:00
48 lines
2.1 KiB
Diff
48 lines
2.1 KiB
Diff
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/world/entity/ai/navigation/PathNavigation.java b/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java
|
|
index 188904c9f0f81db1d63eec953d6746f2dc23dc81..2e9991e6b3c05584002744a2ee2579b1dba218b2 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java
|
|
@@ -192,13 +192,33 @@ public abstract class PathNavigation {
|
|
return this.moveTo(this.createPath(x, y, z, 1), speed);
|
|
}
|
|
|
|
+ // Paper start - Perf: Optimise pathfinding
|
|
+ private int lastFailure = 0;
|
|
+ private int pathfindFailures = 0;
|
|
+ // Paper end - Perf: Optimise pathfinding
|
|
+
|
|
public boolean moveTo(double x, double y, double z, int distance, double speed) {
|
|
return this.moveTo(this.createPath(x, y, z, distance), speed);
|
|
}
|
|
|
|
public boolean moveTo(Entity entity, double speed) {
|
|
+ // Paper start - Perf: Optimise pathfinding
|
|
+ if (this.pathfindFailures > 10 && this.path == null && net.minecraft.server.MinecraftServer.currentTick < this.lastFailure + 40) {
|
|
+ return false;
|
|
+ }
|
|
+ // Paper end - Perf: Optimise pathfinding
|
|
Path path = this.createPath(entity, 1);
|
|
- return path != null && this.moveTo(path, speed);
|
|
+ // Paper start - Perf: Optimise pathfinding
|
|
+ if (path != null && this.moveTo(path, speed)) {
|
|
+ this.lastFailure = 0;
|
|
+ this.pathfindFailures = 0;
|
|
+ return true;
|
|
+ } else {
|
|
+ this.pathfindFailures++;
|
|
+ this.lastFailure = net.minecraft.server.MinecraftServer.currentTick;
|
|
+ return false;
|
|
+ }
|
|
+ // Paper end - Perf: Optimise pathfinding
|
|
}
|
|
|
|
public boolean moveTo(@Nullable Path path, double speed) {
|