themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Remove leading whitespace from rcon commands

Browse source
This commit is contained in:
Deathmax 2011-07-10 11:14:43 +08:00
parent 57fc745c56
commit f03a03a79c
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
TShockAPI/RconHandler.cs
View file

@ -135,9 +135,9 @@ namespace TShockAPI
{ {
if (args[1] == Password) if (args[1] == Password)
{ {
args[1] = ""; args[1] = args[0] = "";
string command = string.Join(" ", args.ToArray()); string command = string.Join(" ", args.ToArray());
command = command.TrimEnd(' ').TrimEnd('\0'); command = command.TrimEnd(' ').TrimEnd('\0').TrimStart(' ');
Log.ConsoleInfo("Rcon from " + EP.ToString() + ":" + command); Log.ConsoleInfo("Rcon from " + EP.ToString() + ":" + command);
Response = ""; Response = "";
response = ExecuteCommand(command); response = ExecuteCommand(command);
@ -171,10 +171,10 @@ namespace TShockAPI
if (packetstring.Split(' ').Length == 2) if (packetstring.Split(' ').Length == 2)
challenge = packetstring.Split(' ')[1]; challenge = packetstring.Split(' ')[1];
response = "infoResponse\n"; response = "infoResponse\n";
var infostring = string.Format(@"\mapname\{1}\sv_maxclients\{2}\clients\{3}\sv_privateClients\{4}\hconly\{5}\gamename\TER\protocol\100\sv_hostname\{0}", var infostring = string.Format(@"\_TShock_ver\{6}\mapname\{1}\sv_maxclients\{2}\clients\{3}\sv_privateClients\{4}\hconly\{5}\gamename\TERRARIA\protocol\100\sv_hostname\{0}",
TShock.Config.ServerName, Main.worldName, Main.maxNetPlayers, TShock.Config.ServerName, Main.worldName, Main.maxNetPlayers,
Tools.ActivePlayers(), Main.maxNetPlayers - TShock.Config.MaxSlots, Tools.ActivePlayers(), Main.maxNetPlayers - TShock.Config.MaxSlots,
TShock.Config.HardcoreOnly ? 1 : 0); TShock.Config.HardcoreOnly ? 1 : 0, TShock.VersionNum.ToString());
if (challenge != "") if (challenge != "")
infostring += @"\challenge\" + challenge; infostring += @"\challenge\" + challenge;
response += infostring; response += infostring;
@ -189,10 +189,10 @@ namespace TShockAPI
if (packetstring.Split(' ').Length == 2) if (packetstring.Split(' ').Length == 2)
challenge = packetstring.Split(' ')[1]; challenge = packetstring.Split(' ')[1];
response = "statusResponse\n"; response = "statusResponse\n";
var statusstring = string.Format(@"\mapname\{1}\sv_maxclients\{2}\clients\{3}\sv_privateClients\{4}\hconly\{5}\gamename\TER\protocol\100\sv_hostname\{0}", var statusstring = string.Format(@"\_TShock_ver\{6}\mapname\{1}\sv_maxclients\{2}\clients\{3}\sv_privateClients\{4}\hconly\{5}\gamename\TERRARIA\protocol\100\sv_hostname\{0}",
TShock.Config.ServerName, Main.worldName, Main.maxNetPlayers, TShock.Config.ServerName, Main.worldName, Main.maxNetPlayers,
Tools.ActivePlayers(), Main.maxNetPlayers - TShock.Config.MaxSlots, Tools.ActivePlayers(), Main.maxNetPlayers - TShock.Config.MaxSlots,
TShock.Config.HardcoreOnly ? 1 : 0) + "\n"; TShock.Config.HardcoreOnly ? 1 : 0, TShock.VersionNum.ToString()) + "\n";
if (challenge != "") if (challenge != "")
statusstring += @"\challenge\" + challenge; statusstring += @"\challenge\" + challenge;
foreach (TSPlayer player in TShock.Players) foreach (TSPlayer player in TShock.Players)