SteamWar/Velocity
13
0
Fork 0
geforkt von Mirrors/Velocity
Code Issues Pull-Requests Aktivität

Fix SpotBugs complaint

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Andrew Steinborn 2020-10-26 20:58:20 -04:00
Ursprung 45752d5ea4
Commit 536049995d
1 geänderte Dateien mit 6 neuen und 17 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

23
proxy/src/main/java/com/velocitypowered/proxy/util/InformationUtils.java
Datei anzeigen

@ -16,13 +16,10 @@ import com.velocitypowered.api.proxy.config.ProxyConfig;
import com.velocitypowered.api.proxy.server.RegisteredServer; import com.velocitypowered.api.proxy.server.RegisteredServer;
import com.velocitypowered.api.util.ProxyVersion; import com.velocitypowered.api.util.ProxyVersion;
import io.netty.channel.unix.DomainSocketAddress;
import java.net.Inet4Address; import java.net.Inet4Address;
import java.net.Inet6Address; import java.net.Inet6Address;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.net.SocketAddress;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -170,22 +167,14 @@ public enum InformationUtils {
public static JsonObject collectServerInfo(RegisteredServer server) { public static JsonObject collectServerInfo(RegisteredServer server) {
JsonObject info = new JsonObject(); JsonObject info = new JsonObject();
info.addProperty("currentPlayers", server.getPlayersConnected().size()); info.addProperty("currentPlayers", server.getPlayersConnected().size());
SocketAddress address = server.getServerInfo().getAddress(); InetSocketAddress iaddr = server.getServerInfo().getAddress();
if (address instanceof InetSocketAddress) { if (iaddr.isUnresolved()) {
InetSocketAddress iaddr = (InetSocketAddress) address; // Greetings form Netty 4aa10db9
if (iaddr.isUnresolved()) { info.addProperty("host", iaddr.getHostString());
// Greetings form Netty 4aa10db9
info.addProperty("host", iaddr.getHostString());
} else {
info.addProperty("host", anonymizeInetAddress(iaddr.getAddress()));
}
info.addProperty("port", iaddr.getPort());
} else if (address instanceof DomainSocketAddress) {
DomainSocketAddress daddr = (DomainSocketAddress) address;
info.addProperty("path", daddr.path());
} else { } else {
info.addProperty("info", address.toString()); info.addProperty("host", anonymizeInetAddress(iaddr.getAddress()));
} }
info.addProperty("port", iaddr.getPort());
return info; return info;
} }