3
0
Mirror von https://github.com/PaperMC/Velocity.git synchronisiert 2024-11-17 05:20:14 +01:00

Merge pull request #56 from Leymooo/ping

add method to get player ping
Dieser Commit ist enthalten in:
Andrew Steinborn 2018-08-25 12:45:13 -04:00 committet von GitHub
Commit 37eabde0c5
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 4AEE18F83AFDEB23
3 geänderte Dateien mit 28 neuen und 4 gelöschten Zeilen

Datei anzeigen

@ -36,6 +36,12 @@ public interface Player extends CommandSource, InboundConnection, ChannelMessage
PlayerSettings getPlayerSettings(); PlayerSettings getPlayerSettings();
/**
* Returns the current player's ping
* @return the player's ping or -1 if ping information is currently unknown
*/
long getPing();
/** /**
* Sends a chat message to the player's client. * Sends a chat message to the player's client.
* @param component the chat message to send * @param component the chat message to send

Datei anzeigen

@ -28,7 +28,8 @@ public class ClientPlaySessionHandler implements MinecraftSessionHandler {
private static final int MAX_PLUGIN_CHANNELS = 128; private static final int MAX_PLUGIN_CHANNELS = 128;
private final ConnectedPlayer player; private final ConnectedPlayer player;
private long lastPing = -1; private long lastPingID = -1;
private long lastPingSent = -1;
private boolean spawned = false; private boolean spawned = false;
private final List<UUID> serverBossBars = new ArrayList<>(); private final List<UUID> serverBossBars = new ArrayList<>();
private final Set<String> clientPluginMsgChannels = new HashSet<>(); private final Set<String> clientPluginMsgChannels = new HashSet<>();
@ -53,11 +54,13 @@ public class ClientPlaySessionHandler implements MinecraftSessionHandler {
public void handle(MinecraftPacket packet) { public void handle(MinecraftPacket packet) {
if (packet instanceof KeepAlive) { if (packet instanceof KeepAlive) {
KeepAlive keepAlive = (KeepAlive) packet; KeepAlive keepAlive = (KeepAlive) packet;
if (keepAlive.getRandomId() != lastPing) { if (keepAlive.getRandomId() != lastPingID) {
// The last keep alive we got was probably from a different server. Let's ignore it, and hope the next // The last keep alive we got was probably from a different server. Let's ignore it, and hope the next
// ping is alright. // ping is alright.
return; return;
} }
player.setPing(System.currentTimeMillis() - lastPingSent);
resetPingData();
} }
if (packet instanceof ClientSettings) { if (packet instanceof ClientSettings) {
@ -144,7 +147,7 @@ public class ClientPlaySessionHandler implements MinecraftSessionHandler {
} }
public void handleBackendJoinGame(JoinGame joinGame) { public void handleBackendJoinGame(JoinGame joinGame) {
lastPing = Long.MIN_VALUE; // reset last ping resetPingData(); // reset ping data;
if (!spawned) { if (!spawned) {
// nothing special to do here // nothing special to do here
spawned = true; spawned = true;
@ -252,6 +255,12 @@ public class ClientPlaySessionHandler implements MinecraftSessionHandler {
} }
public void setLastPing(long lastPing) { public void setLastPing(long lastPing) {
this.lastPing = lastPing; this.lastPingID = lastPing;
this.lastPingSent = System.currentTimeMillis();
}
private void resetPingData() {
this.lastPingID = -1;
this.lastPingSent = -1;
} }
} }

Datei anzeigen

@ -54,6 +54,7 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player {
private final GameProfile profile; private final GameProfile profile;
private PermissionFunction permissionFunction = null; private PermissionFunction permissionFunction = null;
private int tryIndex = 0; private int tryIndex = 0;
private long ping = -1;
private VelocityServerConnection connectedServer; private VelocityServerConnection connectedServer;
private ClientSettings clientSettings; private ClientSettings clientSettings;
private VelocityServerConnection connectionInFlight; private VelocityServerConnection connectionInFlight;
@ -89,6 +90,14 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player {
} }
@Override @Override
public long getPing() {
return this.ping;
}
public void setPing(long ping) {
this.ping = ping;
}
public PlayerSettings getPlayerSettings() { public PlayerSettings getPlayerSettings() {
return settings == null ? ClientSettingsWrapper.DEFAULT : this.settings; return settings == null ? ClientSettingsWrapper.DEFAULT : this.settings;
} }