mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-12 06:58:11 +02:00
Upstream has released updates that appear 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: 01aa02eb PR-858: Add LivingEntity#playHurtAnimation() 9421320f PR-884: Refinements to new ban API for improved compatibility and correctness 37a60b45 SPIGOT-6455, SPIGOT-7030, PR-750: Improve ban API 4eeb174b All smithing inventories are now the new smithing inventory f2bb168e PR-880: Add methods to get/set FallingBlock CancelDrop e7a807fa PR-879: Add Player#sendHealthUpdate() 692b8e96 SPIGOT-7370: Remove float value conversion in plugin.yml 2d033390 SPIGOT-7403: Add direct API for waxed signs 16a08373 PR-876: Add missing Raider API and 'no action ticks' CraftBukkit Changes: b60a95c8c PR-1189: Add LivingEntity#playHurtAnimation() 95c335c63 PR-1226: Fix VehicleEnterEvent not being called for certain entities 0a0fc3bee PR-1227: Refinements to new ban API for improved compatibility and correctness 0d0b1e5dc Revert bad change to PathfinderGoalSit causing all cats to sit 648196070 SPIGOT-6455, SPIGOT-7030, PR-1054: Improve ban API 31fe848d6 All smithing inventories are now the new smithing inventory 9a919a143 SPIGOT-7416: SmithItemEvent not firing in Smithing Table 9f64f0d22 PR-1221: Add methods to get/set FallingBlock CancelDrop 3be9ac171 PR-1220: Add Player#sendHealthUpdate() c1279f775 PR-1209: Clean up various patches c432e4397 Fix Raider#setCelebrating() implementation 504d96665 SPIGOT-7403: Add direct API for waxed signs c68c1f1b3 PR-1216: Add missing Raider API and 'no action ticks' 85b89c3dd Increase outdated build delay Spigot Changes: 9ebce8af Rebuild patches 64b565e6 Rebuild patches
136 lines
6.8 KiB
Diff
136 lines
6.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Tue, 4 Aug 2020 22:24:15 +0200
|
|
Subject: [PATCH] Optimize Pathfinder - Remove Streams / Optimized collections
|
|
|
|
1.17 Update: Please do this k thx bb
|
|
I utilized the IDE to convert streams to non streams code, so shouldn't
|
|
be any risk of behavior change. Only did minor optimization of the
|
|
generated code set to remove unnecessary things.
|
|
|
|
I expect us to just drop this patch on next major update and re-apply
|
|
it with the IDE again and re-apply the collections optimization.
|
|
|
|
Optimize collection by creating a list instead of a set of the key and value.
|
|
|
|
This lets us get faster foreach iteration, as well as avoids map lookups on
|
|
the values when needed.
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java b/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java
|
|
index 300c812d513e0b948a7e79c0ed241f514c7a09fc..d23481453717f715124156b5d83f6448f720d049 100644
|
|
--- a/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java
|
|
+++ b/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java
|
|
@@ -38,9 +38,12 @@ public class PathFinder {
|
|
if (node == null) {
|
|
return null;
|
|
} else {
|
|
- Map<Target, BlockPos> map = positions.stream().collect(Collectors.toMap((pos) -> {
|
|
- return this.nodeEvaluator.getGoal((double)pos.getX(), (double)pos.getY(), (double)pos.getZ());
|
|
- }, Function.identity()));
|
|
+ // Paper start - remove streams - and optimize collection
|
|
+ List<Map.Entry<Target, BlockPos>> map = Lists.newArrayList();
|
|
+ for (BlockPos pos : positions) {
|
|
+ map.add(new java.util.AbstractMap.SimpleEntry<>(this.nodeEvaluator.getGoal(pos.getX(), pos.getY(), pos.getZ()), pos));
|
|
+ }
|
|
+ // Paper end
|
|
Path path = this.findPath(world.getProfiler(), node, map, followRange, distance, rangeMultiplier);
|
|
this.nodeEvaluator.done();
|
|
return path;
|
|
@@ -48,18 +51,19 @@ public class PathFinder {
|
|
}
|
|
|
|
@Nullable
|
|
- private Path findPath(ProfilerFiller profiler, Node startNode, Map<Target, BlockPos> positions, float followRange, int distance, float rangeMultiplier) {
|
|
+ // Paper start - optimize collection
|
|
+ private Path findPath(ProfilerFiller profiler, Node startNode, List<Map.Entry<Target, BlockPos>> positions, float followRange, int distance, float rangeMultiplier) {
|
|
profiler.push("find_path");
|
|
profiler.markForCharting(MetricCategory.PATH_FINDING);
|
|
- Set<Target> set = positions.keySet();
|
|
+ // Set<Target> set = positions.keySet();
|
|
startNode.g = 0.0F;
|
|
- startNode.h = this.getBestH(startNode, set);
|
|
+ startNode.h = this.getBestH(startNode, positions); // Paper - optimize collection
|
|
startNode.f = startNode.h;
|
|
this.openSet.clear();
|
|
this.openSet.insert(startNode);
|
|
- Set<Node> set2 = ImmutableSet.of();
|
|
+ // Set<Node> set2 = ImmutableSet.of(); // Paper - unused - diff on change
|
|
int i = 0;
|
|
- Set<Target> set3 = Sets.newHashSetWithExpectedSize(set.size());
|
|
+ List<Map.Entry<Target, BlockPos>> entryList = Lists.newArrayListWithExpectedSize(positions.size()); // Paper - optimize collection
|
|
int j = (int)((float)this.maxVisitedNodes * rangeMultiplier);
|
|
|
|
while(!this.openSet.isEmpty()) {
|
|
@@ -71,14 +75,18 @@ public class PathFinder {
|
|
Node node = this.openSet.pop();
|
|
node.closed = true;
|
|
|
|
- for(Target target : set) {
|
|
+ // Paper start - optimize collection
|
|
+ for(int i1 = 0; i1 < positions.size(); i1++) {
|
|
+ final Map.Entry<Target, BlockPos> entry = positions.get(i1);
|
|
+ Target target = entry.getKey();
|
|
if (node.distanceManhattan(target) <= (float)distance) {
|
|
target.setReached();
|
|
- set3.add(target);
|
|
+ entryList.add(entry);
|
|
+ // Paper end
|
|
}
|
|
}
|
|
|
|
- if (!set3.isEmpty()) {
|
|
+ if (!entryList.isEmpty()) { // Paper - rename variable
|
|
break;
|
|
}
|
|
|
|
@@ -93,7 +101,7 @@ public class PathFinder {
|
|
if (node2.walkedDistance < followRange && (!node2.inOpenSet() || g < node2.g)) {
|
|
node2.cameFrom = node;
|
|
node2.g = g;
|
|
- node2.h = this.getBestH(node2, set) * 1.5F;
|
|
+ node2.h = this.getBestH(node2, positions) * 1.5F; // Paper - list instead of set
|
|
if (node2.inOpenSet()) {
|
|
this.openSet.changeCost(node2, node2.g + node2.h);
|
|
} else {
|
|
@@ -105,23 +113,31 @@ public class PathFinder {
|
|
}
|
|
}
|
|
|
|
- Optional<Path> optional = !set3.isEmpty() ? set3.stream().map((node) -> {
|
|
- return this.reconstructPath(node.getBestNode(), positions.get(node), true);
|
|
- }).min(Comparator.comparingInt(Path::getNodeCount)) : set.stream().map((target) -> {
|
|
- return this.reconstructPath(target.getBestNode(), positions.get(target), false);
|
|
- }).min(Comparator.comparingDouble(Path::getDistToTarget).thenComparingInt(Path::getNodeCount));
|
|
- profiler.pop();
|
|
- return !optional.isPresent() ? null : optional.get();
|
|
+ // Paper start - remove streams - and optimize collection
|
|
+ Path best = null;
|
|
+ boolean entryListIsEmpty = entryList.isEmpty();
|
|
+ Comparator<Path> comparator = entryListIsEmpty ? Comparator.comparingInt(Path::getNodeCount)
|
|
+ : Comparator.comparingDouble(Path::getDistToTarget).thenComparingInt(Path::getNodeCount);
|
|
+ for (Map.Entry<Target, BlockPos> entry : entryListIsEmpty ? positions : entryList) {
|
|
+ Path path = this.reconstructPath(entry.getKey().getBestNode(), entry.getValue(), !entryListIsEmpty);
|
|
+ if (best == null || comparator.compare(path, best) < 0)
|
|
+ best = path;
|
|
+ }
|
|
+ return best;
|
|
+ // Paper end
|
|
}
|
|
|
|
protected float distance(Node a, Node b) {
|
|
return a.distanceTo(b);
|
|
}
|
|
|
|
- private float getBestH(Node node, Set<Target> targets) {
|
|
+ private float getBestH(Node node, List<Map.Entry<Target, BlockPos>> targets) { // Paper - optimize collection - Set<Target> -> List<Map.Entry<Target, BlockPos>>
|
|
float f = Float.MAX_VALUE;
|
|
|
|
- for(Target target : targets) {
|
|
+ // Paper start - optimize collection
|
|
+ for (int i = 0, targetsSize = targets.size(); i < targetsSize; i++) {
|
|
+ final Target target = targets.get(i).getKey();
|
|
+ // Paper end
|
|
float g = node.distanceTo(target);
|
|
target.updateBest(g, node);
|
|
f = Math.min(g, f);
|