mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
0a4aaf4966
Upstream has released updates that appears to apply and compile correctly Paper Changes: 90264712a [Auto] Updated Upstream (Bukkit) 960d992fd Further improve Chunk Light Prioritization 0d19e4579 Fix deadlock issue with watchdog stopping baf1fabe9 Updated Upstream (CraftBukkit) c0547a6cb [CI-SKIP] Revitalise CONTRIBUTING.md
36 lines
1.6 KiB
Diff
36 lines
1.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
|
Date: Sat, 21 Mar 2020 11:47:39 -0500
|
|
Subject: [PATCH] Configurable server mod name
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
index 0a7dd67516..99b6666a85 100644
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
@@ -1506,7 +1506,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
|
}
|
|
|
|
public String getServerModName() {
|
|
- return "Purpur"; // Purpur // Tuinity // Paper // Spigot // CraftBukkit
|
|
+ return net.pl3x.purpur.PurpurConfig.serverModName; // Purpur // Tuinity // Paper // Spigot // CraftBukkit
|
|
}
|
|
|
|
public CrashReport b(CrashReport crashreport) {
|
|
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
|
index d699a91685..27cbfdfba8 100644
|
|
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
|
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
|
|
@@ -139,6 +139,11 @@ public class PurpurConfig {
|
|
afkTabListPrefix = getString("settings.messages.afk-tab-list-prefix", afkTabListPrefix);
|
|
}
|
|
|
|
+ public static String serverModName = "Purpur";
|
|
+ private static void serverModName() {
|
|
+ serverModName = getString("settings.server-mod-name", serverModName);
|
|
+ }
|
|
+
|
|
public static String timingsUrl = "https://timings.pl3x.net";
|
|
private static void timingsSettings() {
|
|
timingsUrl = getString("settings.timings.url", timingsUrl);
|