cdanesi/ajQueue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a semi-rare error when a server is offline on bungeecord

Browse Source
This commit is contained in:
ajgeiss0702
2023-01-09 15:23:04 -07:00
parent 2de83c7383
commit 0a2db4f09a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platforms/bungeecord/src/main/java/us/ajg0702/queue/platforms/bungeecord/server/BungeeServer.java
+3 -2
View File
@@ -2,6 +2,7 @@ package us.ajg0702.queue.platforms.bungeecord.server;
import net.md_5.bungee.api.config.ServerInfo; import net.md_5.bungee.api.config.ServerInfo;
import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.connection.ProxiedPlayer;
import org.jetbrains.annotations.Nullable;
import us.ajg0702.queue.api.AjQueueAPI; import us.ajg0702.queue.api.AjQueueAPI;
import us.ajg0702.queue.api.players.AdaptedPlayer; import us.ajg0702.queue.api.players.AdaptedPlayer;
import us.ajg0702.queue.api.server.AdaptedServer; import us.ajg0702.queue.api.server.AdaptedServer;
@@ -51,7 +52,7 @@ public class BungeeServer implements AdaptedServer {
if(debug) logger.info("[pinger] [" + getName() + "] sending ping"); if(debug) logger.info("[pinger] [" + getName() + "] sending ping");
handle.ping((pp, error) -> { handle.ping((pp, error) -> {
if(error != null) { if(error != null || pp == null) {
markOffline(debug, logger, future, sent, error); markOffline(debug, logger, future, sent, error);
} }
@@ -71,7 +72,7 @@ public class BungeeServer implements AdaptedServer {
return future; return future;
} }
private void markOffline(boolean debug, QueueLogger logger, CompletableFuture<AdaptedServerPing> future, long sent, Throwable e) { private void markOffline(boolean debug, QueueLogger logger, CompletableFuture<AdaptedServerPing> future, long sent, @Nullable Throwable e) {
long lastOnline = lastSuccessfullPing == null ? 0 : lastSuccessfullPing.getFetchedTime(); long lastOnline = lastSuccessfullPing == null ? 0 : lastSuccessfullPing.getFetchedTime();
offlineTime = (int) Math.min(sent - lastOnline, Integer.MAX_VALUE); offlineTime = (int) Math.min(sent - lastOnline, Integer.MAX_VALUE);