mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2026-01-04 15:41:40 +00:00
3c25377465
ClassInstanceMultiMap belongs to Minecraft vanilla entity storage. And is unused, since replaced by spottedleaf's entity storage (rewrite chunk system). However these patches might be useful for vanilla entity storage if is used.
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 f621cfea59b6d2f2fb29333e50860584b7992c26..79674f4bd7a12c42dec19a4175012d7a2dc88b84 100644
|
|
--- a/net/minecraft/server/level/ChunkMap.java
|
|
+++ b/net/minecraft/server/level/ChunkMap.java
|
|
@@ -773,7 +773,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(
|
|
@@ -785,23 +785,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
|