Rim/IW4M-Admin
Rim/IW4M-Admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 30 Wiki Activity

fix T7 extra null bytes in status response

Browse Source 
fix regression bug with info response on T6
This commit is contained in:
RaidMax 2020-04-18 10:46:55 -05:00
parent 8c29027b3f
commit ee087f1c85
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Application/RCon/RConConnection.cs
View File

@ -219,7 +219,7 @@ namespace IW4MAdmin.Application.RCon
else else
{ {
splitStatusStrings.Add(responseString.Replace(config.CommandPrefixes.RConResponse, "")); splitStatusStrings.Add(responseString.Replace(config.CommandPrefixes.RConResponse, "").TrimEnd('\0'));
} }
} }

8
SharedLibraryCore/Utilities.cs
View File

@ -669,10 +669,10 @@ namespace SharedLibraryCore
Dictionary<string, string> dict = null; Dictionary<string, string> dict = null;
if (values.Length % 2 == 0 && values.Length > 1) if (values.Length > 1)
{ {
dict = new Dictionary<string, string>(); dict = new Dictionary<string, string>();
for (int i = 0; i < values.Length; i += 2) for (int i = values.Length % 2 == 0 ? 0 : 1; i < values.Length; i += 2)
{ {
dict.Add(values[i], values[i + 1]); dict.Add(values[i], values[i + 1]);
} }
@ -754,7 +754,9 @@ namespace SharedLibraryCore
} }
var response = await server.RemoteConnection.SendQueryAsync(RCon.StaticHelpers.QueryType.GET_INFO); var response = await server.RemoteConnection.SendQueryAsync(RCon.StaticHelpers.QueryType.GET_INFO);
string combinedResponse = string.Join('\\', response.Where(r => r.Length > 0 && r[0] == '\\')); string combinedResponse = response.Length > 1 ?
string.Join('\\', response.Where(r => r.Length > 0 && r[0] == '\\')) :
response[0];
return combinedResponse.DictionaryFromKeyValue(); return combinedResponse.DictionaryFromKeyValue();
} }