keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Fix server startup query info not including new text

Browse source
This commit is contained in:
tterrag 2020-05-23 16:22:29 -04:00
parent eb9c966095
commit 6829324f5a
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/main/java/net/minecraftforge/fml/StartupQuery.java
View file

@ -316,14 +316,29 @@ public class StartupQuery {
DedicatedServer server = serverSupplier.get(); DedicatedServer server = serverSupplier.get();
if (query.getResult() == null) if (query.getResult() == null)
{ {
LOGGER.warn(SQ, query.getText()); if (!query.getHeader().isEmpty())
{
LOGGER.warn(SQ, "\n" + query.getHeader() + "\n");
}
LOGGER.warn(SQ, "\n" + query.getText());
if (!query.getAction().isEmpty())
{
LOGGER.warn(SQ, "\n\n" + query.getAction());
}
query.finish(); query.finish();
} }
else else
{ {
String text = query.getText() + StringBuilder text = new StringBuilder("\n");
"\n\nRun the command /fml confirm or or /fml cancel to proceed." + if (!query.getHeader().isEmpty()) {
"\nAlternatively start the server with -Dfml.queryResult=confirm or -Dfml.queryResult=cancel to preselect the answer."; text.append(query.getHeader()).append("\n\n");
}
text.append(query.getText()).append("\n");
if (!query.getAction().isEmpty()) {
text.append("\n").append(query.getAction());
}
text.append("\nConfirm with '/fml confirm' or cancel with '/fml cancel'.")
.append("\nAlternatively start the server with -Dfml.queryResult=confirm or -Dfml.queryResult=cancel to preselect the answer.");
LOGGER.warn(SQ, text); LOGGER.warn(SQ, text);
if (!query.isSynchronous()) return; // no-op until mc does commands in another thread (if ever) if (!query.isSynchronous()) return; // no-op until mc does commands in another thread (if ever)