mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-26 17:17:13 +01:00
36 lines
1.9 KiB
Diff
36 lines
1.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
|
Date: Thu, 6 Jul 2023 20:17:37 -0700
|
|
Subject: [PATCH] Optimize player lookups for beacons
|
|
|
|
For larger ranges, it's better to iterate over the player list
|
|
than the entity slices.
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
|
|
index d575294924df6b970c5773a5cdd8b2a1a9cbce19..dd1fe8357ccf084880a7f3d4d9e499bde672c787 100644
|
|
--- a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
|
|
+++ b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java
|
|
@@ -333,7 +333,22 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name
|
|
double d0 = blockEntity != null ? blockEntity.getEffectRange() : (i * 10 + 10); // Paper - Custom beacon ranges
|
|
|
|
AABB axisalignedbb = (new AABB(blockposition)).inflate(d0).expandTowards(0.0D, (double) world.getHeight(), 0.0D);
|
|
- List<Player> list = world.getEntitiesOfClass(Player.class, axisalignedbb);
|
|
+ // Paper start - Perf: optimize player lookup for beacons
|
|
+ List<Player> list;
|
|
+ if (d0 <= 128.0) {
|
|
+ list = world.getEntitiesOfClass(Player.class, axisalignedbb);
|
|
+ } else {
|
|
+ list = new java.util.ArrayList<>();
|
|
+ for (Player player : world.players()) {
|
|
+ if (player.isSpectator()) {
|
|
+ continue;
|
|
+ }
|
|
+ if (player.getBoundingBox().intersects(axisalignedbb)) {
|
|
+ list.add(player);
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ // Paper end - Perf: optimize player lookup for beacons
|
|
|
|
return list;
|
|
}
|