mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-19 15:09:25 +00:00
74 lines
2.8 KiB
Diff
74 lines
2.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
From: Taiyou06 <kaandindar21@gmail.com>
|
||
Date: Sun, 16 Feb 2025 09:21:50 +0100
|
||
Subject: [PATCH] Slightly optimise getNearestPlayer
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
Original:
|
||
|
||
Condition checks per iteration: ~3-4 (predicate check, distance check, and d comparison)
|
||
Calculations per iteration: Distance calculation + potentially a multiplication
|
||
Total operations: ~(5-6) × n
|
||
|
||
Patch:
|
||
|
||
Condition checks per iteration: 1 (just the distance comparison)
|
||
Calculations per iteration: Distance calculation
|
||
One-time operation: Convert distance to squared distance
|
||
Total operations: ~3 × n (in the no-predicate case) or ~4 × n (with predicate)
|
||
|
||
diff --git a/net/minecraft/world/level/EntityGetter.java b/net/minecraft/world/level/EntityGetter.java
|
||
index 670860df81a3abfc1b8b53be505fce0ee32ee2c4..083a2b5da246113913bcd5d0b2b9be42cf0554d9 100644
|
||
--- a/net/minecraft/world/level/EntityGetter.java
|
||
+++ b/net/minecraft/world/level/EntityGetter.java
|
||
@@ -201,23 +201,42 @@ public interface EntityGetter extends ca.spottedleaf.moonrise.patches.chunk_syst
|
||
}
|
||
// Paper end - Affects Spawning API
|
||
|
||
+ // Leaf start - Slightly optimise getNearestPlayer
|
||
@Nullable
|
||
default Player getNearestPlayer(double x, double y, double z, double distance, @Nullable Predicate<Entity> predicate) {
|
||
- double d = -1.0;
|
||
+ if (distance < 0.0) {
|
||
+ distance = Double.MAX_VALUE;
|
||
+ } else {
|
||
+ distance = distance * distance;
|
||
+ }
|
||
+
|
||
Player player = null;
|
||
|
||
- for (Player player1 : this.players()) {
|
||
- if (predicate == null || predicate.test(player1)) {
|
||
+ if (predicate == null) {
|
||
+ for (int i = 0; i < this.players().size(); i++) {
|
||
+ Player player1 = this.players().get(i);
|
||
double d1 = player1.distanceToSqr(x, y, z);
|
||
- if ((distance < 0.0 || d1 < distance * distance) && (d == -1.0 || d1 < d)) {
|
||
- d = d1;
|
||
+ if (d1 < distance) {
|
||
+ distance = d1;
|
||
player = player1;
|
||
}
|
||
}
|
||
+ } else {
|
||
+ for (int i = 0; i < this.players().size(); i++) {
|
||
+ Player player1 = this.players().get(i);
|
||
+ if (predicate.test(player1)) {
|
||
+ double d1 = player1.distanceToSqr(x, y, z);
|
||
+ if (d1 < distance) {
|
||
+ distance = d1;
|
||
+ player = player1;
|
||
+ }
|
||
+ }
|
||
+ }
|
||
}
|
||
|
||
return player;
|
||
}
|
||
+ // Leaf end - Slightly optimise getNearestPlayer
|
||
|
||
// Paper start
|
||
default List<org.bukkit.entity.HumanEntity> findNearbyBukkitPlayers(double x, double y, double z, double radius, boolean notSpectator) {
|