diff --git a/.docs/pterodactyl/regex.md b/.docs/pterodactyl/regex.md index 83becd2..76f0841 100644 --- a/.docs/pterodactyl/regex.md +++ b/.docs/pterodactyl/regex.md @@ -11,7 +11,7 @@ ### Chat ```re -\[\d{2}:\d{2}:\d{2}\sINFO\]: (?:<|\[)(\w+)(?:>|\]) (.*) +\[\d{2}:\d{2}:\d{2}\sINFO\]: (?!\[(?:Server|Rcon)\])(?:<|\[)(\w+)(?:>|\]) (.*) ``` ### Join @@ -43,7 +43,7 @@ ### Chat ```re -^\[\d{2}:\d{2}:\d{2}\] \[Server thread\/INFO\] \[minecraft\/MinecraftServer\]: (?:<|\[)(\w+)(?:>|\]) (.*) +^\[\d{2}:\d{2}:\d{2}\] \[Server thread\/INFO\] \[minecraft\/MinecraftServer\]: (?!\[(?:Server|Rcon)\])(?:<|\[)(\w+)(?:>|\]) (.*) ``` ### Join diff --git a/pterodactyl/config.py b/pterodactyl/config.py index df0a263..8d93a42 100644 --- a/pterodactyl/config.py +++ b/pterodactyl/config.py @@ -10,7 +10,7 @@ def register_config(config_obj: Config) -> None: startup_jar=None, startup_arguments=None, current_status='', - chat_regex=r"\[\d{2}:\d{2}:\d{2}\sINFO\]: (?:<|\[)(\w+)(?:>|\]) (.*)", + chat_regex=r"\[\d{2}:\d{2}:\d{2}\sINFO\]: (?!\[(?:Server|Rcon)\])(?:<|\[)(\w+)(?:>|\]) (.*)", server_regex=r"^\[\d{2}:\d{2}:\d{2} INFO\]:(?: \[Not Secure\])? \[(?:Server|Rcon)\] (.*)", join_regex=r"^\[\d{2}:\d{2}:\d{2} INFO\]: ([^<\n]+) joined the game$", leave_regex=r"^\[\d{2}:\d{2}:\d{2} INFO\]: ([^<\n]+) left the game$",