mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-20 18:07:43 +01:00
417a025211
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@e4f5e1c Bump netty Pufferfish Changes: pufferfish-gg/Pufferfish@a8543a4 #33 Fix anti-xray related crash bug pufferfish-gg/Pufferfish@aefcb1a Updated Upstream (Paper)
67 lines
3.0 KiB
Diff
67 lines
3.0 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
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
|
|
index db23e2afd1b9a7a8e1b29e48a31441b0a64beb5d..dea412353ba3e997d8024cb0770b9ac7300b63a1 100644
|
|
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
|
|
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
|
|
@@ -1021,22 +1021,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<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
|
|
- 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 5cd36fef58afdc60d58acde8809f6507d4d1ea04..6e061bf2951f0bd86364da3129f365799edda24c 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -1734,7 +1734,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
|