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

Only create zones and message blocks table when required.

Browse Source
This commit is contained in:
UnknownShadow200 2016-08-23 19:04:09 +10:00
parent 6e1dcc72f1
commit 1b6fecc7d4
3 changed files with 49 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
Commands/building/CmdMessageBlock.cs
View File

@ -21,8 +21,8 @@ using System.Data;
using MCGalaxy.BlockBehaviour; using MCGalaxy.BlockBehaviour;
using MCGalaxy.SQL; using MCGalaxy.SQL;
namespace MCGalaxy.Commands.Building { namespace MCGalaxy.Commands.Building {
public sealed class CmdMessageBlock : Command { public sealed class CmdMessageBlock : Command {
public override string name { get { return "mb"; } } public override string name { get { return "mb"; } }
public override string shortcut { get { return ""; } } public override string shortcut { get { return ""; } }
public override string type { get { return CommandTypes.Building; } } public override string type { get { return CommandTypes.Building; } }
@ -36,17 +36,17 @@ namespace MCGalaxy.Commands.Building {
public override void Use(Player p, string message) { public override void Use(Player p, string message) {
if (message == "") { Help(p); return; } if (message == "") { Help(p); return; }
CatchPos cpos; MBData cpos;
cpos.message = null; cpos.message = null;
string[] args = message.SplitSpaces(2); string[] args = message.SplitSpaces(2);
switch (args[0].ToLower()) { switch (args[0].ToLower()) {
case "air": cpos.type = Block.MsgAir; break; case "air": cpos.type = Block.MsgAir; break;
case "water": cpos.type = Block.MsgWater; break; case "water": cpos.type = Block.MsgWater; break;
case "lava": cpos.type = Block.MsgLava; break; case "lava": cpos.type = Block.MsgLava; break;
case "black": cpos.type = Block.MsgBlack; break; case "black": cpos.type = Block.MsgBlack; break;
case "white": cpos.type = Block.MsgWhite; break; case "white": cpos.type = Block.MsgWhite; break;
case "show": ShowMessageBlocks(p); return; case "show": ShowMessageBlocks(p); return;
default: cpos.type = Block.MsgWhite; cpos.message = message; break; default: cpos.type = Block.MsgWhite; cpos.message = message; break;
} }
if (args.Length == 1) { if (args.Length == 1) {
Player.Message(p, "You need to provide text to put in the messageblock."); return; Player.Message(p, "You need to provide text to put in the messageblock."); return;
@ -85,7 +85,7 @@ namespace MCGalaxy.Commands.Building {
void PlacedMark(Player p, ushort x, ushort y, ushort z, byte type, byte extType) { void PlacedMark(Player p, ushort x, ushort y, ushort z, byte type, byte extType) {
p.ClearBlockchange(); p.ClearBlockchange();
CatchPos cpos = (CatchPos)p.blockchangeObject; MBData cpos = (MBData)p.blockchangeObject;
byte old = p.level.GetTile(x, y, z); byte old = p.level.GetTile(x, y, z);
if (p.level.CheckAffectPermissions(p, x, y, z, old, cpos.type, 0)) { if (p.level.CheckAffectPermissions(p, x, y, z, old, cpos.type, 0)) {
@ -94,7 +94,7 @@ namespace MCGalaxy.Commands.Building {
UpdateDatabase(p, cpos, x, y, z); UpdateDatabase(p, cpos, x, y, z);
Player.Message(p, "Message block created."); Player.Message(p, "Message block created.");
} else { } else {
p.RevertBlock(x, y, z); p.RevertBlock(x, y, z);
Player.Message(p, "Failed to create a message block."); Player.Message(p, "Failed to create a message block.");
} }
@ -102,20 +102,29 @@ namespace MCGalaxy.Commands.Building {
p.Blockchange += PlacedMark; p.Blockchange += PlacedMark;
} }
void UpdateDatabase(Player p, CatchPos cpos, ushort x, ushort y, ushort z) { void UpdateDatabase(Player p, MBData data, ushort x, ushort y, ushort z) {
cpos.message = cpos.message.Replace("'", "\\'"); data.message = data.message.Replace("'", "\\'");
cpos.message = Colors.EscapeColors(cpos.message); data.message = Colors.EscapeColors(data.message);
//safe against SQL injections because no user input is given here //safe against SQL injections because no user input is given here
DataTable Messages = Database.Fill("SELECT * FROM `Messages" + p.level.name + "` WHERE X=@0 AND Y=@1 AND Z=@2", x, y, z); string lvlName = p.level.name;
Messages.Dispose(); object locker = ThreadSafeCache.DBCache.Get(lvlName);
string syntax = Messages.Rows.Count == 0 ? lock (locker) {
"INSERT INTO `Messages" + p.level.name + "` (X, Y, Z, Message) VALUES (@0, @1, @2, @3)" Database.Execute(String.Format(LevelDB.createMessages, lvlName));
: "UPDATE `Messages" + p.level.name + "` SET Message=@3 WHERE X=@0 AND Y=@1 AND Z=@2";
Database.Execute(syntax, x, y, z, cpos.message); int count = 0;
string syntax = "SELECT * FROM `Messages" + lvlName + "` WHERE X=@0 AND Y=@1 AND Z=@2";
using (DataTable Messages = Database.Fill(syntax, x, y, z))
count = Messages.Rows.Count;
syntax = count == 0 ?
"INSERT INTO `Messages" + lvlName + "` (X, Y, Z, Message) VALUES (@0, @1, @2, @3)"
: "UPDATE `Messages" + lvlName + "` SET Message=@3 WHERE X=@0 AND Y=@1 AND Z=@2";
Database.Execute(syntax, x, y, z, data.message);
}
} }
struct CatchPos { public string message; public byte type; } struct MBData { public string message; public byte type; }
void ShowMessageBlocks(Player p) { void ShowMessageBlocks(Player p) {
p.showMBs = !p.showMBs; p.showMBs = !p.showMBs;
@ -142,7 +151,7 @@ namespace MCGalaxy.Commands.Building {
Player.Message(p, "%HPlaces a message in your next block."); Player.Message(p, "%HPlaces a message in your next block.");
Player.Message(p, "%H Valid blocks: white, black, air, water, lava"); Player.Message(p, "%H Valid blocks: white, black, air, water, lava");
Player.Message(p, "%H Use | to separate commands, e.g. /say 1 |/say 2"); Player.Message(p, "%H Use | to separate commands, e.g. /say 1 |/say 2");
Player.Message(p, "%H Note: \"@p\" is a placeholder for player who clicked."); Player.Message(p, "%H Note: \"@p\" is a placeholder for player who clicked.");
Player.Message(p, "%T/mb show %H- Shows or hides MBs"); Player.Message(p, "%T/mb show %H- Shows or hides MBs");
} }
} }

2
Levels/LevelActions.cs
View File

@ -59,7 +59,7 @@ namespace MCGalaxy {
//newName is being split and partly checked on illegal characters reserved for Windows. //newName is being split and partly checked on illegal characters reserved for Windows.
string syntax = Server.useMySQL string syntax = Server.useMySQL
? "RENAME TABLE `{2}{0}` TO `{2}{1}`" : "ALTER TABLE `{2}{0}` RENAME TO `{2}{1}`"; ? "RENAME TABLE `{2}{0}` TO `{2}{1}`" : "ALTER TABLE `{2}{0}` RENAME TO `{2}{1}`";
Database.Execute(String.Format(syntax, src, dst, "Blocks")); Database.Execute(String.Format(syntax, src, dst, "Block"));
object locker = ThreadSafeCache.DBCache.Get(src); object locker = ThreadSafeCache.DBCache.Get(src);
lock (locker) { lock (locker) {

26
Levels/LevelDB.cs
View File

@ -40,7 +40,7 @@ namespace MCGalaxy {
Server.s.Log("Saved BlockDB changes for:" + lvl.name, true); Server.s.Log("Saved BlockDB changes for:" + lvl.name, true);
} }
unsafe static bool DoSaveChanges(List<Level.BlockPos> tempCache, char* ptr, unsafe static bool DoSaveChanges(List<Level.BlockPos> tempCache, char* ptr,
Level lvl, string date, BulkTransaction transaction) { Level lvl, string date, BulkTransaction transaction) {
string template = "INSERT INTO `Block" + lvl.name + string template = "INSERT INTO `Block" + lvl.name +
"` (Username, TimePerformed, X, Y, Z, type, deleted) VALUES (@Name, @Time, @X, @Y, @Z, @Tile, @Del)"; "` (Username, TimePerformed, X, Y, Z, type, deleted) VALUES (@Name, @Time, @X, @Y, @Z, @Tile, @Del)";
@ -104,8 +104,6 @@ namespace MCGalaxy {
public static void CreateTables(string givenName) { public static void CreateTables(string givenName) {
Database.Execute(String.Format(createBlock, givenName, Server.useMySQL ? "BOOL" : "INT")); Database.Execute(String.Format(createBlock, givenName, Server.useMySQL ? "BOOL" : "INT"));
Database.Execute(String.Format(createPortals, givenName)); Database.Execute(String.Format(createPortals, givenName));
Database.Execute(String.Format(createMessages, givenName));
Database.Execute(String.Format(createZones, givenName));
} }
internal static void LoadZones(Level level, string name) { internal static void LoadZones(Level level, string name) {
@ -150,22 +148,30 @@ namespace MCGalaxy {
if (Block.mb(tile)) continue; if (Block.mb(tile)) continue;
//givenName is safe against SQL injections, it gets checked in CmdLoad.cs //givenName is safe against SQL injections, it gets checked in CmdLoad.cs
Database.Execute("DELETE FROM `Messages" + name + "` WHERE X=@0 AND Y=@1 AND Z=@2", Database.Execute("DELETE FROM `Messages" + name + "` WHERE X=@0 AND Y=@1 AND Z=@2",
row["X"], row["Y"], row["Z"]); row["X"], row["Y"], row["Z"]);
} }
} }
} }
public static void DeleteZone(string level, Level.Zone zn) { public static void DeleteZone(string level, Level.Zone zn) {
Database.Execute("DELETE FROM `Zone" + level + "` WHERE Owner=@0 AND SmallX=@1 AND " + object locker = ThreadSafeCache.DBCache.Get(level);
"SMALLY=@2 AND SMALLZ=@3 AND BIGX=@4 AND BIGY=@5 AND BIGZ=@6", lock (locker) {
zn.Owner, zn.smallX, zn.smallY, zn.smallZ, zn.bigX, zn.bigY, zn.bigZ); if (!Database.TableExists("Zone" + level)) return;
Database.Execute("DELETE FROM `Zone" + level + "` WHERE Owner=@0 AND SmallX=@1 AND " +
"SMALLY=@2 AND SMALLZ=@3 AND BIGX=@4 AND BIGY=@5 AND BIGZ=@6",
zn.Owner, zn.smallX, zn.smallY, zn.smallZ, zn.bigX, zn.bigY, zn.bigZ);
}
} }
public static void CreateZone(string level, Level.Zone zn) { public static void CreateZone(string level, Level.Zone zn) {
Database.Execute("INSERT INTO `Zone" + level + "` (Owner, SmallX, SmallY, " + object locker = ThreadSafeCache.DBCache.Get(level);
"SmallZ, BigX, BigY, BigZ) VALUES (@0, @1, @2, @3, @4, @5, @6)", lock (locker) {
zn.Owner, zn.smallX, zn.smallY, zn.smallZ, zn.bigX, zn.bigY, zn.bigZ); Database.Execute(String.Format(LevelDB.createZones, level));
Database.Execute("INSERT INTO `Zone" + level + "` (Owner, SmallX, SmallY, " +
"SmallZ, BigX, BigY, BigZ) VALUES (@0, @1, @2, @3, @4, @5, @6)",
zn.Owner, zn.smallX, zn.smallY, zn.smallZ, zn.bigX, zn.bigY, zn.bigZ);
}
} }