From 4ca476c1fa67ee0a60d08ad9e4fcc6513cfbebcd Mon Sep 17 00:00:00 2001 From: ME1312 Date: Mon, 19 Nov 2018 12:27:06 -0500 Subject: [PATCH] Correct LinkServer packets & server autodetection --- LICENSE | 2 +- .../Client/Bukkit/Network/Packet/PacketLinkServer.java | 2 +- .../Client/Sponge/Network/Packet/PacketLinkServer.java | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/LICENSE b/LICENSE index 0bec3aa1..91eddf72 100644 --- a/LICENSE +++ b/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2017 ME1312 + Copyright (C) 2015-2019 ME1312 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketLinkServer.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketLinkServer.java index faf3f826..3567ec22 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketLinkServer.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketLinkServer.java @@ -31,7 +31,7 @@ public class PacketLinkServer implements PacketIn, PacketOut { @Override public YAMLSection generate() { YAMLSection json = new YAMLSection(); - json.set("name", plugin.subdata.getName()); + if (plugin.subdata.getName() != null) json.set("name", plugin.subdata.getName()); json.set("port", Bukkit.getServer().getPort()); return json; } diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketLinkServer.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketLinkServer.java index f53c8fff..125aa66f 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketLinkServer.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/Packet/PacketLinkServer.java @@ -38,7 +38,8 @@ public class PacketLinkServer implements PacketIn, PacketOut { @Override public YAMLSection generate() { YAMLSection json = new YAMLSection(); - json.set("name", plugin.subdata.getName()); + if (plugin.subdata.getName() != null) json.set("name", plugin.subdata.getName()); + if (plugin.game.getServer().getBoundAddress().isPresent()) json.set("port", plugin.game.getServer().getBoundAddress().get()); return json; }