mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2026-01-04 15:41:40 +00:00
ea00b11d11
* prevents async entity tracker update equipment * fix seenBy updated check * skip submit empty * fix invertedVisibilityEntities data race * strict thread check * set max-threads to 1 by default * use fixed thread count * increase thread priority * Revert "use fixed thread count" This reverts commit6746bc25a8. * Revert "set max-threads to 1 by default" This reverts commit5295b6d3e1. * update entity tracker * cleanup * [ci skip] fix phrasing * cleanup * cleanup * support Citizens * optimize update if chunk player no change * configurable threads * configurable no blocking * fix pos y and z * optimize no blocking * cleanup * cleanup * add handle during waitUntilNextTick * fix entity disappear * cleanup * disable nonblocking by default * [ci skip] add entity slice * impl fork-join * fix async locator diff * optimize queue * inline iterator * [ci skip] Update patch header * cleanup * improve compatibility * add license header * optimize spin wait * remove queue-size option * dynamic adjust subtasks --------- Co-authored-by: Taiyou06 <kaandindar21@gmail.com> Co-authored-by: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
64 lines
3.5 KiB
Diff
64 lines
3.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Taiyou06 <kaandindar21@gmail.com>
|
|
Date: Sat, 8 Feb 2025 05:32:30 +0100
|
|
Subject: [PATCH] Optimize checking nearby players for spawning
|
|
|
|
|
|
diff --git a/net/minecraft/server/level/ChunkMap.java b/net/minecraft/server/level/ChunkMap.java
|
|
index 634d37f6401f19cc28f9c131dbfbbfefb6c0895a..3c80a42a4d99460d75ab18afae43cfe29e4be798 100644
|
|
--- a/net/minecraft/server/level/ChunkMap.java
|
|
+++ b/net/minecraft/server/level/ChunkMap.java
|
|
@@ -764,7 +764,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
|
|
}
|
|
|
|
private boolean anyPlayerCloseEnoughForSpawningInternal(ChunkPos chunkPos, boolean reducedRange) {
|
|
- double blockRange; // Paper - use from event
|
|
+ //double blockRange; // Paper - use from event // Leaf - Optimize checking nearby players for spawning - move down
|
|
// Spigot end
|
|
// Paper start - chunk tick iteration optimisation
|
|
final ca.spottedleaf.moonrise.common.list.ReferenceList<ServerPlayer> players = ((ca.spottedleaf.moonrise.patches.chunk_system.level.ChunkSystemServerLevel)this.level).moonrise$getNearbyPlayers().getPlayers(
|
|
@@ -776,23 +776,35 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
|
|
|
|
final ServerPlayer[] raw = players.getRawDataUnchecked();
|
|
final int len = players.size();
|
|
+ // Leaf start - Optimize checking nearby players for spawning
|
|
+ // Precompute chunk center once
|
|
+ // inline, copy from SectionPos#sectionToBlockCoord
|
|
+ final double centerX = (chunkPos.x << 4) + 8;
|
|
+ final double centerZ = (chunkPos.z << 4) + 8;
|
|
|
|
- Objects.checkFromIndexSize(0, len, raw.length);
|
|
for (int i = 0; i < len; ++i) {
|
|
final ServerPlayer serverPlayer = raw[i];
|
|
- // Paper start - PlayerNaturallySpawnCreaturesEvent
|
|
- com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent event;
|
|
- blockRange = 16384.0D;
|
|
+ if (serverPlayer.isSpectator()) continue; // Skip spectators early
|
|
+ final double blockRangeSquared;
|
|
if (reducedRange) {
|
|
- event = serverPlayer.playerNaturallySpawnedEvent;
|
|
+ // Handle reduced range from PlayerNaturallySpawnCreaturesEvent
|
|
+ // Paper start - PlayerNaturallySpawnCreaturesEvent
|
|
+ final com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent event = serverPlayer.playerNaturallySpawnedEvent;
|
|
if (event == null || event.isCancelled()) continue;
|
|
- blockRange = (double) ((event.getSpawnRadius() << 4) * (event.getSpawnRadius() << 4));
|
|
- }
|
|
- if (this.playerIsCloseEnoughForSpawning(serverPlayer, chunkPos, blockRange)) {
|
|
+ final int spawnRadius = event.getSpawnRadius();
|
|
+ blockRangeSquared = (double) (spawnRadius * spawnRadius) * 256.0; // (radius << 4)^2
|
|
// Paper end - PlayerNaturallySpawnCreaturesEvent
|
|
+ } else {
|
|
+ blockRangeSquared = 16384.0D; // Default 128^2
|
|
+ }
|
|
+ // Calculate squared distance using precomputed center
|
|
+ final double dx = serverPlayer.getX() - centerX;
|
|
+ final double dz = serverPlayer.getZ() - centerZ;
|
|
+ if (dx * dx + dz * dz < blockRangeSquared) {
|
|
return true;
|
|
}
|
|
}
|
|
+ // Leaf end - Optimize checking nearby players for spawning
|
|
|
|
return false;
|
|
// Paper end - chunk tick iteration optimisation
|