From 462dbb6f8ba1c8d22b6a165cde96eb497eb858e8 Mon Sep 17 00:00:00 2001 From: RaidMax Date: Sun, 30 Jun 2024 20:46:40 -0500 Subject: [PATCH] fix T7 status IP parsing --- Plugins/ScriptPlugins/ParserBOIII.js | 6 +++--- Plugins/ScriptPlugins/ParserT7.js | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Plugins/ScriptPlugins/ParserBOIII.js b/Plugins/ScriptPlugins/ParserBOIII.js index 47ab96940..b10b180fe 100644 --- a/Plugins/ScriptPlugins/ParserBOIII.js +++ b/Plugins/ScriptPlugins/ParserBOIII.js @@ -13,10 +13,10 @@ var plugin = { rconParser = manager.GenerateDynamicRConParser(this.name); eventParser = manager.GenerateDynamicEventParser(this.name); - rconParser.Configuration.Status.Pattern = '^ *([0-9]+) +-?([0-9]+) +((?:[A-Z]+|[0-9]+)) +((?:[a-z]|[0-9]){8,32}|(?:[a-z]|[0-9]){8,32}|bot[0-9]+|(?:[0-9]+)) *(.{0,32}) +(\\d+\\.\\d+\\.\\d+.\\d+\\:-*\\d{1,5}|0+.0+:-*\\d{1,5}|loopback|unknown)(?:\\(\\d+\\))? +(-*[0-9]+) *$'; + rconParser.Configuration.Status.Pattern = '^ *([0-9]+) +-?([0-9]+) +((?:[A-Z]+|[0-9]+)) +((?:[a-z]|[0-9]){8,32}|(?:[a-z]|[0-9]){8,32}|bot[0-9]+|(?:[0-9]+)) *(.{0,32}) +(\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}.\\d{1,3}|loopback|unknown|0+.0+)(?:\\:-?\\d{1,5})? +(-*[0-9]+) *$'; rconParser.Configuration.StatusHeader.Pattern = 'num +score +ping +xuid +name +address +qport *'; - rconParser.Configuration.CommandPrefixes.Kick = 'clientkick_for_reason {0} "{1}"'; - rconParser.Configuration.CommandPrefixes.Ban = 'clientkick_for_reason {0} "{1}"'; + rconParser.Configuration.CommandPrefixes.Kick = 'clientkick {0}'; // clientkick_for_reason fails over rcon + rconParser.Configuration.CommandPrefixes.Ban = 'clientkick {0}'; rconParser.Configuration.CommandPrefixes.TempBan = 'clientkick_for_reason {0} "{1}"'; rconParser.Configuration.CommandPrefixes.RConResponse = '\xff\xff\xff\xff(\1|print) ?'; rconParser.Configuration.GametypeStatus.Pattern = 'Gametype: (.+)'; diff --git a/Plugins/ScriptPlugins/ParserT7.js b/Plugins/ScriptPlugins/ParserT7.js index 30976d9ed..5ab112707 100644 --- a/Plugins/ScriptPlugins/ParserT7.js +++ b/Plugins/ScriptPlugins/ParserT7.js @@ -14,10 +14,10 @@ var plugin = { rconParser = manager.GenerateDynamicRConParser(this.name); eventParser = manager.GenerateDynamicEventParser(this.name); - rconParser.Configuration.Status.Pattern = '^ *([0-9]+) +-?([0-9]+) +((?:[A-Z]+|[0-9]+)) +((?:[a-z]|[0-9]){8,32}|(?:[a-z]|[0-9]){8,32}|bot[0-9]+|(?:[0-9]+)) *(.{0,32}) +(\\d+\\.\\d+\\.\\d+.\\d+\\:-*\\d{1,5}|0+.0+:-*\\d{1,5}|loopback|unknown)(?:\\([0-9]+\\)) +(-*[0-9]+) *$'; + rconParser.Configuration.Status.Pattern = '^ *([0-9]+) +-?([0-9]+) +((?:[A-Z]+|[0-9]+)) +((?:[a-z]|[0-9]){8,32}|(?:[a-z]|[0-9]){8,32}|bot[0-9]+|(?:[0-9]+)) *(.{0,32}) +(\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}.\\d{1,3}|loopback|unknown|0+.0+)(?:\\:-?\\d{1,5})? +(-*[0-9]+) *$'; rconParser.Configuration.StatusHeader.Pattern = 'num +score +ping +xuid +name +address +qport|---------- Live ----------'; - rconParser.Configuration.CommandPrefixes.Kick = 'clientkick_for_reason {0} "{1}"'; - rconParser.Configuration.CommandPrefixes.Ban = 'clientkick_for_reason {0} "{1}"'; + rconParser.Configuration.CommandPrefixes.Kick = 'clientkick {0}'; // clientkick_for_reason fails over rcon + rconParser.Configuration.CommandPrefixes.Ban = 'clientkick {0}'; rconParser.Configuration.CommandPrefixes.TempBan = 'tempbanclient {0}'; rconParser.Configuration.CommandPrefixes.RConCommand = '\xff\xff\xff\xff\x00{0} {1}'; rconParser.Configuration.CommandPrefixes.RConGetDvar = '\xff\xff\xff\xff\x00{0} {1}';