Merge branch 'master' into future

src/main/java/carpet/commands/LogCommand.java

@@ -18,6 +18,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Arrays;
 
 import static com.mojang.brigadier.arguments.StringArgumentType.getString;
 import static net.minecraft.command.CommandSource.suggestMatching;
@@ -201,8 +202,13 @@ public class LogCommand
             Messenger.m(source, "r Unknown logger: ","rb "+logname);
             return 0;
         }
+        if (!LoggerRegistry.getLogger(logname).isOptionValid(option))
+        {
+            Messenger.m(source, "r Invalid option: ", "rb "+option);
+            return 0;
+        }
         LoggerRegistry.subscribePlayer(player_name, logname, option);
-        if (option!=null)
+        if (option != null)
         {
             Messenger.m(source, "gi Subscribed to " + logname + "(" + option + ")");
         }
@@ -210,6 +216,6 @@ public class LogCommand
         {
             Messenger.m(source, "gi Subscribed to " + logname);
         }
-            return 1;
+        return 1;
     }
 }