--- a/net/minecraft/server/dedicated/DedicatedServer.java +++ b/net/minecraft/server/dedicated/DedicatedServer.java @@ -54,11 +54,23 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.GameRules; import net.minecraft.world.level.GameType; -import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.SkullBlockEntity; import net.minecraft.world.level.storage.LevelStorageSource; import org.slf4j.Logger; +// CraftBukkit start +import net.minecraft.server.WorldLoader; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.io.IoBuilder; +import org.bukkit.command.CommandSender; +import org.bukkit.craftbukkit.SpigotTimings; // Spigot +import org.bukkit.craftbukkit.util.TerminalCompletionHandler; +import org.bukkit.craftbukkit.util.TerminalConsoleWriterThread; +import org.bukkit.event.server.ServerCommandEvent; +import org.bukkit.event.server.RemoteServerCommandEvent; +// CraftBukkit end + public class DedicatedServer extends MinecraftServer implements ServerInterface { static final Logger LOGGER = LogUtils.getLogger(); @@ -67,7 +79,7 @@ private final List consoleInput = Collections.synchronizedList(Lists.newArrayList()); @Nullable private QueryThreadGs4 queryThreadGs4; - private final RconConsoleSource rconConsoleSource; + // private final RemoteControlCommandListener rconConsoleSource; // CraftBukkit - remove field @Nullable private RconThread rconThread; public DedicatedServerSettings settings; @@ -81,25 +93,58 @@ private DebugSampleSubscriptionTracker debugSampleSubscriptionTracker; public ServerLinks serverLinks; - public DedicatedServer(Thread serverThread, LevelStorageSource.LevelStorageAccess session, PackRepository dataPackManager, WorldStem saveLoader, DedicatedServerSettings propertiesLoader, DataFixer dataFixer, Services apiServices, ChunkProgressListenerFactory worldGenerationProgressListenerFactory) { - super(serverThread, session, dataPackManager, saveLoader, Proxy.NO_PROXY, dataFixer, apiServices, worldGenerationProgressListenerFactory); - this.settings = propertiesLoader; - this.rconConsoleSource = new RconConsoleSource(this); - this.serverTextFilter = ServerTextFilter.createFromConfig(propertiesLoader.getProperties()); - this.serverLinks = DedicatedServer.createServerLinks(propertiesLoader); + // CraftBukkit start - Signature changed + public DedicatedServer(joptsimple.OptionSet options, WorldLoader.DataLoadContext worldLoader, Thread thread, LevelStorageSource.LevelStorageAccess convertable_conversionsession, PackRepository resourcepackrepository, WorldStem worldstem, DedicatedServerSettings dedicatedserversettings, DataFixer datafixer, Services services, ChunkProgressListenerFactory worldloadlistenerfactory) { + super(options, worldLoader, thread, convertable_conversionsession, resourcepackrepository, worldstem, Proxy.NO_PROXY, datafixer, services, worldloadlistenerfactory); + // CraftBukkit end + this.settings = dedicatedserversettings; + // this.rconConsoleSource = new RemoteControlCommandListener(this); // CraftBukkit - remove field + this.serverTextFilter = ServerTextFilter.createFromConfig(dedicatedserversettings.getProperties()); + this.serverLinks = DedicatedServer.createServerLinks(dedicatedserversettings); } @Override public boolean initServer() throws IOException { Thread thread = new Thread("Server console handler") { public void run() { - BufferedReader bufferedreader = new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8)); + // CraftBukkit start + if (!org.bukkit.craftbukkit.Main.useConsole) { + return; + } + jline.console.ConsoleReader bufferedreader = DedicatedServer.this.reader; + // MC-33041, SPIGOT-5538: if System.in is not valid due to javaw, then return + try { + System.in.available(); + } catch (IOException ex) { + return; + } + // CraftBukkit end + String s; try { - while (!DedicatedServer.this.isStopped() && DedicatedServer.this.isRunning() && (s = bufferedreader.readLine()) != null) { - DedicatedServer.this.handleConsoleInput(s, DedicatedServer.this.createCommandSourceStack()); + // CraftBukkit start - JLine disabling compatibility + while (!DedicatedServer.this.isStopped() && DedicatedServer.this.isRunning()) { + if (org.bukkit.craftbukkit.Main.useJline) { + s = bufferedreader.readLine(">", null); + } else { + s = bufferedreader.readLine(); + } + + // SPIGOT-5220: Throttle if EOF (ctrl^d) or stdin is /dev/null + if (s == null) { + try { + Thread.sleep(50L); + } catch (InterruptedException ex) { + Thread.currentThread().interrupt(); + } + continue; + } + if (s.trim().length() > 0) { // Trim to filter lines which are just spaces + DedicatedServer.this.handleConsoleInput(s, DedicatedServer.this.createCommandSourceStack()); + } + // CraftBukkit end } } catch (IOException ioexception) { DedicatedServer.LOGGER.error("Exception handling console input", ioexception); @@ -108,6 +153,29 @@ } }; + // CraftBukkit start - TODO: handle command-line logging arguments + java.util.logging.Logger global = java.util.logging.Logger.getLogger(""); + global.setUseParentHandlers(false); + for (java.util.logging.Handler handler : global.getHandlers()) { + global.removeHandler(handler); + } + global.addHandler(new org.bukkit.craftbukkit.util.ForwardLogHandler()); + + final org.apache.logging.log4j.core.Logger logger = ((org.apache.logging.log4j.core.Logger) LogManager.getRootLogger()); + for (org.apache.logging.log4j.core.Appender appender : logger.getAppenders().values()) { + if (appender instanceof org.apache.logging.log4j.core.appender.ConsoleAppender) { + logger.removeAppender(appender); + } + } + + TerminalConsoleWriterThread writerThread = new TerminalConsoleWriterThread(System.out, this.reader); + this.reader.setCompletionHandler(new TerminalCompletionHandler(writerThread, this.reader.getCompletionHandler())); + writerThread.start(); + + System.setOut(IoBuilder.forLogger(logger).setLevel(Level.INFO).buildPrintStream()); + System.setErr(IoBuilder.forLogger(logger).setLevel(Level.WARN).buildPrintStream()); + // CraftBukkit end + thread.setDaemon(true); thread.setUncaughtExceptionHandler(new DefaultUncaughtExceptionHandler(DedicatedServer.LOGGER)); thread.start(); @@ -126,13 +194,18 @@ this.setPreventProxyConnections(dedicatedserverproperties.preventProxyConnections); this.setLocalIp(dedicatedserverproperties.serverIp); } + // Spigot start + this.setPlayerList(new DedicatedPlayerList(this, this.registries(), this.playerDataStorage)); + org.spigotmc.SpigotConfig.init((java.io.File) this.options.valueOf("spigot-settings")); + org.spigotmc.SpigotConfig.registerCommands(); + // Spigot end this.setPvpAllowed(dedicatedserverproperties.pvp); this.setFlightAllowed(dedicatedserverproperties.allowFlight); this.setMotd(dedicatedserverproperties.motd); super.setPlayerIdleTimeout((Integer) dedicatedserverproperties.playerIdleTimeout.get()); this.setEnforceWhitelist(dedicatedserverproperties.enforceWhitelist); - this.worldData.setGameType(dedicatedserverproperties.gamemode); + // this.worldData.setGameType(dedicatedserverproperties.gamemode); // CraftBukkit - moved to world loading DedicatedServer.LOGGER.info("Default game type: {}", dedicatedserverproperties.gamemode); InetAddress inetaddress = null; @@ -156,6 +229,12 @@ return false; } + // CraftBukkit start + // this.setPlayerList(new DedicatedPlayerList(this, this.registries(), this.playerDataStorage)); // Spigot - moved up + this.server.loadPlugins(); + this.server.enablePlugins(org.bukkit.plugin.PluginLoadOrder.STARTUP); + // CraftBukkit end + if (!this.usesAuthentication()) { DedicatedServer.LOGGER.warn("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!"); DedicatedServer.LOGGER.warn("The server will make no attempt to authenticate usernames. Beware."); @@ -170,7 +249,7 @@ if (!OldUsersConverter.serverReadyAfterUserconversion(this)) { return false; } else { - this.setPlayerList(new DedicatedPlayerList(this, this.registries(), this.playerDataStorage)); + // this.setPlayerList(new DedicatedPlayerList(this, this.registries(), this.playerDataStorage)); // CraftBukkit - moved up this.debugSampleSubscriptionTracker = new DebugSampleSubscriptionTracker(this.getPlayerList()); this.tickTimeLogger = new RemoteSampleLogger(TpsDebugDimensions.values().length, this.debugSampleSubscriptionTracker, RemoteDebugSampleType.TICK_TIME); long i = Util.getNanos(); @@ -178,13 +257,13 @@ SkullBlockEntity.setup(this.services, this); GameProfileCache.setUsesAuthentication(this.usesAuthentication()); DedicatedServer.LOGGER.info("Preparing level \"{}\"", this.getLevelIdName()); - this.loadLevel(); + this.loadLevel(this.storageSource.getLevelId()); // CraftBukkit long j = Util.getNanos() - i; String s = String.format(Locale.ROOT, "%.3fs", (double) j / 1.0E9D); DedicatedServer.LOGGER.info("Done ({})! For help, type \"help\"", s); if (dedicatedserverproperties.announcePlayerAchievements != null) { - ((GameRules.BooleanValue) this.getGameRules().getRule(GameRules.RULE_ANNOUNCE_ADVANCEMENTS)).set(dedicatedserverproperties.announcePlayerAchievements, this); + ((GameRules.BooleanValue) this.getGameRules().getRule(GameRules.RULE_ANNOUNCE_ADVANCEMENTS)).set(dedicatedserverproperties.announcePlayerAchievements, this.overworld()); // CraftBukkit - per-world } if (dedicatedserverproperties.enableQuery) { @@ -293,6 +372,7 @@ this.queryThreadGs4.stop(); } + System.exit(0); // CraftBukkit } @Override @@ -302,8 +382,8 @@ } @Override - public boolean isLevelEnabled(Level world) { - return world.dimension() == Level.NETHER ? this.getProperties().allowNether : true; + public boolean isLevelEnabled(net.minecraft.world.level.Level world) { + return world.dimension() == net.minecraft.world.level.Level.NETHER ? this.getProperties().allowNether : true; } public void handleConsoleInput(String command, CommandSourceStack commandSource) { @@ -311,12 +391,22 @@ } public void handleConsoleInputs() { + SpigotTimings.serverCommandTimer.startTiming(); // Spigot while (!this.consoleInput.isEmpty()) { ConsoleInput servercommand = (ConsoleInput) this.consoleInput.remove(0); - this.getCommands().performPrefixedCommand(servercommand.source, servercommand.msg); + // CraftBukkit start - ServerCommand for preprocessing + ServerCommandEvent event = new ServerCommandEvent(this.console, servercommand.msg); + this.server.getPluginManager().callEvent(event); + if (event.isCancelled()) continue; + servercommand = new ConsoleInput(event.getCommand(), servercommand.source); + + // this.getCommands().performPrefixedCommand(servercommand.source, servercommand.msg); // Called in dispatchServerCommand + this.server.dispatchServerCommand(this.console, servercommand); + // CraftBukkit end } + SpigotTimings.serverCommandTimer.stopTiming(); // Spigot } @Override @@ -383,7 +473,7 @@ @Override public boolean isUnderSpawnProtection(ServerLevel world, BlockPos pos, Player player) { - if (world.dimension() != Level.OVERWORLD) { + if (world.dimension() != net.minecraft.world.level.Level.OVERWORLD) { return false; } else if (this.getPlayerList().getOps().isEmpty()) { return false; @@ -541,16 +631,52 @@ @Override public String getPluginNames() { - return ""; + // CraftBukkit start - Whole method + StringBuilder result = new StringBuilder(); + org.bukkit.plugin.Plugin[] plugins = this.server.getPluginManager().getPlugins(); + + result.append(this.server.getName()); + result.append(" on Bukkit "); + result.append(this.server.getBukkitVersion()); + + if (plugins.length > 0 && this.server.getQueryPlugins()) { + result.append(": "); + + for (int i = 0; i < plugins.length; i++) { + if (i > 0) { + result.append("; "); + } + + result.append(plugins[i].getDescription().getName()); + result.append(" "); + result.append(plugins[i].getDescription().getVersion().replaceAll(";", ",")); + } + } + + return result.toString(); + // CraftBukkit end } @Override public String runCommand(String command) { - this.rconConsoleSource.prepareForCommand(); + // CraftBukkit start - fire RemoteServerCommandEvent + throw new UnsupportedOperationException("Not supported - remote source required."); + } + + public String runCommand(RconConsoleSource rconConsoleSource, String s) { + rconConsoleSource.prepareForCommand(); this.executeBlocking(() -> { - this.getCommands().performPrefixedCommand(this.rconConsoleSource.createCommandSourceStack(), command); + CommandSourceStack wrapper = rconConsoleSource.createCommandSourceStack(); + RemoteServerCommandEvent event = new RemoteServerCommandEvent(rconConsoleSource.getBukkitSender(wrapper), s); + this.server.getPluginManager().callEvent(event); + if (event.isCancelled()) { + return; + } + ConsoleInput serverCommand = new ConsoleInput(event.getCommand(), wrapper); + this.server.dispatchServerCommand(event.getSender(), serverCommand); }); - return this.rconConsoleSource.getCommandResponse(); + return rconConsoleSource.getCommandResponse(); + // CraftBukkit end } public void storeUsingWhiteList(boolean useWhitelist) { @@ -660,4 +786,15 @@ } } } + + // CraftBukkit start + public boolean isDebugging() { + return this.getProperties().debug; + } + + @Override + public CommandSender getBukkitSender(CommandSourceStack wrapper) { + return this.console; + } + // CraftBukkit end }