From 7f8b30aed3886c036534cacff73046eafade7485 Mon Sep 17 00:00:00 2001 From: DaemonUmbra Date: Tue, 5 Nov 2019 14:10:19 -0500 Subject: [PATCH] Made the slash optional in fml confirm/cancel. (#6282) --- src/main/java/net/minecraftforge/fml/StartupQuery.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/minecraftforge/fml/StartupQuery.java b/src/main/java/net/minecraftforge/fml/StartupQuery.java index bc892540a8..afb13435eb 100644 --- a/src/main/java/net/minecraftforge/fml/StartupQuery.java +++ b/src/main/java/net/minecraftforge/fml/StartupQuery.java @@ -280,22 +280,23 @@ public class StartupQuery { for (Iterator it = dedServer.pendingCommandList.iterator(); it.hasNext(); ) { String cmd = it.next().command.trim().toLowerCase(); + cmd = cmd.charAt(0) == '/' ? cmd.substring(1) : cmd; // strip the forward slash to make it optional - if (cmd.equals("/fml confirm")) + if (cmd.equals("fml confirm")) { LOGGER.info(SQ, "confirmed"); query.setResult(true); done = true; it.remove(); } - else if (cmd.equals("/fml cancel")) + else if (cmd.equals("fml cancel")) { LOGGER.info(SQ, "cancelled"); query.setResult(false); done = true; it.remove(); } - else if (cmd.equals("/stop")) + else if (cmd.equals("stop")) { StartupQuery.abort(); }