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

Fix rare viewer NPE

This commit is contained in:
themode 2022-03-09 17:28:37 +01:00
parent f36304f613
commit d1b654e843
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/net/minestom/server/entity/EntityView.java
View File

@ -163,6 +163,7 @@ final class EntityView {
}
public void register(T entity) {
assert Entity.getEntity(entity.getEntityId()) == entity : "Unregistered entity shouldn't be registered as viewer";
this.bitSet.add(entity.getEntityId());
}
@ -238,20 +239,18 @@ final class EntityView {
final class SetImpl extends AbstractSet<Player> {
@Override
public @NotNull Iterator<Player> iterator() {
Player[] players;
List<Player> players;
synchronized (mutex) {
var bitSet = viewableOption.bitSet;
if (bitSet.isEmpty()) return Collections.emptyIterator();
players = new Player[bitSet.size()];
int i = 0;
players = new ArrayList<>(bitSet.size());
for (IntIterator it = bitSet.intIterator(); it.hasNext(); ) {
final int id = it.nextInt();
final Player player = (Player) Entity.getEntity(id);
assert player != null;
players[i++] = player;
if (player != null) players.add(player);
}
}
return Arrays.asList(players).iterator();
return players.iterator();
}
@Override