mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Move "use-display-name-in-quit-message" to settings namespace (#6257)

Browse source
This commit is contained in:
MeFisto94 2021-07-26 01:11:44 +02:00 • committed by GitHub
commit efd7e5182c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
36 changed files with 82 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

6
patches/server/0399-Add-tick-times-API-and-mspt-command.patch
View file

@ -75,7 +75,7 @@ index 0000000000000000000000000000000000000000..d0211d4f39f9d6af1d751ac66342b42c
+ }
+}
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 5c67c51dd0a19357086d4ceb3ca724401e4d26b8..89a475429ede42f3a8aae16760e56bfba57bb1b5 100644
index 40818b03f2f285124e2cf6982936e66ff047b6e7..6259677b6d06cea5c66b3e3f508eef648dab0de1 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -69,6 +69,7 @@ public class PaperConfig {
@ -84,8 +84,8 @@ index 5c67c51dd0a19357086d4ceb3ca724401e4d26b8..89a475429ede42f3a8aae16760e56bfb
commands.put("paper", new PaperCommand("paper"));
+ commands.put("mspt", new MSPTCommand("mspt"));
version = getInt("config-version", 20);
set("config-version", 20);
version = getInt("config-version", 21);
set("config-version", 21);
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 0115ffe84356468ddc254d8d5bdd719bc5e7e3f8..def1edb961ba41819ce30c427b1616578a513433 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java