diff --git a/Commands/CmdOverseer.cs b/Commands/CmdOverseer.cs index b8a6b3d8e..1f745864a 100644 --- a/Commands/CmdOverseer.cs +++ b/Commands/CmdOverseer.cs @@ -17,7 +17,6 @@ */ using System; using System.IO; -using System.Linq; using MCGalaxy.Commands.CPE; using MCGalaxy.Commands.World; diff --git a/Economy/Awards.cs b/Economy/Awards.cs index c59a3a987..54d12f021 100644 --- a/Economy/Awards.cs +++ b/Economy/Awards.cs @@ -91,7 +91,7 @@ namespace MCGalaxy { using (StreamWriter w = new StreamWriter("text/playerAwards.txt")) { foreach (PlayerAward pA in PlayerAwards) - w.WriteLine(pA.Name.ToLower() + " : " + string.Join(",", pA.Awards.ToArray())); + w.WriteLine(pA.Name.ToLower() + " : " + pA.Awards.Join(",")); } } #endregion diff --git a/Games/Countdown/CountdownGame.Game.cs b/Games/Countdown/CountdownGame.Game.cs index fb51edf8d..a392596ad 100644 --- a/Games/Countdown/CountdownGame.Game.cs +++ b/Games/Countdown/CountdownGame.Game.cs @@ -17,10 +17,9 @@ */ using System; using System.Collections.Generic; -using System.Linq; using System.Threading; -namespace MCGalaxy.Games { - + +namespace MCGalaxy.Games { public sealed partial class CountdownGame : IGame { public override void PlayerJoinedGame(Player p) { diff --git a/Games/Countdown/CountdownGame.cs b/Games/Countdown/CountdownGame.cs index 6ea272aec..89678d773 100644 --- a/Games/Countdown/CountdownGame.cs +++ b/Games/Countdown/CountdownGame.cs @@ -17,11 +17,9 @@ */ using System; using System.Collections.Generic; -using System.Linq; using System.Threading; -namespace MCGalaxy.Games { - +namespace MCGalaxy.Games { public sealed partial class CountdownGame { public List players = new List(); diff --git a/Games/LavaSurvival/LavaSurvival.cs b/Games/LavaSurvival/LavaSurvival.cs index 7ae909900..8c7721285 100644 --- a/Games/LavaSurvival/LavaSurvival.cs +++ b/Games/LavaSurvival/LavaSurvival.cs @@ -345,7 +345,7 @@ namespace MCGalaxy.Games } if (OnVoteStart != null) - OnVoteStart(votes.Keys.ToList().ToArray()); + OnVoteStart(GetVotedLevels().ToArray()); map.ChatLevel("Vote for the next map! The vote ends in " + voteTime + " minute" + (voteTime == 1 ? "" : "s") +"."); map.ChatLevel("Choices: " + str.Remove(0, 4)); @@ -353,8 +353,7 @@ namespace MCGalaxy.Games voteTimer.AutoReset = false; voteTimer.Elapsed += delegate { - try - { + try { EndVote(); voteTimer.Dispose(); } @@ -363,9 +362,16 @@ namespace MCGalaxy.Games voteTimer.Start(); voteActive = true; } + + List GetVotedLevels() { + var keys = votes.Keys; + List names = new List(); + foreach (string key in keys) + names.Add(key); + return names; + } - public void EndVote() - { + public void EndVote() { if (!voteActive) return; voteActive = false; diff --git a/Server/BackupDB.cs b/Server/BackupDB.cs index 9e0a6077c..ff38c9588 100644 --- a/Server/BackupDB.cs +++ b/Server/BackupDB.cs @@ -166,19 +166,18 @@ namespace MCGalaxy { int foundStart = tableSQLString.IndexOf("(") + 1; int foundLength = tableSQLString.LastIndexOf(")") - foundStart; tableSQLString = tableSQLString.Substring(foundStart, foundLength); + // Now we have everything inside the parenthisies. string[] column = tableSQLString.Split(','); - foreach (string col in column) - { - if (!col.ToUpper().StartsWith("PRIMARY KEY")) - { + foreach (string col in column) { + if (!col.ToUpper().StartsWith("PRIMARY KEY")) { + bool autoInc = col.IndexOf("AUTOINCREMENT") >= 0 || col.IndexOf("AUTO_INCREMENT") >= 0; string[] split = col.TrimStart('\n', '\r', '\t').Split(" ".ToCharArray(), StringSplitOptions.RemoveEmptyEntries); //Just to make it the same as the MySQL schema. schema.Add(new string[] { split[0].Trim('`'), split[1].Trim('\t', '`'), ( split.Length > 2 ? (split[2].Trim('\t', '`').ToUpper() == "NOT" ? "NOT NULL" : "DEFAULT NULL") : ""), ( split.Length > 2 ? (split[split.Length - 2].Trim('\t', '`').ToUpper() == "PRIMARY" && split[split.Length - 1].Trim('\t', '`').ToUpper() == "KEY" ? "PRI" : "") : ""), - "NULL", - (split.Contains("AUTO_INCREMENT") || split.Contains("AUTOINCREMENT") ? "AUTO_INCREMENT" : "")}); + "NULL", autoInc ? "AUTO_INCREMENT" : ""}); } } return schema; diff --git a/Server/Extra/ProfanityFilter.cs b/Server/Extra/ProfanityFilter.cs index 6d6ccc208..f9ba28414 100644 --- a/Server/Extra/ProfanityFilter.cs +++ b/Server/Extra/ProfanityFilter.cs @@ -20,14 +20,11 @@ using System; using System.Collections.Generic; using System.IO; -using System.Linq; using System.Text; using System.Text.RegularExpressions; -namespace MCGalaxy -{ - public static class ProfanityFilter - { +namespace MCGalaxy { + public static class ProfanityFilter { private static Dictionary RegexReduce; private static List BadWords; public static void Init() diff --git a/Server/Server.cs b/Server/Server.cs index 7af773c23..06b2d38fe 100644 --- a/Server/Server.cs +++ b/Server/Server.cs @@ -16,13 +16,10 @@ permissions and limitations under the Licenses. */ using System; -using System.Data; using System.IO; -using System.Linq; using System.Net; using System.Net.Sockets; using MCGalaxy.Games; -using MCGalaxy.SQL; using Newtonsoft.Json; namespace MCGalaxy { @@ -161,13 +158,17 @@ namespace MCGalaxy { public static string SendResponse(HttpListenerRequest request) { try { - string api = ""; - API API = new API(); - API.max_players = (int)Server.players; - API.players = Player.players.Select(mc => mc.name).ToArray(); - API.chat = Player.Last50Chat.ToArray(); - api = JsonConvert.SerializeObject(API, Formatting.Indented); - return api; + API data = new API(); + data.max_players = (int)Server.players; + + Player[] players = PlayerInfo.Online.Items; + string[] names = new string[players.Length]; + for (int i = 0; i < players.Length; i++) + names[i] = players[i].name; + data.players = names; + + data.chat = Player.Last50Chat.ToArray(); + return JsonConvert.SerializeObject(data, Formatting.Indented); } catch(Exception e) { Logger.WriteError(e); } @@ -177,19 +178,19 @@ namespace MCGalaxy { public static string WhoIsResponse(HttpListenerRequest request) { try { string p = request.QueryString.Get("name"); - if (p == null || p == "") - return "Error"; - var whois = new WhoWas(p); - Group grp = Group.Find(whois.rank); - whois.banned = grp != null && grp.Permission == LevelPermission.Banned; + if (p == null || p == "") return "Error"; - if (whois.banned) { + WhoWas data = new WhoWas(p); + Group grp = Group.Find(data.rank); + data.banned = grp != null && grp.Permission == LevelPermission.Banned; + + if (data.banned) { string[] bandata = Ban.GetBanData(p); - whois.banned_by = bandata[0]; - whois.ban_reason = bandata[1]; - whois.banned_time = bandata[2]; + data.banned_by = bandata[0]; + data.ban_reason = bandata[1]; + data.banned_time = bandata[2]; } - return JsonConvert.SerializeObject(whois, Formatting.Indented); + return JsonConvert.SerializeObject(data, Formatting.Indented); } catch(Exception e) { Logger.WriteError(e); }