AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-09-29 00:26:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix /whois and /whowas raising an error when there is an empty line in the text/bans.txt file. (Thanks RealRoland)

Browse Source
This commit is contained in:
UnknownShadow200 2016-03-25 10:22:33 +11:00
parent 16b13ff70a
commit 3dff13aade
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Player/Ban.cs
View File

@ -50,8 +50,11 @@ namespace MCGalaxy {
/// <summary> Returns whether the given user is banned. </summary> /// <summary> Returns whether the given user is banned. </summary>
public static bool IsBanned(string who) { public static bool IsBanned(string who) {
who = who.ToLower(); who = who.ToLower();
foreach (string line in File.ReadAllLines("text/bans.txt")) foreach (string line in File.ReadAllLines("text/bans.txt")) {
if (line.Split(' ')[1] == who) return true; string[] parts = line.Split(' ');
if (parts.Length <= 1) continue;
if (parts[1] == who) return true;
}
return false; return false;
} }
@ -62,6 +65,7 @@ namespace MCGalaxy {
string bannedby = "", reason = "", timedate = "", oldrank = "", stealth = ""; string bannedby = "", reason = "", timedate = "", oldrank = "", stealth = "";
foreach (string line in File.ReadAllLines("text/bans.txt")) { foreach (string line in File.ReadAllLines("text/bans.txt")) {
string[] parts = line.Split(' '); string[] parts = line.Split(' ');
if (parts.Length <= 5) continue;
if (parts[1] == who) { if (parts[1] == who) {
bannedby = parts[0]; bannedby = parts[0];
reason = CP437Reader.ConvertToRaw(parts[2]); reason = CP437Reader.ConvertToRaw(parts[2]);
@ -80,7 +84,8 @@ namespace MCGalaxy {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
foreach (string line in File.ReadAllLines("text/bans.txt")) { foreach (string line in File.ReadAllLines("text/bans.txt")) {
if (line.Split(' ')[1] != name) string[] parts = line.Split(' ');
if (parts.Length <= 1 || parts[1] != name)
sb.Append(line + "\r\n"); sb.Append(line + "\r\n");
else else
success = true; success = true;
@ -97,7 +102,7 @@ namespace MCGalaxy {
foreach (string line in File.ReadAllLines("text/bans.txt")) { foreach (string line in File.ReadAllLines("text/bans.txt")) {
string[] parts = line.Split(' '); string[] parts = line.Split(' ');
if (parts[1] == who) { if (parts.Length > 2 && parts[1] == who) {
parts[2] = CP437Writer.ConvertToUnicode(reason); parts[2] = CP437Writer.ConvertToUnicode(reason);
found = true; found = true;
sb.Append(String.Join(" ", parts) + "\r\n"); sb.Append(String.Join(" ", parts) + "\r\n");