twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-22 15:53:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Optimize player lookups for beacons

Browse Source 
For larger ranges, it's better to iterate over the player list
than the entity slices.
This commit is contained in:
Spottedleaf
2023-07-06 20:17:37 -07:00
parent 6fca06ec72
commit bfd4276e56
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
paper-server/patches/sources/net/minecraft/world/level/block/entity/BeaconBlockEntity.java.patch
View File

@@ -77,7 +77,7 @@
if (blockEntity.lastCheckY >= l) { if (blockEntity.lastCheckY >= l) {
blockEntity.lastCheckY = world.getMinY() - 1; blockEntity.lastCheckY = world.getMinY() - 1;
@@ -247,43 +291,108 @@ @@ -247,43 +291,123 @@
@Override @Override
public void setRemoved() { public void setRemoved() {
@@ -108,6 +108,7 @@
- int j = (9 + beaconLevel * 2) * 20; - int j = (9 + beaconLevel * 2) * 20;
- AABB axisalignedbb = (new AABB(pos)).inflate(d0).expandTowards(0.0D, (double) world.getHeight(), 0.0D); - AABB axisalignedbb = (new AABB(pos)).inflate(d0).expandTowards(0.0D, (double) world.getHeight(), 0.0D);
- List<Player> list = world.getEntitiesOfClass(Player.class, axisalignedbb);
+ return b0; + return b0;
+ } + }
+ } + }
@@ -129,7 +130,22 @@
+ double d0 = blockEntity != null ? blockEntity.getEffectRange() : (i * 10 + 10); // Paper - Custom beacon ranges + 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); + 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; + return list;
+ } + }
@@ -201,7 +217,7 @@
public static void playSound(Level world, BlockPos pos, SoundEvent sound) { public static void playSound(Level world, BlockPos pos, SoundEvent sound) {
world.playSound((Player) null, pos, sound, SoundSource.BLOCKS, 1.0F, 1.0F); world.playSound((Player) null, pos, sound, SoundSource.BLOCKS, 1.0F, 1.0F);
} }
@@ -316,7 +425,7 @@ @@ -316,7 +440,7 @@
if (nbt.contains(key, 8)) { if (nbt.contains(key, 8)) {
ResourceLocation minecraftkey = ResourceLocation.tryParse(nbt.getString(key)); ResourceLocation minecraftkey = ResourceLocation.tryParse(nbt.getString(key));
@@ -210,7 +226,7 @@
} else { } else {
return null; return null;
} }
@@ -327,11 +436,13 @@ @@ -327,11 +451,13 @@
super.loadAdditional(nbt, registries); super.loadAdditional(nbt, registries);
this.primaryPower = BeaconBlockEntity.loadEffect(nbt, "primary_effect"); this.primaryPower = BeaconBlockEntity.loadEffect(nbt, "primary_effect");
this.secondaryPower = BeaconBlockEntity.loadEffect(nbt, "secondary_effect"); this.secondaryPower = BeaconBlockEntity.loadEffect(nbt, "secondary_effect");
@@ -224,7 +240,7 @@
} }
@Override @Override
@@ -345,6 +456,7 @@ @@ -345,6 +471,7 @@
} }
this.lockKey.addToTag(nbt, registries); this.lockKey.addToTag(nbt, registries);
@@ -232,7 +248,7 @@
} }
public void setCustomName(@Nullable Component customName) { public void setCustomName(@Nullable Component customName) {
@@ -360,7 +472,7 @@ @@ -360,7 +487,7 @@
@Nullable @Nullable
@Override @Override
public AbstractContainerMenu createMenu(int syncId, Inventory playerInventory, Player player) { public AbstractContainerMenu createMenu(int syncId, Inventory playerInventory, Player player) {