Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-02-05 23:11:36 +01:00
Code Issues Projects Releases Wiki Activity

Use an IntOpenHashSet to store viewers id

Browse Source
This commit is contained in:
themode 2021-12-22 04:47:48 +01:00 committed by TheMode
parent 573e896a1f
commit 8c1c18e345
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,7 @@
package net.minestom.server.utils; package net.minestom.server.utils;
import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
import it.unimi.dsi.fastutil.ints.IntSet;
import it.unimi.dsi.fastutil.objects.ObjectArraySet; import it.unimi.dsi.fastutil.objects.ObjectArraySet;
import net.minestom.server.coordinate.Point; import net.minestom.server.coordinate.Point;
import net.minestom.server.entity.Entity; import net.minestom.server.entity.Entity;
@ -8,7 +10,6 @@ import net.minestom.server.instance.EntityTracker;
import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.roaringbitmap.RoaringBitmap;
import java.util.*; import java.util.*;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@ -125,7 +126,7 @@ public final class ViewEngine {
// The consumers to be called when an entity is added/removed. // The consumers to be called when an entity is added/removed.
public final Consumer<T> addition, removal; public final Consumer<T> addition, removal;
// Contains all the auto-entity ids that are viewable by this option. // Contains all the auto-entity ids that are viewable by this option.
public final RoaringBitmap bitSet = new RoaringBitmap(); public final IntSet bitSet = new IntOpenHashSet();
// 1 if auto, 0 if manual // 1 if auto, 0 if manual
private volatile int auto = 1; private volatile int auto = 1;
// References from the entity trackers. // References from the entity trackers.
@ -221,7 +222,7 @@ public final class ViewEngine {
public int size() { public int size() {
synchronized (mutex) { synchronized (mutex) {
int size = manualViewers.size(); int size = manualViewers.size();
if (entity != null) return size + viewableOption.bitSet.getCardinality(); if (entity != null) return size + viewableOption.bitSet.size();
// Non-entity fallback // Non-entity fallback
final List<List<Player>> auto = ViewEngine.this.viewableOption.references; final List<List<Player>> auto = ViewEngine.this.viewableOption.references;
if (auto != null) { if (auto != null) {