From af8d1af635e12e5cf54734be6a3e20beb783a20b Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Sep 2017 13:56:23 +1000 Subject: [PATCH] Initialize ping to -1 --- proxy/src/main/java/net/md_5/bungee/ServerConnection.java | 2 +- .../main/java/net/md_5/bungee/connection/UpstreamBridge.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnection.java b/proxy/src/main/java/net/md_5/bungee/ServerConnection.java index 1be12dbce..a30291068 100644 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnection.java @@ -30,7 +30,7 @@ public class ServerConnection implements Server private boolean pingFailed; @Getter @Setter - private long sentPingId; + private long sentPingId = -1; private final Unsafe unsafe = new Unsafe() { diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java index 29e763c77..ae3d900b2 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java @@ -123,7 +123,7 @@ public class UpstreamBridge extends PacketHandler con.setPing( newPing ); } else { - if ( con.getServer().getSentPingId() != 0 && !con.getServer().isPingFailed() ) + if ( con.getServer().getSentPingId() != -1 && !con.getServer().isPingFailed() ) { alive.setRandomId( con.getServer().getSentPingId() ); con.getServer().unsafe().sendPacket( alive );