37 lines
2.0 KiB
Diff
37 lines
2.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: nostalgic853 <yuu8583@proton.me>
|
|
Date: Sat, 22 Oct 2022 17:23:09 +0800
|
|
Subject: [PATCH] Let user decide if we should warn while running in a root
|
|
user
|
|
|
|
|
|
diff --git a/src/main/java/cc/keyimc/keyi/KeyiConfig.java b/src/main/java/cc/keyimc/keyi/KeyiConfig.java
|
|
index bc9403d002ef24e71be67a962d099f5d73db9540..1b20dbc56dcbd68aca45444f3f313ef77ce74423 100644
|
|
--- a/src/main/java/cc/keyimc/keyi/KeyiConfig.java
|
|
+++ b/src/main/java/cc/keyimc/keyi/KeyiConfig.java
|
|
@@ -132,4 +132,10 @@ public final class KeyiConfig {
|
|
public static void reload() {
|
|
KeyiConfig.init((File) MinecraftServer.getServer().options.valueOf("keyi-settings"));
|
|
}
|
|
+
|
|
+ public static boolean enableRootUserWarning = true;
|
|
+
|
|
+ public static void misc() {
|
|
+ enableRootUserWarning = getBoolean("misc.enable-root-user-warning", enableRootUserWarning);
|
|
+ }
|
|
}
|
|
\ No newline at end of file
|
|
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
|
index ca0ddafe66dd5d02b1e96b1fc1c574490b68e6d4..16a38506db85f553f54132e808e633ea15f500bf 100644
|
|
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
|
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
|
@@ -185,7 +185,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
|
|
}
|
|
|
|
// Paper start - detect running as root
|
|
- if (io.papermc.paper.util.ServerEnvironment.userIsRootOrAdmin()) {
|
|
+ if (io.papermc.paper.util.ServerEnvironment.userIsRootOrAdmin() && cc.keyimc.keyi.KeyiConfig.enableRootUserWarning) { // KeYi start - let user decide if we should warn
|
|
DedicatedServer.LOGGER.warn("****************************");
|
|
DedicatedServer.LOGGER.warn("YOU ARE RUNNING THIS SERVER AS AN ADMINISTRATIVE OR ROOT USER. THIS IS NOT ADVISED.");
|
|
DedicatedServer.LOGGER.warn("YOU ARE OPENING YOURSELF UP TO POTENTIAL RISKS WHEN DOING THIS.");
|