Upstream
/
Paper
mirror of https://github.com/PaperMC/Paper.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge fdc8aac894 into 8f7ac62905

This commit is contained in:
Ryan Jones 2024-04-29 12:33:13 +02:00 committed by GitHub
parent 8f7ac62905 fdc8aac894
commit 3231d81b4e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4443 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4420
patches/server/0096-Paper-config-files.patch Normal file
View File

File diff suppressed because it is too large Load Diff

23
patches/server/1025-Use-MOTD-provided-in-Paper-config-if-it-exists.patch Normal file
View File

@ -0,0 +1,23 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: wordandahalf <10679776+wordandahalf@users.noreply.github.com>
Date: Sun, 7 Aug 2022 20:06:23 -0500
Subject: [PATCH] Use MOTD provided in Paper config, if it exists
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index bfde5bbcccfaa754ec6bdf4f3817981a93e465bd..750ed134ebf520ce91f9ea3d4ead3a56b624b566 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2184,6 +2184,12 @@ public final class CraftServer implements Server {
// Paper start
@Override
public net.kyori.adventure.text.Component motd() {
+ net.kyori.adventure.text.Component paperMotd =
+ io.papermc.paper.configuration.GlobalConfiguration.get().messages.motd;
+
+ if (paperMotd != null)
+ return paperMotd;
+
return console.getComponentMotd();
}
// Paper end