51 lines
3.4 KiB
Diff
51 lines
3.4 KiB
Diff
|
From 0000000000000000000000000000000000000000 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] Support Paper ip address config + add missing logs
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
||
|
|
index dbccbcb9b44e4efacdf53c2d161115cc20b36cff..18348d01003c8b3299ae3d5292fd9e50f9153cce 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
||
|
|
@@ -643,7 +643,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
|
||
|
|
|
||
|
|
@Override
|
||
|
|
public boolean logIPs() {
|
||
|
|
- return this.getProperties().logIPs;
|
||
|
|
+ return this.getProperties().logIPs && io.papermc.paper.configuration.GlobalConfiguration.get().logging.logPlayerIpAddresses; // Paper
|
||
|
|
}
|
||
|
|
|
||
|
|
protected boolean convertOldUsers() {
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/network/LegacyQueryHandler.java b/src/main/java/net/minecraft/server/network/LegacyQueryHandler.java
|
||
|
|
index d4f5a98a0b1ca9f2a8baa6e0b27353df94d1f333..8f4a964a0863b1be834c1ea1e3d49092516f9258 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/network/LegacyQueryHandler.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/network/LegacyQueryHandler.java
|
||
|
|
@@ -50,7 +50,7 @@ public class LegacyQueryHandler extends ChannelInboundHandlerAdapter {
|
||
|
|
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 {}", net.minecraft.server.MinecraftServer.getServer().logIPs() ? socketaddress: "<ip address withheld>"); // Paper
|
||
|
|
|
||
|
|
// 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);
|
||
|
|
@@ -83,7 +83,7 @@ public class LegacyQueryHandler extends ChannelInboundHandlerAdapter {
|
||
|
|
// 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 {}", net.minecraft.server.MinecraftServer.getServer().logIPs() ? socketaddress: "<ip address withheld>"); // Paper
|
||
|
|
}
|
||
|
|
|
||
|
|
if (s == null) {
|
||
|
|
@@ -207,7 +207,7 @@ public class LegacyQueryHandler extends ChannelInboundHandlerAdapter {
|
||
|
|
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(): "<ip address withheld>"); // Paper
|
||
|
|
|
||
|
|
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(
|