From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: James Lyne Date: Mon, 7 Dec 2020 17:52:36 +0000 Subject: [PATCH] Spread out and optimise player list ticksSpread out and optimise player list ticks diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java index 8a2568a6af89cf1d979bf8accf5d9c7bfdbfdec8..75d2dbe9092b8f46d102bf50d616bc37883f8375 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -1004,22 +1004,22 @@ public abstract class PlayerList { } public void tick() { - if (++this.sendAllPlayerInfoIn > 600) { - // CraftBukkit start - for (int i = 0; i < this.players.size(); ++i) { - final ServerPlayer target = (ServerPlayer) this.players.get(i); - - target.connection.send(new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.UPDATE_LATENCY, this.players.stream().filter(new Predicate() { - @Override - public boolean apply(ServerPlayer input) { - return target.getBukkitEntity().canSee(input.getBukkitEntity()); - } - }).collect(Collectors.toList()))); + // Purpur start + if (this.sendAllPlayerInfoIn < this.players.size()) { + final org.bukkit.craftbukkit.entity.CraftPlayer target = this.players.get(this.sendAllPlayerInfoIn).getBukkitEntity(); + final List list = new java.util.ArrayList<>(); + for (ServerPlayer player : this.players) { + if (target.canSee(player.getUUID())) { + list.add(player); + } } - // CraftBukkit end - this.sendAllPlayerInfoIn = 0; + target.getHandle().connection.send(new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.UPDATE_LATENCY, list)); } + if (++this.sendAllPlayerInfoIn > 600) { + this.sendAllPlayerInfoIn = 0; + } + // Purpur end } public void broadcastAll(Packet packet) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java index 676d98f183d798f1ea894cd78539f9034edb3659..9388a960317b3d0bcebbbce3855db64d2dc9e97a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1503,7 +1503,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @Override public boolean canSee(Player player) { - return !this.hiddenPlayers.containsKey(player.getUniqueId()); + // Purpur start + return canSee(player.getUniqueId()); + } + + public boolean canSee(UUID uuid) { + return !hiddenPlayers.containsKey(uuid); + // Purpur end } @Override