From d30edf8df471d207c692c3041d96040bb23bad0f Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Tue, 26 Jul 2016 16:07:06 +1000 Subject: [PATCH] More Execute instead of executeQuery and Fill instead of fillData for Database. calls. --- Commands/Chat/CmdColor.cs | 11 ++--------- Commands/Chat/CmdTColor.cs | 10 ++-------- Commands/Chat/CmdTitle.cs | 8 ++------ Commands/Moderation/CmdPlayerEditDB.cs | 7 ++----- Levels/LevelActions.cs | 8 ++++---- Player/Player.Handlers.cs | 9 ++------- Player/PlayerInfo.cs | 22 ++++++++-------------- 7 files changed, 22 insertions(+), 53 deletions(-) diff --git a/Commands/Chat/CmdColor.cs b/Commands/Chat/CmdColor.cs index bf4586315..8da1f060b 100644 --- a/Commands/Chat/CmdColor.cs +++ b/Commands/Chat/CmdColor.cs @@ -56,7 +56,6 @@ namespace MCGalaxy.Commands { } static void SetBotColor(Player p, PlayerBot pBot, string[] args) { - ParameterisedQuery query = ParameterisedQuery.Create(); string color = args.Length == 2 ? "&1" : Colors.Parse(args[2]); if (color == "") { Player.Message(p, "There is no color \"" + args[2] + "\"."); return; } Player.GlobalMessage("Bot " + pBot.ColoredName + "'s %Scolor was changed to " + color + Colors.Name(color)); @@ -68,23 +67,17 @@ namespace MCGalaxy.Commands { } static void SetColor(Player p, Player who, string[] args) { - ParameterisedQuery query = ParameterisedQuery.Create(); if (args.Length == 1) { Player.SendChatFrom(who, who.ColoredName + " %Shad their color removed.", false); who.color = who.group.color; - - query.AddParam("@Name", who.name); - Database.executeQuery(query, "UPDATE Players SET color = '' WHERE name = @Name"); + Database.Execute("UPDATE Players SET color = '' WHERE name = @0", who.name); } else { string color = Colors.Parse(args[1]); if (color == "") { Player.Message(p, "There is no color \"" + args[1] + "\"."); return; } else if (color == who.color) { Player.Message(p, who.DisplayName + " already has that color."); return; } Player.SendChatFrom(who, who.ColoredName + " %Shad their color changed to " + color + Colors.Name(color) + "%S.", false); who.color = color; - - query.AddParam("@Color", color); - query.AddParam("@Name", who.name); - Database.executeQuery(query, "UPDATE Players SET color = @Color WHERE name = @Name"); + Database.Execute("UPDATE Players SET color = @1 WHERE name = @0", who.name, color); } Entities.GlobalDespawn(who, true); Entities.GlobalSpawn(who, true); diff --git a/Commands/Chat/CmdTColor.cs b/Commands/Chat/CmdTColor.cs index 72d549c39..3f410acea 100644 --- a/Commands/Chat/CmdTColor.cs +++ b/Commands/Chat/CmdTColor.cs @@ -49,23 +49,17 @@ namespace MCGalaxy.Commands { } static void SetTColor(Player p, Player who, string[] args) { - ParameterisedQuery query = ParameterisedQuery.Create(); if (args.Length == 1) { Player.SendChatFrom(who, who.ColoredName + " %Shad their title color removed.", false); who.titlecolor = ""; - - query.AddParam("@Name", who.name); - Database.executeQuery(query, "UPDATE Players SET title_color = '' WHERE Name = @Name"); + Database.Execute("UPDATE Players SET title_color = '' WHERE Name = @0", who.name); } else { string color = Colors.Parse(args[1]); if (color == "") { Player.Message(p, "There is no color \"" + args[1] + "\"."); return; } else if (color == who.titlecolor) { Player.Message(p, who.DisplayName + " already has that title color."); return; } Player.SendChatFrom(who, who.ColoredName + " %Shad their title color changed to " + color + Colors.Name(color) + "%S.", false); who.titlecolor = color; - - query.AddParam("@Color", color); - query.AddParam("@Name", who.name); - Database.executeQuery(query, "UPDATE Players SET title_color = @Color WHERE Name = @Name"); + Database.Execute("UPDATE Players SET title_color = @1 WHERE Name = @0", who.name, color); } who.SetPrefix(); } diff --git a/Commands/Chat/CmdTitle.cs b/Commands/Chat/CmdTitle.cs index 7eaf0d854..fad02f229 100644 --- a/Commands/Chat/CmdTitle.cs +++ b/Commands/Chat/CmdTitle.cs @@ -51,20 +51,16 @@ namespace MCGalaxy.Commands { static void SetTitle(Player p, Player who, string[] args) { string title = args.Length > 1 ? args[1] : ""; - ParameterisedQuery query = ParameterisedQuery.Create(); if (title != "") title = title.Replace("[", "").Replace("]", ""); if (title.Length >= 20) { Player.Message(p, "Title must be under 20 letters."); return; } if (title == "") { Player.SendChatFrom(who, who.FullName + " %Shad their title removed.", false); - query.AddParam("@Name", who.name); - Database.executeQuery(query, "UPDATE Players SET Title = '' WHERE Name = @Name"); + Database.Execute("UPDATE Players SET Title = '' WHERE Name = @0", who.name); } else { Player.SendChatFrom(who, who.FullName + " %Swas given the title of &b[" + title + "%b]", false); - query.AddParam("@Title", title); - query.AddParam("@Name", who.name); - Database.executeQuery(query, "UPDATE Players SET Title = @Title WHERE Name = @Name"); + Database.Execute("UPDATE Players SET Title = @1 WHERE Name = @0", who.name, title); } who.title = title; who.SetPrefix(); diff --git a/Commands/Moderation/CmdPlayerEditDB.cs b/Commands/Moderation/CmdPlayerEditDB.cs index 354ffe6bf..30eae1a62 100644 --- a/Commands/Moderation/CmdPlayerEditDB.cs +++ b/Commands/Moderation/CmdPlayerEditDB.cs @@ -176,13 +176,10 @@ namespace MCGalaxy.Commands { } static void UpdateDB(Player p, string name, string type, string value, string column) { - ParameterisedQuery query = ParameterisedQuery.Create(); - query.AddParam("@Name", name); if (value != "") { - query.AddParam("@ArgValue", value); - Database.executeQuery(query, "UPDATE Players SET " + column + "=@ArgValue WHERE Name=@Name"); + Database.Execute("UPDATE Players SET " + column + "=@1 WHERE Name=@0", name, value); } else { - Database.executeQuery(query, "UPDATE Players SET " + column + "='' WHERE Name=@Name"); + Database.Execute("UPDATE Players SET " + column + "='' WHERE Name=@0", name); } } diff --git a/Levels/LevelActions.cs b/Levels/LevelActions.cs index 5702d2ab8..e0ba490c2 100644 --- a/Levels/LevelActions.cs +++ b/Levels/LevelActions.cs @@ -58,10 +58,10 @@ namespace MCGalaxy { //safe against SQL injections because foundLevel is being checked and, //newName is being split and partly checked on illegal characters reserved for Windows. if (Server.useMySQL) - Database.Excecute(String.Format("RENAME TABLE `Block{0}` TO `Block{1}`, " + - "`Portals{0}` TO `Portals{1}`, " + - "`Messages{0}` TO `Messages{1}`, " + - "`Zone{0}` TO `Zone{1}`", src, dst)); + Database.Execute(String.Format("RENAME TABLE `Block{0}` TO `Block{1}`, " + + "`Portals{0}` TO `Portals{1}`, " + + "`Messages{0}` TO `Messages{1}`, " + + "`Zone{0}` TO `Zone{1}`", src, dst)); else { using (BulkTransaction helper = SQLiteBulkTransaction.Create()) { // ensures that it's either all work, or none work. helper.Execute(String.Format("ALTER TABLE `Block{0}` RENAME TO `Block{1}`", src, dst)); diff --git a/Player/Player.Handlers.cs b/Player/Player.Handlers.cs index 5183016c4..c50f89b70 100644 --- a/Player/Player.Handlers.cs +++ b/Player/Player.Handlers.cs @@ -443,10 +443,7 @@ namespace MCGalaxy { if (Server.verify) return Server.whiteList.Contains(name); // Verify names is off, check if the player is on the same IP. - ParameterisedQuery query = ParameterisedQuery.Create(); - query.AddParam("@IP", ip); - using (DataTable ipQuery = Database.fillData(query, "SELECT Name FROM Players WHERE IP = @IP")) - return ipQuery.Rows.Contains(name) && Server.whiteList.Contains(name); + return Server.whiteList.Contains(name) && PlayerInfo.FindAccounts(ip).Contains(name); } void CompleteLoginProcess() { @@ -489,9 +486,7 @@ namespace MCGalaxy { //OpenClassic Client Check SendBlockchange(0, 0, 0, 0); - ParameterisedQuery query = ParameterisedQuery.Create(); - query.AddParam("@Name", name); - DataTable playerDb = Database.fillData(query, "SELECT * FROM Players WHERE Name=@Name"); + DataTable playerDb = Database.Fill("SELECT * FROM Players WHERE Name=@0", name); timeLogged = DateTime.Now; lastLogin = DateTime.Now; diff --git a/Player/PlayerInfo.cs b/Player/PlayerInfo.cs index f0e6945a7..56e80cf7e 100644 --- a/Player/PlayerInfo.cs +++ b/Player/PlayerInfo.cs @@ -157,11 +157,9 @@ namespace MCGalaxy { } public static List FindAccounts(string ip) { - ParameterisedQuery query = ParameterisedQuery.Create(); - query.AddParam("@IP", ip); - DataTable clones = Database.fillData(query, "SELECT Name FROM Players WHERE IP=@IP"); - + DataTable clones = Database.Fill("SELECT Name FROM Players WHERE IP=@0", ip); List alts = new List(); + foreach (DataRow row in clones.Rows) { string name = row["Name"].ToString(); if (!alts.CaselessContains(name)) @@ -191,21 +189,17 @@ namespace MCGalaxy { static DataTable Query(string name, string selector) { - ParameterisedQuery query = ParameterisedQuery.Create(); - query.AddParam("@Name", name); string syntax = Server.useMySQL ? - "SELECT " + selector + " FROM Players WHERE Name=@Name COLLATE utf8_general_ci" : - "SELECT " + selector + " FROM Players WHERE Name=@Name COLLATE NOCASE"; - return Database.fillData(query, syntax); + "SELECT " + selector + " FROM Players WHERE Name=@0 COLLATE utf8_general_ci" : + "SELECT " + selector + " FROM Players WHERE Name=@0 COLLATE NOCASE"; + return Database.Fill(syntax, name); } static DataTable QueryMulti(string name, string selector) { - ParameterisedQuery query = ParameterisedQuery.Create(); - query.AddParam("@Name", "%" + name + "%"); string syntax = Server.useMySQL ? - "SELECT " + selector + " FROM Players WHERE Name LIKE @Name LIMIT 21" : - "SELECT " + selector + " FROM Players WHERE Name LIKE @Name LIMIT 21 COLLATE NOCASE"; - return Database.fillData(query, syntax); + "SELECT " + selector + " FROM Players WHERE Name LIKE @0 LIMIT 21" : + "SELECT " + selector + " FROM Players WHERE Name LIKE @0 LIMIT 21 COLLATE NOCASE"; + return Database.Fill(syntax, "%" + name + "%"); } static OfflinePlayer FillInfo(DataRow row, bool fullStats) {