68 lines
3.1 KiB
Diff
68 lines
3.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: James Lyne <jim+github@not-null.co.uk>
|
|
Date: Mon, 7 Dec 2020 17:52:36 +0000
|
|
Subject: [PATCH] Spread out and optimise player list ticksSpread out and
|
|
optimise player list ticks
|
|
|
|
Original code by PurpurMC, licensed under MIT
|
|
You can find the original code on https://github.com/PurpurMC/Purpur
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
|
|
index e4c5521ecc421bbf7150d08c5961d484cb02bd0f..4feddab26597b67edc4f79e10d41a88d96f16b37 100644
|
|
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
|
|
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
|
|
@@ -1021,22 +1021,21 @@ 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<ServerPlayer>() {
|
|
- @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<ServerPlayer> list = new java.util.ArrayList<>();
|
|
+ for (ServerPlayer player : this.players) {
|
|
+ if (target.canSee(player.getUUID())) {
|
|
+ list.add(player);
|
|
+ }
|
|
}
|
|
- // CraftBukkit end
|
|
+ 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 a5ccc1b3c7cef43527556c33d846cc9904e3ab8b..60dbed75f29777f8ffcd1349549be75729d48be1 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -1626,7 +1626,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
|
|
|
@Override
|
|
public boolean canSee(org.bukkit.entity.Entity entity) {
|
|
- return !this.hiddenEntities.containsKey(entity.getUniqueId());
|
|
+ // Purpur start
|
|
+ return this.canSee(entity.getUniqueId());
|
|
+ }
|
|
+
|
|
+ public boolean canSee(UUID uuid) {
|
|
+ return !this.hiddenEntities.containsKey(uuid);
|
|
+ // Purpur end
|
|
}
|
|
|
|
@Override
|