diff options
author | Nassim Jahnke <[email protected]> | 2023-09-23 09:38:10 +1000 |
---|---|---|
committer | Nassim Jahnke <[email protected]> | 2023-09-23 09:38:10 +1000 |
commit | b3ec8bd8ae19e40022ad4dd5db4a1414cb4330bb (patch) | |
tree | 429b9bd9ef2cc19e42b8656ef25ca1548f5efe88 /patches/server/0566-forced-whitelist-use-configurable-kick-message.patch | |
parent | 81c5901c674e6ee89dbfed4848c9eb645bfb0f16 (diff) | |
download | Paper-b3ec8bd8ae19e40022ad4dd5db4a1414cb4330bb.tar.gz Paper-b3ec8bd8ae19e40022ad4dd5db4a1414cb4330bb.zip |
Revert "re-add distance map patch"
This reverts commit 81c5901c674e6ee89dbfed4848c9eb645bfb0f16.
Diffstat (limited to 'patches/server/0566-forced-whitelist-use-configurable-kick-message.patch')
-rw-r--r-- | patches/server/0566-forced-whitelist-use-configurable-kick-message.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/patches/server/0566-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0566-forced-whitelist-use-configurable-kick-message.patch new file mode 100644 index 0000000000..6be6c5a54b --- /dev/null +++ b/patches/server/0566-forced-whitelist-use-configurable-kick-message.patch @@ -0,0 +1,19 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Trigary <[email protected]> +Date: Sat, 27 Mar 2021 09:24:23 +0100 +Subject: [PATCH] forced whitelist: use configurable kick message + + +diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java +index e4a9d99e08d5ed033f20a916f791b9f989fa66fb..6fbe95fea9faa830cde4ff8a8031d148223023e5 100644 +--- a/src/main/java/net/minecraft/server/MinecraftServer.java ++++ b/src/main/java/net/minecraft/server/MinecraftServer.java +@@ -2148,7 +2148,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa + ServerPlayer entityplayer = (ServerPlayer) iterator.next(); + + if (!whitelist.isWhiteListed(entityplayer.getGameProfile()) && !this.getPlayerList().isOp(entityplayer.getGameProfile())) { // Paper - Fix kicking ops when whitelist is reloaded (MC-171420) +- entityplayer.connection.disconnect(Component.translatable("multiplayer.disconnect.not_whitelisted")); ++ entityplayer.connection.disconnect(org.spigotmc.SpigotConfig.whitelistMessage); // Paper - use configurable message + } + } + |