Upstream
/
Minestom
mirror of https://github.com/Minestom/Minestom.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Improve ChunkSet

This commit is contained in:
themode 2022-02-18 11:13:45 +01:00
parent 9b04e89552
commit c3c139735a
2 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/minestom/server/utils/PacketUtils.java
View File

@ -103,8 +103,6 @@ public final class PacketUtils {
*/
public static void sendGroupedPacket(@NotNull Collection<Player> players, @NotNull ServerPacket packet,
@NotNull Predicate<Player> predicate) {
if (players.isEmpty()) return;
// work out if the packet needs to be sent individually due to server-side translating
final SendablePacket sendablePacket = GROUPED_PACKET ? new CachedPacket(packet) : packet;
players.forEach(player -> {
if (predicate.test(player)) player.sendPacket(sendablePacket);

45
src/main/java/net/minestom/server/utils/ViewEngine.java
View File

@ -1,5 +1,6 @@
package net.minestom.server.utils;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
import it.unimi.dsi.fastutil.ints.IntSet;
import net.minestom.server.MinecraftServer;
@ -18,7 +19,6 @@ import java.util.*;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.function.Consumer;
import java.util.function.Predicate;
import java.util.stream.Stream;
/**
* Defines which players are able to see this element.
@ -218,25 +218,38 @@ public final class ViewEngine {
});
}
private Stream<T> references() {
private int lastSize;
private Collection<T> references() {
final TrackedLocation trackedLocation = ViewEngine.this.trackedLocation;
if (trackedLocation == null) return Stream.empty();
if (trackedLocation == null) return List.of();
final Instance instance = trackedLocation.instance();
final Point point = trackedLocation.point();
var references = instance.getEntityTracker().references(point, range, target);
Stream<T> result = references.stream().flatMap(Collection::stream);
if (instance instanceof InstanceContainer container) {
// References from shared instances must be added to the result.
final List<SharedInstance> shared = container.getSharedInstances();
if (!shared.isEmpty()) {
Stream<T> sharedInstanceStream = shared.stream().<List<T>>mapMulti((inst, consumer) -> {
var ref = inst.getEntityTracker().references(point, range, target);
ref.forEach(consumer);
}).flatMap(Collection::stream);
result = Stream.concat(result, sharedInstanceStream);
Int2ObjectOpenHashMap<T> entityMap = new Int2ObjectOpenHashMap<>(Math.max(lastSize, 16));
// Current Instance
for (var reference : instance.getEntityTracker().references(point, range, target)) {
if (reference.isEmpty()) continue;
for (var entity : reference) {
entityMap.putIfAbsent(entity.getEntityId(), entity);
}
}
return result;
// Shared Instances
if (instance instanceof InstanceContainer container) {
final List<SharedInstance> shared = container.getSharedInstances();
if (!shared.isEmpty()) {
for (var sharedInstance : shared) {
for (var reference : sharedInstance.getEntityTracker().references(point, range, target)) {
if (reference.isEmpty()) continue;
for (var entity : reference) {
entityMap.putIfAbsent(entity.getEntityId(), entity);
}
}
}
}
}
this.lastSize = entityMap.size();
return entityMap.values();
}
}
@ -248,7 +261,7 @@ public final class ViewEngine {
@Override
public int size() {
return (int) viewableOption.references().count();
return viewableOption.references().size();
}
@Override