Repo-Mirror/MiraiMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

need to fix in patch 0009

Browse Source
This commit is contained in:
Etil
2021-09-18 16:10:27 +02:00
committed by GitHub
parent 99e4c84f91
commit 4b335ca0d4
1 changed files with 0 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
patches/server/0010-Hide-player-IPs.patch
View File

@@ -1,67 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Etil <81570777+etil2jz@users.noreply.github.com>
Date: Sat, 18 Sep 2021 16:03:10 +0200
Subject: [PATCH] Hide player IPs
diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
index 01fee879c946b6640da34d5890d686f0152437dc..76c2f4b24e16c7d641ae1945b0ef94a6e854b342 100644
--- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
@@ -10,12 +10,14 @@ import java.net.InetSocketAddress;
import java.net.SocketAddress;
import java.security.PrivateKey;
import java.util.Arrays;
+import java.util.Objects;
import java.util.Random;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicInteger;
import javax.annotation.Nullable;
import javax.crypto.Cipher;
import javax.crypto.SecretKey;
+import xyz.arthurb.mirai.MiraiConfig;
import net.minecraft.DefaultUncaughtExceptionHandler;
import net.minecraft.network.Connection;
import net.minecraft.network.FriendlyByteBuf;
@@ -223,6 +225,10 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener
}
public String getUserName() {
+ // Mirai start
+ if (MiraiConfig.hidePlayerIps) {
+ return Objects.toString(this.gameProfile);
+ }
return this.gameProfile != null ? this.gameProfile + " (" + this.connection.getRemoteAddress() + ")" : String.valueOf(this.connection.getRemoteAddress());
}
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 08352cd0e6cc0cbd15aa894353b7e099216b9825..6d860e769eacfc78ca513ee787072d1762c02053 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -7,6 +7,7 @@ import com.google.common.collect.Sets;
import com.mojang.authlib.GameProfile;
import com.mojang.serialization.DataResult;
import com.mojang.serialization.Dynamic;
+import xyz.arthurb.mirai.MiraiConfig;
import io.netty.buffer.Unpooled;
import io.papermc.paper.adventure.PaperAdventure;
import java.io.File;
@@ -486,11 +487,17 @@ public abstract class PlayerList {
// CraftBukkit - Moved from above, added world
// Yatopia start - log player login location
- if (xyz.arthurb.mirai.server.MiraiConfig.logPlayerLoginLoc) {
+ // Mirai start - hide player ips
+ if (xyz.arthurb.mirai.server.MiraiConfig.logPlayerLoginLoc && MiraiConfig.hidePlayerIps) {
+ PlayerList.LOGGER.info("{} logged in with entity id {} at ([{}]{}, {}, {})", player.getName().getString(), player.getId(), worldserver1.serverLevelData.getLevelName(), player.getX(), player.getY(), player.getZ());
+ } else if (xyz.arthurb.mirai.server.MiraiConfig.logPlayerLoginLoc) {
PlayerList.LOGGER.info("{}[{}] logged in with entity id {} at ([{}]{}, {}, {})", player.getName().getString(), s1, player.getId(), worldserver1.serverLevelData.getLevelName(), player.getX(), player.getY(), player.getZ());
+ } else if (MiraiConfig.hidePlayerIps) {
+ PlayerList.LOGGER.info("{} logged in with entity id {}", player.getName().getString(), player.getId());
} else {
PlayerList.LOGGER.info("{}[{}] logged in with entity id {}", player.getName().getString(), s1, player.getId());
}
+ // Mirai end - hide player ips
// Yatopia end - log player login location
}