Repo-Mirror/Leaf
9
0
Fork 0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2025-12-25 01:49:16 +00:00
Code Issues Releases Activity

use TrackedChunk from ChunkData to prevent hash lookup (#461)

Browse Source 
closes #441
This commit is contained in:
hayanesuru
2025-08-15 12:03:29 +09:00
committed by GitHub
parent 91739944e7
commit 8c2b50bdb8
4 changed files with 37 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
leaf-server/src/main/java/org/dreeam/leaf/async/tracker/TrackerCtx.java
View File

@@ -1,6 +1,7 @@
package org.dreeam.leaf.async.tracker;
import ca.spottedleaf.moonrise.common.misc.NearbyPlayers;
import ca.spottedleaf.moonrise.patches.chunk_system.entity.ChunkSystemEntity;
import ca.spottedleaf.moonrise.patches.entity_tracker.EntityTrackerEntity;
import io.papermc.paper.event.player.PlayerTrackEntityEvent;
import io.papermc.paper.event.player.PlayerUntrackEntityEvent;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
@@ -119,31 +120,34 @@ public final class TrackerCtx {
}
void handle(boolean flush) {
handlePackets(world, packets, flush);
if (!pluginEntity.isEmpty()) {
for (final Entity entity : pluginEntity) {
final ChunkMap.TrackedEntity tracker = ((ca.spottedleaf.moonrise.patches.entity_tracker.EntityTrackerEntity)entity).moonrise$getTrackedEntity();
final ChunkMap.TrackedEntity tracker = ((EntityTrackerEntity) entity).moonrise$getTrackedEntity();
if (tracker == null) {
continue;
}
NearbyPlayers.TrackedChunk trackedChunk = world.moonrise$getNearbyPlayers().getChunk(entity.chunkPosition());
tracker.leafTick(this, trackedChunk);
ca.spottedleaf.moonrise.patches.chunk_system.level.chunk.ChunkData chunk = ((ChunkSystemEntity) entity).moonrise$getChunkData();
if (chunk == null) {
continue;
}
tracker.moonrise$tick(chunk.nearbyPlayers);
boolean flag = false;
if (tracker.moonrise$hasPlayers()) {
flag = true;
} else {
FullChunkStatus status = ((ca.spottedleaf.moonrise.patches.chunk_system.entity.ChunkSystemEntity) entity).moonrise$getChunkStatus();
FullChunkStatus status = ((ChunkSystemEntity) entity).moonrise$getChunkStatus();
if (status != null && status.isOrAfter(FullChunkStatus.ENTITY_TICKING)) {
flag = true;
}
}
if (flag) {
tracker.serverEntity.leafSendChanges(this, tracker);
tracker.serverEntity.sendChanges();
}
}
pluginEntity.clear();
}
handlePackets(world, packets, flush);
if (!bukkitVelocityEvent.isEmpty()) {
for (ServerPlayer player : bukkitVelocityEvent) {
if (!world.equals(player.level())) {

38
leaf-server/src/main/java/org/dreeam/leaf/async/tracker/TrackerTask.java
View File

@@ -1,36 +1,26 @@
package org.dreeam.leaf.async.tracker;
import ca.spottedleaf.moonrise.common.misc.NearbyPlayers;
import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
import ca.spottedleaf.moonrise.patches.chunk_system.entity.ChunkSystemEntity;
import ca.spottedleaf.moonrise.patches.chunk_system.level.chunk.ChunkData;
import ca.spottedleaf.moonrise.patches.entity_tracker.EntityTrackerEntity;
import net.minecraft.server.level.ChunkMap;
import net.minecraft.server.level.FullChunkStatus;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.level.ChunkPos;
import org.dreeam.leaf.util.EntitySlice;
import java.util.concurrent.Callable;
public final class TrackerTask implements Callable<TrackerCtx> {
public final ServerLevel world;
private final EntitySlice entities;
public TrackerTask(ServerLevel world, EntitySlice trackerEntities) {
this.world = world;
this.entities = trackerEntities;
}
public record TrackerTask(ServerLevel world, EntitySlice entities) implements Callable<TrackerCtx> {
@Override
public TrackerCtx call() throws Exception {
NearbyPlayers nearbyPlayers = world.moonrise$getNearbyPlayers();
TrackerCtx ctx = new TrackerCtx(this.world);
final TrackerCtx ctx = new TrackerCtx(this.world);
final Entity[] raw = entities.array();
Long2ObjectMap<NearbyPlayers.TrackedChunk> chunkCache = new Long2ObjectOpenHashMap<>();
for (int i = entities.start(); i < entities.end(); i++) {
final Entity entity = raw[i];
final ChunkMap.TrackedEntity tracker = ((ca.spottedleaf.moonrise.patches.entity_tracker.EntityTrackerEntity)entity).moonrise$getTrackedEntity();
long chunkPos = entity.chunkPosition().toLong();
final ChunkMap.TrackedEntity tracker = ((EntityTrackerEntity) entity).moonrise$getTrackedEntity();
// removed in world if null
if (tracker == null) {
continue;
}
@@ -38,16 +28,18 @@ public final class TrackerTask implements Callable<TrackerCtx> {
ctx.citizensEntity(entity);
continue;
}
NearbyPlayers.TrackedChunk trackedChunk = chunkCache.computeIfAbsent(chunkPos, k -> nearbyPlayers.getChunk(ChunkPos.getX(k), ChunkPos.getZ(k)));
tracker.leafTick(ctx, trackedChunk);
ChunkData chunkData = ((ChunkSystemEntity) entity).moonrise$getChunkData();
// removed in world if null
if (chunkData == null) {
continue;
}
tracker.leafTick(ctx, chunkData.nearbyPlayers);
boolean flag = false;
if (tracker.moonrise$hasPlayers()) {
flag = true;
} else {
// may read old value
FullChunkStatus status = ((ca.spottedleaf.moonrise.patches.chunk_system.entity.ChunkSystemEntity) entity).moonrise$getChunkStatus();
// removed in world
FullChunkStatus status = ((ChunkSystemEntity) entity).moonrise$getChunkStatus();
// removed in world if null
if (status != null && status.isOrAfter(FullChunkStatus.ENTITY_TICKING)) {
flag = true;
}