From 0c94630926a8b7b824d0645a0f178633e36ec98e Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Sun, 11 Jun 2023 10:51:11 +1000 Subject: [PATCH] #1184: Add setMotd and setMaxPlayers By: Hannah --- .../net/minecraft/server/players/PlayerList.patch | 9 +++++++-- .../java/org/bukkit/craftbukkit/CraftServer.java | 12 ++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/paper-server/nms-patches/net/minecraft/server/players/PlayerList.patch b/paper-server/nms-patches/net/minecraft/server/players/PlayerList.patch index 4d2e0f4878..efbe11ab53 100644 --- a/paper-server/nms-patches/net/minecraft/server/players/PlayerList.patch +++ b/paper-server/nms-patches/net/minecraft/server/players/PlayerList.patch @@ -27,7 +27,7 @@ public abstract class PlayerList { public static final File USERBANLIST_FILE = new File("banned-players.json"); -@@ -119,14 +139,16 @@ +@@ -119,32 +139,44 @@ private static final int SEND_PLAYER_INFO_INTERVAL = 600; private static final SimpleDateFormat BAN_DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd 'at' HH:mm:ss z"); private final MinecraftServer server; @@ -47,7 +47,12 @@ public final WorldNBTStorage playerIo; private boolean doWhiteList; private final LayeredRegistryAccess registries; -@@ -138,13 +160,23 @@ + private final IRegistryCustom.Dimension synchronizedRegistries; +- protected final int maxPlayers; ++ public int maxPlayers; + private int viewDistance; + private int simulationDistance; + private boolean allowCheatsForAllPlayers; private static final boolean ALLOW_LOGOUTIVATOR = false; private int sendAllPlayerInfoIn; diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java index 0b11dd945e..8f12fd497b 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -631,6 +631,13 @@ public final class CraftServer implements Server { return playerList.getMaxPlayers(); } + @Override + public void setMaxPlayers(int maxPlayers) { + Preconditions.checkArgument(maxPlayers >= 0, "maxPlayers must be >= 0"); + + playerList.maxPlayers = maxPlayers; + } + // NOTE: These are dependent on the corresponding call in MinecraftServer // so if that changes this will need to as well @Override @@ -1954,6 +1961,11 @@ public final class CraftServer implements Server { return console.getMotd(); } + @Override + public void setMotd(String motd) { + console.setMotd(motd); + } + @Override public WarningState getWarningState() { return warningState;