mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-18 20:53:09 +01:00
da9d110d5b
This patch does not appear to be doing anything useful, and may hide errors. Currently, the save logic does not run through this path either so it did not do anything. Additionally, properly implement support for handling RegionFileSizeException in Moonrise.
47 lines
2.1 KiB
Diff
47 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 436812c3bfe53358b4d76bb72d777d6661bb6d60..48c0de870a5bbf647309e69361dfb10ab56c65ab 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
|
|
@@ -209,13 +209,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) {
|