From d12a537299c9c4899bf6554a964e249534601f93 Mon Sep 17 00:00:00 2001 From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com> Date: Sat, 23 Sep 2023 01:49:39 -0400 Subject: [PATCH] Add missing logs for log-ips config option --- .../server/network/LegacyQueryHandler.java.patch | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/paper-server/patches/sources/net/minecraft/server/network/LegacyQueryHandler.java.patch b/paper-server/patches/sources/net/minecraft/server/network/LegacyQueryHandler.java.patch index 4c9495b63b..a4f704f9e9 100644 --- a/paper-server/patches/sources/net/minecraft/server/network/LegacyQueryHandler.java.patch +++ b/paper-server/patches/sources/net/minecraft/server/network/LegacyQueryHandler.java.patch @@ -35,8 +35,9 @@ + com.destroystokyo.paper.event.server.PaperServerListPingEvent event; // Paper if (i == 0) { - LegacyQueryHandler.LOGGER.debug("Ping: (<1.3.x) from {}", socketaddress); +- LegacyQueryHandler.LOGGER.debug("Ping: (<1.3.x) from {}", socketaddress); - s = LegacyQueryHandler.createVersion0Response(this.server); ++ LegacyQueryHandler.LOGGER.debug("Ping: (<1.3.x) from {}", net.minecraft.server.MinecraftServer.getServer().logIPs() ? socketaddress: ""); // Paper - Respect logIPs option + + // Paper start - Call PaperServerListPingEvent and use results + event = com.destroystokyo.paper.network.PaperLegacyStatusClient.processRequest(net.minecraft.server.MinecraftServer.getServer(), (java.net.InetSocketAddress) socketaddress, 39, null); @@ -73,7 +74,8 @@ + // LegacyQueryHandler.LOGGER.debug("Ping: (1.6) from {}", socketaddress); + // Paper end } else { - LegacyQueryHandler.LOGGER.debug("Ping: (1.4-1.5.x) from {}", socketaddress); +- LegacyQueryHandler.LOGGER.debug("Ping: (1.4-1.5.x) from {}", socketaddress); ++ LegacyQueryHandler.LOGGER.debug("Ping: (1.4-1.5.x) from {}", net.minecraft.server.MinecraftServer.getServer().logIPs() ? socketaddress: ""); // Paper - Respect logIPs option } - s = LegacyQueryHandler.createVersion1Response(this.server); @@ -159,7 +161,7 @@ + buf.release(); + this.buf = null; + -+ LOGGER.debug("Ping: (1.6) from {}", ctx.channel().remoteAddress()); ++ LOGGER.debug("Ping: (1.6) from {}", net.minecraft.server.MinecraftServer.getServer().logIPs() ? ctx.channel().remoteAddress(): ""); // Paper - Respect logIPs option + + java.net.InetSocketAddress virtualHost = com.destroystokyo.paper.network.PaperNetworkClient.prepareVirtualHost(host, port); + com.destroystokyo.paper.event.server.PaperServerListPingEvent event = com.destroystokyo.paper.network.PaperLegacyStatusClient.processRequest(