mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-19 09:27:43 +01:00
a5fa03865d
Upstream has released updates that appear to apply and compile correctly Paper Changes: 5d779a621 Implements PlayerHandshakeEvent#getOriginalSocketAddressHostname and deprecates PlayerHandshakeEvent(String, boolean) in favour of PlayerHandshakeEvent(String, String, boolean) 6fab1ee3a Expose Tracked Players b53a650a5 Clear SyncLoadInfo c02c22fde fix: legacy component serialisation was wiped out 2dd5dccf0 Add config option for displayname in quit message (#5260)
77 lines
3.2 KiB
Diff
77 lines
3.2 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 ticks
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
|
|
index 8e25ecc687a9e222a7acba8f4ee12312dd9c0c52..da1cf9eecbe0bcd7e31153589765c0238ac23742 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
|
@@ -73,7 +73,7 @@ public abstract class PlayerList {
|
|
private int viewDistance;
|
|
private EnumGamemode u;
|
|
private boolean v;
|
|
- private int w;
|
|
+ private int w; private int getTick() { return this.w; } private int setTick(int i) { return this.w = i; } // Purpur - OBFHELPER
|
|
|
|
// CraftBukkit start
|
|
private CraftServer cserver;
|
|
@@ -932,22 +932,23 @@ public abstract class PlayerList {
|
|
}
|
|
|
|
public void tick() {
|
|
- if (++this.w > 600) {
|
|
- // CraftBukkit start
|
|
- for (int i = 0; i < this.players.size(); ++i) {
|
|
- final EntityPlayer target = (EntityPlayer) this.players.get(i);
|
|
-
|
|
- target.playerConnection.sendPacket(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.UPDATE_LATENCY, Iterables.filter(this.players, new Predicate<EntityPlayer>() {
|
|
- @Override
|
|
- public boolean apply(EntityPlayer input) {
|
|
- return target.getBukkitEntity().canSee(input.getBukkitEntity());
|
|
- }
|
|
- })));
|
|
+ // Purpur start
|
|
+ int tick = getTick();
|
|
+ if (tick < this.players.size()) {
|
|
+ final org.bukkit.craftbukkit.entity.CraftPlayer target = this.players.get(tick).getBukkitEntity();
|
|
+ final java.util.List<EntityPlayer> list = new java.util.ArrayList<>();
|
|
+ for (EntityPlayer entityplayer : this.players) {
|
|
+ if (target.canSee(entityplayer.getUniqueID())) {
|
|
+ list.add(entityplayer);
|
|
+ }
|
|
}
|
|
- // CraftBukkit end
|
|
- this.w = 0;
|
|
+ target.getHandle().playerConnection.sendPacket(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.UPDATE_LATENCY, list));
|
|
}
|
|
-
|
|
+ if (++tick > 600) {
|
|
+ tick = 0;
|
|
+ }
|
|
+ setTick(tick);
|
|
+ // Purpur end
|
|
}
|
|
|
|
public void sendAll(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 bb954462b5443ca93d833d460cbd1d0cb6292309..0a8c22f6d798a137b32fe2d59c891449013811b6 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -1465,7 +1465,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
|
|
|
@Override
|
|
public boolean canSee(Player player) {
|
|
- return !hiddenPlayers.containsKey(player.getUniqueId());
|
|
+ // Purpur start
|
|
+ return canSee(player.getUniqueId());
|
|
+ }
|
|
+
|
|
+ public boolean canSee(UUID uuid) {
|
|
+ return !hiddenPlayers.containsKey(uuid);
|
|
+ // Purpur end
|
|
}
|
|
|
|
@Override
|